diff --git a/ports/libwebp/0001-build.patch b/ports/libwebp/0001-build.patch index 3c6a63988122df..8a7cd7f37d7c5c 100644 --- a/ports/libwebp/0001-build.patch +++ b/ports/libwebp/0001-build.patch @@ -12,15 +12,6 @@ index bd1bebb..4ce801d 100644 else() add_definitions(-Wall) endif() -@@ -482,7 +485,7 @@ if(WEBP_BUILD_LIBWEBPMUX) - "${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux.h;\ - ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux_types.h;\ - ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h;") -- set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME webpmux) -+ set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME $<$:lib>webpmux) - list(APPEND INSTALLED_LIBRARIES libwebpmux) - configure_pkg_config("src/mux/libwebpmux.pc") - endif() @@ -586,8 +589,12 @@ if(WEBP_BUILD_EXTRAS) # webp_quality add_executable(webp_quality ${WEBP_QUALITY_SRCS} ${WEBP_EXTRAS_SRCS}) diff --git a/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch b/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch deleted file mode 100644 index 5e039a6811b280..00000000000000 --- a/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/cmake/WebPConfig.cmake.in b/cmake/WebPConfig.cmake.in -index 822fc59..cef75fe 100644 ---- a/cmake/WebPConfig.cmake.in -+++ b/cmake/WebPConfig.cmake.in -@@ -4,8 +4,60 @@ set(WEBP_VERSION ${WebP_VERSION}) - @PACKAGE_INIT@ - - include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") -+include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) - --set(WebP_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@") --set(WEBP_INCLUDE_DIRS ${WebP_INCLUDE_DIRS}) --set(WebP_LIBRARIES "@INSTALLED_LIBRARIES@") --set(WEBP_LIBRARIES "${WebP_LIBRARIES}") -+find_path(WEBP_INCLUDE_DIR NAMES webp/types.h) -+set(WebP_INCLUDE_DIR ${WEBP_INCLUDE_DIR}) -+set(WebP_INCLUDE_DIRS ${WEBP_INCLUDE_DIR}) -+set(WEBP_INCLUDE_DIRS ${WEBP_INCLUDE_DIR}) -+ -+if(NOT WEBP_BASE_LIBRARY AND NOT WebP_BASE_LIBRARY) -+ find_library(WEBP_BASE_LIBRARY_RELEASE NAMES webp) -+ find_library(WEBP_BASE_LIBRARY_DEBUG NAMES webpd) -+ select_library_configurations(WEBP_BASE) -+ set(WebP_BASE_LIBRARY ${WEBP_BASE_LIBRARY}) -+ if(WEBP_BASE_LIBRARY) -+ list(APPEND WEBP_LIBRARIES "${WEBP_BASE_LIBRARY}") -+ list(APPEND WebP_LIBRARIES "${WebP_BASE_LIBRARY}") -+ endif() -+endif() -+ -+if(NOT WEBP_DECODER_LIBRARY AND NOT WebP_DECODER_LIBRARY) -+ find_library(WEBP_DECODER_LIBRARY_RELEASE NAMES webpdecoder) -+ find_library(WEBP_DECODER_LIBRARY_DEBUG NAMES webpdecoderd) -+ select_library_configurations(WEBP_DECODER) -+ set(WebP_DECODER_LIBRARY ${WEBP_DECODER_LIBRARY}) -+ if(WEBP_DECODER_LIBRARY) -+ list(APPEND WEBP_LIBRARIES "${WEBP_DECODER_LIBRARY}") -+ list(APPEND WebP_LIBRARIES "${WebP_DECODER_LIBRARY}") -+ endif() -+endif() -+ -+if(NOT WEBP_DEMUX_LIBRARY AND NOT WebP_DEMUX_LIBRARY) -+ find_library(WEBP_DEMUX_LIBRARY_RELEASE NAMES webpdemux) -+ find_library(WEBP_DEMUX_LIBRARY_DEBUG NAMES webpdemuxd) -+ select_library_configurations(WEBP_DEMUX) -+ set(WebP_DEMUX_LIBRARY ${WEBP_DEMUX_LIBRARY}) -+ if(WEBP_DEMUX_LIBRARY) -+ list(APPEND WEBP_LIBRARIES "${WEBP_DEMUX_LIBRARY}") -+ list(APPEND WebP_LIBRARIES "${WebP_DEMUX_LIBRARY}") -+ endif() -+endif() -+ -+if(NOT WEBP_MUX_LIBRARY AND NOT WebP_MUX_LIBRARY) -+ find_library(WEBP_MUX_LIBRARY_RELEASE NAMES libwebpmux) -+ find_library(WEBP_MUX_LIBRARY_DEBUG NAMES libwebpmuxd) -+ select_library_configurations(WEBP_MUX) -+ set(WebP_MUX_LIBRARY ${WEBP_MUX_LIBRARY}) -+ if(WEBP_MUX_LIBRARY) -+ list(APPEND WEBP_LIBRARIES "${WEBP_MUX_LIBRARY}") -+ list(APPEND WebP_LIBRARIES "${WebP_MUX_LIBRARY}") -+ endif() -+endif() -+ -+set(WEBP_LIBRARY ${WEBP_BASE_LIBRARY}) -+set(WebP_LIBRARY ${WebP_BASE_LIBRARY}) -+if(WEBP_BASE_LIBRARY AND WEBP_INCLUDE_DIR) -+ set(WEBP_FOUND 1) -+ set(WebP_FOUND 1) -+endif() diff --git a/ports/libwebp/0002-cmake-config.patch b/ports/libwebp/0002-cmake-config.patch new file mode 100644 index 00000000000000..ae36fb6815eceb --- /dev/null +++ b/ports/libwebp/0002-cmake-config.patch @@ -0,0 +1,24 @@ +diff --git a/cmake/WebPConfig.cmake.in b/cmake/WebPConfig.cmake.in +index 822fc59..fb31829 100644 +--- a/cmake/WebPConfig.cmake.in ++++ b/cmake/WebPConfig.cmake.in +@@ -5,7 +5,17 @@ set(WEBP_VERSION ${WebP_VERSION}) + + 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 ${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) ++ 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-always-mux.patch b/ports/libwebp/0003-always-mux.patch deleted file mode 100644 index c120c95d0ed1e6..00000000000000 --- a/ports/libwebp/0003-always-mux.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b0ae7d5..5813c06 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -472,7 +472,7 @@ if(WEBP_BUILD_CWEBP) - install(TARGETS cwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - --if(WEBP_BUILD_LIBWEBPMUX) -+if(WEBP_BUILD_LIBWEBPMUX OR WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP OR TRUE) - parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "WEBP_MUX_SRCS" "") - add_library(libwebpmux ${WEBP_MUX_SRCS}) - target_link_libraries(libwebpmux webp) diff --git a/ports/libwebp/0003-fix-tool-dependencies.patch b/ports/libwebp/0003-fix-tool-dependencies.patch new file mode 100644 index 00000000000000..63fb5afde1aa2e --- /dev/null +++ b/ports/libwebp/0003-fix-tool-dependencies.patch @@ -0,0 +1,13 @@ +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/0004-add-missing-linked-library.patch b/ports/libwebp/0004-add-missing-linked-library.patch deleted file mode 100644 index 6cfbe7ce8261e6..00000000000000 --- a/ports/libwebp/0004-add-missing-linked-library.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8386687..5ab9ed2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -540,6 +540,10 @@ if(WEBP_BUILD_VWEBP) - PRIVATE ${GLUT_INCLUDE_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/src - ${OPENGL_INCLUDE_DIR}) -+ if(UNIX AND NOT(ANDROID OR BLACKBERRY OR APPLE)) -+ find_package(X11 REQUIRED) -+ target_link_libraries(vwebp ${X11_LIBRARIES} ${X11_Xxf86vm_LIB}) -+ endif() - install(TARGETS vwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - check_c_compiler_flag("-Wno-deprecated-declarations" HAS_NO_DEPRECATED) diff --git a/ports/libwebp/0006-fix-dependecies-platform.patch b/ports/libwebp/0006-fix-dependecies-platform.patch index 819c1f90b25a2b..a5849a7ac5011e 100644 --- a/ports/libwebp/0006-fix-dependecies-platform.patch +++ b/ports/libwebp/0006-fix-dependecies-platform.patch @@ -14,4 +14,4 @@ index 83edb3a..f634094 100644 + target_compile_definitions(vwebp_sdl PRIVATE WEBP_HAVE_JUST_SDL_H) target_include_directories(vwebp_sdl PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/src + ${CMAKE_CURRENT_BINARY_DIR} diff --git a/ports/libwebp/0009-glut.patch b/ports/libwebp/0009-glut.patch index 01d011e5f73ac0..914a935e1835e4 100644 --- a/ports/libwebp/0009-glut.patch +++ b/ports/libwebp/0009-glut.patch @@ -11,13 +11,3 @@ index 0799269..45b3306 100644 imageioutil webp webpdemux) -@@ -543,6 +543,9 @@ if(WEBP_BUILD_VWEBP) - if(UNIX AND NOT(ANDROID OR BLACKBERRY OR APPLE)) - find_package(X11 REQUIRED) - target_link_libraries(vwebp ${X11_LIBRARIES} ${X11_Xxf86vm_LIB}) -+ if(X11_Xrandr_FOUND) # due to glut linking xrandr if found -+ target_link_libraries(vwebp ${X11_Xrandr_LIB}) -+ endif() - endif() - install(TARGETS vwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index 985a6d518c6db3..ae0881b1fedf42 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -1,44 +1,38 @@ vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO webmproject/libwebp - REF 9ce5843dbabcfd3f7c39ec7ceba9cbeb213cbfdf # v1.2.1 - SHA512 43224caedb0d591ad1dd3872cd882c0fe255e24425f6da82fca212783ddb231326797a82ead0a1b8b15dc98db1cb05741e3a5e5131babbcc49a529a9f3253865 - HEAD_REF master - PATCHES - 0001-build.patch - 0002-cmake-config-add-backwards-compatibility.patch - 0003-always-mux.patch #always build libwebpmux - 0004-add-missing-linked-library.patch - 0006-fix-dependecies-platform.patch - 0007-fix-arm-build.patch - 0008-sdl.patch - 0009-glut.patch + OUT_SOURCE_PATH SOURCE_PATH + REPO webmproject/libwebp + REF v1.2.2 + SHA512 04a036b705316ea04add50c9ec2d6d7a8316c710556b97413015d7b8548fe31a8f7f5bf0632e76262ada504dcc35ead20189ee7fcb3cebbe568eb15736ad9a94 + HEAD_REF master + PATCHES + 0001-build.patch + 0002-cmake-config.patch + 0003-fix-tool-dependencies.patch + 0006-fix-dependecies-platform.patch + 0007-fix-arm-build.patch + 0008-sdl.patch + 0009-glut.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - anim WEBP_BUILD_ANIM_UTILS - gif2webp WEBP_BUILD_GIF2WEBP - img2webp WEBP_BUILD_IMG2WEBP - vwebp WEBP_BUILD_VWEBP - vwebp-sdl WEBP_HAVE_SDL - info WEBP_BUILD_WEBPINFO - 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 - libbwebpmux WEBP_BUILD_LIBWEBPMUX + FEATURES + anim WEBP_BUILD_ANIM_UTILS + gif2webp WEBP_BUILD_GIF2WEBP + img2webp WEBP_BUILD_IMG2WEBP + vwebp WEBP_BUILD_VWEBP + vwebp-sdl WEBP_HAVE_SDL + info WEBP_BUILD_WEBPINFO + 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 ) - -if(VCPKG_TARGET_IS_LINUX) - message("WebP currently requires the following library from the system package manager:\n Xxf86vm\n\nThis can be installed on Ubuntu systems via apt-get install libxxf86vm-dev") -endif() - 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!") @@ -46,11 +40,9 @@ if(VCPKG_TARGET_IS_OSX) endif() vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${FEATURE_OPTIONS} - OPTIONS_DEBUG - -DCMAKE_DEBUG_POSTFIX=d + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() @@ -58,27 +50,21 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(PACKAGE_NAME WebP CONFIG_PATH share/WebP/cmake) # find_package is called with WebP not libwebp +vcpkg_cmake_config_fixup(PACKAGE_NAME WebP CONFIG_PATH share/WebP/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libwebp.pc" "-lwebp" "-lwebpd") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libwebpdecoder.pc" "-lwebpdecoder" "-lwebpdecoderd") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libwebpdemux.pc" "-lwebpdemux" "-lwebpdemuxd") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libwebpmux.pc" "-lwebpmux" "-lwebpmuxd") -endif() 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() + 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() - 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}") - endif() + 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}") + endif() endforeach() vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/webp") @@ -89,8 +75,8 @@ 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(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libwebp/vcpkg.json b/ports/libwebp/vcpkg.json index 179f1cc1b30f9a..0b7b25c9e00517 100644 --- a/ports/libwebp/vcpkg.json +++ b/ports/libwebp/vcpkg.json @@ -1,11 +1,12 @@ { "name": "libwebp", - "version": "1.2.1", + "version": "1.2.2", "description": "WebP codec: library to encode and decode images in WebP format", "homepage": "https://github.com/webmproject/libwebp", "dependencies": [ { "name": "libwebp", + "default-features": false, "features": [ "unicode" ], @@ -21,6 +22,7 @@ } ], "default-features": [ + "libwebpmux", "nearlossless", "simd" ], @@ -37,6 +39,7 @@ "gif2webp", "img2webp", "info", + "libwebpmux", "mux", "nearlossless", "simd" @@ -63,6 +66,7 @@ "dependencies": [ { "name": "libwebp", + "default-features": false, "features": [ "img2webp", "mux" @@ -81,6 +85,7 @@ "dependencies": [ { "name": "libwebp", + "default-features": false, "features": [ "vwebp" ] @@ -94,7 +99,14 @@ "gif2webp": { "description": "Build the gif2webp conversion tool.", "dependencies": [ - "giflib" + "giflib", + { + "name": "libwebp", + "default-features": false, + "features": [ + "libwebpmux" + ] + } ] }, "img2webp": { @@ -102,6 +114,13 @@ "dependencies": [ "libjpeg-turbo", "libpng", + { + "name": "libwebp", + "default-features": false, + "features": [ + "libwebpmux" + ] + }, "tiff" ] }, @@ -109,10 +128,31 @@ "description": "Build the webpinfo command line tool." }, "libbwebpmux": { + "description": "Obsolete, use feature libwebpmux instead.", + "dependencies": [ + { + "name": "libwebp", + "default-features": false, + "features": [ + "libwebpmux" + ] + } + ] + }, + "libwebpmux": { "description": "Build the libwebpmux library" }, "mux": { - "description": "Build the webpmux command line tool." + "description": "Build the webpmux command line tool.", + "dependencies": [ + { + "name": "libwebp", + "default-features": false, + "features": [ + "libwebpmux" + ] + } + ] }, "nearlossless": { "description": "Enable near-lossless encoding" @@ -141,6 +181,7 @@ "dependencies": [ { "name": "libwebp", + "default-features": false, "features": [ "vwebp" ] diff --git a/ports/opencv3/0003-force-package-requirements.patch b/ports/opencv3/0003-force-package-requirements.patch index dd12caad531ab1..372811aa8845d9 100644 --- a/ports/opencv3/0003-force-package-requirements.patch +++ b/ports/opencv3/0003-force-package-requirements.patch @@ -32,7 +32,7 @@ else() ocv_clear_internal_cache_vars(WEBP_LIBRARY WEBP_INCLUDE_DIR) - include(cmake/OpenCVFindWebP.cmake) -+ find_package(WebP REQUIRED) ++ find_package(WEBP NAMES WebP REQUIRED) if(WEBP_FOUND) set(HAVE_WEBP 1) endif() diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index 06404f6590d9f0..3acd535726dbdb 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv3", "version": "3.4.16", - "port-version": 5, + "port-version": 6, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", diff --git a/ports/opencv4/0003-force-package-requirements.patch b/ports/opencv4/0003-force-package-requirements.patch index 15ce3756be50ee..6990dd96388aec 100644 --- a/ports/opencv4/0003-force-package-requirements.patch +++ b/ports/opencv4/0003-force-package-requirements.patch @@ -32,7 +32,7 @@ else() ocv_clear_internal_cache_vars(WEBP_LIBRARY WEBP_INCLUDE_DIR) - include(cmake/OpenCVFindWebP.cmake) -+ find_package(WebP REQUIRED) ++ find_package(WEBP NAMES WebP REQUIRED) if(WEBP_FOUND) set(HAVE_WEBP 1) endif() diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index bf3293b2734784..e485574e7e44ef 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.5.5", - "port-version": 1, + "port-version": 2, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", diff --git a/ports/osgearth/make-all-find-packages-required.patch b/ports/osgearth/make-all-find-packages-required.patch index 51bd86f408bdb6..b685f7dba43799 100644 --- a/ports/osgearth/make-all-find-packages-required.patch +++ b/ports/osgearth/make-all-find-packages-required.patch @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 7541c8d07..cc14d2160 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -122,40 +122,54 @@ option(OSGEARTH_ENABLE_GEOCODER "Enable the geocoder (GDAL/OGR must be built wit +@@ -122,40 +122,53 @@ option(OSGEARTH_ENABLE_GEOCODER "Enable the geocoder (GDAL/OGR must be built wit # Mobile/GLES: IF (OSGEARTH_USE_GLES) @@ -45,9 +45,8 @@ index 7541c8d07..cc14d2160 100755 +find_package(protobuf CONFIG REQUIRED) +set(Protobuf_LIBRARIES protobuf::libprotoc protobuf::libprotobuf) +set(Protobuf_FOUND 1) -+find_package(WebP CONFIG REQUIRED) ++find_package(WEBP NAMES WebP CONFIG REQUIRED) +set(WEBP_LIBRARY WebP::webp) -+set(WEBP_FOUND 1) +find_package(Blend2D CONFIG REQUIRED) if(OSGEARTH_ENABLE_PROFILING) diff --git a/ports/osgearth/vcpkg.json b/ports/osgearth/vcpkg.json index f9dcae84cef2af..558f4e6e447aa4 100644 --- a/ports/osgearth/vcpkg.json +++ b/ports/osgearth/vcpkg.json @@ -1,7 +1,7 @@ { "name": "osgearth", "version": "3.2", - "port-version": 4, + "port-version": 5, "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.", "homepage": "https://github.com/gwaldron/osgearth", "supports": "!(x86 | wasm32)", diff --git a/ports/qt5-imageformats/portfile.cmake b/ports/qt5-imageformats/portfile.cmake index a3cd9f92ac5ebd..04c41716eb940d 100644 --- a/ports/qt5-imageformats/portfile.cmake +++ b/ports/qt5-imageformats/portfile.cmake @@ -24,13 +24,13 @@ if(NOT VCPKG_TARGET_IS_OSX) endif() find_library(WEBP_RELEASE NAMES webp PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(WEBP_DEBUG NAMES webpd webp PATHS "${CURRENT_INSTALLED_DIR}/debug/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 webpdemuxd webpdemux PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(WEBPMUX_RELEASE NAMES webpmux libwebpmux PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(WEBPMUX_DEBUG NAMES webpmuxd webpmux libwebpmuxd libwebpmux PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(WEBPDECODER_RELEASE NAMES webpdecoder libwebpdecoder PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(WEBPDECODER_DEBUG NAMES webpdecoder libwebpdecoder webpdecoderd libwebpdecoderd PATHS "${CURRENT_INSTALLED_DIR}/debug/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 diff --git a/ports/qt5-imageformats/vcpkg.json b/ports/qt5-imageformats/vcpkg.json index da6422d1e77b50..208f381440cff2 100644 --- a/ports/qt5-imageformats/vcpkg.json +++ b/ports/qt5-imageformats/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-imageformats", "version": "5.15.3", + "port-version": 1, "description": "Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP", "license": null, "dependencies": [ diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index dc6881eecf5350..e7cf8d1557b8f1 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -98,9 +98,7 @@ replace_skia_dep(harfbuzz "/include/harfbuzz" "harfbuzz-icu" "harfbuzz-icu" "") replace_skia_dep(icu "/include" "icuuc,icuucd" "icuuc" "U_USING_ICU_NAMESPACE=0") replace_skia_dep(libjpeg-turbo "/include" "jpeg,jpegd;turbojpeg,turbojpegd" "jpeg;turbojpeg" "") replace_skia_dep(libpng "/include" "libpng16,libpng16d" "libpng16" "") -replace_skia_dep(libwebp "/include" - "webp,webpd;webpdemux,webpdemuxd;webpdecoder,webpdecoderd;libwebpmux,libwebpmuxd" - "webp;webpdemux;webpdecoder;libwebpmux" "") +replace_skia_dep(libwebp "/include" "webp;webpdemux;webpdecoder;webpmux" "webp;webpdemux;webpdecoder;webpmux" "") replace_skia_dep(zlib "/include" "z,zlib,zlibd" "z,zlib" "") set(OPTIONS "\ diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index d8991a23706f55..756ab79e83b255 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -1,7 +1,7 @@ { "name": "skia", "version-date": "2020-05-18", - "port-version": 8, + "port-version": 9, "description": [ "Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.", "It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.", diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index c8d53313f3ba21..dc8594f6efef2c 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -36,13 +36,14 @@ vcpkg_cmake_configure( -DBUILD_DOCS=OFF -DBUILD_CONTRIB=OFF -DBUILD_TESTS=OFF - -DCMAKE_DEBUG_POSTFIX=d # tiff sets "d" for MSVC only. -Dlibdeflate=OFF -Djbig=OFF # This is disabled by default due to GPL/Proprietary licensing. -Djpeg12=OFF -Dlerc=OFF -DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=ON -DCMAKE_DISABLE_FIND_PACKAGE_GLUT=ON + OPTIONS_DEBUG + -DCMAKE_DEBUG_POSTFIX=d # tiff sets "d" for MSVC only. ) vcpkg_cmake_install() diff --git a/ports/tiff/vcpkg-cmake-wrapper.cmake.in b/ports/tiff/vcpkg-cmake-wrapper.cmake.in index 40b159093c6eb3..1acf30fad26f02 100644 --- a/ports/tiff/vcpkg-cmake-wrapper.cmake.in +++ b/ports/tiff/vcpkg-cmake-wrapper.cmake.in @@ -17,7 +17,7 @@ if(TIFF_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") if(@webp@) find_package(WebP CONFIG ${z_vcpkg_tiff_find_options}) list(APPEND z_vcpkg_tiff_link_libraries WebP::WebP) - list(APPEND z_vcpkg_tiff_libraries ${WEBP_LIBRARIES}) + list(APPEND z_vcpkg_tiff_libraries ${WebP_LIBRARIES}) endif() if(@lzma@) find_package(LibLZMA ${z_vcpkg_tiff_find_options}) diff --git a/ports/tiff/vcpkg.json b/ports/tiff/vcpkg.json index 59f4c26e80e629..dad2b88d5a967d 100644 --- a/ports/tiff/vcpkg.json +++ b/ports/tiff/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tiff", "version": "4.3.0", - "port-version": 6, + "port-version": 7, "description": "A library that supports the manipulation of TIFF image files", "homepage": "https://libtiff.gitlab.io/libtiff/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 276409497a487b..cb140f1378b07a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4161,7 +4161,7 @@ "port-version": 1 }, "libwebp": { - "baseline": "1.2.1", + "baseline": "1.2.2", "port-version": 0 }, "libwebsockets": { @@ -5086,11 +5086,11 @@ }, "opencv3": { "baseline": "3.4.16", - "port-version": 5 + "port-version": 6 }, "opencv4": { "baseline": "4.5.5", - "port-version": 1 + "port-version": 2 }, "opendnp3": { "baseline": "3.1.1", @@ -5234,7 +5234,7 @@ }, "osgearth": { "baseline": "3.2", - "port-version": 4 + "port-version": 5 }, "osi": { "baseline": "0.108.6", @@ -5714,7 +5714,7 @@ }, "qt5-imageformats": { "baseline": "5.15.3", - "port-version": 0 + "port-version": 1 }, "qt5-location": { "baseline": "5.15.3", @@ -6514,7 +6514,7 @@ }, "skia": { "baseline": "2020-05-18", - "port-version": 8 + "port-version": 9 }, "skyr-url": { "baseline": "1.13.0", @@ -6934,7 +6934,7 @@ }, "tiff": { "baseline": "4.3.0", - "port-version": 6 + "port-version": 7 }, "tinkerforge": { "baseline": "2.1.25", diff --git a/versions/l-/libwebp.json b/versions/l-/libwebp.json index 935958cc6a3e70..c41c58cbf92627 100644 --- a/versions/l-/libwebp.json +++ b/versions/l-/libwebp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf8ec989a234ddde96494e4e07d0ffd93df82151", + "version": "1.2.2", + "port-version": 0 + }, { "git-tree": "ca5a8b2ed264617e8a35d22e1e6ac18ebe99900f", "version": "1.2.1", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index c767104acaea1e..0313cede660295 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65bade77414d264741d23ce93401c1bc08718e86", + "version": "3.4.16", + "port-version": 6 + }, { "git-tree": "55064c574fa80aef66dd85a330f669ba7ad402e9", "version": "3.4.16", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 63730e2feb0520..12e428e573fecb 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "90f4418431aa3ddcdbd34c33d5e654cda5cda26a", + "version": "4.5.5", + "port-version": 2 + }, { "git-tree": "dcdd746ffc69d5f3234b67ee17fdd54966c8f5cb", "version": "4.5.5", diff --git a/versions/o-/osgearth.json b/versions/o-/osgearth.json index 80893cbe434fbe..ef767931f59e48 100644 --- a/versions/o-/osgearth.json +++ b/versions/o-/osgearth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80311fbaa014b84f8cdb3faa8abbdc16e01837d5", + "version": "3.2", + "port-version": 5 + }, { "git-tree": "99b20c5ff2821870694fdc973b7f44d4b54db2ba", "version": "3.2", diff --git a/versions/q-/qt5-imageformats.json b/versions/q-/qt5-imageformats.json index d0446553918624..30012615502661 100644 --- a/versions/q-/qt5-imageformats.json +++ b/versions/q-/qt5-imageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6035880bd5e6bd0954d738de1bb2e2b79f66953c", + "version": "5.15.3", + "port-version": 1 + }, { "git-tree": "bdb4dae2e952e636c45967063bcb7c5dbb9cea65", "version": "5.15.3", diff --git a/versions/s-/skia.json b/versions/s-/skia.json index 168d625e74968f..7499ae3b7cd593 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdf8cda1612a4770f3a01e35ae5da93654abc17d", + "version-date": "2020-05-18", + "port-version": 9 + }, { "git-tree": "104ba7c5e5e46398000e92e0f9cc3c9f0999e142", "version-date": "2020-05-18", diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index 8882dafc3c1329..f8d9cc569e70fd 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f05b5c8b426ce84fbc8930c8f935b792feeb1f4", + "version": "4.3.0", + "port-version": 7 + }, { "git-tree": "7d1677b9568234f05c4be9f04f321b9506884376", "version": "4.3.0",