From c4d24cbbdda173764deb8c5b22614abc25c4e8f7 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 25 Jan 2023 07:21:16 +0100 Subject: [PATCH 01/12] [libwebp] Update to 1.3.0 --- ports/libwebp/0002-cmake-config.patch | 20 ++---- .../libwebp/0003-fix-tool-dependencies.patch | 13 ---- ports/libwebp/0008-sdl.patch | 38 +++++++----- ports/libwebp/0009-glut.patch | 13 ---- ports/libwebp/0010-fix_build.patch | 62 ------------------- ports/libwebp/portfile.cmake | 7 +-- ports/libwebp/vcpkg.json | 3 +- 7 files changed, 32 insertions(+), 124 deletions(-) delete mode 100644 ports/libwebp/0003-fix-tool-dependencies.patch delete mode 100644 ports/libwebp/0009-glut.patch delete mode 100644 ports/libwebp/0010-fix_build.patch diff --git a/ports/libwebp/0002-cmake-config.patch b/ports/libwebp/0002-cmake-config.patch index cc9a27fc8b1433..834034b4a22ce1 100644 --- a/ports/libwebp/0002-cmake-config.patch +++ b/ports/libwebp/0002-cmake-config.patch @@ -1,26 +1,18 @@ diff --git a/cmake/WebPConfig.cmake.in b/cmake/WebPConfig.cmake.in -index 822fc59..fb31829 100644 +index f334739..43f10e0 100644 --- a/cmake/WebPConfig.cmake.in +++ b/cmake/WebPConfig.cmake.in -@@ -5,7 +5,19 @@ set(WEBP_VERSION ${WebP_VERSION}) +@@ -12,5 +12,12 @@ include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") -+include(CMakeFindDependencyMacro) -+find_dependency(Threads) - include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") - --set(WebP_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@") -+get_filename_component(_vcpkg_libwebp_root "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE) -+set(WebP_INCLUDE_DIRS "${_vcpkg_libwebp_root}/include") + set(WebP_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@") set(WEBP_INCLUDE_DIRS ${WebP_INCLUDE_DIRS}) -set(WebP_LIBRARIES "@INSTALLED_LIBRARIES@") +set(WebP_LIBRARIES "") +include(SelectLibraryConfigurations) -+foreach(_vcpkg_libwebp_lib IN ITEMS @INSTALLED_LIBRARIES@) -+ string(REPLACE "libwebpmux" "webpmux" _vcpkg_libwebp_lib "${_vcpkg_libwebp_lib}") # offical OUTPUT_NAME -+ find_library(_vcpkg_${_vcpkg_libwebp_lib}_LIBRARY_RELEASE NAMES ${_vcpkg_libwebp_lib} NAMES_PER_DIR PATHS "${_vcpkg_libwebp_root}/lib" NO_DEFAULT_PATH) -+ find_library(_vcpkg_${_vcpkg_libwebp_lib}_LIBRARY_DEBUG NAMES ${_vcpkg_libwebp_lib}d ${_vcpkg_libwebp_lib} NAMES_PER_DIR PATHS "${_vcpkg_libwebp_root}/debug/lib" NO_DEFAULT_PATH) ++foreach(_vcpkg_libwebp_lib IN ITEMS @INSTALLED_LIBRARIES@ sharpyuv) ++ find_library(_vcpkg_${_vcpkg_libwebp_lib}_LIBRARY_RELEASE NAMES ${_vcpkg_libwebp_lib} lib${_vcpkg_libwebp_lib} NAMES_PER_DIR PATHS "${VCPKG_IMPORT_PREFIX}/lib" NO_DEFAULT_PATH) ++ find_library(_vcpkg_${_vcpkg_libwebp_lib}_LIBRARY_DEBUG NAMES ${_vcpkg_libwebp_lib}d lib${_vcpkg_libwebp_lib}d ${_vcpkg_libwebp_lib} lib${_vcpkg_libwebp_lib} NAMES_PER_DIR PATHS "${VCPKG_IMPORT_PREFIX}/debug/lib" NO_DEFAULT_PATH) + select_library_configurations(_vcpkg_${_vcpkg_libwebp_lib}) + list(APPEND WebP_LIBRARIES ${_vcpkg_${_vcpkg_libwebp_lib}_LIBRARIES}) +endforeach() set(WEBP_LIBRARIES "${WebP_LIBRARIES}") -+unset(_vcpkg_libwebp_root) diff --git a/ports/libwebp/0003-fix-tool-dependencies.patch b/ports/libwebp/0003-fix-tool-dependencies.patch deleted file mode 100644 index 63fb5afde1aa2e..00000000000000 --- a/ports/libwebp/0003-fix-tool-dependencies.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 77a0f85..4a84ed1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -410,6 +410,8 @@ endif() - - # Build the executables if asked for. - if(WEBP_BUILD_ANIM_UTILS -+ OR WEBP_BUILD_WEBPINFO -+ OR WEBP_BUILD_WEBPMUX - OR WEBP_BUILD_CWEBP - OR WEBP_BUILD_DWEBP - OR WEBP_BUILD_GIF2WEBP diff --git a/ports/libwebp/0008-sdl.patch b/ports/libwebp/0008-sdl.patch index b922ef17254259..466388a89a0702 100644 --- a/ports/libwebp/0008-sdl.patch +++ b/ports/libwebp/0008-sdl.patch @@ -1,8 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 91a4ba8..10a3f4d 100644 +index 0a5af42..636eef7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -624,11 +624,12 @@ endif() +@@ -635,16 +635,22 @@ if(WEBP_BUILD_EXTRAS) + ${CMAKE_CURRENT_BINARY_DIR}/src ${SDL_INCLUDE_DIR}) + set(WEBP_HAVE_SDL 1) + target_compile_definitions(vwebp_sdl PUBLIC WEBP_HAVE_SDL) ++ target_compile_definitions(vwebp_sdl PRIVATE WEBP_HAVE_JUST_SDL_H) ++ if(WIN32) ++ target_link_libraries(vwebp_sdl dxguid winmm) ++ endif() + endif() + endif() if(WEBP_BUILD_WEBP_JS) # wasm2js does not support SIMD. @@ -11,27 +20,26 @@ index 91a4ba8..10a3f4d 100644 # JavaScript version add_executable(webp_js ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c) - target_link_libraries(webp_js webpdecoder SDL) -- target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + target_link_libraries(webp_js webpdecoder ${SDL_LIBRARY}) -+ target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${SDL_INCLUDE_DIR}) + target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) ++ target_include_directories(webp_js PRIVATE ${SDL_INCLUDE_DIR}) set(WEBP_HAVE_SDL 1) set_target_properties( webp_js -@@ -641,14 +642,14 @@ if(WEBP_BUILD_WEBP_JS) +@@ -653,12 +659,15 @@ if(WEBP_BUILD_WEBP_JS) + -sEXPORTED_RUNTIME_METHODS=cwrap") + set_target_properties(webp_js PROPERTIES OUTPUT_NAME webp) + target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL) ++ target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_JUST_SDL_H) + endif() # WASM version add_executable(webp_wasm ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c) - target_link_libraries(webp_wasm webpdecoder SDL) -- target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + target_link_libraries(webp_wasm webpdecoder ${SDL_LIBRARY}) -+ target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${SDL_INCLUDE_DIR}) + target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) ++ target_include_directories(webp_wasm PRIVATE ${SDL_INCLUDE_DIR}) ++ target_compile_definitions(webp_wasm PUBLIC EMSCRIPTEN WEBP_HAVE_JUST_SDL_H) set_target_properties( webp_wasm - PROPERTIES LINK_FLAGS "-s WASM=1 \ - -s EXPORTED_FUNCTIONS='[\"_WebpToSDL\"]' -s INVOKE_RUN=0 \ - -s EXPORTED_RUNTIME_METHODS='[\"cwrap\"]'") -- target_compile_definitions(webp_wasm PUBLIC EMSCRIPTEN WEBP_HAVE_SDL) -+ target_compile_definitions(webp_wasm PUBLIC EMSCRIPTEN WEBP_HAVE_SDL WEBP_HAVE_JUST_SDL_H) - - target_compile_definitions(webpdspdecode PUBLIC EMSCRIPTEN) - endif() + PROPERTIES LINK_FLAGS "-sWASM=1 \ diff --git a/ports/libwebp/0009-glut.patch b/ports/libwebp/0009-glut.patch deleted file mode 100644 index 914a935e1835e4..00000000000000 --- a/ports/libwebp/0009-glut.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0799269..45b3306 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -532,7 +532,7 @@ if(WEBP_BUILD_VWEBP) - target_link_libraries(vwebp - ${OPENGL_LIBRARIES} - exampleutil -- ${GLUT_glut_LIBRARY} -+ GLUT::GLUT - imageioutil - webp - webpdemux) diff --git a/ports/libwebp/0010-fix_build.patch b/ports/libwebp/0010-fix_build.patch deleted file mode 100644 index 1d3d45094a819c..00000000000000 --- a/ports/libwebp/0010-fix_build.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 43742c7f7..44b035ebb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -248,6 +248,9 @@ ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h") - if(MSVC) - # avoid security warnings for e.g., fopen() used in the examples. - add_definitions(-D_CRT_SECURE_NO_WARNINGS) -+ if(BUILD_SHARED_LIBS) -+ add_definitions("-DWEBP_DLL") -+ endif() - else() - add_definitions(-Wall) - endif() -@@ -635,8 +638,12 @@ if(WEBP_BUILD_EXTRAS) - # webp_quality - add_executable(webp_quality ${WEBP_QUALITY_SRCS}) - target_link_libraries(webp_quality exampleutil imagedec extras) -+ if(BUILD_SHARED_LIBS) -+ target_link_libraries(webp_quality webpdspdecode) -+ endif() - target_include_directories(webp_quality - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} -+ ${CMAKE_CURRENT_SOURCE_DIR}/src - ${CMAKE_CURRENT_BINARY_DIR}) - - # vwebp_sdl -@@ -651,6 +658,10 @@ if(WEBP_BUILD_EXTRAS) - ${SDL_INCLUDE_DIR}) - set(WEBP_HAVE_SDL 1) - target_compile_definitions(vwebp_sdl PUBLIC WEBP_HAVE_SDL) -+ if (MSVC) -+ target_link_libraries(vwebp_sdl dxguid winmm) -+ endif() -+ target_compile_definitions(vwebp_sdl PRIVATE WEBP_HAVE_JUST_SDL_H) - endif() - endif() - -@@ -669,7 +680,7 @@ if(WEBP_BUILD_WEBP_JS) - -s EXPORTED_FUNCTIONS='[\"_WebpToSDL\"]' -s INVOKE_RUN=0 \ - -s EXPORTED_RUNTIME_METHODS='[\"cwrap\"]'") - set_target_properties(webp_js PROPERTIES OUTPUT_NAME webp) -- target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL) -+ target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL WEBP_HAVE_JUST_SDL_H) - endif() - - # WASM version -diff --git a/src/webp/types.h b/src/webp/types.h -index 47f7f2b00..a7a706590 100644 ---- a/src/webp/types.h -+++ b/src/webp/types.h -@@ -39,7 +39,9 @@ typedef long long int int64_t; - #ifndef WEBP_EXTERN - // This explicitly marks library functions and allows for changing the - // signature for e.g., Windows DLL builds. --# if defined(__GNUC__) && __GNUC__ >= 4 -+# if defined(_MSC_VER) && defined(WEBP_DLL) -+# define WEBP_EXTERN extern __declspec(dllexport) -+# elif defined(__GNUC__) && __GNUC__ >= 4 - # define WEBP_EXTERN extern __attribute__ ((visibility ("default"))) - # else - # define WEBP_EXTERN extern diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index b15557743b0f80..216492ca3f0d33 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -1,16 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO webmproject/libwebp - REF v1.2.4 - SHA512 85c7d2bd1697ed6f18d565056d0105edd63697f144d2c935e9c0563ff09f4acc56d4ac509668f920e8d5dc3c74b53a42f65265fc758fed173cb2168c4d6a551c + REF "v${VERSION}" + SHA512 96f73ba6caee4e65535721ca80faa976f51930eb6693e4499593e896f15269dfb756defabe7afbefb3bd2ef90afc0c95e3ba49d8020bc18589c34e9e680d955a HEAD_REF master PATCHES 0002-cmake-config.patch - 0003-fix-tool-dependencies.patch 0007-fix-arm-build.patch 0008-sdl.patch - 0009-glut.patch - 0010-fix_build.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/libwebp/vcpkg.json b/ports/libwebp/vcpkg.json index d759b4fb7625af..b2380d0b90bf7d 100644 --- a/ports/libwebp/vcpkg.json +++ b/ports/libwebp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libwebp", - "version": "1.2.4", - "port-version": 1, + "version": "1.3.0", "description": "WebP codec: library to encode and decode images in WebP format", "homepage": "https://github.com/webmproject/libwebp", "license": "BSD-3-Clause", From a4600a372818264b63e36a994549550ce1f74d93 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 25 Jan 2023 07:21:43 +0100 Subject: [PATCH 02/12] Fix [core] on x64-osx --- ports/libwebp/vcpkg.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ports/libwebp/vcpkg.json b/ports/libwebp/vcpkg.json index b2380d0b90bf7d..790b0701c83268 100644 --- a/ports/libwebp/vcpkg.json +++ b/ports/libwebp/vcpkg.json @@ -13,6 +13,14 @@ ], "platform": "windows" }, + { + "name": "libwebp", + "default-features": false, + "features": [ + "simd" + ], + "platform": "osx & x64" + }, { "name": "vcpkg-cmake", "host": true From c14ddacf2a62fc670435d24dd1a37c3a05b0b413 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 25 Jan 2023 07:25:51 +0100 Subject: [PATCH 03/12] Fix features and dependencies --- ports/libwebp/0010-fix_build.patch | 21 +++++++++++ ports/libwebp/portfile.cmake | 24 ++++++------ ports/libwebp/vcpkg.json | 60 +++++++++++++++--------------- 3 files changed, 63 insertions(+), 42 deletions(-) create mode 100644 ports/libwebp/0010-fix_build.patch diff --git a/ports/libwebp/0010-fix_build.patch b/ports/libwebp/0010-fix_build.patch new file mode 100644 index 00000000000000..c33bee25e6dd08 --- /dev/null +++ b/ports/libwebp/0010-fix_build.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 636eef7..80361f1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -452,6 +452,7 @@ endif() + if(WEBP_BUILD_ANIM_UTILS + OR WEBP_BUILD_CWEBP + OR WEBP_BUILD_DWEBP ++ OR WEBP_BUILD_EXTRAS + OR WEBP_BUILD_GIF2WEBP + OR WEBP_BUILD_IMG2WEBP + OR WEBP_BUILD_VWEBP +@@ -488,6 +489,8 @@ if(WEBP_BUILD_ANIM_UTILS + TARGET exampleutil imageioutil imagedec imageenc + PROPERTY INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/src + ${CMAKE_CURRENT_BINARY_DIR}/src) ++ target_include_directories(imagedec PRIVATE ${WEBP_DEP_IMG_INCLUDE_DIRS}) ++ target_include_directories(imageenc PRIVATE ${WEBP_DEP_IMG_INCLUDE_DIRS}) + endif() + + if(WEBP_BUILD_DWEBP) diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index 216492ca3f0d33..ef224793d882a4 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -8,37 +8,37 @@ vcpkg_from_github( 0002-cmake-config.patch 0007-fix-arm-build.patch 0008-sdl.patch + 0010-fix_build.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES anim WEBP_BUILD_ANIM_UTILS + cwebp WEBP_BUILD_CWEBP + dwebp WEBP_BUILD_DWEBP + extras WEBP_BUILD_EXTRAS gif2webp WEBP_BUILD_GIF2WEBP img2webp WEBP_BUILD_IMG2WEBP - vwebp WEBP_BUILD_VWEBP - vwebp-sdl WEBP_HAVE_SDL info WEBP_BUILD_WEBPINFO + libwebpmux WEBP_BUILD_LIBWEBPMUX mux WEBP_BUILD_WEBPMUX - extras WEBP_BUILD_EXTRAS nearlossless WEBP_NEAR_LOSSLESS simd WEBP_ENABLE_SIMD - cwebp WEBP_BUILD_CWEBP - dwebp WEBP_BUILD_DWEBP swap16bitcsp WEBP_ENABLE_SWAP_16BIT_CSP unicode WEBP_UNICODE - libwebpmux WEBP_BUILD_LIBWEBPMUX + vwebp WEBP_BUILD_VWEBP + vwebp-sdl CMAKE_REQUIRE_FIND_PACKAGE_SDL + INVERTED_FEATURES + vwebp-sdl CMAKE_DISABLE_FIND_PACKAGE_SDL ) -if(VCPKG_TARGET_IS_OSX) - if("vwebp" IN_LIST FEATURES OR "extras" IN_LIST FEATURES) - message(FATAL_ERROR "Due to GLUT Framework problems with CMake, at the moment it's not possible to build VWebP or extras on Mac!") - endif() -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_SDL + CMAKE_REQUIRE_FIND_PACKAGE_SDL ) vcpkg_cmake_install() diff --git a/ports/libwebp/vcpkg.json b/ports/libwebp/vcpkg.json index 790b0701c83268..e59cd8bc92b682 100644 --- a/ports/libwebp/vcpkg.json +++ b/ports/libwebp/vcpkg.json @@ -45,6 +45,7 @@ "anim", "cwebp", "dwebp", + "extras", "gif2webp", "img2webp", "info", @@ -57,22 +58,25 @@ { "name": "libwebp", "features": [ - "extras" + "vwebp" ], - "platform": "!osx" + "platform": "!osx & !static" }, { "name": "libwebp", "features": [ "vwebp-sdl" ], - "platform": "!osx" + "platform": "!osx & !static & !uwp" } ] }, "anim": { "description": "Build animation utilities.", "dependencies": [ + "giflib", + "libjpeg-turbo", + "libpng", { "name": "libwebp", "default-features": false, @@ -80,30 +84,32 @@ "img2webp", "mux" ] - } + }, + "tiff" ] }, "cwebp": { - "description": "Build the cwebp command line tool." + "description": "Build the cwebp command line tool.", + "dependencies": [ + "libjpeg-turbo", + "libpng", + "tiff" + ] }, "dwebp": { - "description": "Build the dwebp command line tool." + "description": "Build the dwebp command line tool.", + "dependencies": [ + "libjpeg-turbo", + "libpng", + "tiff" + ] }, "extras": { - "description": "Build extras.", - "supports": "!osx", + "description": "Build extras. (Doesn't include vwebp-sdl.)", "dependencies": [ - { - "name": "libwebp", - "default-features": false, - "features": [ - "vwebp" - ] - }, - { - "name": "sdl1", - "platform": "windows" - } + "libjpeg-turbo", + "libpng", + "tiff" ] }, "gif2webp": { @@ -178,30 +184,24 @@ }, "vwebp": { "description": "Build the vwebp viewer tool.", - "supports": "!osx", + "supports": "!osx & !static", "dependencies": [ - { - "name": "freeglut", - "platform": "!osx" - }, + "freeglut", "opengl" ] }, "vwebp-sdl": { - "description": "Build the vwebp viewer tool.", - "supports": "!osx", + "description": "Build the vwebp viewer tool for SDL.", "dependencies": [ { "name": "libwebp", "default-features": false, "features": [ + "extras", "vwebp" ] }, - { - "name": "sdl1", - "platform": "windows" - } + "sdl1" ] } } From 885bf8fce45f1ebd07e3fb0ef0ccb8e5b395a30d Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 25 Jan 2023 07:39:12 +0100 Subject: [PATCH 04/12] Cleanup tool installation --- ports/libwebp/portfile.cmake | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index ef224793d882a4..174552a291b1ac 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -36,6 +36,16 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} + OPTIONS_DEBUG + -DWEBP_BUILD_ANIM_UTILS=OFF + -DWEBP_BUILD_CWEBP=OFF + -DWEBP_BUILD_DWEBP=OFF + -DWEBP_BUILD_EXTRAS=OFF + -DWEBP_BUILD_GIF2WEBP=OFF + -DWEBP_BUILD_IMG2WEBP=OFF + -DWEBP_BUILD_VWEBP=OFF + -DWEBP_BUILD_WEBPINFO=OFF + -DWEBP_BUILD_WEBPMUX=OFF MAYBE_UNUSED_VARIABLES CMAKE_DISABLE_FIND_PACKAGE_SDL CMAKE_REQUIRE_FIND_PACKAGE_SDL @@ -51,28 +61,14 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_fixup_pkgconfig() -set(BIN_NAMES get_disto gif2webp img2webp vwebp vwebp_sdl webpinfo webpmux webp_quality cwebp dwebp) -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/webp/") -foreach(tool ${BIN_NAMES}) - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") - endif() - +vcpkg_list(SET BIN_NAMES) +foreach(tool IN ITEMS get_disto gif2webp img2webp vwebp vwebp_sdl webpinfo webpmux webp_quality cwebp dwebp) if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/webp/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + vcpkg_list(APPEND BIN_NAMES "${tool}") endif() endforeach() -vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/webp") - -#No tools -file(GLOB_RECURSE RESULT "${CURRENT_PACKAGES_DIR}/tools/") -list(LENGTH RESULT RES_LEN) -if(RES_LEN EQUAL 0) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/") -endif() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +if(NOT BIN_NAMES STREQUAL "") + vcpkg_copy_tools(TOOL_NAMES ${BIN_NAMES} AUTO_CLEAN) endif() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From 5f7311ac3eaa77bbf2b29186e84e95afcad2f3a2 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 25 Jan 2023 09:14:46 +0100 Subject: [PATCH 05/12] Usage --- ports/libwebp/portfile.cmake | 1 + ports/libwebp/usage | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 ports/libwebp/usage diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index 174552a291b1ac..7ce123c7173cfa 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -71,4 +71,5 @@ if(NOT BIN_NAMES STREQUAL "") vcpkg_copy_tools(TOOL_NAMES ${BIN_NAMES} AUTO_CLEAN) endif() +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libwebp/usage b/ports/libwebp/usage new file mode 100644 index 00000000000000..da6b265263a981 --- /dev/null +++ b/ports/libwebp/usage @@ -0,0 +1,9 @@ +libwebp provides CMake targets: + + find_package(WebP CONFIG REQUIRED) + # basic usage + target_link_libraries(main PRIVATE WebP::webp WebP::webpdecoder WebP::webpdemux) + # for manipulating the WebP graphics format container (port feature libwebpmux) + target_link_libraries(main PRIVATE WebP::libwebpmux) + # for sharp RGB to YUV conversion + target_link_libraries(main PRIVATE WebP::sharpyuv) From 42e0273f654117844ae317c06cbaf521d70462e4 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 25 Jan 2023 21:29:45 +0100 Subject: [PATCH 06/12] Lift restriction for vwebp tool --- ports/libwebp/portfile.cmake | 1 + ports/libwebp/vcpkg.json | 6 +++--- versions/baseline.json | 4 ++-- versions/l-/libwebp.json | 5 +++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index 7ce123c7173cfa..98321c1ad5c68a 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -36,6 +36,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} + -DWEBP_LINK_STATIC=OFF # lift restriction for vwebp tool OPTIONS_DEBUG -DWEBP_BUILD_ANIM_UTILS=OFF -DWEBP_BUILD_CWEBP=OFF diff --git a/ports/libwebp/vcpkg.json b/ports/libwebp/vcpkg.json index e59cd8bc92b682..2e8593069edff4 100644 --- a/ports/libwebp/vcpkg.json +++ b/ports/libwebp/vcpkg.json @@ -60,14 +60,14 @@ "features": [ "vwebp" ], - "platform": "!osx & !static" + "platform": "!osx" }, { "name": "libwebp", "features": [ "vwebp-sdl" ], - "platform": "!osx & !static & !uwp" + "platform": "!osx & !uwp" } ] }, @@ -184,7 +184,7 @@ }, "vwebp": { "description": "Build the vwebp viewer tool.", - "supports": "!osx & !static", + "supports": "!osx", "dependencies": [ "freeglut", "opengl" diff --git a/versions/baseline.json b/versions/baseline.json index 85ded9f7c3ba92..da7a2e9c8cd75d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4469,8 +4469,8 @@ "port-version": 1 }, "libwebp": { - "baseline": "1.2.4", - "port-version": 1 + "baseline": "1.3.0", + "port-version": 0 }, "libwebsockets": { "baseline": "4.3.2", diff --git a/versions/l-/libwebp.json b/versions/l-/libwebp.json index 3658c75f84c30b..6f9f5b9ad42e3f 100644 --- a/versions/l-/libwebp.json +++ b/versions/l-/libwebp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb2c7d13c9f1180e0db104b2b2cf083bf082c7dd", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "4b045db27d934d57c56d09c3721b05c46043cbb7", "version": "1.2.4", From df7012038f49c30df993c2cdb54d138c0ddb560b Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 25 Jan 2023 23:05:14 +0100 Subject: [PATCH 07/12] [mapnik] Fix libwebp --- ports/mapnik/fix-libwebp.patch | 14 ++++++++++++++ ports/mapnik/portfile.cmake | 2 ++ ports/mapnik/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mapnik.json | 5 +++++ 5 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 ports/mapnik/fix-libwebp.patch diff --git a/ports/mapnik/fix-libwebp.patch b/ports/mapnik/fix-libwebp.patch new file mode 100644 index 00000000000000..4ab84be07b5e20 --- /dev/null +++ b/ports/mapnik/fix-libwebp.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/FindWebP.cmake b/cmake/FindWebP.cmake +index 860dc3d..fd38dc0 100644 +--- a/cmake/FindWebP.cmake ++++ b/cmake/FindWebP.cmake +@@ -1,3 +1,9 @@ ++find_package(WebP CONFIG) ++if(WebP_FOUND) ++ add_library(WebP::WebP INTERFACE IMPORTED) ++ set_target_properties(WebP::WebP PROPERTIES INTERFACE_LINK_LIBRARIES WebP::webp) ++endif() ++return() + # Distributed under the OSI-approved BSD 3-Clause License. See accompanying + # file Copyright.txt or https://cmake.org/licensing for details. + diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 015000a419723a..1bd12746ca74b8 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -7,6 +7,8 @@ vcpkg_from_github( REF d7b83c0f7d11397aff5b5d8e0bb294ef6ea4354d SHA512 62b47cb753e9698e55fe88593009016676b6c0c0a90c3f29be6f44a45f9f783ec5beca6916e549f9adbdc750e2e0334a9e927fc0dcb6a88431e40c2e920ff962 HEAD_REF master + PATCHES + fix-libwebp.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 40a796611c1091..0e2dc48852f49f 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mapnik", "version-date": "2022-01-28", - "port-version": 2, + "port-version": 3, "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index da7a2e9c8cd75d..713f7aa47c2008 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4822,7 +4822,7 @@ }, "mapnik": { "baseline": "2022-01-28", - "port-version": 2 + "port-version": 3 }, "marble": { "baseline": "22.04.0", diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index 7f11caf0309f4c..d073d267d3dc46 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cfda7c550d94553c517079456a6b4acc6150f8c9", + "version-date": "2022-01-28", + "port-version": 3 + }, { "git-tree": "dd7ab22238efd828be89e8e17677aa5b395ac07b", "version-date": "2022-01-28", From e12a028021562819934599c1d2e18f2ac439075e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 26 Jan 2023 11:09:04 +0100 Subject: [PATCH 08/12] [qt5-imageformats] Use libwebp pc files --- ports/qt5-imageformats/portfile.cmake | 20 +++----------------- ports/qt5-imageformats/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/q-/qt5-imageformats.json | 5 +++++ 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/ports/qt5-imageformats/portfile.cmake b/ports/qt5-imageformats/portfile.cmake index 98d0bbeaa4b4ee..d82fc421793d2a 100644 --- a/ports/qt5-imageformats/portfile.cmake +++ b/ports/qt5-imageformats/portfile.cmake @@ -28,27 +28,13 @@ if(FREEGLUT_NEEDED) find_library(FREEGLUT_DEBUG NAMES freeglutd freeglut glutd glut PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) endif() -find_library(WEBP_RELEASE NAMES webp PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(WEBP_DEBUG NAMES webp PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(WEBPDEMUX_RELEASE NAMES webpdemux PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(WEBPDEMUX_DEBUG NAMES webpdemux PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(WEBPMUX_RELEASE NAMES webpmux PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(WEBPMUX_DEBUG NAMES webpmux PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(WEBPDECODER_RELEASE NAMES webpdecoder PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(WEBPDECODER_DEBUG NAMES webpdecoder PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -# Depends on opengl in default build but might depend on giflib, libjpeg-turbo, zlib, libpng, tiff, freeglut (!osx), sdl1 (windows) -# which would require extra libraries to be linked e.g. giflib freeglut sdl1 other ones are already linked - -if(NOT VCPKG_TARGET_IS_WINDOWS) - string(APPEND WEBP_RELEASE " -pthread") - string(APPEND WEBP_DEBUG " -pthread") -endif() +x_vcpkg_pkgconfig_get_modules(PREFIX webp MODULES libwebp libwebpdemux libwebpmux libwebpdecoder LIBS) set(OPT_REL "TIFF_LIBS=${tiff_LIBS_RELEASE}" - "WEBP_LIBS=${WEBPDECODER_RELEASE} ${WEBPDEMUX_RELEASE} ${WEBPMUX_RELEASE} ${WEBP_RELEASE}" + "WEBP_LIBS=${webp_LIBS_RELEASE}" "JASPER_LIBS=${JASPER_RELEASE} ${JPEG_RELEASE} ${ZLIB_RELEASE}") # This will still fail if LIBWEBP is installed with all available features due to the missing additional dependencies set(OPT_DBG "TIFF_LIBS=${tiff_LIBS_DEBUG}" - "WEBP_LIBS=${WEBPDECODER_DEBUG} ${WEBPDEMUX_DEBUG} ${WEBPMUX_DEBUG} ${WEBP_DEBUG}" + "WEBP_LIBS=${webp_LIBS_DEBUG}" "JASPER_LIBS=${JASPER_DEBUG} ${JPEG_DEBUG} ${ZLIB_DEBUG}") if(FREEGLUT_NEEDED) diff --git a/ports/qt5-imageformats/vcpkg.json b/ports/qt5-imageformats/vcpkg.json index d9405992ab4a94..f02fc3610e4091 100644 --- a/ports/qt5-imageformats/vcpkg.json +++ b/ports/qt5-imageformats/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-imageformats", "version": "5.15.8", + "port-version": 1, "description": "Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP", "license": null, "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 713f7aa47c2008..93ee04a7db6fd7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6234,7 +6234,7 @@ }, "qt5-imageformats": { "baseline": "5.15.8", - "port-version": 0 + "port-version": 1 }, "qt5-location": { "baseline": "5.15.8", diff --git a/versions/q-/qt5-imageformats.json b/versions/q-/qt5-imageformats.json index 855f8f1d9c227c..684534a7ac841c 100644 --- a/versions/q-/qt5-imageformats.json +++ b/versions/q-/qt5-imageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "51299732d963e9fa181b759715ecf78b4ee01698", + "version": "5.15.8", + "port-version": 1 + }, { "git-tree": "33bc274f73bfd44b51a44b04fd9298b4f22fa2bc", "version": "5.15.8", From b8012b5b9fe9d66045a4a2b804aa21172c345de4 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 26 Jan 2023 16:30:40 +0100 Subject: [PATCH 09/12] Revert "Lift restriction for vwebp tool" This reverts commit 42e0273f654117844ae317c06cbaf521d70462e4. --- ports/libwebp/portfile.cmake | 1 - ports/libwebp/vcpkg.json | 6 +++--- versions/l-/libwebp.json | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index 98321c1ad5c68a..7ce123c7173cfa 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -36,7 +36,6 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -DWEBP_LINK_STATIC=OFF # lift restriction for vwebp tool OPTIONS_DEBUG -DWEBP_BUILD_ANIM_UTILS=OFF -DWEBP_BUILD_CWEBP=OFF diff --git a/ports/libwebp/vcpkg.json b/ports/libwebp/vcpkg.json index 2e8593069edff4..e59cd8bc92b682 100644 --- a/ports/libwebp/vcpkg.json +++ b/ports/libwebp/vcpkg.json @@ -60,14 +60,14 @@ "features": [ "vwebp" ], - "platform": "!osx" + "platform": "!osx & !static" }, { "name": "libwebp", "features": [ "vwebp-sdl" ], - "platform": "!osx & !uwp" + "platform": "!osx & !static & !uwp" } ] }, @@ -184,7 +184,7 @@ }, "vwebp": { "description": "Build the vwebp viewer tool.", - "supports": "!osx", + "supports": "!osx & !static", "dependencies": [ "freeglut", "opengl" diff --git a/versions/l-/libwebp.json b/versions/l-/libwebp.json index 6f9f5b9ad42e3f..f6af4d9993ccec 100644 --- a/versions/l-/libwebp.json +++ b/versions/l-/libwebp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fb2c7d13c9f1180e0db104b2b2cf083bf082c7dd", + "git-tree": "d11b6a22e2acdba95c761dd4045cd8d66095f42d", "version": "1.3.0", "port-version": 0 }, From 78bbfee7853c78462b67cd98121a16853f340c52 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 26 Jan 2023 16:54:45 +0100 Subject: [PATCH 10/12] [gdal] Use upstream WebP config --- ports/gdal/cmake-project-include.cmake | 6 ++++++ ports/gdal/portfile.cmake | 1 + ports/gdal/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++++ 5 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 ports/gdal/cmake-project-include.cmake diff --git a/ports/gdal/cmake-project-include.cmake b/ports/gdal/cmake-project-include.cmake new file mode 100644 index 00000000000000..33ce62b9821565 --- /dev/null +++ b/ports/gdal/cmake-project-include.cmake @@ -0,0 +1,6 @@ +if(GDAL_USE_WEBP) + find_package(WebP CONFIG REQUIRED) + add_library(WEBP::WebP ALIAS WebP::webp) + set(GDAL_CHECK_PACKAGE_WebP_NAMES WebP CACHE INTERNAL "vcpkg") + set(GDAL_CHECK_PACKAGE_WebP_TARGETS WebP::webp CACHE INTERNAL "vcpkg") +endif() diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index dd89e7c6466d88..05d62753f2326a 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -91,6 +91,7 @@ vcpkg_cmake_configure( -DGDAL_CHECK_PACKAGE_QHULL_NAMES=Qhull "-DGDAL_CHECK_PACKAGE_QHULL_TARGETS=${qhull_target}" "-DQHULL_LIBRARY=${qhull_target}" + -DCMAKE_PROJECT_INCLUDE="${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" OPTIONS_DEBUG -DBUILD_APPS=OFF MAYBE_UNUSED_VARIABLES diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 19a935621ac981..220a222b32633a 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-semver": "3.6.2", - "port-version": 1, + "port-version": 2, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 93ee04a7db6fd7..eb5f811c99728e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2586,7 +2586,7 @@ }, "gdal": { "baseline": "3.6.2", - "port-version": 1 + "port-version": 2 }, "gdcm": { "baseline": "3.0.12", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 6e11043e222b10..e8421cee583183 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "11923340f9057d7e444b83e7a06afbf50e67e0d1", + "version-semver": "3.6.2", + "port-version": 2 + }, { "git-tree": "3a5646f7afab7b9f78bd8b874df4e2b3355b4a1a", "version-semver": "3.6.2", From f890638584258705cfd705850fea690dec137afe Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 26 Jan 2023 20:18:04 -0800 Subject: [PATCH 11/12] Revert no longer necessary changes to mapnik. --- ports/mapnik/portfile.cmake | 2 -- ports/mapnik/vcpkg.json | 1 - versions/baseline.json | 2 +- versions/m-/mapnik.json | 5 ----- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 7b9915f9326226..02cdf7c88cd8de 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -6,8 +6,6 @@ vcpkg_from_github( REF 4e064b8b8e324c4df7f2ae21dd72ccb85e1d4140 SHA512 4db329cad90058abc1a3430fded6fac5a49334f8feffb8510bd965a28dee630adf150174c933e61c76e93f6f107397e97929c863c97603d8dcef28f1a25f4628 HEAD_REF master - PATCHES - fix-libwebp.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index e977575d28cd89..d3e85ad0decdce 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mapnik", "version-date": "2023-01-17", - "port-version": 1, "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index cbda3984ce30f2..c689dca59db67c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4830,7 +4830,7 @@ }, "mapnik": { "baseline": "2023-01-17", - "port-version": 1 + "port-version": 0 }, "marble": { "baseline": "22.04.0", diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index 877d5552096501..f2f1466d345a8f 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "eed3a82c5ff0ed16a1a74391c0ac7c61e8784324", - "version-date": "2023-01-17", - "port-version": 1 - }, { "git-tree": "6fc189206b9c2055b544278ede1ce5be2e0f48ff", "version-date": "2023-01-17", From 109aa1d2c3baebc7bcbc3cb27ef577492ff8a123 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 26 Jan 2023 20:19:16 -0800 Subject: [PATCH 12/12] Remove unnecessary patch that git checkout didn't remove. --- ports/mapnik/fix-libwebp.patch | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 ports/mapnik/fix-libwebp.patch diff --git a/ports/mapnik/fix-libwebp.patch b/ports/mapnik/fix-libwebp.patch deleted file mode 100644 index 4ab84be07b5e20..00000000000000 --- a/ports/mapnik/fix-libwebp.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/cmake/FindWebP.cmake b/cmake/FindWebP.cmake -index 860dc3d..fd38dc0 100644 ---- a/cmake/FindWebP.cmake -+++ b/cmake/FindWebP.cmake -@@ -1,3 +1,9 @@ -+find_package(WebP CONFIG) -+if(WebP_FOUND) -+ add_library(WebP::WebP INTERFACE IMPORTED) -+ set_target_properties(WebP::WebP PROPERTIES INTERFACE_LINK_LIBRARIES WebP::webp) -+endif() -+return() - # Distributed under the OSI-approved BSD 3-Clause License. See accompanying - # file Copyright.txt or https://cmake.org/licensing for details. -