* [gentoo-commits] repo/gentoo:master commit in: media-libs/libraw/, media-libs/libraw/files/
@ 2017-01-17 17:11 Markus Meier
0 siblings, 0 replies; 5+ messages in thread
From: Markus Meier @ 2017-01-17 17:11 UTC (permalink / raw
To: gentoo-commits
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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libraw/, media-libs/libraw/files/
@ 2017-10-08 21:15 Tim Harder
0 siblings, 0 replies; 5+ messages in thread
From: Tim Harder @ 2017-10-08 21:15 UTC (permalink / raw
To: gentoo-commits
commit: 89d4a8e0a0a321727125b3292b88dabd8fcf0599
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 8 21:13:16 2017 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sun Oct 8 21:14:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89d4a8e0
media-libs/libraw: remove old
media-libs/libraw/Manifest | 6 -
media-libs/libraw/files/libraw-0.17.2-gcc6.patch | 189 -----------------------
media-libs/libraw/libraw-0.17.2.ebuild | 67 --------
media-libs/libraw/libraw-0.18.2.ebuild | 63 --------
4 files changed, 325 deletions(-)
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index f270ad6d804..2ef09561592 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,12 +1,6 @@
-DIST LibRaw-0.17.2.tar.gz 1472714 SHA256 92b0c42c7666eca9307e5e1f97d6fefc196cf0b7ee089e22880259a76fafd15c SHA512 e27227850b09e291802c089c826778579420a4af3f4b94dddf488bfc7eb84335d7a944445287d5993c5a574c192df5117c022d1b3d0372b3539a4553612988f4 WHIRLPOOL 55ab9980dc789a0f8c08043a93c1004e268ac3e0902f789a808a47f50e9294eb2f3755f71ecc0310e80cdf440aa60d9ed0e389b27d184e81db6f90f144257436
-DIST LibRaw-0.18.2.tar.gz 1281674 SHA256 ce366bb38c1144130737eb16e919038937b4dc1ab165179a225d5e847af2abc6 SHA512 87d3e5a0ecf7fc7c35a32f3963d108553b2d21a89aa75e4f2d9fab939aa14aa267ccf2a29e75e12d613c39798eb222b55da80371e699e913a58a7ae0fd47a2bc WHIRLPOOL 04493eb20169091b1782f5f7d5988c142c612e726f3225c4394779aa4caae678792ac080fcf43bf25bffa698b1ab7353a4eaf226d15125db2254d7b1bc16045b
DIST LibRaw-0.18.4.tar.gz 1281104 SHA256 eaf4931b46e65861e88bbe704ccf370381e94d63e9a898b889ded4e0cb3b0c97 SHA512 e71db23a70f0cda745ae862f4cb6a0c51c968e4c7399f28e86de8beb894526fa76cd337c1406e2eaee3f287f15e8912d1a0f7217493c6444a491ca3329f63776 WHIRLPOOL c7bfecfe51280088b8be35a226e765b2a3f810d120150a74326b4ee9662f10b170fa8cca7b4ef7191431b7b08df4f83df5dbe6da1811915405b4d2d72b988e38
DIST LibRaw-0.18.5.tar.gz 1280046 SHA256 fa2a7d14d9dfaf6b368f958a76d79266b3f58c2bc367bebab56e11baa94da178 SHA512 751a1c54507b7408d0d36c3f1fb0e31928f5ae540fae42eb2b57d8fcebcd44134dc452a4f3838dd31dbc8fb3978a6cac6129429a3350f8be5dc44146309aff81 WHIRLPOOL b35227120e140abbd59b6587296fc81e7737a32cce82b8d4b2c240d448c786040302d1737c614168b5e8f797a760a396cfc353929afa7aba48af3f3e70cd1b8d
-DIST LibRaw-demosaic-pack-GPL2-0.17.2.tar.gz 31190 SHA256 a2e5e9cc04fa8f3e94070110dce8a06aa3b0b2f573ed99c5fc3e327d15f014b7 SHA512 634fcd62433bc9a9aebccd113ef95a070609edee2520b7a609bab1b9612cc472b77295deb84e43ffcf002a2cdb57bb92a39d1e4b1bb8fed77a221b370074edea WHIRLPOOL a10d7921a9f20b088e2e0d773315bd00b2c4105c1a9e6890386fe53a08af2e698441e6abf9ab445099962e500502618fb687974126a4345422a759fb174e591c
-DIST LibRaw-demosaic-pack-GPL2-0.18.2.tar.gz 31777 SHA256 f467689182728240c6358c1b890e9fe4ee08667c74433f6bd6a4710e3ae2aab6 SHA512 d979671769bb9a4695ace5c5478d6fefea2d9efd1ed30b25e3d6e3e517b86b551cbe9df7db75f735b130e1baf98b5d3485478f59379265fc4376c195ac6c1125 WHIRLPOOL e03fd53af54e0b86811273c1900764fbad5be7d259445031f9b178bc82aba53880a0f26916b86fbe0e8b12fe4eba78f594a7abbeaa1d77fa86379cf664f28a38
DIST LibRaw-demosaic-pack-GPL2-0.18.4.tar.gz 33129 SHA256 8961b0a90d4b1a5d00a13d9ed2f23e8f2c651b4a68c0470e01ba7668cc98145f SHA512 05bef76530f9237e1d1bfe08014f30de328b68319f88d126aaffa8baf3b89615d160bac36a6ad2cc38cab0faeb8c4bf86714dd568e7f01cfd1ee2513ac175a5d WHIRLPOOL 70fd4d7d5503d4edf985be7afe0635d8f54e3680a6be0384c0036480001d2fcb32cd6faa02f6219a5c28192448b2ea50bffae324b83d77509712887d7f02ccf4
DIST LibRaw-demosaic-pack-GPL2-0.18.5.tar.gz 30449 SHA256 2ae7923868c3e927eee72cf2e4d91384560b7cfe76a386ecf319c069d343c674 SHA512 1599695394717558e61844e32d76bf653741592d81691c9f55bfb72c8c5d485bce4eab3fc0eefd37640254c431bd78706fe04ca547e42566dda789f0b6559af5 WHIRLPOOL 880f95a95d61b9832ef0a5115aeb9d3ca27dd8de893265b86073fc30e22224a3fea125fb0d9a26d9af01cfb1a8aa4d21a93a5574599ffddf2d1b69e9349fa093
-DIST LibRaw-demosaic-pack-GPL3-0.17.2.tar.gz 38908 SHA256 b00cd0f54851bd3c8a66be4cacbf049e4508f1bac8ff85cb4528d8979739ed36 SHA512 fda6e22a8e4eb5614c6878ed77990f8f558ea54b9ec63ca77fb279543efa334c60d0fc48c1c5029c17216a1f7ed0e84db73675bd9d7308f869d11218184e19ad WHIRLPOOL 545d5fc29ccc01f862868675b12ea5dab8fad5bd59781e744344fee62d446697529cc9ac169f2167d81feea8dbbb56f57cb4883d02e4e472fa81e992f3a7f73f
-DIST LibRaw-demosaic-pack-GPL3-0.18.2.tar.gz 39290 SHA256 01080bc2448de87339f086229319c9e1cca97ac0621416feb537b96f0dba4a57 SHA512 0fcfd89ea7607e9a5c0594f09ec49ae3be749efeaa4a30a05d45926610609ef23ff416075fae153efe20b62ab020c0433525761025613d585acffbcd7c663d51 WHIRLPOOL 8be882be0ca70a2b6885397442d3e656553ae79946f39cf878a048f447e60a0d47d10ee219ab7c59c01b1c7997b392a942fe1ed1ac572a115e440e6a1d3f0b1b
DIST LibRaw-demosaic-pack-GPL3-0.18.4.tar.gz 38622 SHA256 9aa8ad60581b9c6a0ed81d96f897804cac832c7eeb087a38ca61fcd54838966c SHA512 158d951d0e1c35f1ebdde8849f0b51e23332c8b5b13a4b0ab0677a3d4a1682afd6e7c5dec4194072b4588699bf49a023591fa1b05d2a8f4c54cd1a44e65e3ad9 WHIRLPOOL da402afa54a6b3a10f17a3e2ea92475433a8baeb02c9be95d107fbb740f8e3448cba7183ef161ef04613f815af9c97196a7d9d3b14cca643ffabf329df7d9de5
DIST LibRaw-demosaic-pack-GPL3-0.18.5.tar.gz 38899 SHA256 b0ec998c4884cedd86a0627481a18144f0024a35c7a6fa5ae836182c16975c2b SHA512 c00193b64673e093c33a9d1316448eea4eb7e2b274d5d3bd39cef02b7269e56ce72f9b47831039e00b2feb8344b5266f9c03b5f11212d520809674db253cb028 WHIRLPOOL 78dfc95e23c4570f604262911747f751177e35d489875c1c1de21afeead4f902774e75387fc37b49a7800012fdb8bb872340faf15607e2b206677bb8fd236c6c
diff --git a/media-libs/libraw/files/libraw-0.17.2-gcc6.patch b/media-libs/libraw/files/libraw-0.17.2-gcc6.patch
deleted file mode 100644
index de5eb4881c4..00000000000
--- a/media-libs/libraw/files/libraw-0.17.2-gcc6.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-Backport upstream patch to compile against GCC 6 from
-https://github.com/LibRaw/LibRaw/commit/eba7a66e23f2f62cc4c8115af8066f2df5da085a
-
-Patch by Peter Levine
-See also: https://bugs.gentoo.org/show_bug.cgi?id=582852
-
---- a/dcraw/dcraw.c
-+++ b/dcraw/dcraw.c
-@@ -5788,30 +5788,37 @@ void CLASS lin_interpolate()
- */
- void CLASS vng_interpolate()
- {
-- static const signed char *cp, terms[] = {
-- -2,-2,+0,-1,0,0x01, -2,-2,+0,+0,1,0x01, -2,-1,-1,+0,0,0x01,
-- -2,-1,+0,-1,0,0x02, -2,-1,+0,+0,0,0x03, -2,-1,+0,+1,1,0x01,
-- -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03,
-- -2,+1,-1,+0,0,0x04, -2,+1,+0,-1,1,0x04, -2,+1,+0,+0,0,0x06,
-- -2,+1,+0,+1,0,0x02, -2,+2,+0,+0,1,0x04, -2,+2,+0,+1,0,0x04,
-- -1,-2,-1,+0,0,0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,
-- -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,0x88, -1,-1,+1,-2,0,0x40,
-- -1,-1,+1,-1,0,0x22, -1,-1,+1,+0,0,0x33, -1,-1,+1,+1,1,0x11,
-- -1,+0,-1,+2,0,0x08, -1,+0,+0,-1,0,0x44, -1,+0,+0,+1,0,0x11,
-- -1,+0,+1,-2,1,0x40, -1,+0,+1,-1,0,0x66, -1,+0,+1,+0,1,0x22,
-- -1,+0,+1,+1,0,0x33, -1,+0,+1,+2,1,0x10, -1,+1,+1,-1,1,0x44,
-- -1,+1,+1,+0,0,0x66, -1,+1,+1,+1,0,0x22, -1,+1,+1,+2,0,0x10,
-- -1,+2,+0,+1,0,0x04, -1,+2,+1,+0,1,0x04, -1,+2,+1,+1,0,0x04,
-- +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40,
-- +0,-1,+1,+0,0,0x11, +0,-1,+2,-2,0,0x40, +0,-1,+2,-1,0,0x20,
-- +0,-1,+2,+0,0,0x30, +0,-1,+2,+1,1,0x10, +0,+0,+0,+2,1,0x08,
-- +0,+0,+2,-2,1,0x40, +0,+0,+2,-1,0,0x60, +0,+0,+2,+0,1,0x20,
-- +0,+0,+2,+1,0,0x30, +0,+0,+2,+2,1,0x10, +0,+1,+1,+0,0,0x44,
-- +0,+1,+1,+2,0,0x10, +0,+1,+2,-1,1,0x40, +0,+1,+2,+0,0,0x60,
-- +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,0x80,
-- +1,-1,+1,+1,0,0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,
-- +1,+0,+2,+1,0,0x10
-- }, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 };
-+ struct interpolate_terms {
-+ signed char y1, x1, y2, x2, weight;
-+ unsigned char grads;
-+ };
-+ static const interpolate_terms terms[] = {
-+ {-2,-2,+0,-1,0,0x01}, {-2,-2,+0,+0,1,0x01}, {-2,-1,-1,+0,0,0x01},
-+ {-2,-1,+0,-1,0,0x02}, {-2,-1,+0,+0,0,0x03}, {-2,-1,+0,+1,1,0x01},
-+ {-2,+0,+0,-1,0,0x06}, {-2,+0,+0,+0,1,0x02}, {-2,+0,+0,+1,0,0x03},
-+ {-2,+1,-1,+0,0,0x04}, {-2,+1,+0,-1,1,0x04}, {-2,+1,+0,+0,0,0x06},
-+ {-2,+1,+0,+1,0,0x02}, {-2,+2,+0,+0,1,0x04}, {-2,+2,+0,+1,0,0x04},
-+ {-1,-2,-1,+0,0,0x80}, {-1,-2,+0,-1,0,0x01}, {-1,-2,+1,-1,0,0x01},
-+ {-1,-2,+1,+0,1,0x01}, {-1,-1,-1,+1,0,0x88}, {-1,-1,+1,-2,0,0x40},
-+ {-1,-1,+1,-1,0,0x22}, {-1,-1,+1,+0,0,0x33}, {-1,-1,+1,+1,1,0x11},
-+ {-1,+0,-1,+2,0,0x08}, {-1,+0,+0,-1,0,0x44}, {-1,+0,+0,+1,0,0x11},
-+ {-1,+0,+1,-2,1,0x40}, {-1,+0,+1,-1,0,0x66}, {-1,+0,+1,+0,1,0x22},
-+ {-1,+0,+1,+1,0,0x33}, {-1,+0,+1,+2,1,0x10}, {-1,+1,+1,-1,1,0x44},
-+ {-1,+1,+1,+0,0,0x66}, {-1,+1,+1,+1,0,0x22}, {-1,+1,+1,+2,0,0x10},
-+ {-1,+2,+0,+1,0,0x04}, {-1,+2,+1,+0,1,0x04}, {-1,+2,+1,+1,0,0x04},
-+ {+0,-2,+0,+0,1,0x80}, {+0,-1,+0,+1,1,0x88}, {+0,-1,+1,-2,0,0x40},
-+ {+0,-1,+1,+0,0,0x11}, {+0,-1,+2,-2,0,0x40}, {+0,-1,+2,-1,0,0x20},
-+ {+0,-1,+2,+0,0,0x30}, {+0,-1,+2,+1,1,0x10}, {+0,+0,+0,+2,1,0x08},
-+ {+0,+0,+2,-2,1,0x40}, {+0,+0,+2,-1,0,0x60}, {+0,+0,+2,+0,1,0x20},
-+ {+0,+0,+2,+1,0,0x30}, {+0,+0,+2,+2,1,0x10}, {+0,+1,+1,+0,0,0x44},
-+ {+0,+1,+1,+2,0,0x10}, {+0,+1,+2,-1,1,0x40}, {+0,+1,+2,+0,0,0x60},
-+ {+0,+1,+2,+1,0,0x20}, {+0,+1,+2,+2,0,0x10}, {+1,-2,+1,+0,0,0x80},
-+ {+1,-1,+1,+1,0,0x88}, {+1,+0,+1,+2,0,0x08}, {+1,+0,+2,-1,0,0x40},
-+ {+1,+0,+2,+1,0,0x10}
-+ };
-+ const interpolate_terms *cpt;
-+ signed char *cp;
-+ signed char chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 };
- ushort (*brow[5])[4], *pix;
- int prow=8, pcol=2, *ip, *code[16][16], gval[8], gmin, gmax, sum[4];
- int row, col, x, y, x1, x2, y1, y2, t, weight, grads, color, diag;
-@@ -5829,11 +5836,11 @@ void CLASS vng_interpolate()
- for (row=0; row < prow; row++) /* Precalculate for VNG */
- for (col=0; col < pcol; col++) {
- code[row][col] = ip;
-- for (cp=terms, t=0; t < 64; t++) {
-- y1 = *cp++; x1 = *cp++;
-- y2 = *cp++; x2 = *cp++;
-- weight = *cp++;
-- grads = *cp++;
-+ for (cpt=&terms[0], t=0; t < 64, cpt = &terms[t]; t++) {
-+ y1 = cpt->y1; x1 = cpt->x1;
-+ y2 = cpt->y2; x2 = cpt->x2;
-+ weight = cpt->weight;
-+ grads = cpt->grads;
- color = fcol(row+y1,col+x1);
- if (fcol(row+y2,col+x2) != color) continue;
- diag = (fcol(row,col+1) == color && fcol(row+1,col) == color) ? 2:1;
-@@ -16289,7 +16296,7 @@ void CLASS tiff_head (struct tiff_hdr *th, int full)
- strncpy (th->desc, desc, 512);
- strncpy (th->make, make, 64);
- strncpy (th->model, model, 64);
-- strcpy (th->soft, "dcraw v"DCRAW_VERSION);
-+ strcpy (th->soft, "dcraw v" DCRAW_VERSION);
- t = localtime (×tamp);
- sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d",
- t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);
---- a/internal/dcraw_common.cpp
-+++ b/internal/dcraw_common.cpp
-@@ -4618,30 +4618,37 @@ void CLASS lin_interpolate()
- */
- void CLASS vng_interpolate()
- {
-- static const signed char *cp, terms[] = {
-- -2,-2,+0,-1,0,0x01, -2,-2,+0,+0,1,0x01, -2,-1,-1,+0,0,0x01,
-- -2,-1,+0,-1,0,0x02, -2,-1,+0,+0,0,0x03, -2,-1,+0,+1,1,0x01,
-- -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03,
-- -2,+1,-1,+0,0,0x04, -2,+1,+0,-1,1,0x04, -2,+1,+0,+0,0,0x06,
-- -2,+1,+0,+1,0,0x02, -2,+2,+0,+0,1,0x04, -2,+2,+0,+1,0,0x04,
-- -1,-2,-1,+0,0,0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,
-- -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,0x88, -1,-1,+1,-2,0,0x40,
-- -1,-1,+1,-1,0,0x22, -1,-1,+1,+0,0,0x33, -1,-1,+1,+1,1,0x11,
-- -1,+0,-1,+2,0,0x08, -1,+0,+0,-1,0,0x44, -1,+0,+0,+1,0,0x11,
-- -1,+0,+1,-2,1,0x40, -1,+0,+1,-1,0,0x66, -1,+0,+1,+0,1,0x22,
-- -1,+0,+1,+1,0,0x33, -1,+0,+1,+2,1,0x10, -1,+1,+1,-1,1,0x44,
-- -1,+1,+1,+0,0,0x66, -1,+1,+1,+1,0,0x22, -1,+1,+1,+2,0,0x10,
-- -1,+2,+0,+1,0,0x04, -1,+2,+1,+0,1,0x04, -1,+2,+1,+1,0,0x04,
-- +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40,
-- +0,-1,+1,+0,0,0x11, +0,-1,+2,-2,0,0x40, +0,-1,+2,-1,0,0x20,
-- +0,-1,+2,+0,0,0x30, +0,-1,+2,+1,1,0x10, +0,+0,+0,+2,1,0x08,
-- +0,+0,+2,-2,1,0x40, +0,+0,+2,-1,0,0x60, +0,+0,+2,+0,1,0x20,
-- +0,+0,+2,+1,0,0x30, +0,+0,+2,+2,1,0x10, +0,+1,+1,+0,0,0x44,
-- +0,+1,+1,+2,0,0x10, +0,+1,+2,-1,1,0x40, +0,+1,+2,+0,0,0x60,
-- +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,0x80,
-- +1,-1,+1,+1,0,0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,
-- +1,+0,+2,+1,0,0x10
-- }, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 };
-+ struct interpolate_terms {
-+ signed char y1, x1, y2, x2, weight;
-+ unsigned char grads;
-+ };
-+ static const interpolate_terms terms[] = {
-+ {-2,-2,+0,-1,0,0x01}, {-2,-2,+0,+0,1,0x01}, {-2,-1,-1,+0,0,0x01},
-+ {-2,-1,+0,-1,0,0x02}, {-2,-1,+0,+0,0,0x03}, {-2,-1,+0,+1,1,0x01},
-+ {-2,+0,+0,-1,0,0x06}, {-2,+0,+0,+0,1,0x02}, {-2,+0,+0,+1,0,0x03},
-+ {-2,+1,-1,+0,0,0x04}, {-2,+1,+0,-1,1,0x04}, {-2,+1,+0,+0,0,0x06},
-+ {-2,+1,+0,+1,0,0x02}, {-2,+2,+0,+0,1,0x04}, {-2,+2,+0,+1,0,0x04},
-+ {-1,-2,-1,+0,0,0x80}, {-1,-2,+0,-1,0,0x01}, {-1,-2,+1,-1,0,0x01},
-+ {-1,-2,+1,+0,1,0x01}, {-1,-1,-1,+1,0,0x88}, {-1,-1,+1,-2,0,0x40},
-+ {-1,-1,+1,-1,0,0x22}, {-1,-1,+1,+0,0,0x33}, {-1,-1,+1,+1,1,0x11},
-+ {-1,+0,-1,+2,0,0x08}, {-1,+0,+0,-1,0,0x44}, {-1,+0,+0,+1,0,0x11},
-+ {-1,+0,+1,-2,1,0x40}, {-1,+0,+1,-1,0,0x66}, {-1,+0,+1,+0,1,0x22},
-+ {-1,+0,+1,+1,0,0x33}, {-1,+0,+1,+2,1,0x10}, {-1,+1,+1,-1,1,0x44},
-+ {-1,+1,+1,+0,0,0x66}, {-1,+1,+1,+1,0,0x22}, {-1,+1,+1,+2,0,0x10},
-+ {-1,+2,+0,+1,0,0x04}, {-1,+2,+1,+0,1,0x04}, {-1,+2,+1,+1,0,0x04},
-+ {+0,-2,+0,+0,1,0x80}, {+0,-1,+0,+1,1,0x88}, {+0,-1,+1,-2,0,0x40},
-+ {+0,-1,+1,+0,0,0x11}, {+0,-1,+2,-2,0,0x40}, {+0,-1,+2,-1,0,0x20},
-+ {+0,-1,+2,+0,0,0x30}, {+0,-1,+2,+1,1,0x10}, {+0,+0,+0,+2,1,0x08},
-+ {+0,+0,+2,-2,1,0x40}, {+0,+0,+2,-1,0,0x60}, {+0,+0,+2,+0,1,0x20},
-+ {+0,+0,+2,+1,0,0x30}, {+0,+0,+2,+2,1,0x10}, {+0,+1,+1,+0,0,0x44},
-+ {+0,+1,+1,+2,0,0x10}, {+0,+1,+2,-1,1,0x40}, {+0,+1,+2,+0,0,0x60},
-+ {+0,+1,+2,+1,0,0x20}, {+0,+1,+2,+2,0,0x10}, {+1,-2,+1,+0,0,0x80},
-+ {+1,-1,+1,+1,0,0x88}, {+1,+0,+1,+2,0,0x08}, {+1,+0,+2,-1,0,0x40},
-+ {+1,+0,+2,+1,0,0x10}
-+ };
-+ const interpolate_terms *cpt;
-+ signed char *cp;
-+ signed char chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 };
- ushort (*brow[5])[4], *pix;
- int prow=8, pcol=2, *ip, *code[16][16], gval[8], gmin, gmax, sum[4];
- int row, col, x, y, x1, x2, y1, y2, t, weight, grads, color, diag;
-@@ -4659,11 +4666,11 @@ void CLASS vng_interpolate()
- for (row=0; row < prow; row++) /* Precalculate for VNG */
- for (col=0; col < pcol; col++) {
- code[row][col] = ip;
-- for (cp=terms, t=0; t < 64; t++) {
-- y1 = *cp++; x1 = *cp++;
-- y2 = *cp++; x2 = *cp++;
-- weight = *cp++;
-- grads = *cp++;
-+ for (cpt=&terms[0], t=0; t < 64, cpt = &terms[t]; t++) {
-+ y1 = cpt->y1; x1 = cpt->x1;
-+ y2 = cpt->y2; x2 = cpt->x2;
-+ weight = cpt->weight;
-+ grads = cpt->grads;
- color = fcol(row+y1,col+x1);
- if (fcol(row+y2,col+x2) != color) continue;
- diag = (fcol(row,col+1) == color && fcol(row+1,col) == color) ? 2:1;
---- a/libraw/libraw_const.h
-+++ b/libraw/libraw_const.h
-@@ -255,8 +255,7 @@ enum LibRaw_progress
-
- LIBRAW_PROGRESS_THUMB_LOAD = 1<<28,
- LIBRAW_PROGRESS_TRESERVED1 = 1<<29,
-- LIBRAW_PROGRESS_TRESERVED2 = 1<<30,
-- LIBRAW_PROGRESS_TRESERVED3 = 1<<31
-+ LIBRAW_PROGRESS_TRESERVED2 = 1<<30
- };
- #define LIBRAW_PROGRESS_THUMB_MASK 0x0fffffff
-
diff --git a/media-libs/libraw/libraw-0.17.2.ebuild b/media-libs/libraw/libraw-0.17.2.ebuild
deleted file mode 100644
index b6ae8c9c05c..00000000000
--- a/media-libs/libraw/libraw-0.17.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal 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="https://www.libraw.org/"
-SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
- demosaic? (
- https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${MY_PV}.tar.gz
- https://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:
-# https://www.libraw.org/data/LICENSE.LibRaw.pdf
-LICENSE="LGPL-2.1 CDDL GPL-2 GPL-3"
-SLOT="0/15" # 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.17.2-gcc6.patch )
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --disable-static
- $(use_enable demosaic demosaic-pack-gpl2)
- $(use_enable demosaic demosaic-pack-gpl3)
- $(use_enable examples)
- $(use_enable jpeg)
- $(use_enable jpeg2k jasper)
- $(use_enable lcms)
- $(use_enable openmp)
- )
- ECONF_SOURCE="${S}" \
- econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- # package installs .pc files
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libraw/libraw-0.18.2.ebuild b/media-libs/libraw/libraw-0.18.2.ebuild
deleted file mode 100644
index 0aeacdf3e3c..00000000000
--- a/media-libs/libraw/libraw-0.18.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal 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="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
-SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
- demosaic? (
- https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${MY_PV}.tar.gz
- https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${MY_PV}.tar.gz
- )"
-
-LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
-SLOT="0/16" # 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 )
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --disable-static
- $(use_enable demosaic demosaic-pack-gpl2)
- $(use_enable demosaic demosaic-pack-gpl3)
- $(use_enable examples)
- $(use_enable jpeg)
- $(use_enable jpeg2k jasper)
- $(use_enable lcms)
- $(use_enable openmp)
- )
- ECONF_SOURCE="${S}" \
- econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- # package installs .pc files
- find "${D}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libraw/, media-libs/libraw/files/
@ 2018-02-18 9:49 Sergei Trofimovich
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2018-02-18 9:49 UTC (permalink / raw
To: gentoo-commits
commit: 23a185e1b261116feeea69568134b873a09e4398
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 18 09:48:53 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 09:49:21 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23a185e1
media-libs/libraw: fix build failure against glibc-2.27, bug #647556
Closes: https://bugs.gentoo.org/647556
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-libs/libraw/files/libraw-0.18.4-glibc-2.27.patch | 14 ++++++++++++++
media-libs/libraw/libraw-0.18.4.ebuild | 6 +++++-
media-libs/libraw/libraw-0.18.6.ebuild | 6 +++++-
media-libs/libraw/libraw-0.18.7.ebuild | 4 ++++
4 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/media-libs/libraw/files/libraw-0.18.4-glibc-2.27.patch b/media-libs/libraw/files/libraw-0.18.4-glibc-2.27.patch
new file mode 100644
index 00000000000..3e33cc62acc
--- /dev/null
+++ b/media-libs/libraw/files/libraw-0.18.4-glibc-2.27.patch
@@ -0,0 +1,14 @@
+Fix build failure on glibc-2.27 caused by pow64 symbol collision.
+
+https://github.com/LibRaw/LibRaw/pull/115
+https://bugs.gentoo.org/647556
+diff --git a/internal/dcraw_common.cpp b/internal/dcraw_common.cpp
+index 18bcdbc..8cec744 100644
+--- a/internal/dcraw_common.cpp
++++ b/internal/dcraw_common.cpp
+@@ -5770,4 +5770,5 @@ static float powf_lim(float a, float b, float limup)
+ return (b>limup || b < -limup)?0.f:powf(a,b);
+ }
++#define powf64 powf_lim64 /* workaround symbol collision */
+ static float powf64(float a, float b)
+ {
diff --git a/media-libs/libraw/libraw-0.18.4.ebuild b/media-libs/libraw/libraw-0.18.4.ebuild
index 95da5a43109..00899324988 100644
--- a/media-libs/libraw/libraw-0.18.4.ebuild
+++ b/media-libs/libraw/libraw-0.18.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -32,6 +32,10 @@ S=${WORKDIR}/${MY_P}
DOCS=( Changelog.txt README )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.18.4-glibc-2.27.patch
+)
+
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
diff --git a/media-libs/libraw/libraw-0.18.6.ebuild b/media-libs/libraw/libraw-0.18.6.ebuild
index 318f92ff612..2db1f344707 100644
--- a/media-libs/libraw/libraw-0.18.6.ebuild
+++ b/media-libs/libraw/libraw-0.18.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -32,6 +32,10 @@ S="${WORKDIR}/${MY_P}"
DOCS=( Changelog.txt README )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.18.4-glibc-2.27.patch
+)
+
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
diff --git a/media-libs/libraw/libraw-0.18.7.ebuild b/media-libs/libraw/libraw-0.18.7.ebuild
index 4989fcd6c7f..2db1f344707 100644
--- a/media-libs/libraw/libraw-0.18.7.ebuild
+++ b/media-libs/libraw/libraw-0.18.7.ebuild
@@ -32,6 +32,10 @@ S="${WORKDIR}/${MY_P}"
DOCS=( Changelog.txt README )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.18.4-glibc-2.27.patch
+)
+
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libraw/, media-libs/libraw/files/
@ 2018-09-15 2:31 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-09-15 2:31 UTC (permalink / raw
To: gentoo-commits
commit: 11672b476e8d21c6485b89119a9179d899ccbaab
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 14 18:50:24 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 02:30:29 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11672b47
media-libs/libraw: Security cleanup
Bug: https://bugs.gentoo.org/654376
Package-Manager: Portage-2.3.49, Repoman-2.3.10
media-libs/libraw/Manifest | 4 --
.../libraw/files/libraw-0.18.4-glibc-2.27.patch | 14 -----
media-libs/libraw/libraw-0.18.4.ebuild | 67 ----------------------
media-libs/libraw/libraw-0.18.8.ebuild | 63 --------------------
4 files changed, 148 deletions(-)
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 100f9a05b70..10ce62fd346 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,10 +1,6 @@
DIST LibRaw-0.18.11.tar.gz 1283643 BLAKE2B cd217a0c40d0f30ff95968c5238ad349d32f6ae44aca3847b32c236e8e82e7ff25ba5d6bb0cffe8d73b288239830982d074a306b682160bfe8c73b0df9fcff09 SHA512 4d114bdb589c96d95f646b1d016cfb9546ea7a53b9f23af1dc5d0e38cb4d1b2aa7270f2d4dbe7c6c323fb7f21403914a0bb75afa7b6204d0a99c72ecf0c812c9
DIST LibRaw-0.18.12.tar.gz 1283491 BLAKE2B a0e23bf58ecf331ef52e529be5dd27acf8458d1a6de700b36df6172b7cfde2da62561e29c197bc360237b12c7a427b1d07a0c64862fe1cead461a6989e488218 SHA512 8fcf1e24295457f09a654a14d77869ca401a21e9f4386d91fb0fd5bc9aa20a882bf490a64c183108e645b5fa70401f97868c83837a057cb707f58fa31a417d44
DIST LibRaw-0.18.13.tar.gz 1287631 BLAKE2B cb335dd21b897222a80ae7b486d751a080dafe93d9c4ce72ad337bc724707831a70428323027f5f343c4b0ff08820b6f68553436240a85d115eaaa30b6b0c269 SHA512 80e6ca48b00176e7c4dd21d8249c60e71e987c01e719abc3bda8b859645301b9dee4bb365bbcb79cbe0067220d3b966add4757b35d4b6ada0a59bbdb29925254
-DIST LibRaw-0.18.4.tar.gz 1281104 BLAKE2B dc6c2b594f0897eea509d3122bd7f41bccd89182a5e294b331544ad626631f18637660e1de7ea1c8b5e1c0b59678189d06f9fd12e27016e2ea3ec736cabfbbe4 SHA512 e71db23a70f0cda745ae862f4cb6a0c51c968e4c7399f28e86de8beb894526fa76cd337c1406e2eaee3f287f15e8912d1a0f7217493c6444a491ca3329f63776
-DIST LibRaw-0.18.8.tar.gz 1281773 BLAKE2B 755d17ee4c08e26b04d20cc6284f43e1a87d2bc1b41499d175c6ebfc39684732a4407b990115818553c7b815c66bb04ad451d478ed2c084c443871de8ea221e4 SHA512 48871a5e43c89a17962fae426a962d11a6ce40cb8e7d8abc90e98c899dc42b7e1711398c075901ddbc710fe7e916ba6d507bee7e18975779caa8f5d512b1d580
DIST LibRaw-0.19.0.tar.gz 1300662 BLAKE2B f182f1fd7d02eaa34f8b8e2336cbc59cd8c3345cddeace2ed305d048d160bf8d6ecdf04129829b3202a16e70d987a5b2a83c036ec95d1b7b6c748dbb5b46271b SHA512 33d0e9a031add901bdd10ffcde6a0f7837a4f4bec0bbbd21ad661e518dadcb1699133f17b3b2f6cd6cefe87ef3017cb7e1b816c4ce3dfebaaf5d9b2ff6b65238
-DIST LibRaw-demosaic-pack-GPL2-0.18.4.tar.gz 33129 BLAKE2B 724501ae52bf83006dd1e7730f750c65f4a58ca385227a7c9d5c8ab2926ef2fb74a798bd09b78e6f9c1c5cdd39de712ec05a49412087f3b889f3ff76dbb0fbe8 SHA512 05bef76530f9237e1d1bfe08014f30de328b68319f88d126aaffa8baf3b89615d160bac36a6ad2cc38cab0faeb8c4bf86714dd568e7f01cfd1ee2513ac175a5d
DIST LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz 30868 BLAKE2B 30cef85c49e066fa4b1d86ee4d7bfd7bff07897f91edd57aa52428f7ecf2d6e930703e496d4e55e034c6da2f68735f8b20f493a1d7a00d51b0430a4b98e6ee45 SHA512 c34419cec055ea976a348c342f5ec2141e2686b5eb50dd23d7b9fd707eefd86779d331f06b4570dedb1682c33fcd6ac0446b3167ca1f3e3fd2566a0c66c6fd3d
-DIST LibRaw-demosaic-pack-GPL3-0.18.4.tar.gz 38622 BLAKE2B 268085234335619487f52bf22739c28f077c24d02990e7a56a0a3e5b9a654227762adb366b0be5b3b0a9a1fe2553a798b4d5b120699c93cae16415f4aaf4ea4a SHA512 158d951d0e1c35f1ebdde8849f0b51e23332c8b5b13a4b0ab0677a3d4a1682afd6e7c5dec4194072b4588699bf49a023591fa1b05d2a8f4c54cd1a44e65e3ad9
DIST LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz 39002 BLAKE2B 544a1eab61c825c7f2202107d623a56e1f81ad3e5111b419bf12708e2d8a9903f192c23904ab8fb274636d9262d3d89f02fa5e05a0e70d7834782c2df8ec0548 SHA512 10e8cb6694159d04deb813a88e5c3195eed6e2e438f41533db91b17997af1b9d54f286303447ca6e3d1b377922e388f6fcc8a8370254011e11b85612c914d500
diff --git a/media-libs/libraw/files/libraw-0.18.4-glibc-2.27.patch b/media-libs/libraw/files/libraw-0.18.4-glibc-2.27.patch
deleted file mode 100644
index 3e33cc62acc..00000000000
--- a/media-libs/libraw/files/libraw-0.18.4-glibc-2.27.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix build failure on glibc-2.27 caused by pow64 symbol collision.
-
-https://github.com/LibRaw/LibRaw/pull/115
-https://bugs.gentoo.org/647556
-diff --git a/internal/dcraw_common.cpp b/internal/dcraw_common.cpp
-index 18bcdbc..8cec744 100644
---- a/internal/dcraw_common.cpp
-+++ b/internal/dcraw_common.cpp
-@@ -5770,4 +5770,5 @@ static float powf_lim(float a, float b, float limup)
- return (b>limup || b < -limup)?0.f:powf(a,b);
- }
-+#define powf64 powf_lim64 /* workaround symbol collision */
- static float powf64(float a, float b)
- {
diff --git a/media-libs/libraw/libraw-0.18.4.ebuild b/media-libs/libraw/libraw-0.18.4.ebuild
deleted file mode 100644
index 3d180fb60a2..00000000000
--- a/media-libs/libraw/libraw-0.18.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal 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="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
-SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
- demosaic? (
- https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${MY_PV}.tar.gz
- https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${MY_PV}.tar.gz
- )"
-
-LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
-SLOT="0/16" # subslot = libraw soname version
-KEYWORDS="alpha amd64 arm ~arm64 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.18.4-glibc-2.27.patch
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --disable-static
- $(use_enable demosaic demosaic-pack-gpl2)
- $(use_enable demosaic demosaic-pack-gpl3)
- $(use_enable examples)
- $(use_enable jpeg)
- $(use_enable jpeg2k jasper)
- $(use_enable lcms)
- $(use_enable openmp)
- )
- ECONF_SOURCE="${S}" \
- econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- # package installs .pc files
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libraw/libraw-0.18.8.ebuild b/media-libs/libraw/libraw-0.18.8.ebuild
deleted file mode 100644
index 1c3d0a2783d..00000000000
--- a/media-libs/libraw/libraw-0.18.8.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal 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="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
-SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
- demosaic? (
- https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${MY_PV}.tar.gz
- https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${MY_PV}.tar.gz
- )"
-
-LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
-SLOT="0/16" # subslot = libraw soname version
-KEYWORDS="alpha amd64 arm ~arm64 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 )
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --disable-static
- $(use_enable demosaic demosaic-pack-gpl2)
- $(use_enable demosaic demosaic-pack-gpl3)
- $(use_enable examples)
- $(use_enable jpeg)
- $(use_enable jpeg2k jasper)
- $(use_enable lcms)
- $(use_enable openmp)
- )
- ECONF_SOURCE="${S}" \
- econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- # package installs .pc files
- find "${D}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libraw/, media-libs/libraw/files/
@ 2023-10-15 10:28 Hans de Graaff
0 siblings, 0 replies; 5+ messages in thread
From: Hans de Graaff @ 2023-10-15 10:28 UTC (permalink / raw
To: gentoo-commits
commit: 8bfc77ff0d80c08df6ca2401ef3c77faecd1680f
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 15 10:27:22 2023 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Oct 15 10:27:56 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bfc77ff
media-libs/libraw: fix CVE-2023-1729
Bug: https://bugs.gentoo.org/908041
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
.../libraw/files/libraw-0.21.1-CVE-2023-1729.patch | 22 ++++++++
media-libs/libraw/libraw-0.21.1-r1.ebuild | 62 ++++++++++++++++++++++
2 files changed, 84 insertions(+)
diff --git a/media-libs/libraw/files/libraw-0.21.1-CVE-2023-1729.patch b/media-libs/libraw/files/libraw-0.21.1-CVE-2023-1729.patch
new file mode 100644
index 000000000000..427b3c852c16
--- /dev/null
+++ b/media-libs/libraw/files/libraw-0.21.1-CVE-2023-1729.patch
@@ -0,0 +1,22 @@
+From 9ab70f6dca19229cb5caad7cc31af4e7501bac93 Mon Sep 17 00:00:00 2001
+From: Alex Tutubalin <lexa@lexa.ru>
+Date: Sat, 14 Jan 2023 18:32:59 +0300
+Subject: [PATCH] do not set shrink flag for 3/4 component images
+
+---
+ src/preprocessing/raw2image.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/preprocessing/raw2image.cpp b/src/preprocessing/raw2image.cpp
+index e65e2ad7..702cf290 100644
+--- a/src/preprocessing/raw2image.cpp
++++ b/src/preprocessing/raw2image.cpp
+@@ -43,6 +43,8 @@ void LibRaw::raw2image_start()
+
+ // adjust for half mode!
+ IO.shrink =
++ !imgdata.rawdata.color4_image && !imgdata.rawdata.color3_image &&
++ !imgdata.rawdata.float4_image && !imgdata.rawdata.float3_image &&
+ P1.filters &&
+ (O.half_size || ((O.threshold || O.aber[0] != 1 || O.aber[2] != 1)));
+
diff --git a/media-libs/libraw/libraw-0.21.1-r1.ebuild b/media-libs/libraw/libraw-0.21.1-r1.ebuild
new file mode 100644
index 000000000000..98313a578726
--- /dev/null
+++ b/media-libs/libraw/libraw-0.21.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal 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="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
+SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+# SONAME isn't exactly the same as PV but it does correspond and
+# libraw has unstable ABI across releases.
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples jpeg +lcms openmp zlib"
+
+RDEPEND="
+ jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+ lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )
+ zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( Changelog.txt README.md )
+
+PATCHES=( "${FILESDIR}/${P}-CVE-2023-1729.patch" )
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --disable-jasper
+ $(multilib_native_use_enable examples)
+ $(use_enable jpeg)
+ $(use_enable lcms)
+ $(use_enable openmp)
+ $(use_enable zlib)
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ # package installs .pc files
+ find "${D}" -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-10-15 10:28 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-08 21:15 [gentoo-commits] repo/gentoo:master commit in: media-libs/libraw/, media-libs/libraw/files/ Tim Harder
-- strict thread matches above, loose matches on Subject: below --
2023-10-15 10:28 Hans de Graaff
2018-09-15 2:31 Andreas Sturmlechner
2018-02-18 9:49 Sergei Trofimovich
2017-01-17 17:11 Markus Meier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox