Unbundle libraw, patch by Pino Toscano

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

4 files changed, 216 insertions, 9 deletions

diff --git a/kde-base/libkdcraw/ChangeLog b/kde-base/libkdcraw/ChangeLog
index c93ab5c615c7..fa9d077805c7 100644
--- a/kde-base/libkdcraw/ChangeLog
+++ b/kde-base/libkdcraw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkdcraw
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdcraw/ChangeLog,v 1.171 2013/07/02 16:48:06 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdcraw/ChangeLog,v 1.172 2013/07/04 21:45:42 dilfridge Exp $
+
+*libkdcraw-4.10.5-r1 (04 Jul 2013)
+
+  04 Jul 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libkdcraw-4.10.5-r1.ebuild, +files/libkdcraw-4.10.5-extlibraw.patch:
+  Unbundle libraw, patch by Pino Toscano
 
 *libkdcraw-4.10.5 (02 Jul 2013)
 
diff --git a/kde-base/libkdcraw/Manifest b/kde-base/libkdcraw/Manifest
index 5b82cdab9aeb..3f9015e1a4ed 100644
--- a/kde-base/libkdcraw/Manifest
+++ b/kde-base/libkdcraw/Manifest
@@ -1,20 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libkdcraw-4.10.5-extlibraw.patch 6347 SHA256 e6d243c4619d700f5256c6228b026181c1a822237c13e5a97972340e17a5a78d SHA512 548e674009bcd9d1bbfe428ecbcf838d2785799df0b702b9ff24eb3e576ee88b313927d607da97db211c2a722cf3cdd33f6e4f115c2f7b388d2966f1f999d182 WHIRLPOOL cf0eab1974c9cea6abbae19892050c03c5e3c4cc7d517ea0ac6a1d260047e2fecf7f739b1f49412de2d7e7632624ad736ba3bf935b634b15762e2c429979297b
 DIST libkdcraw-4.10.4.tar.xz 345488 SHA256 e96e29adbdbdb21101c90fbf299d1d39ffd9f7e14c1a441e04f57c9e8c4a3071 SHA512 34bb0826c4f47d520ef99f375a393c10c211462f763ca3040bc91fa656232ae604ae0586491c0107b809557e475bbeedebec96e1c3e8dacadcd96223027a0dec WHIRLPOOL cab62728b9a74b4583e185cb99159d3e805f58f109bda9cc93845d5cf03a9d6ed4d3b5d8030193678848036e16c6a6b4107da5c231512bdf94b439095b5ee917
 DIST libkdcraw-4.10.5.tar.xz 349916 SHA256 cad35e13ea44c4e0bf0932bfb0aae951e24ec957b06737057ad9dc0b735b3c5c SHA512 3e15536c1e773ce2c5085ed331ef93d7b1d517b08f6e56b4b4de186cb40faf602d82836714844f48504083df27cd107528c0a3256c49ebd5c64161abc295b874 WHIRLPOOL 30cff28f147d87659a46297134a799385d73c488513fa3ee52eaa1a66e69944fd78f5793fef80166f4314e9c34873c4774dc1d07979683808ed1b27af23c6d8c
 EBUILD libkdcraw-4.10.4.ebuild 446 SHA256 cb07defa3323875450683cdddbda11fe2eec442cd932392feb96f89858dc84e7 SHA512 de4aea4af62c8ec1198c37eb65481bb1ae981e959ee1342fac80dcadfccbfec5fcba11642824059587a002f204f182d335886aa8227f36f65f7df19af29c3250 WHIRLPOOL 843edc3033b53241d6ff6c5ce589e641e62bcccd80027fc32ee428d68f4c1d1aca4d3aec52e6f4c2b65000f1ceda2f6d22615987b6d36b7d561ae6174d84932d
+EBUILD libkdcraw-4.10.5-r1.ebuild 680 SHA256 dad3d099de8877f682749fb60044987e94c34e97c93092566fc866cca8ba92b8 SHA512 0f2025aa123f08f2a7300149dcbf28b2248a7e7ee3c1ed42736c863c356cb37aec43d714ff8b905764ffe7604939152612a17d53b72bf5e0b5512dc3b8a8329f WHIRLPOOL 506d71e219b10a5f240a4bb317e16e27ca333a81740bd7cc5dad734dd28c123c745128d427d1eefae7ca3bbe09ba6541be3d24b2eaa29212ba081ed4d384d78c
 EBUILD libkdcraw-4.10.5.ebuild 720 SHA256 8739d8b240e40688953b0c1e6ddf9c90117012e44bb851ed8b509e60f317d468 SHA512 0bdc42c38db51fc1029969dd17f38cde8542b3333d1beee3a79a342bbc2de01cc39f20f33f874bcd079793c4b5f20ff2052f68f0083fce95b68a969547c3c2ab WHIRLPOOL 2f6742883ec6ac5c21318ae13eefa6ff4981e395de9db10bcbe9bcecdb0eb2e8d1878b3c867ddbe7fdfacd6a9e0cb9b648d340a048062ebf2692721083703f16
-MISC ChangeLog 20677 SHA256 930e69200749c86b4a51850396f38d4537033c4b172f675bd26cf018e2e35446 SHA512 5915c235c00190be7332257edc4edf4f96ecdeabffc7e4937e0b59290da86f55c6ff6cf4746cd63938baa5534528a2b221dc41eb38ba6643d7229cb5e8214390 WHIRLPOOL 0b7758c60db2f3d16552cd0010917aa49cbaba4539529282c31ac20b5c47b8cf04452a0e06e96d3ecf4e74786545bc2f11e0ba82d85dd31323d7f1f4e71a0b97
+MISC ChangeLog 20889 SHA256 cdcdc8e58716d8dbf165794ac6a3d2b8ec03835ce203187c3d62c38b606c6fbc SHA512 691f4731cf0006d31fc93ebc960f2a2bde58fabe3f80c827ff6e707e0ee263e11909c951f7f7b7162b971c0475ddc26a1d71eefeeaa568212010308d8318d975 WHIRLPOOL bb314d0b772d31c206ff9ebd4ab2ffeb89d1612cfde0058c39c6f70a270740d0310888e9cd4171fc48cac6c07bc95d5acfa5746d83cfdd7c0d23994ace7d0e31
 MISC metadata.xml 294 SHA256 5dc40e1cc3fabc79be9d5f1d6af4c389a32657515e8b82820461355d8851462b SHA512 abc51ef78ecf50a739c57b36143fb25ac8397761fef1e71dbdbf54e49520f503014c4df1bd7033d3ced3cb6562d5cbadb69f7355bd96e893f216d04d1e556382 WHIRLPOOL b099298a4d70c7b651d516a953eaba0c7e488955586e9037b6b904bbdf0d48d6311ef54823c1beed9b0138c59bd4eecc86bc31b67220b0ca62965b6a7cd8e661
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR0wSVAAoJEO+t9ga+3I3a2w8H/iwTP0O0sULCAjPS+WoYNQi7
-Twzd7lMjMT78XzRi3zcGzWGFDaMHKxE3eraANTYn+2AeEz0zOCW1XcuD22JpBsCX
-m3lDB9LekCd3lhaLwE41e2J7q3bKsP/JK2ZpxHFLLHvAqZv94VnRvTMiCIUKIVaZ
-CIf8tKGmggI0OEjpIrUCz9+lLpEqrzFjGIfoCPL2gXSaEYmgyQQAfIS9Xtdeg1F6
-tXOPUReepAu3O4Y4AdIOIMjPN/zdcH73OcaeTUBhWWtWr7m76moN58mLX2hvxX+J
-+XXL8iuNG7FASZYLLLvp9MimdBscU3bHbFJidoIWfhEJvhoQzeDxIwOEywIhodU=
-=1ShC
+iQJ8BAEBCABmBQJR1e2JXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc8YQQAMD09L8bT7eXj1/BfobDP7Th
+ydgcDWcq/VL/DYnUm3N2CDCOPbNbpr6FVZtNiB6wvEQrkhXFKrBUR8/SZcyoXZ2J
+EDmenl5r/AJBWntedcHXtnol9AEhkpCaySzLyTwGumoils+aku/0gflggckCN1Ms
+JArcuZJVjbrDZNj5Z6oVJV+s2fNK2feBRT7iKsLNO23xqfa02kQpk1wQhWapVJi9
+9Wh+R1f/XP2mCbaYt/qMpdS54BzJVDRJouOgCTbtwNu3gjs0OhCcotEHpfshdWir
+sPdEtXPyZ3ZlgXV11u4R316WebzstCXGo6+A++iOWV6cBAeYv3ssMD/wBrgwEBbO
+TV2RNnlJHDllBZxr99zaosWHwUXmNRmgMJOAesZUo/tmfM1Ispy5LqbuTnmrVTFG
+8Tx32kIt2RUqYWDNIzxGpBLryUn9ijyIHDRfbAnIBVdHUMZY9UiFXSk27MUI7bn4
+gcelRElvhSUV7QE1TrlcsyiqFBcE1btzEWBH2fYUvvGP1BgEbps6XWI/evNYDgde
+4c4B9nbcURw8/o+XwdZYEQCufLswAeKZ2esEm4NCJtjfomv4N8ZHOYpHc0IET4ja
+AOTE/MwtVHniJeNTBUc7sfFmEok8TeYJTKdQSoc3L08aAUitIvdDcBk/2yzD+SnX
+s3BzDdtiN/Y5AT1u9lZe
+=MhE0
 -----END PGP SIGNATURE-----
diff --git a/kde-base/libkdcraw/files/libkdcraw-4.10.5-extlibraw.patch b/kde-base/libkdcraw/files/libkdcraw-4.10.5-extlibraw.patch
new file mode 100644
index 000000000000..e5eba854d207
--- /dev/null
+++ b/kde-base/libkdcraw/files/libkdcraw-4.10.5-extlibraw.patch
@@ -0,0 +1,163 @@
+Patch by Pino Toscano
+Source: https://git.reviewboard.kde.org/r/110962/diff/
+
+
+diff -ruN libkdcraw-4.10.5.orig/CMakeLists.txt libkdcraw-4.10.5/CMakeLists.txt
+--- libkdcraw-4.10.5.orig/CMakeLists.txt	2013-06-28 19:36:41.000000000 +0200
++++ libkdcraw-4.10.5/CMakeLists.txt	2013-07-04 23:25:14.000000000 +0200
+@@ -29,15 +29,14 @@
+ MESSAGE(STATUS "----------------------------------------------------------------------------------")
+ MESSAGE(STATUS "Starting CMake configuration for: libkdcraw")
+ 
+-OPTION(ENABLE_LCMS2    "Link libraw to LCMS2 else LCMS1 (default=OFF)"    OFF)
+-OPTION(ENABLE_RAWSPEED "Compile libraw with RawSpeed codec (default=OFF)" OFF)
+-
+ FIND_PACKAGE(KDE4 REQUIRED)
+ INCLUDE(KDE4Defaults)
+ INCLUDE(MacroLibrary)
+ INCLUDE(MacroOptionalAddSubdirectory)
+ INCLUDE(FindPackageHandleStandardArgs)
+ 
++FIND_PACKAGE(LibRaw 0.15 REQUIRED)
++
+ ADD_DEFINITIONS (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS})
+ INCLUDE_DIRECTORIES (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+ 
+@@ -106,7 +105,6 @@
+ 
+ # ==================================================================================================
+ 
+-ADD_SUBDIRECTORY(libraw)
+ ADD_SUBDIRECTORY(libkdcraw)
+ ADD_SUBDIRECTORY(test)
+ ADD_SUBDIRECTORY(icons)
+diff -ruN libkdcraw-4.10.5.orig/cmake/modules/FindLibRaw.cmake libkdcraw-4.10.5/cmake/modules/FindLibRaw.cmake
+--- libkdcraw-4.10.5.orig/cmake/modules/FindLibRaw.cmake	1970-01-01 01:00:00.000000000 +0100
++++ libkdcraw-4.10.5/cmake/modules/FindLibRaw.cmake	2013-07-04 23:25:14.000000000 +0200
+@@ -0,0 +1,63 @@
++# - Find LibRaw
++# Find the LibRaw library
++# This module defines
++#  LibRaw_INCLUDE_DIR, where to find libraw.h
++#  LibRaw_LIBRARIES, the libraries needed to use LibRaw
++#  LibRaw_VERSION_STRING, the version string of LibRaw
++#  LibRaw_DEFINITIONS, the definitions needed to use LibRaw
++
++
++# Copyright (c) 2013, Pino Toscano <pino@kde.org>
++#
++# Redistribution and use is allowed according to the terms of the BSD license.
++# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++
++
++find_package(PkgConfig)
++if(PKG_CONFIG_FOUND)
++   pkg_check_modules(PC_LIBRAW libraw)
++   set(LibRaw_DEFINITIONS ${PC_LIBRAW_CFLAGS_OTHER})
++endif()
++
++find_path(LibRaw_INCLUDE_DIR libraw.h
++   HINTS
++   ${PC_LIBRAW_INCLUDEDIR}
++   ${PC_LibRaw_INCLUDE_DIRS}
++   PATH_SUFFIXES libraw
++)
++
++find_library(LibRaw_LIBRARIES NAMES raw
++   HINTS
++   ${PC_LIBRAW_LIBDIR}
++   ${PC_LIBRAW_LIBRARY_DIRS}
++)
++
++if(LibRaw_INCLUDE_DIR)
++   file(READ ${LibRaw_INCLUDE_DIR}/libraw_version.h _libraw_version_content)
++   string(REGEX MATCH "#define LIBRAW_MAJOR_VERSION[ ]*([0-9]*)\n" _version_major_match ${_libraw_version_content})
++   set(_libraw_version_major "${CMAKE_MATCH_1}")
++   string(REGEX MATCH "#define LIBRAW_MINOR_VERSION[ ]*([0-9]*)\n" _version_minor_match ${_libraw_version_content})
++   set(_libraw_version_minor "${CMAKE_MATCH_1}")
++   string(REGEX MATCH "#define LIBRAW_PATCH_VERSION[ ]*([0-9]*)\n" _version_patch_match ${_libraw_version_content})
++   set(_libraw_version_patch "${CMAKE_MATCH_1}")
++   if(_version_major_match AND _version_minor_match AND _version_patch_match)
++      set(LibRaw_VERSION_STRING "${_libraw_version_major}.${_libraw_version_minor}.${_libraw_version_patch}")
++   else()
++      if(NOT LibRaw_FIND_QUIETLY)
++         message(STATUS "Failed to get version information from ${LibRaw_INCLUDE_DIR}/libraw_version.h")
++      endif()
++   endif()
++endif()
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(LibRaw
++   REQUIRED_VARS LibRaw_LIBRARIES LibRaw_INCLUDE_DIR
++   VERSION_VAR LibRaw_VERSION_STRING
++)
++
++mark_as_advanced(LibRaw_INCLUDE_DIR
++   LibRaw_LIBRARIES
++   LibRaw_VERSION_STRING
++   LibRaw_DEFINITIONS
++)
++
+diff -ruN libkdcraw-4.10.5.orig/libkdcraw/CMakeLists.txt libkdcraw-4.10.5/libkdcraw/CMakeLists.txt
+--- libkdcraw-4.10.5.orig/libkdcraw/CMakeLists.txt	2013-06-28 19:36:41.000000000 +0200
++++ libkdcraw-4.10.5/libkdcraw/CMakeLists.txt	2013-07-04 23:29:38.000000000 +0200
+@@ -22,7 +22,27 @@
+ #
+ # ============================================================
+ 
+-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libraw)
++# In some versions LibRaw is not linked against OpenMP stuff,
++# so manually link libkdcraw against it for now.
++
++IF(NOT APPLE)
++    # OpenMP library detection (requires CMake >= 2.6.3)
++    # NOTE: OpenMP under MacOSX do not support multithreading.
++
++    MACRO_OPTIONAL_FIND_PACKAGE(OpenMP)
++
++    IF(OPENMP_FOUND)
++        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
++        IF("${OpenMP_CXX_FLAGS}" STREQUAL "-fopenmp")
++            SET(OPENMP_LDFLAGS "-lgomp")
++        ENDIF("${OpenMP_CXX_FLAGS}" STREQUAL "-fopenmp")
++        IF("${OpenMP_CXX_FLAGS}" STREQUAL "-xopenmp")
++            SET(OPENMP_LDFLAGS "-xopenmp")
++        ENDIF("${OpenMP_CXX_FLAGS}" STREQUAL "-xopenmp")
++    ENDIF(OPENMP_FOUND)
++ENDIF(NOT APPLE)
++
++INCLUDE_DIRECTORIES(${LibRaw_INCLUDE_DIR})
+ 
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+ 
+@@ -42,15 +62,15 @@
+ KDE4_ADD_LIBRARY(kdcraw SHARED ${kdcraw_LIB_SRCS})
+ 
+ TARGET_LINK_LIBRARIES(kdcraw
+-                      libraw
++                      ${LibRaw_LIBRARIES}
+                       ${KDE4_KDEUI_LIBS}
+                       ${KDE4_KIO_LIBS}
+                       ${KDE4_SOLID_LIBS}
+                       ${KDE4_THREADWEAVER_LIBRARIES}
++                      ${OPENMP_LDFLAGS}
+                      )
+ 
+-SET_TARGET_PROPERTIES(kdcraw PROPERTIES VERSION ${DCRAW_LIB_SO_VERSION_STRING} SOVERSION ${DCRAW_LIB_SO_CUR_VERSION}
+-                                        DEFINE_SYMBOL LIBRAW_BUILDLIB)
++SET_TARGET_PROPERTIES(kdcraw PROPERTIES VERSION ${DCRAW_LIB_SO_VERSION_STRING} SOVERSION ${DCRAW_LIB_SO_CUR_VERSION})
+ 
+ INSTALL(TARGETS kdcraw ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+diff -ruN libkdcraw-4.10.5.orig/libkdcraw/libkdcraw_export.h libkdcraw-4.10.5/libkdcraw/libkdcraw_export.h
+--- libkdcraw-4.10.5.orig/libkdcraw/libkdcraw_export.h	2013-06-28 19:36:41.000000000 +0200
++++ libkdcraw-4.10.5/libkdcraw/libkdcraw_export.h	2013-07-04 23:25:14.000000000 +0200
+@@ -31,7 +31,7 @@
+ #include <kdemacros.h>
+ 
+ #ifndef LIBKDCRAW_EXPORT
+-# if defined(LIBRAW_BUILDLIB)
++# if defined(MAKE_KDCRAW_LIB)
+    /* We are building this library */ 
+ #  define LIBKDCRAW_EXPORT KDE_EXPORT
+ # else
diff --git a/kde-base/libkdcraw/libkdcraw-4.10.5-r1.ebuild b/kde-base/libkdcraw/libkdcraw-4.10.5-r1.ebuild
new file mode 100644
index 000000000000..c7724d8e0987
--- /dev/null
+++ b/kde-base/libkdcraw/libkdcraw-4.10.5-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdcraw/libkdcraw-4.10.5-r1.ebuild,v 1.1 2013/07/04 21:45:42 dilfridge Exp $
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="KDE digital camera raw image library wrapper"
+KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug jasper lcms"
+
+DEPEND="
+	>=media-libs/libraw-0.15:=
+	virtual/jpeg
+	jasper? ( media-libs/jasper )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.10.5-extlibraw.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package jasper)
+	)
+
+	kde4-base_src_configure
+}