From 0619aaec650861d2a15a91cbbf11e0c626a1cf12 Mon Sep 17 00:00:00 2001 From: Qing-Dong Wang Date: Fri, 26 Apr 2019 14:37:20 +0800 Subject: [PATCH] [freeglut] fix download URLs (#6035) --- ports/freeglut/portfile.cmake | 2 +- ports/freeimage/portfile.cmake | 2 +- ports/giflib/portfile.cmake | 2 +- ports/tinyutf8/portfile.cmake | 58 +++++++++++++++++----------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/ports/freeglut/portfile.cmake b/ports/freeglut/portfile.cmake index 3be83ed4a1..24d022b177 100644 --- a/ports/freeglut/portfile.cmake +++ b/ports/freeglut/portfile.cmake @@ -1,7 +1,7 @@ include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/freeglut-3.0.0) vcpkg_download_distfile(ARCHIVE - URLS "http://downloads.sourceforge.net/project/freeglut/freeglut/3.0.0/freeglut-3.0.0.tar.gz" + URLS "https://sourceforge.net/projects/freeglut/files/freeglut/3.0.0/freeglut-3.0.0.tar.gz/download" FILENAME "freeglut-3.0.0.tar.gz" SHA512 9c45d5b203b26a7ff92331b3e080a48e806c92fbbe7c65d9262dd18c39cd6efdad8a795a80f499a2d23df84b4909dbd7c1bab20d7dd3555d3d88782ce9dd15b0 ) diff --git a/ports/freeimage/portfile.cmake b/ports/freeimage/portfile.cmake index 3fea39a0e5..f3d9279c3b 100644 --- a/ports/freeimage/portfile.cmake +++ b/ports/freeimage/portfile.cmake @@ -2,7 +2,7 @@ include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/FreeImage) vcpkg_download_distfile(ARCHIVE - URLS "http://downloads.sourceforge.net/freeimage/FreeImage3180.zip" + URLS "https://sourceforge.net/projects/freeimage/files/Source%20Distribution/3.18.0/FreeImage3180.zip/download" FILENAME "FreeImage3180.zip" SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818 ) diff --git a/ports/giflib/portfile.cmake b/ports/giflib/portfile.cmake index aeca810ed5..ed68c11b88 100644 --- a/ports/giflib/portfile.cmake +++ b/ports/giflib/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) set(GIFLIB_VERSION 5.1.4) vcpkg_download_distfile(ARCHIVE - URLS "http://downloads.sourceforge.net/sourceforge/giflib/giflib-${GIFLIB_VERSION}.tar.bz2" + URLS "https://nchc.dl.sourceforge.net/project/giflib/giflib-${GIFLIB_VERSION}.tar.bz2" FILENAME "giflib-${GIFLIB_VERSION}.tar.bz2" SHA512 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d ) diff --git a/ports/tinyutf8/portfile.cmake b/ports/tinyutf8/portfile.cmake index 921fcbd4bc..8ee8ae4369 100644 --- a/ports/tinyutf8/portfile.cmake +++ b/ports/tinyutf8/portfile.cmake @@ -1,29 +1,29 @@ -include(vcpkg_common_functions) - -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO DuffsDevice/tinyutf8 - REF v2.2 - SHA512 5b524696f2d2b0d09d31498ca03444609f31984007f2c56e4f50cc2eadaa2583de2af07644cf471e08ad88bc1a7881bc34803dbfac18d22e2089792c05ee4b13 - HEAD_REF master - PATCHES fixbuild.patch -) - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" TINYUTF8_BUILD_STATIC) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DTINYUTF8_BUILD_STATIC=${TINYUTF8_BUILD_STATIC} -) - -vcpkg_install_cmake() -vcpkg_copy_pdbs() - -# Handle copyright -configure_file(${SOURCE_PATH}/LICENCE ${CURRENT_PACKAGES_DIR}/share/tinyutf8/copyright COPYONLY) - -# remove unneeded files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DuffsDevice/tinyutf8 + REF v2.2 + SHA512 5b524696f2d2b0d09d31498ca03444609f31984007f2c56e4f50cc2eadaa2583de2af07644cf471e08ad88bc1a7881bc34803dbfac18d22e2089792c05ee4b13 + HEAD_REF master + PATCHES fixbuild.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" TINYUTF8_BUILD_STATIC) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DTINYUTF8_BUILD_STATIC=${TINYUTF8_BUILD_STATIC} +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENCE ${CURRENT_PACKAGES_DIR}/share/tinyutf8/copyright COPYONLY) + +# remove unneeded files +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)