diff options
Diffstat (limited to 'media-libs/libraw/files')
| -rw-r--r-- | media-libs/libraw/files/libraw-0.16.0_alpha2-automagic-jasper.patch | 12 | ||||
| -rw-r--r-- | media-libs/libraw/files/libraw-0.16.0_alpha2-lcms2-first.patch | 47 |
2 files changed, 27 insertions, 32 deletions
diff --git a/media-libs/libraw/files/libraw-0.16.0_alpha2-automagic-jasper.patch b/media-libs/libraw/files/libraw-0.16.0_alpha2-automagic-jasper.patch index 9f158f4ec5bb..ed27bb5312c0 100644 --- a/media-libs/libraw/files/libraw-0.16.0_alpha2-automagic-jasper.patch +++ b/media-libs/libraw/files/libraw-0.16.0_alpha2-automagic-jasper.patch @@ -20,13 +20,13 @@ - ADD_DEFINITIONS(-DUSE_JASPER) - INCLUDE_DIRECTORIES(${JASPER_INCLUDE_DIR}) +IF(ENABLE_JASPER) -+ FIND_PACKAGE(Jasper) ++ FIND_PACKAGE(Jasper) + -+ # Flag to use libjasper with LibRaw RedCine codec -+ IF(JASPER_FOUND) -+ ADD_DEFINITIONS(-DUSE_JASPER) -+ INCLUDE_DIRECTORIES(${JASPER_INCLUDE_DIR}) -+ ENDIF() ++ # Flag to use libjasper with LibRaw RedCine codec ++ IF(JASPER_FOUND) ++ ADD_DEFINITIONS(-DUSE_JASPER) ++ INCLUDE_DIRECTORIES(${JASPER_INCLUDE_DIR}) ++ ENDIF() ENDIF() # For registration to libraw_config.h diff --git a/media-libs/libraw/files/libraw-0.16.0_alpha2-lcms2-first.patch b/media-libs/libraw/files/libraw-0.16.0_alpha2-lcms2-first.patch index 8b96df08257a..a9a514972d34 100644 --- a/media-libs/libraw/files/libraw-0.16.0_alpha2-lcms2-first.patch +++ b/media-libs/libraw/files/libraw-0.16.0_alpha2-lcms2-first.patch @@ -1,8 +1,6 @@ -Check for lcms2 before falling back to lcms1. - --- LibRaw-0.16.0-Alpha2/CMakeLists.txt +++ LibRaw-0.16.0-Alpha2/CMakeLists.txt -@@ -119,27 +119,27 @@ +@@ -119,26 +119,26 @@ SET(LCMS_SUPPORT_CAN_BE_COMPILED false) IF (ENABLE_LCMS) @@ -16,16 +14,15 @@ Check for lcms2 before falling back to lcms1. - ADD_DEFINITIONS(-DUSE_LCMS) - # For compatibility - SET(LCMS2_LIBRARIES ${LCMS_LIBRARIES}) -- SET(LCMS_SUPPORT_CAN_BE_COMPILED true) -+ MESSAGE(STATUS "Check for LCMS2 availability...") -+ FIND_PACKAGE(LCMS2) -+ 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}) -+ MACRO_LOG_FEATURE(LCMS2_FOUND "LCMS2" "A small-footprint color management engine" "http://www.littlecms.com" FALSE "" "Needed by libkdcraw") -+ # Flag to compile Little CMS version 2 with LibRaw -+ ADD_DEFINITIONS(-DUSE_LCMS2) -+ SET(LCMS_SUPPORT_CAN_BE_COMPILED true) ++ MESSAGE(STATUS "Check for LCMS2 availability...") ++ FIND_PACKAGE(LCMS2) ++ 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}) ++ MACRO_LOG_FEATURE(LCMS2_FOUND "LCMS2" "A small-footprint color management engine" "http://www.littlecms.com" FALSE "" "Needed by libkdcraw") ++ # Flag to compile Little CMS version 2 with LibRaw ++ ADD_DEFINITIONS(-DUSE_LCMS2) + SET(LCMS_SUPPORT_CAN_BE_COMPILED true) ELSE () - MESSAGE(STATUS "Check for LCMS2 availability instead LCMS1...") - FIND_PACKAGE(LCMS2) @@ -35,18 +32,16 @@ Check for lcms2 before falling back to lcms1. - MACRO_LOG_FEATURE(LCMS2_FOUND "LCMS2" "A small-footprint color management engine" "http://www.littlecms.com" FALSE "" "Needed by libkdcraw") - # Flag to compile Little CMS version 2 with LibRaw - ADD_DEFINITIONS(-DUSE_LCMS2) -- SET(LCMS_SUPPORT_CAN_BE_COMPILED true) -+ MESSAGE(STATUS "Check for LCMS1 availability...") -+ FIND_PACKAGE(LCMS) -+ IF (LCMS_FOUND) -+ MESSAGE(STATUS "Found LCMS1: ${LCMS_LIBRARIES} ${LCMS_INCLUDE_DIR}") -+ INCLUDE_DIRECTORIES(${LCMS_INCLUDE_DIR}) -+ MACRO_LOG_FEATURE(LCMS_FOUND "LCMS1" "A small-footprint color management engine" "http://www.littlecms.com" TRUE "" "Needed by libkdcraw") -+ # Flag to compile Little CMS version 1 with LibRaw -+ ADD_DEFINITIONS(-DUSE_LCMS) -+ # For compatibility -+ SET(LCMS2_LIBRARIES ${LCMS_LIBRARIES}) -+ SET(LCMS_SUPPORT_CAN_BE_COMPILED true) ++ MESSAGE(STATUS "Check for LCMS1 availability...") ++ FIND_PACKAGE(LCMS) ++ IF (LCMS_FOUND) ++ MESSAGE(STATUS "Found LCMS1: ${LCMS_LIBRARIES} ${LCMS_INCLUDE_DIR}") ++ INCLUDE_DIRECTORIES(${LCMS_INCLUDE_DIR}) ++ MACRO_LOG_FEATURE(LCMS_FOUND "LCMS1" "A small-footprint color management engine" "http://www.littlecms.com" TRUE "" "Needed by libkdcraw") ++ # Flag to compile Little CMS version 1 with LibRaw ++ ADD_DEFINITIONS(-DUSE_LCMS) ++ # For compatibility ++ SET(LCMS2_LIBRARIES ${LCMS_LIBRARIES}) + SET(LCMS_SUPPORT_CAN_BE_COMPILED true) ENDIF () ENDIF () - ENDIF() |