Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[libraw] update to snapshot 202101 #16409

Closed
wants to merge 13 commits into from
41 changes: 0 additions & 41 deletions ports/libraw/findlibraw_debug_fix.patch

This file was deleted.

20 changes: 20 additions & 0 deletions ports/libraw/fix-incorrect-pdb.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 948a0a0..1afe304 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -620,12 +620,12 @@ INSTALL(TARGETS raw_r
ARCHIVE DESTINATION lib${LIB_SUFFIX}
)

-IF(MSVC)
- INSTALL(FILES ${PROJECT_BINARY_DIR}/raw.pdb
+IF(MSVC AND BUILD_SHARED_LIBS)
+ INSTALL(FILES ${PROJECT_BINARY_DIR}/raw${CMAKE_DEBUG_POSTFIX}.pdb
DESTINATION lib
CONFIGURATIONS Debug RelWithDebInfo
)
- INSTALL(FILES ${PROJECT_BINARY_DIR}/raw_r.pdb
+ INSTALL(FILES ${PROJECT_BINARY_DIR}/raw_r${CMAKE_DEBUG_POSTFIX}.pdb
DESTINATION lib
CONFIGURATIONS Debug RelWithDebInfo
)
34 changes: 14 additions & 20 deletions ports/libraw/lcms2_debug_fix.patch
Original file line number Diff line number Diff line change
@@ -1,35 +1,29 @@
--- a/cmake/modules/FindLCMS2.cmake 2016-11-02 07:09:50.000000000 +0100
+++ b/cmake/modules/FindLCMS2.cmake 2018-06-02 00:43:27.309100600 +0200
@@ -13,7 +13,6 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying LICENSE file.

-
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
if(NOT WIN32)
@@ -29,18 +28,30 @@
diff --git a/cmake/modules/FindLCMS2.cmake b/cmake/modules/FindLCMS2.cmake
index 4e3e482..bffc946 100644
--- a/cmake/modules/FindLCMS2.cmake
+++ b/cmake/modules/FindLCMS2.cmake
@@ -29,18 +29,30 @@ find_path(LCMS2_INCLUDE_DIR lcms2.h
PATH_SUFFIXES lcms2 liblcms2
)

-find_library(LCMS2_LIBRARIES NAMES lcms2 liblcms2 lcms-2 liblcms-2
+include(SelectLibraryConfigurations)
+
+find_library(LCMS2_LIBRARY_RELEASE NAMES lcms2 liblcms2 lcms-2 liblcms-2
+ PATHS
+ ${PC_LCMS2_LIBDIR}
+ ${PC_LCMS2_LIBRARY_DIRS}
+ PATH_SUFFIXES lcms2
+)
+
+find_library(LCMS2_LIBRARY_DEBUG NAMES lcms2d liblcms2d lcms-2d liblcms-2d
PATHS
${PC_LCMS2_LIBDIR}
${PC_LCMS2_LIBRARY_DIRS}
PATH_SUFFIXES lcms2
)

-if(LCMS2_INCLUDE_DIR AND LCMS2_LIBRARIES)
+find_library(LCMS2_LIBRARY_DEBUG NAMES lcms2d liblcms2d lcms-2d liblcms-2d
+ PATHS
+ ${PC_LCMS2_LIBDIR}
+ ${PC_LCMS2_LIBRARY_DIRS}
+ PATH_SUFFIXES lcms2
+)
+
+select_library_configurations(LCMS2)
+
+
Expand All @@ -43,7 +37,7 @@

if(LCMS2_FOUND)
file(READ ${LCMS2_INCLUDE_DIR}/lcms2.h LCMS2_VERSION_CONTENT)
@@ -50,11 +61,11 @@
@@ -50,11 +62,11 @@ if(LCMS2_FOUND)
if(NOT LCMS2_FIND_QUIETLY)
string(SUBSTRING ${LCMS2_VERSION} 0 1 LCMS2_MAJOR_VERSION)
string(SUBSTRING ${LCMS2_VERSION} 1 2 LCMS2_MINOR_VERSION)
Expand All @@ -57,7 +51,7 @@
endif(NOT LCMS2_FIND_QUIETLY)
set(LCMS2_VERSION NOTFOUND)
endif(LCMS2_VERSION_MATCH)
@@ -68,5 +79,5 @@
@@ -68,5 +80,5 @@ else(LCMS2_FOUND)
endif(NOT LCMS2_FIND_QUIETLY)
endif(LCMS2_FOUND)

Expand Down
10 changes: 5 additions & 5 deletions ports/libraw/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO LibRaw/LibRaw
REF d4f05dd1b9b2d44c8f7e82043cbad3c724db2416
SHA512 5794521f535163afd7815ad005295301c5e0e2f8b2f34ef0a911d9dd1572c1f456b292777548203f9767957a55782b5bc9041c033190d25d1e9b4240d7df32b9
REF aeb6a2b6f1e0f752340580e60a7ed56099b4ff21 #2021-2-24
SHA512 7eeccdc1cd1e35b4463ce3c2097a2e097de9aac49dccfeaa695024264d35a8f974b8e830b4f5b39c1a8130905fb6341edaccde6889bf125a65f8d2f20adcf90e
HEAD_REF master
)

vcpkg_from_github(
OUT_SOURCE_PATH LIBRAW_CMAKE_SOURCE_PATH
REPO LibRaw/LibRaw-cmake
REF a71f3b83ee3dccd7be32f9a2f410df4d9bdbde0a
SHA512 607e6f76bcb57534da4f0c864b7a421f1ed49244468b1b52abe77f65aa599cae80715520b3a951294321b812deffd4f163757c9949f337571aa54f414ccc58a5
REF 5d54a89d1e3229b313b2cf3db8bf493dfc153cdb #2021-2-24
SHA512 546814981fa80f3befbf96f264fbd08092e83e2f4f42fe206a7bc997c19e35a4d8904689eaafc5fccacb083a518039bf73a507d705c4a73eaa93eb28b2de8a6f
HEAD_REF master
PATCHES
findlibraw_debug_fix.patch
fix-incorrect-pdb.patch
lcms2_debug_fix.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.
Expand Down
3 changes: 1 addition & 2 deletions ports/libraw/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "libraw",
"version-string": "201903",
"port-version": 5,
"version-date": "2021-02-24",
"description": "raw image decoder library",
"homepage": "https://www.libraw.org",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3749,8 +3749,8 @@
"port-version": 3
},
"libraw": {
"baseline": "201903",
"port-version": 5
"baseline": "2021-02-24",
"port-version": 0
},
"librdkafka": {
"baseline": "1.7.0",
Expand Down
11 changes: 3 additions & 8 deletions versions/l-/libraw.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
{
"versions": [
{
"git-tree": "fa490349ec4e8e8d8854c18725068a8a8474b3ac",
"version-string": "201903",
"port-version": 5
},
{
"git-tree": "80a0638bcb03f5e4c53f4b35562da7b8485fda11",
"version-string": "201903",
"port-version": 4
"git-tree": "eff7bf4f3ac49276efbbe559b1f6d5ecf46050b3",
"version-date": "2021-02-24",
"port-version": 0
},
{
"git-tree": "659d20658809488ab3cfccf30d85870ce06615e0",
Expand Down