diff options
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) |