Version bump.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 188 insertions, 16 deletions

diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index 79e1c460553f..1e32546035f2 100644
--- a/media-gfx/darktable/ChangeLog
+++ b/media-gfx/darktable/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/darktable
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.5 2011/08/14 23:41:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.6 2011/08/26 10:11:00 radhermit Exp $
+
+*darktable-0.9.2 (26 Aug 2011)
+
+  26 Aug 2011; Tim Harder <radhermit@gentoo.org> +darktable-0.9.2.ebuild,
+  +files/darktable-0.9.2-system-libraw.patch:
+  Version bump.
 
   14 Aug 2011; Tim Harder <radhermit@gentoo.org> -darktable-0.9.ebuild,
   -darktable-0.9-r1.ebuild, -darktable-0.9.1.ebuild,
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index ae1467be0145..44254ea158b9 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,23 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX darktable-0.9-automagic-deps.patch 3765 RMD160 ee3ac81726536a28f10292692fbe56589572fcdc SHA1 04b6908c5b5adc0ad007cd48d8642068f9f2b191 SHA256 a7f7fa29056edab7e2f3ed39a835b46e63d1560369db08479f966d124b5e6e3d
 AUX darktable-0.9-cflags.patch 1756 RMD160 0d758421e2517659f005f5e00dc6e9acbfdc1f56 SHA1 66fd9d18b8f3d49ccb3e34af7395321a1fb6fbde SHA256 babf25ac1f5af7012575da8e7611ef1da1d99d7971e8d3b2b91d03a51675ef9c
 AUX darktable-0.9.1-no-rawspeed.patch 2458 RMD160 fb5528db7f378f3a46690556e1902c86fe127214 SHA1 c5b083edabb3b23fbf9d9f2370a7117d6d19254a SHA256 fcb0be4c37a27a0594260a2adacff66e63b2896c0fe7644f2027a839eef9dee2
 AUX darktable-0.9.1-system-libraw.patch 3192 RMD160 1d702d3a637def655adabc0c7fa01f1e83278adc SHA1 0d73fac5bbff6830b26e9204c6ed773cf0596132 SHA256 9e93c711d9eb7b1e69ecc1692375f312bb4172b4a8a6ae05ca7bbf720cb88af3
+AUX darktable-0.9.2-system-libraw.patch 3249 RMD160 2bf77c9f5807fa42f4bb64e554695c8b9ffa57f3 SHA1 c60612c58eb90c7c64d526541c171b3974564d02 SHA256 fd9a15e3d1f4b2709d357ad25f35f6d27a073f61791f572d1e21bb1956c20084
 DIST darktable-0.9.1.tar.gz 2227084 RMD160 8f8725768005103c3fda3328ba85142ba622c315 SHA1 8279eb2aceda0decbfe0c0d8977e39fa4a37bae6 SHA256 b687a5f1b2a6c8aa230c1dc3ef83bf74a103e3ebe1c61cdea95a612a7375f21e
+DIST darktable-0.9.2.tar.gz 2269319 RMD160 95b5f28afd787070d5e8c236f7e3bb2d27522cae SHA1 5527854edd10cca074bd956772b81d646a796293 SHA256 c7f17961db67f430c449e5294ff4a59ae2a649ba17af0fa55f3e9c5bec9ca20a
 EBUILD darktable-0.9.1-r1.ebuild 2420 RMD160 72d9e4f1c9976a04db64458c7f11ba967bb254cd SHA1 cd8cbd14a5f2bbc56045a2a029b059eaa545961e SHA256 3929493363bf5761ea813e7ac36d04694ecbbcb1eb86eefe6160a1d905a8abf8
+EBUILD darktable-0.9.2.ebuild 2279 RMD160 1a2435b2282a76f6a15c59bce432374de5aa3ca6 SHA1 13036bdd3f6cbf5b9e5409bf19a078fcae56bf8e SHA256 b95a2d92063bfe9fce591b065ca53afbfd2780255e53366558ee059f82f5219c
 EBUILD darktable-9999.ebuild 1623 RMD160 f3347734bee2f1ca5315f32f411b9a0c69efb7b8 SHA1 9207440e484af0482a688050522e4669b6f8606a SHA256 289b63a6c228b36ffaeb46ac1caec805b3d76206f0836a9bae693ea66f488541
-MISC ChangeLog 1573 RMD160 150893071e30ffb45b10673ca1a16f6b0c71301b SHA1 ac5b2b77403f2654f49a49e9b4c6494d4ffc9b0e SHA256 7db575a1a6886265958d155ba1a357755653c4c7c67ba2616d6d3b759503a3f7
+MISC ChangeLog 1742 RMD160 ad0ba60290cbc45240d23b2601dbf93204f223fc SHA1 d38bdb0166a3d505d187267d735d6157c7addc4b SHA256 bc9931fb73cd27fd021e6be77aeabb959d63a8aa5b0ef68cd4d3ff3b882460a3
 MISC metadata.xml 527 RMD160 9f8606862d83ed65586cc0536f42eb43f5507477 SHA1 1e819b10154566d56fdae0e194a366a5da6c385b SHA256 ecd6213a4fa14c5beb2ae0c07a710fd67135a7898ad5cb081740c5470c4e43e8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBCgAGBQJOSF0/AAoJEEqz6FtPBkyjeG4H/1+pBSqUuQaZQuFl5uDDoQtD
-fdk9gL/iOG3X1a0DWM7nDoAGKDUIAAcXHPQk9QickkJCVdi1DxjRlsc39UYwT410
-Nb2rXO9O+7bs4K5Jqwdw03P1m7Zl7X7CihF8/sth+tX4zEak3BvOZDrjDdE6DOkK
-p9xqezXH7lL1snGbOwoEG3rRGgoMdLMX2C95DDjZ/lUFGY66+sk/+p9BU4Xcz8dH
-XlRlHht3j/ERQ7jRTTgFqi0NuJ72Ub7fuYy8CUSJQLIPfVy5BE0jqd7BT9mcAURt
-KWrahm0DtF8TiWCBqLjQOnhJsPK2jURNCXCPlYjmyv/G2uBB/hrJsmC46YKkijo=
-=7G3Q
------END PGP SIGNATURE-----
diff --git a/media-gfx/darktable/darktable-0.9.2.ebuild b/media-gfx/darktable/darktable-0.9.2.ebuild
new file mode 100644
index 000000000000..481f50aabd20
--- /dev/null
+++ b/media-gfx/darktable/darktable-0.9.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-0.9.2.ebuild,v 1.1 2011/08/26 10:11:00 radhermit Exp $
+
+EAPI="4"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://darktable.git.sf.net/gitroot/darktable/darktable"
+	EGIT_BRANCH="master"
+	EGIT_COMMIT="master"
+	SCM="git-2"
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+GCONF_DEBUG="no"
+inherit cmake-utils ${SCM}
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="http://darktable.sf.net/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug flickr gconf gnome-keyring gphoto2 kde nls openmp +rawspeed +slideshow"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/libxml2:2
+	flickr? ( media-libs/flickcurl )
+	gconf? ( gnome-base/gconf )
+	gnome-base/libglade:2.0
+	gnome-base/librsvg:2
+	gnome-keyring? ( gnome-base/gnome-keyring )
+	gphoto2? ( media-libs/libgphoto2 )
+	kde? ( dev-libs/dbus-glib )
+	media-gfx/exiv2
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.3
+	media-libs/libpng
+	>=media-libs/libraw-0.13.4[demosaic]
+	media-libs/openexr
+	media-libs/tiff
+	net-misc/curl
+	slideshow? (
+		media-libs/libsdl
+		virtual/opengl
+	)
+	virtual/jpeg
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )
+	openmp? ( >=sys-devel/gcc-4.4[openmp] )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-system-libraw.patch
+	"${FILESDIR}"/${PN}-0.9.1-no-rawspeed.patch
+	"${FILESDIR}"/${PN}-0.9-cflags.patch
+)
+
+src_prepare() {
+	base_src_prepare
+	sed -i -e "s:\(/share/doc/\)darktable:\1${PF}:" \
+		-e "s:LICENSE::" doc/CMakeLists.txt || die
+}
+
+src_configure() {
+	use debug && CMAKE_BUILD_TYPE=Debug
+
+	mycmakeargs=(
+		$(cmake-utils_use_use flickr FLICKR)
+		$(cmake-utils_use_use gconf GCONF_BACKEND)
+		$(cmake-utils_use_use gnome-keyring GNOME_KEYRING)
+		$(cmake-utils_use_use gphoto2 CAMERA_SUPPORT)
+		$(cmake-utils_use_use kde KWALLET)
+		$(cmake-utils_use_use nls NLS)
+		$(cmake-utils_use_use openmp OPENMP)
+		$(cmake-utils_use !rawspeed DONT_USE_RAWSPEED)
+		$(cmake-utils_use_build slideshow SLIDESHOW)
+		-DDONT_INSTALL_GCONF_SCHEMAS=ON
+		-DINSTALL_IOP_EXPERIMENTAL=ON
+		-DINSTALL_IOP_LEGACY=ON
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-gfx/darktable/files/darktable-0.9.2-system-libraw.patch b/media-gfx/darktable/files/darktable-0.9.2-system-libraw.patch
new file mode 100644
index 000000000000..89ddc001510a
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-0.9.2-system-libraw.patch
@@ -0,0 +1,90 @@
+--- darktable-0.9.2.orig/cmake/modules/FindLibraw.cmake
++++ darktable-0.9.2/cmake/modules/FindLibraw.cmake
+@@ -0,0 +1,29 @@
++# - Try to find libraw
++# Once done, this will define
++#
++#  Libraw_FOUND - system has Libraw
++#  Libraw_INCLUDE_DIRS - the Libraw include directories
++#  Libraw_LIBRARIES - link these to use Libraw
++
++include(LibFindMacros)
++
++# Use pkg-config to get hints about paths
++libfind_pkg_check_modules(Libraw_PKGCONF libraw)
++
++# Include dir
++find_path(Libraw_INCLUDE_DIR
++  NAMES libraw.h
++  PATHS ${Libraw_PKGCONF_INCLUDE_DIRS}
++)
++
++# Finally the library itself
++find_library(Libraw_LIBRARY
++  NAMES raw_r
++  PATHS ${Libraw_PKGCONF_LIBRARY_DIRS}
++)
++
++# Set the include dir variables and the libraries and let libfind_process do the rest.
++# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
++set(Libraw_PROCESS_INCLUDES Libraw_INCLUDE_DIR Libraw_INCLUDE_DIRS)
++set(Libraw_PROCESS_LIBS Libraw_LIBRARY Libraw_LIBRARIES)
++libfind_process(Libraw)
+--- darktable-0.9.2.orig/src/CMakeLists.txt
++++ darktable-0.9.2/src/CMakeLists.txt
+@@ -77,7 +77,6 @@
+ 
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external)
+-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/LibRaw)
+ 
+ # initial compiler flags
+ add_definitions("-DHAVE_CONFIG_H")
+@@ -129,7 +128,7 @@
+ endif(USE_CAMERA_SUPPORT)
+ 
+ # Find all the libs that don't require extra parameters
+-foreach(lib ${OUR_LIBS} LensFun GIO GThread GModule Cairo PangoCairo PThread Rsvg2 GDK-PixBuf LibXml2 INotify Sqlite3 Exiv2  CURL PNG JPEG TIFF OpenEXR LCMS2)
++foreach(lib ${OUR_LIBS} LensFun Libraw GIO GThread GModule Cairo PangoCairo PThread Rsvg2 GDK-PixBuf LibXml2 INotify Sqlite3 Exiv2  CURL PNG JPEG TIFF OpenEXR LCMS2)
+   find_package(${lib} REQUIRED)
+   include_directories(${${lib}_INCLUDE_DIRS})
+   list(APPEND LIBS ${${lib}_LIBRARIES})
+@@ -311,17 +310,6 @@
+ set_target_properties(lib_darktable PROPERTIES LINKER_LANGUAGE C)
+ 
+ 
+-#
+-# the libraw part is a bit of a hack:
+-# the static linking didn't work since it was pulling -lstdc++ and -lm into linker flags.
+-# so we do a custom dependency and pretend an imported liblibraw_r.a so no other -l are
+-# appended.
+-#
+-add_dependencies(lib_darktable libraw_r)
+-add_library(libraw_static STATIC IMPORTED)
+-set_target_properties(libraw_static PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external/LibRaw/liblibraw_r.a)
+-target_link_libraries(lib_darktable ${LIBS} libraw_static)
+-
+ # same for librawspeed (can switch it off with -DDONT_USE_RAWSPEED, for macs):
+ if(NOT DONT_USE_RAWSPEED)
+   add_definitions("-DHAVE_RAWSPEED")
+@@ -336,9 +324,6 @@
+ install(TARGETS lib_darktable DESTINATION ${LIB_INSTALL}/darktable)
+ list(APPEND LIBS lib_darktable)
+ 
+-# Compile libraw modules
+-add_subdirectory(external/LibRaw)
+-
+ # Compile views modules
+ add_subdirectory(views)
+ 
+--- darktable-0.9.2.orig/src/common/imageio.c
++++ darktable-0.9.2/src/common/imageio.c
+@@ -547,7 +547,7 @@
+   raw->params.threshold = 0;
+   raw->params.auto_bright_thr = img->raw_auto_bright_threshold;
+ 
+-  raw->params.amaze_ca_refine = 0;
++  // raw->params.amaze_ca_refine = 0;
+   raw->params.fbdd_noiserd    = 0;
+ 
+   ret = libraw_open_file(raw, filename);