Revision bump. Add rawspeed flag to allow for libraw backend only support (bug #378571).

(Portage version: 2.2.0_alpha50/cvs/Linux x86_64)

4 files changed, 148 insertions, 1 deletions

diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index feb8c8024a5e..2d742c99c9a5 100644
--- a/media-gfx/darktable/ChangeLog
+++ b/media-gfx/darktable/ChangeLog
@@ -1,6 +1,13 @@
 # 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.3 2011/07/28 06:57:48 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.4 2011/08/14 23:38:26 radhermit Exp $
+
+*darktable-0.9.1-r1 (14 Aug 2011)
+
+  14 Aug 2011; Tim Harder <radhermit@gentoo.org> +darktable-0.9.1-r1.ebuild,
+  +files/darktable-0.9.1-no-rawspeed.patch, metadata.xml:
+  Revision bump. Add rawspeed flag to allow for libraw backend only support
+  (bug #378571).
 
 *darktable-0.9.1 (28 Jul 2011)
 
diff --git a/media-gfx/darktable/darktable-0.9.1-r1.ebuild b/media-gfx/darktable/darktable-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..6941148372d4
--- /dev/null
+++ b/media-gfx/darktable/darktable-0.9.1-r1.ebuild
@@ -0,0 +1,93 @@
+# 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.1-r1.ebuild,v 1.1 2011/08/14 23:38:26 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}"/${PN}-0.9-automagic-deps.patch
+	"${FILESDIR}"/${P}-system-libraw.patch
+	"${FILESDIR}"/${P}-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
+}
+
+src_install(){
+	cmake-utils_src_install
+	newicon data/pixmaps/48x48/darktable.png darktable.png
+}
diff --git a/media-gfx/darktable/files/darktable-0.9.1-no-rawspeed.patch b/media-gfx/darktable/files/darktable-0.9.1-no-rawspeed.patch
new file mode 100644
index 000000000000..db699b89f578
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-0.9.1-no-rawspeed.patch
@@ -0,0 +1,46 @@
+--- darktable-0.9.1.orig/src/CMakeLists.txt
++++ darktable-0.9.1/src/CMakeLists.txt
+@@ -274,19 +274,19 @@
+ )
+ SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c PROPERTIES GENERATED 1)
+ SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h PROPERTIES GENERATED 1)
+-# this is a dummy library whose sole purpose is to serve as a dependency for subdirs, such as imageio/storage/gallery.
+-# cmake can't depend on custom targets in other directories than the current one.
+-add_library(metadata_dummy ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h)
++add_custom_target(metadata_gen DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h)
+ 
+ #
+ # build libdarktable
+ #
+-add_library(lib_darktable STATIC SHARED ${CMAKE_CURRENT_BINARY_DIR}/preferences_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c ${CMAKE_CURRENT_BINARY_DIR}/accelstrings_gen.h ${SOURCES})
++add_library(lib_darktable SHARED ${CMAKE_CURRENT_BINARY_DIR}/preferences_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c ${CMAKE_CURRENT_BINARY_DIR}/accelstrings_gen.h ${SOURCES})
++add_dependencies(lib_darktable metadata_gen)
+ if(APPLE)
+   set_target_properties(lib_darktable PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib/darktable")
+ endif(APPLE)
+ set_target_properties(lib_darktable PROPERTIES OUTPUT_NAME darktable)
+ set_target_properties(lib_darktable PROPERTIES LINKER_LANGUAGE C)
++target_link_libraries(lib_darktable ${LIBS})
+ 
+ 
+ #
+@@ -306,7 +306,7 @@
+   add_dependencies(lib_darktable rawspeed)
+   add_library(rawspeed_static STATIC IMPORTED)
+   set_target_properties(rawspeed_static PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external/rawspeed/librawspeed.a)
+-  target_link_libraries(lib_darktable ${LIBS} rawspeed_static)
++  target_link_libraries(lib_darktable rawspeed_static)
+   # compile rawspeed
+   add_subdirectory(external/rawspeed)
+ endif(NOT DONT_USE_RAWSPEED)
+--- darktable-0.9.1.orig/src/imageio/storage/CMakeLists.txt
++++ darktable-0.9.1/src/imageio/storage/CMakeLists.txt
+@@ -10,7 +10,7 @@
+ foreach(module ${MODULES} ${MODULES_EXPERIMENTAL})
+ 	add_library(${module} MODULE "${module}.c")
+ endforeach(module)
+-add_dependencies(gallery metadata_dummy)
++add_dependencies(gallery metadata_gen)
+ 
+ foreach(module ${MODULES})
+ 	target_link_libraries(${module} ${LIBS})
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index dc38cace064d..c1175e6f3005 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -9,6 +9,7 @@
 	<use>
 		<flag name="flickr">Add support for uploading photos to flickr</flag>
 		<flag name="gconf">Add support for the gconf backend</flag>
+		<flag name="rawspeed">Enable the rawspeed backend</flag>
 		<flag name="slideshow">Build the opengl slideshow viewer</flag>
 	</use>
 </pkgmetadata>