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

[libraw] Update to 0.21.3 (#41295)

Browse Source
This commit is contained in:
Kai Pastor 2024-10-02 16:02:12 +02:00 committed by GitHub
parent f0f811770e
commit cdf98aaa24
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 25 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
ports/libraw/dependencies.patch
View File

@ -1,23 +1,19 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7d5a66..484e76b 100644
index d3faf24..8833187 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,8 +121,14 @@ include(MacroOptionalFindPackage)
# Math library check
+set(PC_LIBS_PRIVATE "")
+set(PC_REQUIRES_PRIVATE "")
if(NOT WIN32)
@@ -130,7 +130,10 @@ set(LIBRAW_PC_REQUIRES_PRIVATE "")
if(NOT WIN32 AND NOT EMSCRIPTEN)
FIND_LIBRARY(MATH_LIBRARY m)
+ if(MATH_LIBRARY)
if(MATH_LIBRARY)
+ set(MATH_LIBRARY m)
+ string(APPEND PC_LIBS_PRIVATE " -lm")
+ endif()
string(APPEND LIBRAW_PC_LIBS_PRIVATE " -l${MATH_LIBRARY}")
+ else()
+ set(MATH_LIBRARY "")
endif()
endif()
# LCMS version 1 and 2 library check
@@ -133,7 +139,11 @@ set(LCMS_FOUND false)
@@ -142,7 +145,11 @@ set(LCMS_FOUND false)
if(ENABLE_LCMS)
message(STATUS "Check for LCMS2 availability...")
@ -30,23 +26,7 @@ index e7d5a66..484e76b 100644
if(LCMS2_FOUND AND (LCMS2_VERSION VERSION_EQUAL 2.1 OR LCMS2_VERSION VERSION_GREATER 2.1))
message(STATUS "Found LCMS2 : ${LCMS2_LIBRARIES} ${LCMS2_INCLUDE_DIR}")
include_directories(${LCMS2_INCLUDE_DIR})
@@ -141,6 +151,7 @@ if(ENABLE_LCMS)
# Flag to compile Little CMS version 2 with LibRaw
add_definitions(-DUSE_LCMS2)
set(LCMS_SUPPORT_CAN_BE_COMPILED true)
+ string(APPEND PC_REQUIRES_PRIVATE " lcms2")
else()
message(STATUS "Check for LCMS availability instead LCMS2...")
find_package(LCMS)
@@ -168,6 +179,7 @@ find_package(JPEG)
# Flag to use zlib with LibRaw DNG deflate codec
if(ZLIB_FOUND)
add_definitions(-DUSE_ZLIB)
+ string(APPEND PC_REQUIRES_PRIVATE " zlib")
endif()
# For registration to libraw_config.h
@@ -176,10 +188,11 @@ MACRO_BOOL_TO_01(ZLIB_FOUND LIBRAW_USE_DNGDEFLATECODEC)
@@ -188,7 +195,7 @@ MACRO_BOOL_TO_01(ZLIB_FOUND LIBRAW_USE_DNGDEFLATECODEC)
# JPEG library check
find_package(JPEG)
if(JPEG_FOUND)
@ -55,40 +35,8 @@ index e7d5a66..484e76b 100644
set(JPEG8_FOUND FALSE)
else()
set(JPEG8_FOUND TRUE)
+ string(APPEND PC_REQUIRES_PRIVATE " libjpeg")
endif()
endif()
@@ -216,6 +229,7 @@ if(ENABLE_JASPER)
add_definitions(-DUSE_JASPER)
include_directories(${JASPER_INCLUDE_DIR})
set(JASPER_SUPPORT_CAN_BE_COMPILED true)
+ string(APPEND PC_REQUIRES_PRIVATE " jasper")
endif()
endif()
diff --git a/cmake/data/libraw.pc.cmake b/cmake/data/libraw.pc.cmake
index aa6ab21..90e0aae 100644
--- a/cmake/data/libraw.pc.cmake
+++ b/cmake/data/libraw.pc.cmake
@@ -10,3 +10,5 @@ Requires:
Version: @RAW_LIB_VERSION_STRING@
Libs: -L${libdir} -lraw
Cflags: -I${includedir} -I${includedir}/libraw
+Libs.private: @PC_LIBS_PRIVATE@
+Requires.private: @PC_REQUIRES_PRIVATE@
diff --git a/cmake/data/libraw_r.pc.cmake b/cmake/data/libraw_r.pc.cmake
index 4fadc36..4215e86 100644
--- a/cmake/data/libraw_r.pc.cmake
+++ b/cmake/data/libraw_r.pc.cmake
@@ -10,3 +10,5 @@ Requires:
Version: @RAW_LIB_VERSION_STRING@
Libs: -L${libdir} -lraw_r
Cflags: -I${includedir} -I${includedir}/libraw
+Libs.private: @PC_LIBS_PRIVATE@
+Requires.private: @PC_REQUIRES_PRIVATE@
diff --git a/cmake/librawConfig.cmake.in b/cmake/librawConfig.cmake.in
index b1b58d8..9b7baac 100644
index b1b58d8..dae06cc 100644
--- a/cmake/librawConfig.cmake.in
+++ b/cmake/librawConfig.cmake.in
@@ -13,7 +13,7 @@ endif()

17
ports/libraw/fix-install.patch
View File

@ -1,17 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 889fddf..e7d5a66 100644
index e6a70d9..a5c70e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -588,7 +588,7 @@ if (LIBRAW_INSTALL)
# Configure and install data file for packaging.
include(GNUInstallDirs)
- if(NOT MSVC)
+ if(1)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/data/libraw.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libraw.pc @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libraw.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
@@ -612,7 +612,13 @@ if (LIBRAW_INSTALL)
@@ -629,7 +629,13 @@ if (LIBRAW_INSTALL)
)
# Install Shared binary files.
@ -26,7 +17,7 @@ index 889fddf..e7d5a66 100644
EXPORT ${PROJECT_NAME}Targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -623,6 +629,7 @@ if (LIBRAW_INSTALL)
@@ -640,6 +646,7 @@ if (LIBRAW_INSTALL)
if(NOT BUILD_SHARED_LIBS AND "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC")
message("ClangCl does not support pdb generation with static libraries")
elseif(MSVC)
@ -35,7 +26,7 @@ index 889fddf..e7d5a66 100644
DESTINATION ${CMAKE_INSTALL_LIBDIR}
CONFIGURATIONS Debug RelWithDebInfo
diff --git a/cmake/data/libraw.pc.cmake b/cmake/data/libraw.pc.cmake
index 510526f..aa6ab21 100644
index 54c5af4..d182680 100644
--- a/cmake/data/libraw.pc.cmake
+++ b/cmake/data/libraw.pc.cmake
@@ -1,6 +1,6 @@

32
ports/libraw/install-interface.patch
View File

@ -1,32 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 484e76b..adbcd10 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,6 +111,9 @@ if(MSVC)
add_definitions(-D_AFX_SECURE_NO_WARNINGS)
endif()
+# For variables in $<INSTALL_INTERFACE:...>
+include(GNUInstallDirs)
+
# -- Check dependencies --------------------------------------------------------------------------------
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} )
@@ -489,7 +492,7 @@ endif()
target_include_directories(raw
PUBLIC
- $<INSTALL_INTERFACE:libraw>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/libraw>
$<BUILD_INTERFACE:${LIBRAW_PATH}>)
target_link_libraries(raw PUBLIC ${MATH_LIBRARY})
@@ -558,7 +561,7 @@ set_target_properties(raw_r PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_link_libraries(raw_r PUBLIC ${MATH_LIBRARY})
target_include_directories(raw_r
PUBLIC
- $<INSTALL_INTERFACE:libraw>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/libraw>
$<BUILD_INTERFACE:${LIBRAW_PATH}>)
if(WIN32)

7
ports/libraw/portfile.cmake
View File

@ -2,19 +2,18 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO LibRaw/LibRaw
REF "${VERSION}"
SHA512 a8b0ec275cc0055d6eb2069008c3312ae007cd86e481111f68d5d60544afcd76b728f8418bf63a80d35d7d00283536da63e03f5eecb4cc28f4cc8d92070e8b39
SHA512 c88d02685ac8854ca4f718206ceb95b17abffceee6501390d8447f9e8c78864d1dd0aedbdcf97e600244f97e1a50cbfea21d15a2557710c7d175f61915f9fe37
HEAD_REF master
)
vcpkg_from_github(
OUT_SOURCE_PATH LIBRAW_CMAKE_SOURCE_PATH
REPO LibRaw/LibRaw-cmake
REF 6e26c9e73677dc04f9eb236a97c6a4dc225ba7e8
SHA512 8ce13d37c2ace2fbc57f571052a5a5a847b707b3de1b3b9e0c1a46afaca86cabd42ee275600eeadc3127bc2a0d0a4f224caed0b07feffdafea32ad0f42e50379
REF eb98e4325aef2ce85d2eb031c2ff18640ca616d3
SHA512 63e68a4d30286ec3aa97168d46b7a1199268099ae27b61abcc92e93ec30e48d364086227983a1d724415e5f4da44d905422f30192453b95f31040e5f8469c3f9
HEAD_REF master
PATCHES
dependencies.patch
install-interface.patch
# Move the non-thread-safe library to manual-link. This is unfortunately needed
# because otherwise libraries that build on top of libraw have to choose.
fix-install.patch

2
ports/libraw/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "libraw",
"version": "0.21.2",
"version": "0.21.3",
"description": "raw image decoder library",
"homepage": "https://www.libraw.org",
"license": "LGPL-2.1-only OR CDDL-1.0",

2
versions/baseline.json
View File

@ -4985,7 +4985,7 @@
"port-version": 0
},
"libraw": {
"baseline": "0.21.2",
"baseline": "0.21.3",
"port-version": 0
},
"librdkafka": {

5
versions/l-/libraw.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8d9f30abb0e54dea057eb43a735efd2779007f49",
"version": "0.21.3",
"port-version": 0
},
{
"git-tree": "02d6abd8ed64b06dde0b3b029c39f30819eea276",
"version": "0.21.2",