Version bump (bug #408323).

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

5 files changed, 190 insertions, 9 deletions

diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index 06b8be274a98..51f91eaa9950 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.14 2012/02/13 09:57:26 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.15 2012/03/16 09:38:32 radhermit Exp $
+
+*darktable-1.0 (16 Mar 2012)
+
+  16 Mar 2012; Tim Harder <radhermit@gentoo.org> +darktable-1.0.ebuild,
+  +files/darktable-1.0-cflags.patch, +files/darktable-1.0-no-gphoto2.patch:
+  Version bump (bug #408323).
 
   13 Feb 2012; Tim Harder <radhermit@gentoo.org>
   -files/darktable-0.9.1-no-rawspeed.patch, -darktable-0.9.2-r1.ebuild,
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 374e8d601857..7f5fd9468663 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -5,18 +5,22 @@ AUX darktable-0.9.3-cflags.patch 1450 RMD160 494b741496ec7801baeb2b2513cf570e3e7
 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
 DIST darktable-0.9.3.tar.gz 2330605 RMD160 a7c51262a52fae0b33179fb4d9030eb78444305d SHA1 36ed6c1102b920096cf80affd71adfa66ae85381 SHA256 1cd75253355bd70b698dc78c2463c1b70867ac96cb6f23337a3b6dec6277892a
+DIST darktable-1.0.tar.gz 2535774 RMD160 ef787b4b3276594e6e1e51272abaa374ea494aeb SHA1 3142beea51d5d5ae6f0089a11cf1b342a48a69f7 SHA256 75e2a1905dc262d771a0064b461b4419a6dc914776ed18cc6a45b8294c175b72
 EBUILD darktable-0.9.3.ebuild 2456 RMD160 ab57230d920a2a81fd12109fd2b2bf828aa4563b SHA1 ad535b3fca65296fe68ef9d2b773cd60961380f2 SHA256 9ce53960dac11f93dede3940130372a79be8858bed23ed482a09e7a0db8d1d01
-MISC ChangeLog 3531 RMD160 466cbde13ae9e18abfb236745c1e458b3c72c0a6 SHA1 df2e717f38808c1f45b2932ee65793efda998314 SHA256 f44bce0a7884044c68605649a3b1f8c7226a6d1355848c3482f440a3c7833991
+EBUILD darktable-1.0.ebuild 2515 RMD160 888a9bfb2d64a4598f2c16f60b1f380985f04f31 SHA1 a3d05a2983c198a910a65269ed7aef34c501ea5f SHA256 c130aa05b1514a05d11d5288c436554172b6a1c1d453a0dbb12de703956b77cb
+MISC ChangeLog 3740 RMD160 3349a2c6ad6522b897680111a8e8736a50cd799d SHA1 1afd151133febc9f695420911f461c35eaa724f4 SHA256 58f5b5a70dd69b6c19b948c61bd0eab337ad0eb8ef2d0cca4779a3acc6f0f233
 MISC metadata.xml 516 RMD160 ca94973ccca803f6f5dd1646f9c9ca3624712144 SHA1 3508593304c9b41001b6721d03f56c94a0183599 SHA256 486fbce594db4aad661bcabd94e398edcf55da660d802bebf7ea0838f7cf26e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPON6QAAoJEEqz6FtPBkyjhqgIAKD4CxEK2CUzUHNgbpgHWVRC
-3gEzdouGkowM8m+n4aUcvCgv8E70hURaqTol6B3sl7ycWN6Ks6JStaE+EYscQluG
-cmWr4EBZ1be/Z84B0guiWzMQTUlgCI1n4Qp122610XfaNTB5gEhDRYT586GSd5Az
-TlCBLuLzOcQkz4jXF1xW2Sstv953vnSyW2N6Ig5gQr8jM5yb1XAso2aHQP10bOvg
-RPy0Lx/Adp1E3SwEcuOr1gz28165HwB3HP9vEJWbkKHefe8fV1DyFQFS78CKcicW
-jW30mzBri/s3lDZAyquNQgElx8HR/6S/wBiehPa1GCfJLe3oVidVZoQMDWQZdgI=
-=BN9S
+iQEcBAEBCgAGBQJPYwoeAAoJEEqz6FtPBkyjgp4H/A/rkSyxnSWp8EZGmul+Y9FJ
+GJdHuH9SCU3MN0ZDG8Rw/3obYMBB0zaUmhJmTfCUdrwYjyLtLD1/wCKT8UzHcD3c
+RZo1wv4zVWeQLP6MQeSYRpw2SM+yG4scQmHLeLzE5dAxopqFe9b7J0Xr7Nce0wk6
+kAiexi66NB/e+9dqNjNFh1Ua3b5xvYTJLlvx9vAdx5Xn1ilp2J/Kkt9OjoZ+Oq7q
+HJY0mIa9pdlUGG/dpGRsq8QViyPwUu4zOl18iXOBnGDn12j+ZCBqa6SqKG6iM38Q
+0NVmUa83ao8Ez9bPnAbiBQSyx8Nd8tFn2LqVtaPf69iRyybPAoxS+Nc7ri5zo9Q=
+=oxzB
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/darktable/darktable-1.0.ebuild b/media-gfx/darktable/darktable-1.0.ebuild
new file mode 100644
index 000000000000..d7b4c880044d
--- /dev/null
+++ b/media-gfx/darktable/darktable-1.0.ebuild
@@ -0,0 +1,99 @@
+# 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.ebuild,v 1.1 2012/03/16 09:38:32 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}
+	dev-util/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
+	"${FILESDIR}"/${P}-no-gphoto2.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-cflags.patch b/media-gfx/darktable/files/darktable-1.0-cflags.patch
new file mode 100644
index 000000000000..88841a04759f
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-1.0-cflags.patch
@@ -0,0 +1,44 @@
+--- darktable-1.0/src/CMakeLists.txt
++++ darktable-1.0/src/CMakeLists.txt
+@@ -233,40 +233,12 @@
+ # c++ code doesn't like -Werror (libraw)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing")
+ 
+-if(NOT APPLE)
+-  # apple build fails on deprecated warnings..
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+-endif(NOT APPLE)
+-
+ 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_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+ 
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse -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 -mfpmath=sse -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")
+-  
+ 
+ #
+ # Generate config.h
diff --git a/media-gfx/darktable/files/darktable-1.0-no-gphoto2.patch b/media-gfx/darktable/files/darktable-1.0-no-gphoto2.patch
new file mode 100644
index 000000000000..3ef088cbe273
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-1.0-no-gphoto2.patch
@@ -0,0 +1,28 @@
+--- darktable-1.0/src/libs/import.c
++++ darktable-1.0/src/libs/import.c
+@@ -28,13 +28,13 @@
+ #include "dtgtk/button.h"
+ #include "gui/accelerators.h"
+ #include "gui/gtk.h"
++#ifdef HAVE_GPHOTO2
+ #include "gui/camera_import_dialog.h"
++#endif
+ #include "libs/lib.h"
+ 
+ DT_MODULE(1)
+ 
+-// #ifdef HAVE_GPHOTO2
+-
+ 
+ #ifdef HAVE_GPHOTO2
+ /** helper function to update ui with available cameras and ther actionbuttons */
+@@ -44,7 +44,9 @@
+ 
+ typedef struct dt_lib_import_t
+ {
++#ifdef HAVE_GPHOTO2
+   dt_camctl_listener_t camctl_listener;
++#endif
+   GtkButton *import_file;
+   GtkButton *import_directory;
+   GtkButton *import_camera;