aboutsummaryrefslogtreecommitdiff
path: root/ports/libtorrent
diff options
context:
space:
mode:
authorAlexander Neumann <30894796+Neumann-A@users.noreply.github.com>2020-11-17 18:18:59 +0100
committerGitHub <noreply@github.com>2020-11-17 09:18:59 -0800
commit3a26eb3dc4d684ca6c1748dccc7a15684b9e8d0a (patch)
tree8f48a1d104ab8329fa56ad5c49d1be1fb49b8ccd /ports/libtorrent
parent12ab060a3d43b56c6689ac7fe5861c6f9138c568 (diff)
downloadvcpkg-3a26eb3dc4d684ca6c1748dccc7a15684b9e8d0a.tar.gz
vcpkg-3a26eb3dc4d684ca6c1748dccc7a15684b9e8d0a.zip
[intl/gettext/fontconfig] update to native build system (#11776)
* [fontconfig] update fontconfig * [libiconv] update to make * [gettext] update to make * [vcpkg_configure_make] Changes considering pure configure ports without the requirement to run autoconfig * [fontconfig] make it work on windows * Remove install of unofficial cmake config * add function get_cmake_vars * fine tuning. * apply to make based ports. * add log suffix on not windows platforms * fix c&p error * add previous LINK env * setup env on windows and extract cpp flags correctly. * update glib and libxml2 * fix windows regressions * Apply suggestions from code review * add windres wrapper to invoke RC. * remove wrong fi * fix libintl. * try fixing uwp * other things to update * exiv2 fix * libtool does not like -RTC1 * pass the /RTC<x> flag directly to the compiler * trust cmake instead of adding extra flags * fix expat * fix iconv wrapper install * change fontconfig intl linkage. * add appcontainer back in which is required for UWP. Why is this not in the cmake flags? * fix pkg-config in vcpkg_configure_make * fix json-c pkg-config installation * remove remnoved config * comment out debug messages + bit of tuning * finally fontconfig * comment debug messages * expat apply extra patches. * Switch back to -E instead of -EP in cpp * commit changes from fontconfig PR * [expat] fix expat details * Apply suggestions from code review Co-authored-by: nicole mazzuca <mazzucan@outlook.com> * cleanup docs * update osx pipeline so that fontconfig actually builds * fix expat the lazy way by using a higher commit than release * fix a barage of regressions due to the use of unofficial targets * [expat] use a higher commit hash with a better stabilized cmake build * forgot freexl regression * more unofficial fixes * fix downstream expat usage * fix wxwidgets * fix gcdm regression * [vtk] fix the regression due to expat * add uwp cl flags back in. Somehow those are not set by cmake * add a few other configure options for full gettext build * fix cmake regression * fix a few regressions * fix static gettext build * fix gettext static * fix libxml2 wrapper for cmake * some more regressions fixes * add conversion from somelib.lib to -lsomelib * add a few option to libiconv. * get logs from CI * add missing ar-lib wrapper * add missing ar-lib wrapper * add fatal error to gettext * remove uuid from the list of LIBS since it seems to not exist in CI? * small but important regex correction * fix regex and add debug message for libs * remove error and only build libintl. * add uuid dependency to fontconfig in qt5-base * osx install gettext for autopoint * fix io2d regression by saying the port is broken ..... (which it is; upstream needs to learn proper cmake) * restore the old libxml2 wrapper with minor modifications * fix xmlsec regression * install wrapper correctly * try actual fixing io2d * improve iconv wrapper * add latest changes from update_fontconfig PR * Apply suggestions from code review first set which don't need special attention Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * Apply suggestions from code review one more simple change Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * [x264] set env AS * fix bugs due to refactor * use subpath everywhere * apply changes from CR * fix fontconfig build. * only change libs in static builds * remove unnecessary lines 41 & 44 * remove flag transformation * reintroduce the flag / to - transformation for MSVC * trying to figure out autopoint issue. using wrong (windows) find.exe instead of msys * add correct working_dir to subpath * escape stupid env paths. * fix typo * add findutils remove debug messages * add error if libtool chokes * add file to msys * pass lt_cv_deplibs_check_method=pass_all on windows (couldn't get file.exe to work so that libtool correctly ids the passed libs) * add bzip2 to msys * reenable libtool check. Lets see if CI agrees * unbreak linux try to figure out where uuid should be on windows. * add -L flag and help libtool ? * try to get ci to find uuid. * try to use cygpath * update controls * cleanup merge mistakes * correct merge issues * determine cmake vars if not done before. * move adding of -l earlier * more merge cleanup * fix uwp builds by not transforming libs * fix patches in io2d * fix xz download error * apply code review changes manually * fix the typos left behind in CR Co-authored-by: nicole mazzuca <mazzucan@outlook.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
Diffstat (limited to 'ports/libtorrent')
-rw-r--r--ports/libtorrent/CONTROL2
-rw-r--r--ports/libtorrent/fix_find_iconv.patch35
-rw-r--r--ports/libtorrent/portfile.cmake4
3 files changed, 2 insertions, 39 deletions
diff --git a/ports/libtorrent/CONTROL b/ports/libtorrent/CONTROL
index 47ef41845..707cf8a43 100644
--- a/ports/libtorrent/CONTROL
+++ b/ports/libtorrent/CONTROL
@@ -1,6 +1,6 @@
Source: libtorrent
Version: 1.2.10
-Port-Version: 1
+Port-Version: 2
Homepage: https://github.com/arvidn/libtorrent
Description: An efficient feature complete C++ BitTorrent implementation
Build-Depends: openssl, boost-system, boost-date-time, boost-chrono, boost-random, boost-asio, boost-crc, boost-config, boost-iterator, boost-scope-exit, boost-multiprecision, boost-pool, boost-variant
diff --git a/ports/libtorrent/fix_find_iconv.patch b/ports/libtorrent/fix_find_iconv.patch
deleted file mode 100644
index 2c22c15e0..000000000
--- a/ports/libtorrent/fix_find_iconv.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9efd451fb..d85b31fd4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -643,24 +643,19 @@ target_optional_compile_definitions(torrent-rasterbar PUBLIC FEATURE NAME mutabl
- target_optional_compile_definitions(torrent-rasterbar PUBLIC FEATURE NAME streaming DEFAULT ON
- DESCRIPTION "Enables support for piece deadline" DISABLED TORRENT_DISABLE_STREAMING)
-
--find_public_dependency(Iconv)
--if(MSVC)
-- set(iconv_package_type OPTIONAL)
--else()
-- set(iconv_package_type RECOMMENDED)
--endif()
-+find_public_dependency(unofficial-iconv REQUIRED)
-
--set_package_properties(Iconv
-+set_package_properties(unofficial-iconv
- PROPERTIES
- URL "https://www.gnu.org/software/libiconv/"
-- DESCRIPTION "GNU encoding conversion library"
-- TYPE ${iconv_package_type}
-+ DESCRIPTION "GNU encoding conversion library (unofficial vcpkg CMake port)"
-+ TYPE REQUIRED
- PURPOSE "Convert strings between various encodings"
- )
-
--if(Iconv_FOUND)
-+if(unofficial-iconv_FOUND)
- target_compile_definitions(torrent-rasterbar PUBLIC TORRENT_USE_ICONV)
-- target_link_libraries(torrent-rasterbar PRIVATE Iconv::Iconv)
-+ target_link_libraries(torrent-rasterbar PRIVATE unofficial::iconv::libiconv unofficial::iconv::libcharset)
- endif()
-
- find_public_dependency(OpenSSL)
diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake
index 54d40d63d..e548b9b44 100644
--- a/ports/libtorrent/portfile.cmake
+++ b/ports/libtorrent/portfile.cmake
@@ -6,9 +6,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
message(FATAL_ERROR "The python feature is currently broken on Windows")
endif()
- if("iconv" IN_LIST FEATURES)
- set(ICONV_PATCH "fix_find_iconv.patch")
- else()
+ if(NOT "iconv" IN_LIST FEATURES)
# prevent picking up libiconv if it happens to already be installed
set(ICONV_PATCH "no_use_iconv.patch")
endif()