media-gfx/darktable: Revision bump. Disable use of OpenCL. Fixes issues with some...

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

diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index dd54baa0f67774a8c445936cb7d38e3c2a5f7c8e..f35ef9252e4204c08d6803ab247ac51c16e581fc 100644 (file)
--- a/media-gfx/darktable/ChangeLog
+++ b/media-gfx/darktable/ChangeLog
@@ -1,6 +1,13 @@
 # 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.8 2011/08/29 03:50:48 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.9 2011/09/14 12:59:27 c1pher Exp $
+
+*darktable-0.9.2-r2 (14 Sep 2011)
+
+  14 Sep 2011; Dane Smith <c1pher@gentoo.org> +darktable-0.9.2-r2.ebuild:
+  Revision bump.
+  Disable the use of OpenCL during compilation.
+  Fixes issues with some modules not loading when it isn't present.
 
   29 Aug 2011; Tim Harder <radhermit@gentoo.org> -darktable-0.9.1-r1.ebuild,
   -files/darktable-0.9.1-system-libraw.patch, -darktable-0.9.2.ebuild,

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 202db949c9198577e6df649646b7dea4282fe67f..c93230233bab114e5ad23e6e9596b99acf7d983e 100644 (file)
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,21 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX darktable-0.9-cflags.patch 1756 RMD160 0d758421e2517659f005f5e00dc6e9acbfdc1f56 SHA1 66fd9d18b8f3d49ccb3e34af7395321a1fb6fbde SHA256 babf25ac1f5af7012575da8e7611ef1da1d99d7971e8d3b2b91d03a51675ef9c
 AUX darktable-0.9.1-no-rawspeed.patch 2458 RMD160 fb5528db7f378f3a46690556e1902c86fe127214 SHA1 c5b083edabb3b23fbf9d9f2370a7117d6d19254a SHA256 fcb0be4c37a27a0594260a2adacff66e63b2896c0fe7644f2027a839eef9dee2
 AUX darktable-0.9.2-system-libraw.patch 3249 RMD160 2bf77c9f5807fa42f4bb64e554695c8b9ffa57f3 SHA1 c60612c58eb90c7c64d526541c171b3974564d02 SHA256 fd9a15e3d1f4b2709d357ad25f35f6d27a073f61791f572d1e21bb1956c20084
 DIST darktable-0.9.2.tar.gz 2269319 RMD160 95b5f28afd787070d5e8c236f7e3bb2d27522cae SHA1 5527854edd10cca074bd956772b81d646a796293 SHA256 c7f17961db67f430c449e5294ff4a59ae2a649ba17af0fa55f3e9c5bec9ca20a
 EBUILD darktable-0.9.2-r1.ebuild 2288 RMD160 390848cae5ae9a4f20d74ce81bf8310f7bc357f3 SHA1 4b4f2e6bf65d9e9113e88907958276f75a804554 SHA256 78066186d7dcc24334b71568d3a7c70a47eb32e20a24e5c9f6d1b508a0685354
-MISC ChangeLog 2227 RMD160 4ddb4943e9901c856817c3d8b13e34e5ab9364bc SHA1 a49a0d711127c1e773eda9f8fae5b5b57a6a17dc SHA256 fa1627510f24e0306bb17569f86653b4888ec567dbd9cf79d9a99c9a75f79ad2
+EBUILD darktable-0.9.2-r2.ebuild 2304 RMD160 1338e1c46c016e5075bc1c60971ce833b24945b0 SHA1 f73aeb70928447f83d18f9d3379e40f95117624e SHA256 a9470f13af0f3b600bb83c63f94e5cb8b7e7c881d090d3e8da70c79e85af7fd5
+MISC ChangeLog 2467 RMD160 61a0365aefe4685aaeb0b8cbe90594e986117550 SHA1 c295b262109b879be87e09976de23a80a928b674 SHA256 1ffd792199c3612c1b1dcb6d8b5bdc5c1871c92d57c0981834cf2c95cde3118d
 MISC metadata.xml 465 RMD160 bbc3e655a5e60e0004f3a4803b2d3c20ad247233 SHA1 c362f75afc307f82e72173127817721333094b36 SHA256 83c7149b821c50794200e14c0673636ff1b9b035b7f8079b40747642e1e06a23
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOWwyiAAoJEEqz6FtPBkyjwTcIAJbOebqhbXRU4cc8lCZzBoBn
-mdy8rwGipdmR3Z3nqhv2K5ow7gs6cwOL7fT2iUD4cGimjykSF9y9uDfrhhGmBgCU
-x9h/X3EH1wtCwVdG4VAGD1T+Ox7/T7vSg6nYxiDh8bUEfkMq44S08tqWSS1FXniA
-5hJo0EisYB/awTQ+OHz2pB5Beu/n1N9V+WSZ98yNFfzRB8qjfGjTIIDhQU6aM7KQ
-LUeFmHVGCt855TpWM+oIbHuJy5ug/TxQuft0RbiAiSmKfF1EyjfUZ9AUXoP3S0wV
-iJwnzXMz2K9vCbZLIBkZpDRFFRplKxR/3zfTwyraY0RU6FWBRa7oKnUgc9r8fGE=
-=K9m+
+iQIcBAEBCAAGBQJOcKSpAAoJEEsurZwMLhUx+10QAKif5uypgW/aiJMfNLuTIaqr
+TPWyu9mVP2u5izdrrSBGuhDENrg8VAzDUnpKoBp1UAxBY2axjvi7rVKfv/THpiJD
+mW9NM5wasxcdBfOM+Gv+MjzML9jGI2RMbna8EuKYSgwXpTIUmOkLoAcr9Gf6SB54
+mfcl1WYnlZKn4QhComBwuY1zAkdyeKcj+VS/mv9Ndiuh7JomXLC7BXJTDvHAzjHX
+ataDZr9lVqd2oDavL7X8vNpBxRPnMg+26PC3+T/KU8zU8ee0ODhK0XJS5RqHsqRd
+J9i24X8TRrur/LLFQA+qr0OFNN8gym1FsF39idhubIuLzNjUh9MNHpuHIz48Zy5S
+SnnED1amf3WvCfREVziEXZCqpaBeYxiaBU/BSqjAdrIplZxObtb1biS/f2McuHtM
+49Q7N+RO8teu4E/WtkITheuewFjfrAUOk+NbqQAanw8Y91t1eMpT+kLea5NEuKjn
+Cx+pyjo92UzSirvgCnMBO0f7YkiopuZzoOQXx8Og4h6flQfluDuAI6MheO82cczk
+9bhSP42jbAGXCjG1ot3Ff7NawytgTfbTtUny+vwXk+hAdj2XA8tHerVJPhmoyBJG
+5lR4mByloNFv3lrERACEKWw3P952FVFez2T+m5LPTv5RASi/z5C3wvQbjKgz9BEp
+BY7k05knvrH7BCWLu7LS
+=rpae
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/darktable/darktable-0.9.2-r2.ebuild b/media-gfx/darktable/darktable-0.9.2-r2.ebuild
new file mode 100644 (file)
index 0000000..b102043
--- /dev/null
+++ b/media-gfx/darktable/darktable-0.9.2-r2.ebuild
@@ -0,0 +1,95 @@
+# 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-r2.ebuild,v 1.1 2011/09/14 12:59:27 c1pher Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+
+inherit gnome2 cmake-utils
+
+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"
+IUSE="debug flickr gnome gphoto2 kde nls openmp +rawspeed +slideshow"
+KEYWORDS="~amd64 ~x86"
+
+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
+       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() {
+       local myconf
+       if use gnome ; then
+               myconf="-DDONT_INSTALL_GCONF_SCHEMAS=OFF"
+       else
+               myconf="-DDONT_INSTALL_GCONF_SCHEMAS=ON"
+       fi
+
+       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}
+               -DUSE_OPENCL=OFF
+               -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
+}