mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 22:09:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[libjxl] update to 0.8.0 (#29171)

Browse Source
This commit is contained in:
Nick 2023-01-25 21:22:21 +01:00 committed by GitHub
parent 9a8ce725d2
commit b95758a284
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ports/libjxl/fix-dependencies.patch
View File

@ -1,5 +1,5 @@
diff --git a/lib/jxl.cmake b/lib/jxl.cmake diff --git a/lib/jxl.cmake b/lib/jxl.cmake
index 72c07f4..5675d1e 100644 index a8a96e1..98d69d6 100644
--- a/lib/jxl.cmake --- a/lib/jxl.cmake
+++ b/lib/jxl.cmake +++ b/lib/jxl.cmake
@@ -3,6 +3,15 @@ @@ -3,6 +3,15 @@
@ -19,10 +19,10 @@ index 72c07f4..5675d1e 100644
# by the encoder: the encoder uses both dec and enc ourse files, while the # by the encoder: the encoder uses both dec and enc ourse files, while the
# decoder uses only dec source files. # decoder uses only dec source files.
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index 50cc72c..fed027e 100644 index 8ee9864..57993ea 100644
--- a/third_party/CMakeLists.txt --- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt
@@ -45,36 +45,7 @@ else() @@ -45,59 +45,7 @@ else()
endif() endif()
# brotli # brotli
@ -55,12 +55,35 @@ index 50cc72c..fed027e 100644
- add_library(${brlib} ALIAS ${brlib}-static) - add_library(${brlib} ALIAS ${brlib}-static)
- endforeach() - endforeach()
- endif() # BROTLI_EMSCRIPTEN - endif() # BROTLI_EMSCRIPTEN
- if(APPLE)
- if(NOT DEFINED CMAKE_MACOSX_RPATH)
- # Use @rpath in install_name when CMAKE_MACOSX_RPATH is not set.
- set_property(TARGET brotlienc PROPERTY MACOSX_RPATH TRUE)
- set_property(TARGET brotlidec PROPERTY MACOSX_RPATH TRUE)
- set_property(TARGET brotlicommon PROPERTY MACOSX_RPATH TRUE)
- endif()
- if((NOT DEFINED CMAKE_MACOSX_RPATH) OR CMAKE_MACOSX_RPATH)
- # Set library search path when @rpath is used.
- if(NOT DEFINED CMAKE_INSTALL_RPATH)
- set_property(TARGET brotlienc PROPERTY INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
- set_property(TARGET brotlidec PROPERTY INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
- set_property(TARGET brotlicommon PROPERTY INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
- endif()
- else()
- # Set conventional install_name when @rpath is not used.
- if(NOT DEFINED CMAKE_INSTALL_NAME_DIR)
- set_property(TARGET brotlienc PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
- set_property(TARGET brotlidec PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
- set_property(TARGET brotlicommon PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
- endif()
- endif()
- endif() # APPLE
-endif() -endif()
+find_package(unofficial-brotli CONFIG REQUIRED) +find_package(unofficial-brotli CONFIG REQUIRED)
# *cms # *cms
if (JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE_PLUGINS) if (JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE_PLUGINS)
@@ -86,18 +57,7 @@ if (JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE_PLUGINS) @@ -109,18 +57,7 @@ if (JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE_PLUGINS)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/skcms/LICENSE" configure_file("${CMAKE_CURRENT_SOURCE_DIR}/skcms/LICENSE"
${PROJECT_BINARY_DIR}/LICENSE.skcms COPYONLY) ${PROJECT_BINARY_DIR}/LICENSE.skcms COPYONLY)
endif () endif ()
@ -79,4 +102,4 @@ index 50cc72c..fed027e 100644
+find_package(lcms2 CONFIG REQUIRED) +find_package(lcms2 CONFIG REQUIRED)
# libpng # libpng
if (JPEGXL_EMSCRIPTEN) if (JPEGXL_BUNDLE_LIBPNG AND JPEGXL_EMSCRIPTEN)

6
ports/libjxl/portfile.cmake
View File

@ -1,10 +1,8 @@
vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO libjxl/libjxl REPO libjxl/libjxl
REF "v${VERSION}" REF "v${VERSION}"
SHA512 c73039606acf7b2cbc331c6787af5167d711fd1af22bc616e1f478c531b087da82c98f2cb7e88c4d1f8bcfdc4e053ae0dc99cc9a811545b7f9658041489ed04b SHA512 ef472ddc5e277f3d41491c2acc03ed0152ec3ea87efb9e3320cfd830ceb383728658318444b06a3e9f8662bc11c0014675966572ce33f49c8e5cb13c5ed48de1
HEAD_REF main HEAD_REF main
PATCHES PATCHES
fix-dependencies.patch fix-dependencies.patch
@ -92,4 +90,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
endif() endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

2
ports/libjxl/vcpkg.json
View File

@ -1,6 +1,6 @@
{ {
"name": "libjxl", "name": "libjxl",
"version-semver": "0.7.0", "version-semver": "0.8.0",
"description": "JPEG XL image format reference implementation", "description": "JPEG XL image format reference implementation",
"homepage": "https://github.com/libjxl/libjxl", "homepage": "https://github.com/libjxl/libjxl",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",

2
versions/baseline.json
View File

@ -3969,7 +3969,7 @@
"port-version": 0 "port-version": 0
}, },
"libjxl": { "libjxl": {
"baseline": "0.7.0", "baseline": "0.8.0",
"port-version": 0 "port-version": 0
}, },
"libkeyfinder": { "libkeyfinder": {

5
versions/l-/libjxl.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "ef11c9864441ebeee257d1baedf1d29d208087f5",
"version-semver": "0.8.0",
"port-version": 0
},
{ {
"git-tree": "1012fef90a25836b40b40275eb7e4ccde46d0521", "git-tree": "1012fef90a25836b40b40275eb7e4ccde46d0521",
"version-semver": "0.7.0", "version-semver": "0.7.0",