Version bump (bug #415001).

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

3 files changed, 155 insertions, 1 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/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