diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-libs/libraw/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-libs/libraw/files')
9 files changed, 299 insertions, 0 deletions
diff --git a/media-libs/libraw/files/libraw-0.16.0-pc.patch b/media-libs/libraw/files/libraw-0.16.0-pc.patch new file mode 100644 index 000000000000..cdf6e0f7130b --- /dev/null +++ b/media-libs/libraw/files/libraw-0.16.0-pc.patch @@ -0,0 +1,36 @@ +diff -ruN LibRaw-0.16.0.orig/cmake/data/libraw.pc.cmake LibRaw-0.16.0/cmake/data/libraw.pc.cmake +--- LibRaw-0.16.0.orig/cmake/data/libraw.pc.cmake 2014-01-17 14:38:31.000000000 +0100 ++++ LibRaw-0.16.0/cmake/data/libraw.pc.cmake 2014-11-29 19:20:50.550486840 +0100 +@@ -9,4 +9,4 @@ + Requires: + Version: @RAW_LIB_VERSION_STRING@ + Libs: -L${libdir} -lraw +-Cflags: -I${includedir}/libraw ++Cflags: -I${includedir} +diff -ruN LibRaw-0.16.0.orig/cmake/data/libraw_r.pc.cmake LibRaw-0.16.0/cmake/data/libraw_r.pc.cmake +--- LibRaw-0.16.0.orig/cmake/data/libraw_r.pc.cmake 2014-01-17 14:38:31.000000000 +0100 ++++ LibRaw-0.16.0/cmake/data/libraw_r.pc.cmake 2014-11-29 19:21:00.456487394 +0100 +@@ -9,4 +9,4 @@ + Requires: + Version: @RAW_LIB_VERSION_STRING@ + Libs: -L${libdir} -lraw_r +-Cflags: -I${includedir}/libraw ++Cflags: -I${includedir} +diff -ruN LibRaw-0.16.0.orig/libraw.pc.in LibRaw-0.16.0/libraw.pc.in +--- LibRaw-0.16.0.orig/libraw.pc.in 2014-01-17 14:38:31.000000000 +0100 ++++ LibRaw-0.16.0/libraw.pc.in 2014-11-29 19:20:24.301485373 +0100 +@@ -8,4 +8,4 @@ + Requires: @PACKAGE_REQUIRES@ + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@ +-Cflags: -I${includedir}/libraw ++Cflags: -I${includedir} +diff -ruN LibRaw-0.16.0.orig/libraw_r.pc.in LibRaw-0.16.0/libraw_r.pc.in +--- LibRaw-0.16.0.orig/libraw_r.pc.in 2014-01-17 14:38:31.000000000 +0100 ++++ LibRaw-0.16.0/libraw_r.pc.in 2014-11-29 19:20:32.439485828 +0100 +@@ -8,4 +8,4 @@ + Requires: @PACKAGE_REQUIRES@ + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@ +-Cflags: -I${includedir}/libraw ++Cflags: -I${includedir} 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 new file mode 100644 index 000000000000..ed27bb5312c0 --- /dev/null +++ b/media-libs/libraw/files/libraw-0.16.0_alpha2-automagic-jasper.patch @@ -0,0 +1,32 @@ +--- 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 diff --git a/media-libs/libraw/files/libraw-0.16.0_alpha2-custom-demosaic-paths.patch b/media-libs/libraw/files/libraw-0.16.0_alpha2-custom-demosaic-paths.patch new file mode 100644 index 000000000000..85a1df495947 --- /dev/null +++ b/media-libs/libraw/files/libraw-0.16.0_alpha2-custom-demosaic-paths.patch @@ -0,0 +1,23 @@ +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 diff --git a/media-libs/libraw/files/libraw-0.16.0_alpha2-docs.patch b/media-libs/libraw/files/libraw-0.16.0_alpha2-docs.patch new file mode 100644 index 000000000000..442bfdc5471e --- /dev/null +++ b/media-libs/libraw/files/libraw-0.16.0_alpha2-docs.patch @@ -0,0 +1,21 @@ +--- 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") 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 new file mode 100644 index 000000000000..a9a514972d34 --- /dev/null +++ b/media-libs/libraw/files/libraw-0.16.0_alpha2-lcms2-first.patch @@ -0,0 +1,47 @@ +--- LibRaw-0.16.0-Alpha2/CMakeLists.txt ++++ LibRaw-0.16.0-Alpha2/CMakeLists.txt +@@ -119,26 +119,26 @@ + 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}) ++ 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) ++ 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 () diff --git a/media-libs/libraw/files/libraw-0.16.0_alpha2-libdir.patch b/media-libs/libraw/files/libraw-0.16.0_alpha2-libdir.patch new file mode 100644 index 000000000000..ae21f625c44b --- /dev/null +++ b/media-libs/libraw/files/libraw-0.16.0_alpha2-libdir.patch @@ -0,0 +1,32 @@ +--- 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) + diff --git a/media-libs/libraw/files/libraw-0.16.0_beta1-include.patch b/media-libs/libraw/files/libraw-0.16.0_beta1-include.patch new file mode 100644 index 000000000000..d0d2355d4981 --- /dev/null +++ b/media-libs/libraw/files/libraw-0.16.0_beta1-include.patch @@ -0,0 +1,20 @@ +diff --git a/cmake/data/libraw.pc.cmake b/cmake/data/libraw.pc.cmake +index abe6c03..aede5f2 100644 +--- a/cmake/data/libraw.pc.cmake ++++ b/cmake/data/libraw.pc.cmake +@@ -9,4 +9,4 @@ URL: http://www.libraw.org + Requires: + Version: @RAW_LIB_VERSION_STRING@ + Libs: -L${libdir} -lraw +-Cflags: -I${includedir}/libraw ++Cflags: -I${includedir} +diff --git a/cmake/data/libraw_r.pc.cmake b/cmake/data/libraw_r.pc.cmake +index d74e49a..16134e8 100644 +--- a/cmake/data/libraw_r.pc.cmake ++++ b/cmake/data/libraw_r.pc.cmake +@@ -9,4 +9,4 @@ URL: http://www.libraw.org + Requires: + Version: @RAW_LIB_VERSION_STRING@ + Libs: -L${libdir} -lraw_r +-Cflags: -I${includedir}/libraw ++Cflags: -I${includedir} diff --git a/media-libs/libraw/files/libraw-0.16.0_beta1-libsuffix.patch b/media-libs/libraw/files/libraw-0.16.0_beta1-libsuffix.patch new file mode 100644 index 000000000000..aa2a813051f9 --- /dev/null +++ b/media-libs/libraw/files/libraw-0.16.0_beta1-libsuffix.patch @@ -0,0 +1,64 @@ +Backport of +From ce720038ed40e4c4554e0d8c0e4e003834ed1652 Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@exherbo.org> +Date: Fri, 29 Nov 2013 20:53:46 +0100 +Subject: [PATCH] Allow specifying a suffix of the libdir +To allow installing to lib32/64 e.g. + + +diff -ruN LibRaw-0.16.0-Beta1.orig/CMakeLists.txt LibRaw-0.16.0-Beta1/CMakeLists.txt +--- LibRaw-0.16.0-Beta1.orig/CMakeLists.txt 2013-12-23 14:36:05.569116564 +0100 ++++ LibRaw-0.16.0-Beta1/CMakeLists.txt 2013-12-23 14:39:37.716121606 +0100 +@@ -95,6 +95,8 @@ + # ================================================================================================== + # General definitions rules + ++SET(LIB_SUFFIX "" CACHE STRING "Define suffix of lib directory name (32/64)" ) ++ + # To prevent warnings from M$ compiler + IF(WIN32 AND MSVC) + ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) +@@ -560,10 +562,10 @@ + # Configure and install data file for packaging. + IF(NOT WIN32) + 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 lib/pkgconfig) ++ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libraw.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) + + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/data/libraw_r.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libraw_r.pc @ONLY) +- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libraw_r.pc DESTINATION lib/pkgconfig) ++ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libraw_r.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) + + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/data/libraw.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/libraw.lsm) + ENDIF() +@@ -584,14 +586,14 @@ + # Install Shared binary files. + INSTALL(TARGETS raw + RUNTIME DESTINATION bin +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX} + ) + + INSTALL(TARGETS raw_r + RUNTIME DESTINATION bin +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX} + ) + + # Install find cmake script to the system for client applications. +@@ -633,8 +635,9 @@ + + INSTALL(TARGETS ${_target} + RUNTIME DESTINATION bin +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX} ++ ) + + ENDMACRO(LIBRAW_BUILD_SAMPLES) + diff --git a/media-libs/libraw/files/libraw-0.16.0_beta1-libsuffixpc.patch b/media-libs/libraw/files/libraw-0.16.0_beta1-libsuffixpc.patch new file mode 100644 index 000000000000..7d140c713c73 --- /dev/null +++ b/media-libs/libraw/files/libraw-0.16.0_beta1-libsuffixpc.patch @@ -0,0 +1,24 @@ +diff --git a/cmake/data/libraw.pc.cmake b/cmake/data/libraw.pc.cmake +index 9d34612..abe6c03 100644 +--- a/cmake/data/libraw.pc.cmake ++++ b/cmake/data/libraw.pc.cmake +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/lib ++libdir=${prefix}/lib@LIB_SUFFIX@ + includedir=${prefix}/include/libraw + + Name: @PROJECT_NAME@ +diff --git a/cmake/data/libraw_r.pc.cmake b/cmake/data/libraw_r.pc.cmake +index bf779d9..d74e49a 100644 +--- a/cmake/data/libraw_r.pc.cmake ++++ b/cmake/data/libraw_r.pc.cmake +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/lib ++libdir=${prefix}/lib@LIB_SUFFIX@ + includedir=${prefix}/include/libraw + + Name: @PROJECT_NAME@ |