* [gentoo-commits] gentoo-x86 commit in media-libs/libraw/files: libraw-0.16.0_alpha2-libdir.patch libraw-0.16.0_alpha2-lcms2-first.patch libraw-0.16.0_alpha2-docs.patch libraw-0.16.0_alpha2-automagic-jasper.patch libraw-0.16.0_alpha2-custom-demosaic-paths.patch
@ 2013-10-20 11:06 Tim Harder (radhermit)
0 siblings, 0 replies; only message in thread
From: Tim Harder (radhermit) @ 2013-10-20 11:06 UTC (permalink / raw
To: gentoo-commits
radhermit 13/10/20 11:06:50
Added: libraw-0.16.0_alpha2-libdir.patch
libraw-0.16.0_alpha2-lcms2-first.patch
libraw-0.16.0_alpha2-docs.patch
libraw-0.16.0_alpha2-automagic-jasper.patch
libraw-0.16.0_alpha2-custom-demosaic-paths.patch
Log:
Switch to cmake build system (fixes bug #488598) and add multilib support (bug #474652).
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Revision Changes Path
1.1 media-libs/libraw/files/libraw-0.16.0_alpha2-libdir.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libraw/files/libraw-0.16.0_alpha2-libdir.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libraw/files/libraw-0.16.0_alpha2-libdir.patch?rev=1.1&content-type=text/plain
Index: libraw-0.16.0_alpha2-libdir.patch
===================================================================
--- LibRaw-0.16.0-Alpha2/CMakeLists.txt
+++ LibRaw-0.16.0-Alpha2/CMakeLists.txt
@@ -565,14 +565,14 @@
# Install Shared binary files.
INSTALL(TARGETS raw
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
INSTALL(TARGETS raw_r
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
# Install find cmake script to the system for client applications.
@@ -626,8 +626,8 @@
INSTALL(TARGETS ${_target}
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib)
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
ENDMACRO(LIBRAW_BUILD_SAMPLES)
1.1 media-libs/libraw/files/libraw-0.16.0_alpha2-lcms2-first.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libraw/files/libraw-0.16.0_alpha2-lcms2-first.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libraw/files/libraw-0.16.0_alpha2-lcms2-first.patch?rev=1.1&content-type=text/plain
Index: libraw-0.16.0_alpha2-lcms2-first.patch
===================================================================
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 @@
SET(LCMS_SUPPORT_CAN_BE_COMPILED false)
IF (ENABLE_LCMS)
- 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 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)
- IF (LCMS2_FOUND AND (LCMS2_VERSION VERSION_EQUAL 2.1 OR LCMS2_VERSION VERSION_GREATER 2.1))
- MESSAGE(STATUS "Found LCMS2 instead LCMS1: ${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 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()
1.1 media-libs/libraw/files/libraw-0.16.0_alpha2-docs.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libraw/files/libraw-0.16.0_alpha2-docs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libraw/files/libraw-0.16.0_alpha2-docs.patch?rev=1.1&content-type=text/plain
Index: libraw-0.16.0_alpha2-docs.patch
===================================================================
--- LibRaw-0.16.0-Alpha2/CMakeLists.txt
+++ LibRaw-0.16.0-Alpha2/CMakeLists.txt
@@ -579,18 +579,6 @@
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/FindLibRaw.cmake
DESTINATION ${CMAKE_ROOT}/Modules)
-# Install doc data files.
-IF(NOT WIN32)
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/COPYRIGHT
- ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.CDDL
- ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.LGPL
- ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.LibRaw.pdf
- ${CMAKE_CURRENT_SOURCE_DIR}/Changelog.txt
- DESTINATION share/libraw
- COMPONENT main
- )
-ENDIF()
-
# Uninstall rules
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/Uninstall.cmake ${CMAKE_BINARY_DIR}/cmake_uninstall.cmake COPYONLY)
ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake")
1.1 media-libs/libraw/files/libraw-0.16.0_alpha2-automagic-jasper.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libraw/files/libraw-0.16.0_alpha2-automagic-jasper.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libraw/files/libraw-0.16.0_alpha2-automagic-jasper.patch?rev=1.1&content-type=text/plain
Index: libraw-0.16.0_alpha2-automagic-jasper.patch
===================================================================
--- LibRaw-0.16.0-Alpha2/CMakeLists.txt
+++ LibRaw-0.16.0-Alpha2/CMakeLists.txt
@@ -65,6 +65,7 @@
# Project Options
OPTION(ENABLE_OPENMP "Build library with OpenMP support (default=ON)" ON)
+OPTION(ENABLE_JASPER "Build library with RedCine codec support (default=ON)" ON)
OPTION(ENABLE_LCMS "Build library with LCMS support (default=ON)" ON)
OPTION(ENABLE_EXAMPLES "Build library with sample command-line programs (default=ON)" ON)
OPTION(ENABLE_RAWSPEED "Build library with extra RawSpeed codec support (default=OFF)" OFF)
@@ -207,12 +208,16 @@
# Jasper library check
-FIND_PACKAGE(Jasper)
+SET(JASPER_FOUND false)
-# Flag to use libjasper with LibRaw RedCine codec
-IF(JASPER_FOUND)
- ADD_DEFINITIONS(-DUSE_JASPER)
- INCLUDE_DIRECTORIES(${JASPER_INCLUDE_DIR})
+IF(ENABLE_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()
ENDIF()
# For registration to libraw_config.h
1.1 media-libs/libraw/files/libraw-0.16.0_alpha2-custom-demosaic-paths.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libraw/files/libraw-0.16.0_alpha2-custom-demosaic-paths.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libraw/files/libraw-0.16.0_alpha2-custom-demosaic-paths.patch?rev=1.1&content-type=text/plain
Index: libraw-0.16.0_alpha2-custom-demosaic-paths.patch
===================================================================
Use externally defined paths for demosaic packs and rawspeed before falling back to defaults.
--- LibRaw-0.16.0-Alpha2/CMakeLists.txt
+++ LibRaw-0.16.0-Alpha2/CMakeLists.txt
@@ -81,9 +81,15 @@
SET(RAWSPEED_RPATH "RawSpeed" CACHE STRING
"Relavive path to extra RawSpeed codec (default=RawSpeed)")
-SET(DEMOSAIC_PACK_GPL2_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${DEMOSAIC_PACK_GPL2_RPATH}")
-SET(DEMOSAIC_PACK_GPL3_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${DEMOSAIC_PACK_GPL3_RPATH}")
-SET(RAWSPEED_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${RAWSPEED_RPATH}")
+IF(NOT DEMOSAIC_PACK_GPL2_PATH)
+ SET(DEMOSAIC_PACK_GPL2_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${DEMOSAIC_PACK_GPL2_RPATH}")
+ENDIF()
+IF(NOT DEMOSAIC_PACK_GPL3_PATH)
+ SET(DEMOSAIC_PACK_GPL3_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${DEMOSAIC_PACK_GPL3_RPATH}")
+ENDIF()
+IF(NOT RAWSPEED_PATH)
+ SET(RAWSPEED_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${RAWSPEED_RPATH}")
+ENDIF()
# ==================================================================================================
# General definitions rules
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-10-20 11:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-20 11:06 [gentoo-commits] gentoo-x86 commit in media-libs/libraw/files: libraw-0.16.0_alpha2-libdir.patch libraw-0.16.0_alpha2-lcms2-first.patch libraw-0.16.0_alpha2-docs.patch libraw-0.16.0_alpha2-automagic-jasper.patch libraw-0.16.0_alpha2-custom-demosaic-paths.patch Tim Harder (radhermit)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox