commit: c545ead528b59c801f1e92d31ff7cc9514008298
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 17 17:11:32 2017 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 17:11:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c545ead5
media-libs/libraw: remove old, bug #567254
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-libs/libraw/Manifest | 3 -
media-libs/libraw/files/libraw-0.16.0-pc.patch | 36 ------------
.../libraw-0.16.0_alpha2-automagic-jasper.patch | 32 -----------
...ibraw-0.16.0_alpha2-custom-demosaic-paths.patch | 23 --------
.../libraw/files/libraw-0.16.0_alpha2-docs.patch | 21 -------
.../files/libraw-0.16.0_alpha2-lcms2-first.patch | 47 ---------------
media-libs/libraw/libraw-0.16.2.ebuild | 66 ----------------------
7 files changed, 228 deletions(-)
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index abc1168..e27c2fc 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,9 +1,6 @@
-DIST LibRaw-0.16.2.tar.gz 1476575 SHA256
6344e355f7c23f13e266844b36265d5f624237ba5a62dc901c7b91b510a84187 SHA512
c8fa974b72c1e2d255254527ca241a059b9a2e0943044c1b3c85257f987d451305fe94b4b901e9efd90ebab71ff602d442686a710c205d51862e88b2dfd13855
WHIRLPOOL
94f5fa4eb100a478d965516dd3c9048ca47bc0253bfd0482ebe3f410269e863a0f484c18bd2e07d44c324dbdbd84c1fd1768466b2b23e6909bc7d534f2a1f9fe
DIST LibRaw-0.17.2.tar.gz 1472714 SHA256
92b0c42c7666eca9307e5e1f97d6fefc196cf0b7ee089e22880259a76fafd15c SHA512
e27227850b09e291802c089c826778579420a4af3f4b94dddf488bfc7eb84335d7a944445287d5993c5a574c192df5117c022d1b3d0372b3539a4553612988f4
WHIRLPOOL
55ab9980dc789a0f8c08043a93c1004e268ac3e0902f789a808a47f50e9294eb2f3755f71ecc0310e80cdf440aa60d9ed0e389b27d184e81db6f90f144257436
DIST LibRaw-0.18.0.tar.gz 1278737 SHA256
d56a0c9a0e6d1b8c8c5585346acf2cfb0554eee0f0948da66f580cd65c8c5c9b SHA512
d0e83cec12a8ff82d86276b0541e92add912fec57cd7ce2a3cd415ba105797b05b5078ddf2c41c05304b95e57081bda87adc62f1bb3f59eea6270c55412d645e
WHIRLPOOL
f1d6f95d63d448bedc583705985cc605458d2a2375364272044be53b8715be3fc75c0b822b1c7ba885d451c62f990db6c1a1e91df4b1e31f13a9cffe624b4f05
-DIST LibRaw-demosaic-pack-GPL2-0.16.2.tar.gz 32652 SHA256
2218f08d59866e7852938356c197b96a6f47d0b9221a261280e010540477e77b SHA512
e41574f48bd3cda5755503b2693859de47b98064611771b9d950a198ad8f197c929c959de18599033c91fc7200d883074900e74ab154a4354d198af98a460903
WHIRLPOOL
56db7577a9a77347ea1f14a52e02925ef6191de1b1a98d7b870bf9e2fb49ffa460255ae5c662f01ef138346d23720333976d5029ddf91ccd99c13ba8cda260c3
DIST LibRaw-demosaic-pack-GPL2-0.17.2.tar.gz 31190 SHA256
a2e5e9cc04fa8f3e94070110dce8a06aa3b0b2f573ed99c5fc3e327d15f014b7 SHA512
634fcd62433bc9a9aebccd113ef95a070609edee2520b7a609bab1b9612cc472b77295deb84e43ffcf002a2cdb57bb92a39d1e4b1bb8fed77a221b370074edea
WHIRLPOOL
a10d7921a9f20b088e2e0d773315bd00b2c4105c1a9e6890386fe53a08af2e698441e6abf9ab445099962e500502618fb687974126a4345422a759fb174e591c
DIST LibRaw-demosaic-pack-GPL2-0.18.0.tar.gz 31149 SHA256
905eff0be2ce43c99527000c81e3b4f4a563ef9bc26581166742459f6358df90 SHA512
7ff65d6ae05cd0e6f62da10567fdb596ec1e2b678d3c3c3920aab3d08accddc636d887cfaa90cb534ffc8763379906889d14a2d228b6c9a8bf7396df675c6e40
WHIRLPOOL
3852e5da779f2c94d7672f61b13de50044fee71f1bba9b4725c68f7bec280e369fe9445d515d131deb88e6ebbf92d97687eeb44b795eeeda71cc4a9e03ffbc1b
-DIST LibRaw-demosaic-pack-GPL3-0.16.2.tar.gz 39457 SHA256
749b5baa3a4f1f5c4ea4169b9293b02b0d2a0714aa01729327f23f82621c9735 SHA512
1cc1ea98f544ac485a797718448e138d3aeab7d4bfce77706161b42ec1edf265e177437ecff2a58c452048102359088a326b0bb4aa63b3d79e76c6156c9374d2
WHIRLPOOL
470a3a673671af6057e4baf268e63742192c3cce88a7dd1cdf7b793d51da2dcf641a6c9b11059b13d82507ab726355c84635eb926a634822b344454ba40e5e65
DIST LibRaw-demosaic-pack-GPL3-0.17.2.tar.gz 38908 SHA256
b00cd0f54851bd3c8a66be4cacbf049e4508f1bac8ff85cb4528d8979739ed36 SHA512
fda6e22a8e4eb5614c6878ed77990f8f558ea54b9ec63ca77fb279543efa334c60d0fc48c1c5029c17216a1f7ed0e84db73675bd9d7308f869d11218184e19ad
WHIRLPOOL
545d5fc29ccc01f862868675b12ea5dab8fad5bd59781e744344fee62d446697529cc9ac169f2167d81feea8dbbb56f57cb4883d02e4e472fa81e992f3a7f73f
DIST LibRaw-demosaic-pack-GPL3-0.18.0.tar.gz 39585 SHA256
c79cbb4a7fa452a860ad0fa92e4feb4c250af4b5db297ea077b9472aa5be3905 SHA512
75f81fe1a9610c80a207f935a92f09ca7a300db1b708dc258973ea22f1b421cccf57000e2cd1538d96a6d2e44410066300be293da13405ea4c3201ddcc8bd900
WHIRLPOOL
8191e246bb3217da147ce12c28c764131e37763cb3d90b870ab5e597dd89516411510cc18a7eaff345827378de3dfa9cd049a96ced9b2314a6a7a56d5d998dfc
diff --git a/media-libs/libraw/files/libraw-0.16.0-pc.patch
b/media-libs/libraw/files/libraw-0.16.0-pc.patch
deleted file mode 100644
index cdf6e0f..00000000
--- a/media-libs/libraw/files/libraw-0.16.0-pc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index ed27bb5..00000000
--- a/media-libs/libraw/files/libraw-0.16.0_alpha2-automagic-jasper.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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
deleted file mode 100644
index 85a1df4..00000000
--- a/media-libs/libraw/files/libraw-0.16.0_alpha2-custom-demosaic-paths.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index 442bfdc..00000000
--- a/media-libs/libraw/files/libraw-0.16.0_alpha2-docs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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
deleted file mode 100644
index a9a5149..00000000
--- a/media-libs/libraw/files/libraw-0.16.0_alpha2-lcms2-first.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- 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/libraw-0.16.2.ebuild
b/media-libs/libraw/libraw-0.16.2.ebuild
deleted file mode 100644
index 99440cf..00000000
--- a/media-libs/libraw/libraw-0.16.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-multilib toolchain-funcs
-
-MY_PN=LibRaw
-MY_PV=${PV/_b/-B}
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital
photo cameras"
-HOMEPAGE="http://www.libraw.org/";
-SRC_URI="http://www.libraw.org/data/${MY_P}.tar.gz
- demosaic? (
-
http://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${MY_PV}.tar.gz
-
http://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${MY_PV}.tar.gz
- )"
-
-# Libraw also has it's own license, which is a pdf file and
-# can be obtained from here:
-# http://www.libraw.org/data/LICENSE.LibRaw.pdf
-LICENSE="LGPL-2.1 CDDL GPL-2 GPL-3"
-SLOT="0/10" # subslot = libraw soname version
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux
~x86-linux"
-IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[${MULTILIB_USEDEP}] )
- lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( Changelog.txt README )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.16.0_alpha2-docs.patch
- "${FILESDIR}"/${PN}-0.16.0_alpha2-automagic-jasper.patch
- "${FILESDIR}"/${PN}-0.16.0_alpha2-lcms2-first.patch
- "${FILESDIR}"/${PN}-0.16.0_alpha2-custom-demosaic-paths.patch
- "${FILESDIR}"/${PN}-0.16.0-pc.patch
-)
-
-pkg_pretend() {
- if use openmp ; then
- tc-has-openmp || die "Please switch to an openmp compatible
compiler"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_enable openmp OPENMP)
- $(cmake-utils_use_enable jpeg JPEG)
- $(cmake-utils_use_enable jpeg2k JASPER)
- $(cmake-utils_use_enable lcms LCMS)
- $(cmake-utils_use_enable examples EXAMPLES)
- $(cmake-utils_use_enable demosaic DEMOSAIC_PACK_GPL2)
- $(cmake-utils_use_enable demosaic DEMOSAIC_PACK_GPL3)
-
-DDEMOSAIC_PACK_GPL2_PATH="${WORKDIR}/${MY_PN}-demosaic-pack-GPL2-${MY_PV}"
-
-DDEMOSAIC_PACK_GPL3_PATH="${WORKDIR}/${MY_PN}-demosaic-pack-GPL3-${MY_PV}"
- )
- cmake-multilib_src_configure
-}
