Version bump.

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

3 files changed, 184 insertions, 1 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/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);