diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-11-17 18:18:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-17 09:18:59 -0800 |
| commit | 3a26eb3dc4d684ca6c1748dccc7a15684b9e8d0a (patch) | |
| tree | 8f48a1d104ab8329fa56ad5c49d1be1fb49b8ccd /ports/io2d | |
| parent | 12ab060a3d43b56c6689ac7fe5861c6f9138c568 (diff) | |
| download | vcpkg-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/io2d')
| -rw-r--r-- | ports/io2d/CONTROL | 1 | ||||
| -rw-r--r-- | ports/io2d/Fix-FindCairo.patch | 15 | ||||
| -rw-r--r-- | ports/io2d/cmake.dep.patch | 62 | ||||
| -rw-r--r-- | ports/io2d/fix-expat.patch | 13 | ||||
| -rw-r--r-- | ports/io2d/fix-linux-build.patch | 22 | ||||
| -rw-r--r-- | ports/io2d/portfile.cmake | 4 |
6 files changed, 64 insertions, 53 deletions
diff --git a/ports/io2d/CONTROL b/ports/io2d/CONTROL index 5848cb754..59ff0c23c 100644 --- a/ports/io2d/CONTROL +++ b/ports/io2d/CONTROL @@ -1,4 +1,5 @@ Source: io2d Version: 2020-09-14 +Port-Version: 1 Description: a lightweight, cross platform drawing library Build-Depends: cairo (!osx), cairo[x11] (linux), graphicsmagick (!osx) diff --git a/ports/io2d/Fix-FindCairo.patch b/ports/io2d/Fix-FindCairo.patch deleted file mode 100644 index e3caa2f7f..000000000 --- a/ports/io2d/Fix-FindCairo.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt -index d0e9176..2ac638c 100644 ---- a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt -+++ b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt -@@ -24,7 +24,9 @@ target_include_directories(io2d_cairo PUBLIC - - target_compile_features(io2d_cairo PUBLIC cxx_std_17) - --target_link_libraries(io2d_cairo PUBLIC io2d_core Cairo::Cairo unofficial::graphicsmagick::graphicsmagick) -+find_package(unofficial-cairo CONFIG REQUIRED) -+ -+target_link_libraries(io2d_cairo PUBLIC io2d_core unofficial::cairo::cairo unofficial::graphicsmagick::graphicsmagick) - - install( - TARGETS io2d_cairo EXPORT io2d_targets diff --git a/ports/io2d/cmake.dep.patch b/ports/io2d/cmake.dep.patch new file mode 100644 index 000000000..baad36341 --- /dev/null +++ b/ports/io2d/cmake.dep.patch @@ -0,0 +1,62 @@ +diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt +index 5ebeb6afa..702864667 100644 +--- a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt ++++ b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt +@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.8) + + project(io2d CXX) + +-find_package(Cairo REQUIRED) +-find_package(GraphicsMagick REQUIRED) ++find_package(unofficial-Cairo REQUIRED) ++find_package(unofficial-GraphicsMagick REQUIRED) + + add_library(io2d_cairo + cairo_renderer-graphicsmagickinit.cpp +@@ -24,7 +24,7 @@ target_include_directories(io2d_cairo PUBLIC + + target_compile_features(io2d_cairo PUBLIC cxx_std_17) + +-target_link_libraries(io2d_cairo PUBLIC io2d_core Cairo::Cairo GraphicsMagick::GraphicsMagick) ++target_link_libraries(io2d_cairo PUBLIC io2d_core unofficial::cairo::cairo unofficial::graphicsmagick::graphicsmagick) + + install( + TARGETS io2d_cairo EXPORT io2d_targets +diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt +index abb150113..75d8c654d 100644 +--- a/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt ++++ b/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt +@@ -27,15 +27,24 @@ if(MSVC) + target_compile_definitions(io2d_cairo_win32 PUBLIC -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_WARNINGS) + + find_library(PIXMAN_LIB pixman-1) +- find_library(FREETYPE_LIB freetype) +- find_library(FONTCONFIG_LIB fontconfig) +- find_library(BZ_LIB bz2) +- find_library(JPEG_LIB jpeg) +- find_library(TIFF_LIB tiff) +- find_library(EXPAT_LIB expat) +- find_library(LZMA_LIB lzma) +- find_library(ICONV_LIB libiconv) +- find_library(CHARSET_LIB libcharset) ++ find_package(FreeType REQUIRED) ++ set(FREETYPE_LIB ${FREETYPE_LIBRARIES}) # I dont use targets here since this means I have to correct the config.cmake too ++ find_package(Fontconfig REQUIRED) ++ set(FONTCONFIG_LIB ${Fontconfig_LIBRARIES}) ++ find_package(BZip2 REQUIRED) ++ set(BZ_LIB ${BZIP2_LIBRARIES}) ++ find_package(JPEG REQUIRED) ++ set(JPEG_LIB ${JPEG_LIBRARIES}) ++ find_package(TIFF REQUIRED) ++ set(TIFF_LIB ${TIFF_LIBRARIES}) ++ find_package(EXPAT REQUIRED) ++ set(EXPAT_LIB ${EXPAT_LIBRARIES}) ++ find_package(LibLZMA REQUIRED) ++ set(LZMA_LIB ${LIBLZMA_LIBRARIES}) ++ find_package(Iconv REQUIRED) ++ if(NOT Iconv_IS_BUILT_IN) ++ set(ICONV_LIB ${Iconv_LIBRARIES}) ++ endif() + + target_link_libraries(io2d_cairo_win32 PUBLIC ${PIXMAN_LIB} ${FREETYPE_LIB} ${FONTCONFIG_LIB} ${BZ_LIB} ${JPEG_LIB} ${TIFF_LIB} ${EXPAT_LIB} ${LZMA_LIB} ${ICONV_LIB} ${CHARSET_LIB}) + endif() diff --git a/ports/io2d/fix-expat.patch b/ports/io2d/fix-expat.patch deleted file mode 100644 index 25d38bb10..000000000 --- a/ports/io2d/fix-expat.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt
-index abb1501..412f3d4 100644
---- a/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt
-+++ b/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt
-@@ -32,7 +32,7 @@ if(MSVC)
- find_library(BZ_LIB bz2)
- find_library(JPEG_LIB jpeg)
- find_library(TIFF_LIB tiff)
-- find_library(EXPAT_LIB expat)
-+ find_library(EXPAT_LIB libexpat)
- find_library(LZMA_LIB lzma)
- find_library(ICONV_LIB libiconv)
- find_library(CHARSET_LIB libcharset)
diff --git a/ports/io2d/fix-linux-build.patch b/ports/io2d/fix-linux-build.patch deleted file mode 100644 index be038fab4..000000000 --- a/ports/io2d/fix-linux-build.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt -index 5ebeb6a..d0e9176 100644 ---- a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt -+++ b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt -@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.8) - project(io2d CXX) - - find_package(Cairo REQUIRED) --find_package(GraphicsMagick REQUIRED) -+find_package(unofficial-graphicsmagick REQUIRED) - - add_library(io2d_cairo - cairo_renderer-graphicsmagickinit.cpp -@@ -24,7 +24,7 @@ target_include_directories(io2d_cairo PUBLIC - - target_compile_features(io2d_cairo PUBLIC cxx_std_17) - --target_link_libraries(io2d_cairo PUBLIC io2d_core Cairo::Cairo GraphicsMagick::GraphicsMagick) -+target_link_libraries(io2d_cairo PUBLIC io2d_core Cairo::Cairo unofficial::graphicsmagick::graphicsmagick) - - install( - TARGETS io2d_cairo EXPORT io2d_targets diff --git a/ports/io2d/portfile.cmake b/ports/io2d/portfile.cmake index ad36dd70e..d47fc97c8 100644 --- a/ports/io2d/portfile.cmake +++ b/ports/io2d/portfile.cmake @@ -7,9 +7,7 @@ vcpkg_from_github( SHA512 f8e5a708f6cbda913a0492a843e1502b8d3cc615a6abda50e850be944e1484ec9087b787c54cc25d513172a7d5ab789be41a761c97df94266df4d1bcf14db17c HEAD_REF master PATCHES - fix-linux-build.patch - Fix-FindCairo.patch - fix-expat.patch + cmake.dep.patch ) if (VCPKG_TARGET_IS_OSX) |
