From: Mike Frysinger Date: Tue, 20 Dec 2011 22:04:32 +0000 (+0000) Subject: Switch to new virtual/opencl #392179 by Michal Pytasz. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=17c7b233e052b0f0a0d294318f00e57785b21268;p=gentoo.git Switch to new virtual/opencl #392179 by Michal Pytasz. Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64 --- diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog index 3367bbf7a0cd..6d678507fb85 100644 --- a/media-gfx/darktable/ChangeLog +++ b/media-gfx/darktable/ChangeLog @@ -1,6 +1,9 @@ # 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.12 2011/11/14 21:15:51 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.13 2011/12/20 22:04:32 vapier Exp $ + + 20 Dec 2011; Mike Frysinger darktable-0.9.3.ebuild: + Switch to new virtual/opencl #392179 by Michal Pytasz. 14 Nov 2011; Tim Harder darktable-0.9.3.ebuild: Add xmp use dep for exiv2 (bug #390301 by Kanstantsin Shautsou). diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest index c1c3354ce328..718829d59ba9 100644 --- a/media-gfx/darktable/Manifest +++ b/media-gfx/darktable/Manifest @@ -1,5 +1,5 @@ -----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 @@ -13,17 +13,13 @@ DIST darktable-0.9.2.tar.gz 2269319 RMD160 95b5f28afd787070d5e8c236f7e3bb2d27522 DIST darktable-0.9.3.tar.gz 2330605 RMD160 a7c51262a52fae0b33179fb4d9030eb78444305d SHA1 36ed6c1102b920096cf80affd71adfa66ae85381 SHA256 1cd75253355bd70b698dc78c2463c1b70867ac96cb6f23337a3b6dec6277892a EBUILD darktable-0.9.2-r1.ebuild 2288 RMD160 390848cae5ae9a4f20d74ce81bf8310f7bc357f3 SHA1 4b4f2e6bf65d9e9113e88907958276f75a804554 SHA256 78066186d7dcc24334b71568d3a7c70a47eb32e20a24e5c9f6d1b508a0685354 EBUILD darktable-0.9.2-r2.ebuild 2345 RMD160 a10b1eb09f12fdf9b2114b58461d1980b9ae3db1 SHA1 f4f21e6c2773280c2e186d8bbabadb7c11f3d1f1 SHA256 d207ca6a3099031bcff2a4b39c3d90ca102aafabb73a1889ed826408239f5632 -EBUILD darktable-0.9.3.ebuild 2657 RMD160 dc158b8d77b46eaa89132bba1ce15827fcd0afe3 SHA1 47cbfe41d2819e7c840eacd1ee764c3afb8b2fc8 SHA256 ed0913710de258fed5700d8d2527921e0fc7b61ba8197a7ba39769a8e218acb0 -MISC ChangeLog 3110 RMD160 4f4ce9755fb66ecf62bf681e04c0bb632b952609 SHA1 a21cfffabf884d534f6cbfe5f658b9f63ee45e78 SHA256 f944eeeffe3c72b628af2acdee10dfab17ca7050f740c01e2bf65e7912e3ee50 +EBUILD darktable-0.9.3.ebuild 2456 RMD160 ab57230d920a2a81fd12109fd2b2bf828aa4563b SHA1 ad535b3fca65296fe68ef9d2b773cd60961380f2 SHA256 9ce53960dac11f93dede3940130372a79be8858bed23ed482a09e7a0db8d1d01 +MISC ChangeLog 3239 RMD160 e130137a0f605f0882a14878ba0661278704dd45 SHA1 e89f9b59af78596cc19d194f90e6ba43a9ec62e8 SHA256 c2e7265d6111862cccc73db5706cc4d5d24a3de0be0e4efaf0f453df94c7e49b MISC metadata.xml 516 RMD160 ca94973ccca803f6f5dd1646f9c9ca3624712144 SHA1 3508593304c9b41001b6721d03f56c94a0183599 SHA256 486fbce594db4aad661bcabd94e398edcf55da660d802bebf7ea0838f7cf26e1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJOwYURAAoJEEqz6FtPBkyjfakIALoX7Z3zOz3n4GGwQMQDTy04 -C/L4+b8X3ycsPHqpsEh//mmU1sVl0uVo/04ujNVudu6bCkkdR7vsb2/QYYfxBhgM -kyQmQro+uj1+Hs5NEKwSL6jywKCed9HcxrOSj+WgrCz/aIEZlPelFocBq6ZJZcpp -1DhXZUu+O/bF4h9v8g7s9kTSno+0ldQ3f9nTTF/7VrKfKUVY+nrDJGSczA6i0gEm -vz9YCiMXYsvhxHZopbPIXYPAOd80mfDBstBKLelc5HI28DIMPLw/7BT+setDIDFm -yKrbvOFSaZUM0k3dO90d4lRLWWjX0ddoKYxfNcxUtbDj/fvSZEYw1fV3HNg/ZG0= -=TZm+ +iF4EAREIAAYFAk7xBnsACgkQaC/OocHi7JbK+QEAkHic05aK6JeAckGG39El0E7J +4ASt4dfzod5ahxF+Cd8A/jos0Fm2ckR74Srz4F6NBREYIWdX+NIzglQBdNaBbi0y +=yRd3 -----END PGP SIGNATURE----- diff --git a/media-gfx/darktable/darktable-0.9.3.ebuild b/media-gfx/darktable/darktable-0.9.3.ebuild index 5f91e596ae5c..50862ddbb94d 100644 --- a/media-gfx/darktable/darktable-0.9.3.ebuild +++ b/media-gfx/darktable/darktable-0.9.3.ebuild @@ -1,11 +1,11 @@ # 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.3.ebuild,v 1.2 2011/11/14 21:15:51 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-0.9.3.ebuild,v 1.3 2011/12/20 22:04:32 vapier Exp $ EAPI="4" GCONF_DEBUG="no" -inherit gnome2 cmake-utils toolchain-funcs +inherit gnome2 eutils cmake-utils toolchain-funcs DESCRIPTION="A virtual lighttable and darkroom for photographers" HOMEPAGE="http://darktable.sf.net/" @@ -13,8 +13,8 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -IUSE="debug flickr gnome gphoto2 kde nls opencl openmp +rawspeed +slideshow video_cards_nvidia" KEYWORDS="~amd64 ~x86" +IUSE="debug flickr gnome gphoto2 kde nls opencl openmp +rawspeed +slideshow video_cards_nvidia" RDEPEND=" dev-db/sqlite:3 @@ -35,10 +35,7 @@ RDEPEND=" media-libs/openexr media-libs/tiff net-misc/curl - opencl? ( video_cards_nvidia? ( - x11-drivers/nvidia-drivers - >=dev-util/nvidia-cuda-toolkit-3.1 - ) ) + opencl? ( virtual/opencl ) slideshow? ( media-libs/libsdl virtual/opengl @@ -72,17 +69,8 @@ src_prepare() { src_configure() { local myconf - if use gnome ; then - myconf="-DDONT_INSTALL_GCONF_SCHEMAS=OFF" - else - myconf="-DDONT_INSTALL_GCONF_SCHEMAS=ON" - fi - - if use opencl && use video_cards_nvidia ; then - myconf+=" -DUSE_OPENCL=ON" - else - myconf+=" -DUSE_OPENCL=OFF" - fi + myconf="-DDONT_INSTALL_GCONF_SCHEMAS=$(usex gnome OFF ON)" + myconf+=" -DUSE_OPENCL=$(usex opencl ON OFF)" use debug && CMAKE_BUILD_TYPE=Debug