Revision bump. Add rawspeed flag to allow for libraw backend only support (bug #378571).
authorTim Harder <radhermit@gentoo.org>
Sun, 14 Aug 2011 23:38:26 +0000 (23:38 +0000)
committerTim Harder <radhermit@gentoo.org>
Sun, 14 Aug 2011 23:38:26 +0000 (23:38 +0000)
Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

media-gfx/darktable/ChangeLog
media-gfx/darktable/Manifest
media-gfx/darktable/darktable-0.9.1-r1.ebuild [new file with mode: 0644]
media-gfx/darktable/files/darktable-0.9.1-no-rawspeed.patch [new file with mode: 0644]
media-gfx/darktable/metadata.xml

index feb8c8024a5ebb2a9d7a70df3ffdbec49ffa3664..2d742c99c9a5c5bbf139ee69078fbf2e54ca5ab5 100644 (file)
@@ -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.3 2011/07/28 06:57:48 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.4 2011/08/14 23:38:26 radhermit Exp $
+
+*darktable-0.9.1-r1 (14 Aug 2011)
+
+  14 Aug 2011; Tim Harder <radhermit@gentoo.org> +darktable-0.9.1-r1.ebuild,
+  +files/darktable-0.9.1-no-rawspeed.patch, metadata.xml:
+  Revision bump. Add rawspeed flag to allow for libraw backend only support
+  (bug #378571).
 
 *darktable-0.9.1 (28 Jul 2011)
 
index ec77b2c0c6a09fc22057d282a28b8f62fab35a2f..96bd46a52073ddedff7c4990e19de31aa2e03d39 100644 (file)
@@ -4,23 +4,25 @@ Hash: SHA512
 AUX darktable-0.9-automagic-deps.patch 3765 RMD160 ee3ac81726536a28f10292692fbe56589572fcdc SHA1 04b6908c5b5adc0ad007cd48d8642068f9f2b191 SHA256 a7f7fa29056edab7e2f3ed39a835b46e63d1560369db08479f966d124b5e6e3d
 AUX darktable-0.9-cflags.patch 1756 RMD160 0d758421e2517659f005f5e00dc6e9acbfdc1f56 SHA1 66fd9d18b8f3d49ccb3e34af7395321a1fb6fbde SHA256 babf25ac1f5af7012575da8e7611ef1da1d99d7971e8d3b2b91d03a51675ef9c
 AUX darktable-0.9-system-libraw.patch 3153 RMD160 80ed54b78c790dca85bbc4a20f6854c488ca16b1 SHA1 c50308b269b7b06714eca20dd0021580361dd2a2 SHA256 13c41b1c9128aaeb2d41e154318090652f9d29bb7b77239c6e5aa66e5c1d5142
+AUX darktable-0.9.1-no-rawspeed.patch 2458 RMD160 fb5528db7f378f3a46690556e1902c86fe127214 SHA1 c5b083edabb3b23fbf9d9f2370a7117d6d19254a SHA256 fcb0be4c37a27a0594260a2adacff66e63b2896c0fe7644f2027a839eef9dee2
 AUX darktable-0.9.1-system-libraw.patch 3192 RMD160 1d702d3a637def655adabc0c7fa01f1e83278adc SHA1 0d73fac5bbff6830b26e9204c6ed773cf0596132 SHA256 9e93c711d9eb7b1e69ecc1692375f312bb4172b4a8a6ae05ca7bbf720cb88af3
 DIST darktable-0.9.1.tar.gz 2227084 RMD160 8f8725768005103c3fda3328ba85142ba622c315 SHA1 8279eb2aceda0decbfe0c0d8977e39fa4a37bae6 SHA256 b687a5f1b2a6c8aa230c1dc3ef83bf74a103e3ebe1c61cdea95a612a7375f21e
 DIST darktable-0.9.tar.gz 2187367 RMD160 c79c8707196a113f9d71a6f52ed68d753d8ff537 SHA1 86a9830bf71bf63abbcc7e426c62f582e5866c2b SHA256 638e9d955e3940155b14bfba81cda291607ba689f216a7979db8a1aeb858a403
 EBUILD darktable-0.9-r1.ebuild 2339 RMD160 c514518094bc1fd1b3bee98c2981e75a37125b5d SHA1 4240834fc050e6a071d1c1337280eb68aa5fcf23 SHA256 8d9a02cc60444b7156a087025312c1a1b5dd1454d4ac6fabc3133939b2155402
+EBUILD darktable-0.9.1-r1.ebuild 2420 RMD160 72d9e4f1c9976a04db64458c7f11ba967bb254cd SHA1 cd8cbd14a5f2bbc56045a2a029b059eaa545961e SHA256 3929493363bf5761ea813e7ac36d04694ecbbcb1eb86eefe6160a1d905a8abf8
 EBUILD darktable-0.9.1.ebuild 2320 RMD160 c14baa90a74a943d76e5d10ca8e5b28e6bc9c5be SHA1 41a3d446975b00c3c5fb4fd9f76e9285b92d9434 SHA256 0e558194e9d1c59202bb9d51a9d3219ebf29615f0a561e148b31301bb1964ed1
 EBUILD darktable-0.9.ebuild 1622 RMD160 0e7733ca760dea18d79944549277095476e6eb78 SHA1 819756ad485379ae7bfb0821cf6419842388cbfa SHA256 2d151f2ee1758134b17729981e5b43d83591f20fd45e9491cb97153f756f2245
 EBUILD darktable-9999.ebuild 1623 RMD160 f3347734bee2f1ca5315f32f411b9a0c69efb7b8 SHA1 9207440e484af0482a688050522e4669b6f8606a SHA256 289b63a6c228b36ffaeb46ac1caec805b3d76206f0836a9bae693ea66f488541
-MISC ChangeLog 1126 RMD160 9bef5a42a3d280fda6551508b945b358ecbf7bcb SHA1 a73d512b85ab76c9e37fa81d9ff8a22e4fae4ae5 SHA256 1eab5624a5b2116e20fcfd53c647a612b9aaeadf36977c2c7fde2abab892d041
-MISC metadata.xml 468 RMD160 4cb0815bbbaaa13c734980789dc43270cba45990 SHA1 cb8fb1ae02b6d3dcd7338b98e1f63f636a0d572b SHA256 1b0ad485c4b2231c459ec25ec6ea90e7df3fc11109ab11c0d4c78a1ed93c95e4
+MISC ChangeLog 1390 RMD160 b9792277c14aa53943467a3306595684ca8d6e77 SHA1 cee3d1c9ae2a13b458c23e646502201964c917fe SHA256 a3236ad1a2706c156cfd5a917aec3b13d76188d2839e62366f20db438354ab5c
+MISC metadata.xml 527 RMD160 9f8606862d83ed65586cc0536f42eb43f5507477 SHA1 1e819b10154566d56fdae0e194a366a5da6c385b SHA256 ecd6213a4fa14c5beb2ae0c07a710fd67135a7898ad5cb081740c5470c4e43e8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOMQh6AAoJEEqz6FtPBkyjlzIIAK4F4wgM8d1z1G9sNqv4fp1P
-VwzI1dAF7kqEZABiVvytHfQQrVnTUxvHn6pshaBYG12gKfZ9/8UJvjgOcbg0YZD3
-BUV8LEzopz4L7Fmsb7CFGD/uDvl053GJCgacUlvIFeMMpqLUq8VRGG6MFJIQLtTI
-1LCwVXPYAUHCHqLSgdLIaISWg7tTXdfJjrIEYcw9EmQ4KKWkye8dldZ2Y2XVrGrP
-ooOfq2xVyqmlM72WSz76id1ZFiWoe/vWqSKHEG8qL/V1zyefPg7Bw2bAlLo38Srg
-QcnQOscpNw0UfdMChcueYBam7vP9DpsBoEF21gJ89bLAAsagvb+7JaJw1cReDxM=
-=ZuD9
+iQEcBAEBCgAGBQJOSFx7AAoJEEqz6FtPBkyjGZ4IAKI9/rlnLPVI1zTEXydmai8e
+7wgHb/9Azsqauq8oVEOu3BGHuQ9PWUOpiZ0O4fVdXiYtachJ+LgAffHwCYCfcgwa
+xehNdxO32oWn9OUNbp6Q6EtuyfWcDKEwEFUGWa1mI54a3hopalK6rub/4jNNbo43
+uzQEQXf+Eo8ka4StTLXnq50CIDW8I65pc6HRMid0cDhPbkYHLDXlTD6VJfj9Rlmf
+yG2G0BeP2epbRYoy9+EB1haTmTahfQIS/6MLVwkKiuT1tlIJV5NxR7JgCet/luAp
+N11OnumH0nYztd5Jabuu63xEBAoCd9p/vwSyM1Y94TtGF6NiWx2wlAmYx3Jnes8=
+=bDoh
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/darktable/darktable-0.9.1-r1.ebuild b/media-gfx/darktable/darktable-0.9.1-r1.ebuild
new file mode 100644 (file)
index 0000000..6941148
--- /dev/null
@@ -0,0 +1,93 @@
+# 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.1-r1.ebuild,v 1.1 2011/08/14 23:38:26 radhermit Exp $
+
+EAPI="4"
+if [[ ${PV} == "9999" ]]; then
+       EGIT_REPO_URI="git://darktable.git.sf.net/gitroot/darktable/darktable"
+       EGIT_BRANCH="master"
+       EGIT_COMMIT="master"
+       SCM="git-2"
+       KEYWORDS=""
+else
+       SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+       KEYWORDS="~amd64 ~x86"
+fi
+GCONF_DEBUG="no"
+inherit cmake-utils ${SCM}
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="http://darktable.sf.net/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug flickr gconf gnome-keyring gphoto2 kde nls openmp +rawspeed +slideshow"
+
+RDEPEND="
+       dev-db/sqlite:3
+       dev-libs/libxml2:2
+       flickr? ( media-libs/flickcurl )
+       gconf? ( gnome-base/gconf )
+       gnome-base/libglade:2.0
+       gnome-base/librsvg:2
+       gnome-keyring? ( gnome-base/gnome-keyring )
+       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}"/${PN}-0.9-automagic-deps.patch
+       "${FILESDIR}"/${P}-system-libraw.patch
+       "${FILESDIR}"/${P}-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() {
+       use debug && CMAKE_BUILD_TYPE=Debug
+
+       mycmakeargs=(
+               $(cmake-utils_use_use flickr FLICKR)
+               $(cmake-utils_use_use gconf GCONF_BACKEND)
+               $(cmake-utils_use_use gnome-keyring 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)
+               -DDONT_INSTALL_GCONF_SCHEMAS=ON
+               -DINSTALL_IOP_EXPERIMENTAL=ON
+               -DINSTALL_IOP_LEGACY=ON
+       )
+       cmake-utils_src_configure
+}
+
+src_install(){
+       cmake-utils_src_install
+       newicon data/pixmaps/48x48/darktable.png darktable.png
+}
diff --git a/media-gfx/darktable/files/darktable-0.9.1-no-rawspeed.patch b/media-gfx/darktable/files/darktable-0.9.1-no-rawspeed.patch
new file mode 100644 (file)
index 0000000..db699b8
--- /dev/null
@@ -0,0 +1,46 @@
+--- darktable-0.9.1.orig/src/CMakeLists.txt
++++ darktable-0.9.1/src/CMakeLists.txt
+@@ -274,19 +274,19 @@
+ )
+ SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c PROPERTIES GENERATED 1)
+ SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h PROPERTIES GENERATED 1)
+-# this is a dummy library whose sole purpose is to serve as a dependency for subdirs, such as imageio/storage/gallery.
+-# cmake can't depend on custom targets in other directories than the current one.
+-add_library(metadata_dummy ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h)
++add_custom_target(metadata_gen DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h)
+ 
+ #
+ # build libdarktable
+ #
+-add_library(lib_darktable STATIC SHARED ${CMAKE_CURRENT_BINARY_DIR}/preferences_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c ${CMAKE_CURRENT_BINARY_DIR}/accelstrings_gen.h ${SOURCES})
++add_library(lib_darktable SHARED ${CMAKE_CURRENT_BINARY_DIR}/preferences_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c ${CMAKE_CURRENT_BINARY_DIR}/accelstrings_gen.h ${SOURCES})
++add_dependencies(lib_darktable metadata_gen)
+ if(APPLE)
+   set_target_properties(lib_darktable PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib/darktable")
+ endif(APPLE)
+ set_target_properties(lib_darktable PROPERTIES OUTPUT_NAME darktable)
+ set_target_properties(lib_darktable PROPERTIES LINKER_LANGUAGE C)
++target_link_libraries(lib_darktable ${LIBS})
+ 
+ 
+ #
+@@ -306,7 +306,7 @@
+   add_dependencies(lib_darktable rawspeed)
+   add_library(rawspeed_static STATIC IMPORTED)
+   set_target_properties(rawspeed_static PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external/rawspeed/librawspeed.a)
+-  target_link_libraries(lib_darktable ${LIBS} rawspeed_static)
++  target_link_libraries(lib_darktable rawspeed_static)
+   # compile rawspeed
+   add_subdirectory(external/rawspeed)
+ endif(NOT DONT_USE_RAWSPEED)
+--- darktable-0.9.1.orig/src/imageio/storage/CMakeLists.txt
++++ darktable-0.9.1/src/imageio/storage/CMakeLists.txt
+@@ -10,7 +10,7 @@
+ foreach(module ${MODULES} ${MODULES_EXPERIMENTAL})
+       add_library(${module} MODULE "${module}.c")
+ endforeach(module)
+-add_dependencies(gallery metadata_dummy)
++add_dependencies(gallery metadata_gen)
+ 
+ foreach(module ${MODULES})
+       target_link_libraries(${module} ${LIBS})
index dc38cace064de479e4ca71d09b9adde02c5f41c9..c1175e6f3005aa5de553090421e6e81c54f6bfb1 100644 (file)
@@ -9,6 +9,7 @@
        <use>
                <flag name="flickr">Add support for uploading photos to flickr</flag>
                <flag name="gconf">Add support for the gconf backend</flag>
+               <flag name="rawspeed">Enable the rawspeed backend</flag>
                <flag name="slideshow">Build the opengl slideshow viewer</flag>
        </use>
 </pkgmetadata>