Version bump.

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

4 files changed, 199 insertions, 9 deletions

diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index 863ec1312bb3..feb8c8024a5e 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.2 2011/07/21 08:55:05 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.3 2011/07/28 06:57:48 radhermit Exp $
+
+*darktable-0.9.1 (28 Jul 2011)
+
+  28 Jul 2011; Tim Harder <radhermit@gentoo.org> +darktable-0.9.1.ebuild,
+  +files/darktable-0.9.1-system-libraw.patch:
+  Version bump.
 
 *darktable-0.9-r1 (21 Jul 2011)
 
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 876c2cd254d1..ec77b2c0c6a0 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -4,20 +4,23 @@ 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-system-libraw.patch 3153 RMD160 80ed54b78c790dca85bbc4a20f6854c488ca16b1 SHA1 c50308b269b7b06714eca20dd0021580361dd2a2 SHA256 13c41b1c9128aaeb2d41e154318090652f9d29bb7b77239c6e5aa66e5c1d5142
+AUX darktable-0.9.1-system-libraw.patch 3192 RMD160 1d702d3a637def655adabc0c7fa01f1e83278adc SHA1 0d73fac5bbff6830b26e9204c6ed773cf0596132 SHA256 9e93c711d9eb7b1e69ecc1692375f312bb4172b4a8a6ae05ca7bbf720cb88af3
+DIST darktable-0.9.1.tar.gz 2227084 RMD160 8f8725768005103c3fda3328ba85142ba622c315 SHA1 8279eb2aceda0decbfe0c0d8977e39fa4a37bae6 SHA256 b687a5f1b2a6c8aa230c1dc3ef83bf74a103e3ebe1c61cdea95a612a7375f21e
 DIST darktable-0.9.tar.gz 2187367 RMD160 c79c8707196a113f9d71a6f52ed68d753d8ff537 SHA1 86a9830bf71bf63abbcc7e426c62f582e5866c2b SHA256 638e9d955e3940155b14bfba81cda291607ba689f216a7979db8a1aeb858a403
 EBUILD darktable-0.9-r1.ebuild 2339 RMD160 c514518094bc1fd1b3bee98c2981e75a37125b5d SHA1 4240834fc050e6a071d1c1337280eb68aa5fcf23 SHA256 8d9a02cc60444b7156a087025312c1a1b5dd1454d4ac6fabc3133939b2155402
+EBUILD darktable-0.9.1.ebuild 2320 RMD160 c14baa90a74a943d76e5d10ca8e5b28e6bc9c5be SHA1 41a3d446975b00c3c5fb4fd9f76e9285b92d9434 SHA256 0e558194e9d1c59202bb9d51a9d3219ebf29615f0a561e148b31301bb1964ed1
 EBUILD darktable-0.9.ebuild 1622 RMD160 0e7733ca760dea18d79944549277095476e6eb78 SHA1 819756ad485379ae7bfb0821cf6419842388cbfa SHA256 2d151f2ee1758134b17729981e5b43d83591f20fd45e9491cb97153f756f2245
 EBUILD darktable-9999.ebuild 1623 RMD160 f3347734bee2f1ca5315f32f411b9a0c69efb7b8 SHA1 9207440e484af0482a688050522e4669b6f8606a SHA256 289b63a6c228b36ffaeb46ac1caec805b3d76206f0836a9bae693ea66f488541
-MISC ChangeLog 957 RMD160 06857487f3c61b104e048a2489dc5eb31108937b SHA1 94ecdea9ef732b9851b6da80b223b3fc97a08ac3 SHA256 a0afb8855c62346fdc83226ef329fb649fb5ec760fdbd734f516b83195dccfea
+MISC ChangeLog 1126 RMD160 9bef5a42a3d280fda6551508b945b358ecbf7bcb SHA1 a73d512b85ab76c9e37fa81d9ff8a22e4fae4ae5 SHA256 1eab5624a5b2116e20fcfd53c647a612b9aaeadf36977c2c7fde2abab892d041
 MISC metadata.xml 468 RMD160 4cb0815bbbaaa13c734980789dc43270cba45990 SHA1 cb8fb1ae02b6d3dcd7338b98e1f63f636a0d572b SHA256 1b0ad485c4b2231c459ec25ec6ea90e7df3fc11109ab11c0d4c78a1ed93c95e4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOJ+luAAoJEEqz6FtPBkyjdlIIAIMy4kFq6bOCAJMV//inEffZ
-lkiBVgXG49h4F9BcPONXE1sCYguRhsv7PoEokVt03e2pwY3cq+/b9h3vpARaroWU
-9/u4D6ljRxBbU+I2WXgBA42kmxlNI1f6o2xB+9ru/DfXYC9sBv7yd5YSixue2HZt
-0mVFUgtCuOsada4KNyERZeO8qgT4+TNMWVnDolcS2rSEIasyroSUa57Ce8jtuwLc
-nOBESSUzpxFvCAk2jV44ShHvZyJyBjL6W86HRkYlOZIeSPZ/wOonzxqE8j0zUUvw
-2Pm9Ec44N0oem9p9rJ1sbYyLBh/OvOvSFekdybwS50PJt63O6ZMCruANiu8T8Uc=
-=HcQt
+iQEcBAEBCgAGBQJOMQh6AAoJEEqz6FtPBkyjlzIIAK4F4wgM8d1z1G9sNqv4fp1P
+VwzI1dAF7kqEZABiVvytHfQQrVnTUxvHn6pshaBYG12gKfZ9/8UJvjgOcbg0YZD3
+BUV8LEzopz4L7Fmsb7CFGD/uDvl053GJCgacUlvIFeMMpqLUq8VRGG6MFJIQLtTI
+1LCwVXPYAUHCHqLSgdLIaISWg7tTXdfJjrIEYcw9EmQ4KKWkye8dldZ2Y2XVrGrP
+ooOfq2xVyqmlM72WSz76id1ZFiWoe/vWqSKHEG8qL/V1zyefPg7Bw2bAlLo38Srg
+QcnQOscpNw0UfdMChcueYBam7vP9DpsBoEF21gJ89bLAAsagvb+7JaJw1cReDxM=
+=ZuD9
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/darktable/darktable-0.9.1.ebuild b/media-gfx/darktable/darktable-0.9.1.ebuild
new file mode 100644
index 000000000000..f3de6c4aaaae
--- /dev/null
+++ b/media-gfx/darktable/darktable-0.9.1.ebuild
@@ -0,0 +1,91 @@
+# 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.ebuild,v 1.1 2011/07/28 06:57:48 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 +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}"/${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_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-system-libraw.patch b/media-gfx/darktable/files/darktable-0.9.1-system-libraw.patch
new file mode 100644
index 000000000000..b631e74dd498
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-0.9.1-system-libraw.patch
@@ -0,0 +1,90 @@
+--- darktable-0.9.1.orig/cmake/modules/FindLibraw.cmake
++++ darktable-0.9.1/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.1.orig/src/CMakeLists.txt
++++ darktable-0.9.1/src/CMakeLists.txt
+@@ -65,7 +65,6 @@
+ 
+ 
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/LibRaw)
+ 
+ # initial compiler flags
+ add_definitions("-DHAVE_CONFIG_H")
+@@ -117,7 +116,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})
+@@ -289,17 +288,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")
+@@ -314,9 +302,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.1.orig/src/common/imageio.c
++++ darktable-0.9.1/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);