Version bump (bug #415001).

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

4 files changed, 173 insertions, 2 deletions

diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index 15e8fc31f603..dda46fb4c9f3 100644
--- a/media-gfx/darktable/ChangeLog
+++ b/media-gfx/darktable/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/darktable
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.16 2012/05/05 07:00:22 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.17 2012/06/08 06:29:28 radhermit Exp $
+
+*darktable-1.0.4 (08 Jun 2012)
+
+  08 Jun 2012; Tim Harder <radhermit@gentoo.org> +darktable-1.0.4.ebuild,
+  +files/darktable-1.0.4-cflags.patch:
+  Version bump (bug #415001).
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> darktable-0.9.3.ebuild,
   darktable-1.0.ebuild:
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index cf665d0f2d8e..8cf5f502843b 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,12 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX darktable-0.9.3-cflags.patch 1450 RMD160 494b741496ec7801baeb2b2513cf570e3e7bbd3c SHA1 ebe77bd85357b275b41072d70920a15135bb2754 SHA256 0f1ea7b5951032c39f2fa92cc7b1a739d3df8ff360e1e41d75b277228e3b2e4a
 AUX darktable-0.9.3-no-rawspeed.patch 2454 RMD160 9df715206f184983fe314e302299f19f6a1cfb14 SHA1 ec6738e3960c0da9eb7823673d0ae1f51019c207 SHA256 d865b01d46813a5ef3f803230a8313a94464e040c4a221f757b222cbb32bef83
 AUX darktable-0.9.3-opencl-kernels.patch 452 RMD160 e28537acbf4f3d2178401ebef45cf8c6a12c87be SHA1 001137eeee0e41c45160cd98f75695cc8eec3be5 SHA256 e7bea66a1538f2f8acc97b80aba090bbaecb78c7b1be132ee06cfcc23b71ef77
 AUX darktable-0.9.3-system-libraw.patch 3027 RMD160 85bcd48e42df239a191ed7c0075758cc18c34db2 SHA1 c7b494b3b8e0a04dab04a4fd5298502e9c780bbb SHA256 9bb49769e5fd98c6a4c48f66448383f50c8b601362a3e2974e2b8745bbd04db7
 AUX darktable-1.0-cflags.patch 1462 RMD160 0561f2dd0d1add67cbbdb2ebf4ff3eba34323763 SHA1 1c9d4b5581794923bc7cbeea151d63f2d79f1cd1 SHA256 dfec1343d549acc507677a862c0aa741efb31edfbc494998cb13a9f11a29b81d
 AUX darktable-1.0-no-gphoto2.patch 626 RMD160 ebbaed411d20bd56ca6faa72b5f119ecdd20dd23 SHA1 15f00958e8d3880d20292d4172542fe620a12bec SHA256 207d67482f718b27b128746ba4b3b47d6edf7df5edae78fcadf3b6eb642a1701
+AUX darktable-1.0.4-cflags.patch 1764 RMD160 f6d21f864e05cfa586afc170dfcd164457f1c3e5 SHA1 f49ae7ae5ea2f5a1a36dae31a8ff805f91c8b0d9 SHA256 3b4ad90e9ffd7e997196a01f40146e6c252b7efe2cf454c8c33781ab18431ad0
 DIST darktable-0.9.3.tar.gz 2330605 RMD160 a7c51262a52fae0b33179fb4d9030eb78444305d SHA1 36ed6c1102b920096cf80affd71adfa66ae85381 SHA256 1cd75253355bd70b698dc78c2463c1b70867ac96cb6f23337a3b6dec6277892a
+DIST darktable-1.0.4.tar.gz 2547099 RMD160 1145d36f76056118cf836796b67480afd5fc8f38 SHA1 ca523b5d944abe9e724737bcbfaf6f29c49aa2c3 SHA256 eb15cbf934e7d504bfffcd841628825cc111265b8cc7c4a895ba6c585b1b108b
 DIST darktable-1.0.tar.gz 2535774 RMD160 ef787b4b3276594e6e1e51272abaa374ea494aeb SHA1 3142beea51d5d5ae6f0089a11cf1b342a48a69f7 SHA256 75e2a1905dc262d771a0064b461b4419a6dc914776ed18cc6a45b8294c175b72
 EBUILD darktable-0.9.3.ebuild 2455 RMD160 e64f77549753eb698bab3e1d2a2c0ab81cb17555 SHA1 4a7d5e703fc627fb268c32999f1f9dc1851cf8ec SHA256 75de69bfe2699da6b6410adb49db4d01ff541f0590fa44d42789ee9cc940b3e2
+EBUILD darktable-1.0.4.ebuild 2479 RMD160 8371152d8c764ac7c8c5a8b82e5ab0023dda8375 SHA1 676b4972c6ffaec2de43455950a8a733e8525901 SHA256 9f3175afd4c37139212af49d5519baf1516bfa3b8fb13eb3827d962fd2f39fbf
 EBUILD darktable-1.0.ebuild 2511 RMD160 46601c94f127c2087c126ba3f3541166c5a3fab0 SHA1 dcd51102247ed0582606eff19d872b23630c1ed7 SHA256 a1edbb5625b8b72f48ee6545ab251ca1bafca6971fbb414fca8e544220303e2e
-MISC ChangeLog 3877 RMD160 3cde1b629889044b90b4899459cda7befca66d42 SHA1 737c6be42a1f3f9fc44969a0aaa69f4b24f76f63 SHA256 deff4f921d50d6e4c323d5f46fa364c81471f53a119be33745e18f4f1b2e3a12
+MISC ChangeLog 4056 RMD160 b1ce0400fbbd05dc56dc32414a7361d697168a04 SHA1 4d1b7d9679f4b19fef08b2b38c0d11d1a14f062d SHA256 856f0d10c36766b0f979fb1f57085a5c03426614f9c7a0d4f12db408932200de
 MISC metadata.xml 516 RMD160 ca94973ccca803f6f5dd1646f9c9ca3624712144 SHA1 3508593304c9b41001b6721d03f56c94a0183599 SHA256 486fbce594db4aad661bcabd94e398edcf55da660d802bebf7ea0838f7cf26e1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCgAGBQJP0ZvSAAoJEEqz6FtPBkyjdfYH/R6quyZsag0GquF8cddy0YJL
+L1oXyMoLEe9aGNxo7t0qkmG2hpRQiirTjQ+eXFcxNqTSnYQf2BIofBinLdfJzvzo
+ozHAO8YE+7stHuwrzmjRMnChqms0U6i4pDp5LiQ2KtvpVPOnVUB+pwzjmmqIr8Bw
+2wS6nILXECzNTCtFF2q3bGdmz85ax6VQPPi4NbGj2e6XLzZYAwcqhTKcxLYvpVsB
+gREfaPdgl15xTflvKvS/PnAbMIcMbRdVO+SS/7yCSrnTt6lE5ns8cf2w2adDnBQ8
+APAcwZo65ke+B5S1zQ6TrgIhUAjnWpTBdNe74/0ujcctQzkYWq9QAbIao69emqs=
+=2jSC
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/darktable/darktable-1.0.4.ebuild b/media-gfx/darktable/darktable-1.0.4.ebuild
new file mode 100644
index 000000000000..40e601c2ef7a
--- /dev/null
+++ b/media-gfx/darktable/darktable-1.0.4.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-1.0.4.ebuild,v 1.1 2012/06/08 06:29:28 radhermit Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+
+inherit gnome2 eutils cmake-utils toolchain-funcs
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="http://darktable.sf.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug flickr gnome gphoto2 kde nls opencl openmp +rawspeed +slideshow video_cards_nvidia"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/libxml2:2
+	flickr? ( media-libs/flickcurl )
+	gnome? (
+		gnome-base/gconf
+		gnome-base/gnome-keyring
+	)
+	gnome-base/librsvg:2
+	gphoto2? ( media-libs/libgphoto2 )
+	kde? ( dev-libs/dbus-glib )
+	media-gfx/exiv2[xmp]
+	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
+	opencl? ( virtual/opencl )
+	slideshow? (
+		media-libs/libsdl
+		virtual/opengl
+	)
+	virtual/jpeg
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.3-system-libraw.patch
+	"${FILESDIR}"/${PN}-0.9.3-no-rawspeed.patch
+	"${FILESDIR}"/${PN}-0.9.3-opencl-kernels.patch
+	"${FILESDIR}"/${P}-cflags.patch
+)
+
+pkg_setup() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	base_src_prepare
+	sed -i -e "s:\(/share/doc/\)darktable:\1${PF}:" \
+		-e "s:LICENSE::" doc/CMakeLists.txt || die
+}
+
+src_configure() {
+	local myconf
+	myconf="-DDONT_INSTALL_GCONF_SCHEMAS=$(usex gnome OFF ON)"
+	myconf+=" -DUSE_OPENCL=$(usex opencl ON OFF)"
+
+	use debug && CMAKE_BUILD_TYPE=Debug
+
+	mycmakeargs=(
+		$(cmake-utils_use_use flickr FLICKR)
+		$(cmake-utils_use_use gnome GCONF_BACKEND)
+		$(cmake-utils_use_use gnome 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)
+		${myconf}
+		-DINSTALL_IOP_EXPERIMENTAL=ON
+		-DINSTALL_IOP_LEGACY=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+	cmake-utils_src_install
+	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+}
diff --git a/media-gfx/darktable/files/darktable-1.0.4-cflags.patch b/media-gfx/darktable/files/darktable-1.0.4-cflags.patch
new file mode 100644
index 000000000000..3595cfa2eb23
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-1.0.4-cflags.patch
@@ -0,0 +1,50 @@
+--- darktable-1.0.4/src/CMakeLists.txt
++++ darktable-1.0.4/src/CMakeLists.txt
+@@ -232,46 +232,11 @@
+ # c++ code doesn't like -Werror (libraw)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing")
+ 
+-if(NOT APPLE AND NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
+-  # apple build fails on deprecated warnings..
+-  # and too many warnings reported by Clang for now
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+-endif(NOT APPLE AND NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
+-
+ if(NOT WIN32)
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
+ endif(NOT WIN32)
+ 
+-if(NOT BINARY_PACKAGE_BUILD)
+-	MESSAGE("-- Checking for -march=native support")
+-	CHECK_C_COMPILER_FLAG("-march=native" MARCHNATIVE)
+-	if (MARCHNATIVE)
+-		set(MARCH "-march=native")	
+-	else()
+-		MESSAGE("-- Checking for -mtune=native support")
+-		CHECK_C_COMPILER_FLAG("-mtune=native" MTUNENATIVE)
+-		if (MTUNENATIVE)
+-			set(MARCH "-mtune=native")
+-		else()
+-			set(MARCH "-mtune=generic")
+-		endif()
+-	endif()
+-else()
+- 	set(MARCH "-mtune=generic")
+-endif()
+-
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -g")
+-set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations ${MARCH}")
+-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -D_DEBUG")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -g")
+-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations ${MARCH}")
+-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -D_DEBUG")
+-if(CMAKE_COMPILER_IS_GNUCC)
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpmath=sse")
+-endif()
+-if(CMAKE_COMPILER_IS_GNUCXX)
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse")
+-endif()
++set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+ 
+ #
+ # Generate config.h