Remove old.
authorTim Harder <radhermit@gentoo.org>
Mon, 29 Aug 2011 03:50:48 +0000 (03:50 +0000)
committerTim Harder <radhermit@gentoo.org>
Mon, 29 Aug 2011 03:50:48 +0000 (03:50 +0000)
Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

media-gfx/darktable/ChangeLog
media-gfx/darktable/Manifest
media-gfx/darktable/darktable-0.9.1-r1.ebuild [deleted file]
media-gfx/darktable/darktable-0.9.2.ebuild [deleted file]
media-gfx/darktable/darktable-9999.ebuild [deleted file]
media-gfx/darktable/files/darktable-0.9-automagic-deps.patch [deleted file]
media-gfx/darktable/files/darktable-0.9.1-system-libraw.patch [deleted file]
media-gfx/darktable/metadata.xml

index decb954842ceb1e519cb0e266bfa9e804d41f72d..dd54baa0f67774a8c445936cb7d38e3c2a5f7c8e 100644 (file)
@@ -1,6 +1,12 @@
 # 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.7 2011/08/26 21:35:59 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.8 2011/08/29 03:50:48 radhermit Exp $
+
+  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,
+  -files/darktable-0.9-automagic-deps.patch, -darktable-9999.ebuild,
+  metadata.xml:
+  Remove old.
 
 *darktable-0.9.2-r1 (26 Aug 2011)
 
index d85e523246f185693e25743828a1159332ace9ad..202db949c9198577e6df649646b7dea4282fe67f 100644 (file)
@@ -1,27 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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.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
 AUX darktable-0.9.2-system-libraw.patch 3249 RMD160 2bf77c9f5807fa42f4bb64e554695c8b9ffa57f3 SHA1 c60612c58eb90c7c64d526541c171b3974564d02 SHA256 fd9a15e3d1f4b2709d357ad25f35f6d27a073f61791f572d1e21bb1956c20084
-DIST darktable-0.9.1.tar.gz 2227084 RMD160 8f8725768005103c3fda3328ba85142ba622c315 SHA1 8279eb2aceda0decbfe0c0d8977e39fa4a37bae6 SHA256 b687a5f1b2a6c8aa230c1dc3ef83bf74a103e3ebe1c61cdea95a612a7375f21e
 DIST darktable-0.9.2.tar.gz 2269319 RMD160 95b5f28afd787070d5e8c236f7e3bb2d27522cae SHA1 5527854edd10cca074bd956772b81d646a796293 SHA256 c7f17961db67f430c449e5294ff4a59ae2a649ba17af0fa55f3e9c5bec9ca20a
-EBUILD darktable-0.9.1-r1.ebuild 2420 RMD160 72d9e4f1c9976a04db64458c7f11ba967bb254cd SHA1 cd8cbd14a5f2bbc56045a2a029b059eaa545961e SHA256 3929493363bf5761ea813e7ac36d04694ecbbcb1eb86eefe6160a1d905a8abf8
 EBUILD darktable-0.9.2-r1.ebuild 2288 RMD160 390848cae5ae9a4f20d74ce81bf8310f7bc357f3 SHA1 4b4f2e6bf65d9e9113e88907958276f75a804554 SHA256 78066186d7dcc24334b71568d3a7c70a47eb32e20a24e5c9f6d1b508a0685354
-EBUILD darktable-0.9.2.ebuild 2279 RMD160 1a2435b2282a76f6a15c59bce432374de5aa3ca6 SHA1 13036bdd3f6cbf5b9e5409bf19a078fcae56bf8e SHA256 b95a2d92063bfe9fce591b065ca53afbfd2780255e53366558ee059f82f5219c
-EBUILD darktable-9999.ebuild 1623 RMD160 f3347734bee2f1ca5315f32f411b9a0c69efb7b8 SHA1 9207440e484af0482a688050522e4669b6f8606a SHA256 289b63a6c228b36ffaeb46ac1caec805b3d76206f0836a9bae693ea66f488541
-MISC ChangeLog 1979 RMD160 bd384fde89adc8c850e2920151ce821fc2c900cb SHA1 9cf2ccf79d500a5cf2a0be314d6150956e894543 SHA256 13ff03e5f52561b380c1163cd051e08e2ccc6d1c731a217ea7a03bdb624f970d
-MISC metadata.xml 527 RMD160 9f8606862d83ed65586cc0536f42eb43f5507477 SHA1 1e819b10154566d56fdae0e194a366a5da6c385b SHA256 ecd6213a4fa14c5beb2ae0c07a710fd67135a7898ad5cb081740c5470c4e43e8
+MISC ChangeLog 2227 RMD160 4ddb4943e9901c856817c3d8b13e34e5ab9364bc SHA1 a49a0d711127c1e773eda9f8fae5b5b57a6a17dc SHA256 fa1627510f24e0306bb17569f86653b4888ec567dbd9cf79d9a99c9a75f79ad2
+MISC metadata.xml 465 RMD160 bbc3e655a5e60e0004f3a4803b2d3c20ad247233 SHA1 c362f75afc307f82e72173127817721333094b36 SHA256 83c7149b821c50794200e14c0673636ff1b9b035b7f8079b40747642e1e06a23
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOWBHFAAoJEEqz6FtPBkyjvtQIAKgE+PC4XkqxHO8U7II2HXpo
-6CQ9xKp53FyRH4fXIQ7siClfBeQ+lnECGPH2x7T+Tqkx1tuK6DxXhKub8hsC1Poa
-sp1NnfD6HzK873XSZAZEFplEhrNAB1jivZ4V8jFKASFyVgsa7IC07DUZU8axc3tc
-vhBTMkDVXQ+TIdu1BcJNDeoZObGHcrIZhFNw73Nd30tZbXkhnGH7Z78WgXocTPDw
-f5JNuClJeeNtIevfBtrfanRGaDNWXAtDFE0wqY1Lw9R1eCzviRMpbSE4Yym/drJY
-6THlzlaw2Hn2FuMj543g0zcVfic4InuJ1ZBCZ5LIuLChOMVBVFKTofgUdVKlLOM=
-=t6W8
+iQEcBAEBCgAGBQJOWwyiAAoJEEqz6FtPBkyjwTcIAJbOebqhbXRU4cc8lCZzBoBn
+mdy8rwGipdmR3Z3nqhv2K5ow7gs6cwOL7fT2iUD4cGimjykSF9y9uDfrhhGmBgCU
+x9h/X3EH1wtCwVdG4VAGD1T+Ox7/T7vSg6nYxiDh8bUEfkMq44S08tqWSS1FXniA
+5hJo0EisYB/awTQ+OHz2pB5Beu/n1N9V+WSZ98yNFfzRB8qjfGjTIIDhQU6aM7KQ
+LUeFmHVGCt855TpWM+oIbHuJy5ug/TxQuft0RbiAiSmKfF1EyjfUZ9AUXoP3S0wV
+iJwnzXMz2K9vCbZLIBkZpDRFFRplKxR/3zfTwyraY0RU6FWBRa7oKnUgc9r8fGE=
+=K9m+
 -----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
deleted file mode 100644 (file)
index 6941148..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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/darktable-0.9.2.ebuild b/media-gfx/darktable/darktable-0.9.2.ebuild
deleted file mode 100644 (file)
index 481f50a..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.ebuild,v 1.1 2011/08/26 10:11:00 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}"/${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() {
-       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
-}
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
deleted file mode 100644 (file)
index e210a3d..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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-9999.ebuild,v 1.1 2011/07/19 19:11:57 c1pher 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/project/darktable/darktable/${PV}/${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="gconf gphoto2 openmp gnome-keyring"
-RDEPEND="
-       gconf? ( gnome-base/gconf )
-       gphoto2? ( media-libs/libgphoto2 )
-       dev-db/sqlite:3
-       dev-libs/libxml2:2
-       gnome-base/libglade:2.0
-       gnome-keyring? ( gnome-base/gnome-keyring )
-       media-gfx/exiv2
-       media-libs/lcms:2
-       >=media-libs/lensfun-0.2.3
-       media-libs/libpng
-       gnome-base/librsvg:2
-       media-libs/openexr
-       media-libs/tiff
-       net-misc/curl
-       x11-libs/cairo
-       x11-libs/gdk-pixbuf:2
-       x11-libs/gtk+:2
-       virtual/jpeg"
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig
-       openmp? ( >=sys-devel/gcc-4.4[openmp] )"
-
-src_configure() {
-       mycmakeargs=(
-               "$(cmake-utils_use_use openmp OPENMP)"
-               "$(cmake-utils_use_use gconf GCONF_BACKEND)"
-               "$(cmake-utils_use_use gphoto2 CAMERA_SUPPORT)"
-               "-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-automagic-deps.patch b/media-gfx/darktable/files/darktable-0.9-automagic-deps.patch
deleted file mode 100644 (file)
index 28d0c23..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
---- darktable-0.9.orig/CMakeLists.txt
-+++ darktable-0.9/CMakeLists.txt
-@@ -4,6 +4,11 @@
- option(USE_GCONF_BACKEND "Detect and use gconf backend if available." ON)
- option(USE_CAMERA_SUPPORT "Detect and use camera support if available." ON)
-+option(USE_NLS "Build Native Language Support (using gettext)" ON)
-+option(USE_FLICKR "Enable Flickr support" ON)
-+option(USE_KWALLET "Build kwallet password storage backend" ON)
-+option(USE_GNOME_KEYRING "Build gnome-keyring password storage backend" ON)
-+option(BUILD_SLIDESHOW "Build the opengl slideshow viewer" ON)
- option(USE_OPENMP "Use openmp threading support." ON)
- option(USE_OPENCL "Use OpenCL support." ON)
- option(USE_DARKTABLE_PROFILING OFF)
---- darktable-0.9.orig/src/CMakeLists.txt
-+++ darktable-0.9/src/CMakeLists.txt
-@@ -124,51 +124,61 @@
-   add_definitions(${${lib}_DEFINITIONS})
- endforeach(lib)
--find_package(Gettext)
--if(Gettext_FOUND)
--  include_directories(${Gettext_INCLUDE_DIRS})
--  list(APPEND LIBS ${Gettext_LIBRARIES})
--  add_definitions("-DUSE_GETTEXT")
--  message(STATUS "Internationalization: Enabled")
--else()
--  message(STATUS "Internationalization: Disabled (libintl not found)")
--endif()
--
--find_package(FLICKCURL)
--if(FLICKCURL_FOUND)
--  include_directories(${FLICKCURL_INCLUDE_DIRS})
--  list(APPEND LIBS ${FLICKCURL_LIBRARIES})
--  add_definitions(${FLICKCURL_DEFINITIONS})
--endif(FLICKCURL_FOUND)
-+if(USE_NLS)
-+  find_package(Gettext)
-+  if(Gettext_FOUND)
-+    include_directories(${Gettext_INCLUDE_DIRS})
-+    list(APPEND LIBS ${Gettext_LIBRARIES})
-+    add_definitions("-DUSE_GETTEXT")
-+    message(STATUS "Internationalization: Enabled")
-+  else()
-+    message(STATUS "Internationalization: Disabled (libintl not found)")
-+  endif()
-+endif(USE_NLS)
-+
-+if(USE_FLICKR)
-+  find_package(FLICKCURL)
-+  if(FLICKCURL_FOUND)
-+    include_directories(${FLICKCURL_INCLUDE_DIRS})
-+    list(APPEND LIBS ${FLICKCURL_LIBRARIES})
-+    add_definitions(${FLICKCURL_DEFINITIONS})
-+  endif(FLICKCURL_FOUND)
-+endif(USE_FLICKR)
- #
- # Detect compile of optional pwstorage backends
- #
-+if(USE_KWALLET) 
- find_package(DBUSGLIB)
--if(DBUSGLIB_FOUND)
--  list(APPEND SOURCES "common/pwstorage/backend_kwallet.c")
--  include_directories(${DBUSGLIB_INCLUDE_DIRS})
--  list(APPEND LIBS ${DBUSGLIB_LIBRARIES})
--  add_definitions("-DHAVE_KWALLET")
--endif(DBUSGLIB_FOUND)
--
--find_package(GnomeKeyring)
--if(GNOMEKEYRING_FOUND)
--  set(SOURCES ${SOURCES} "common/pwstorage/backend_gkeyring.c")
--  include_directories(${GnomeKeyring_INCLUDE_DIRS})
--  list(APPEND LIBS ${GnomeKeyring_LIBRARIES})
--  add_definitions("-DHAVE_GKEYRING")
--endif(GNOMEKEYRING_FOUND)
-+  if(DBUSGLIB_FOUND)
-+    list(APPEND SOURCES "common/pwstorage/backend_kwallet.c")
-+    include_directories(${DBUSGLIB_INCLUDE_DIRS})
-+    list(APPEND LIBS ${DBUSGLIB_LIBRARIES})
-+    add_definitions("-DHAVE_KWALLET")
-+  endif(DBUSGLIB_FOUND)
-+endif(USE_KWALLET)
-+
-+if(USE_GNOME_KEYRING)
-+  find_package(GnomeKeyring)
-+  if(GNOMEKEYRING_FOUND)
-+    set(SOURCES ${SOURCES} "common/pwstorage/backend_gkeyring.c")
-+    include_directories(${GnomeKeyring_INCLUDE_DIRS})
-+    list(APPEND LIBS ${GnomeKeyring_LIBRARIES})
-+    add_definitions("-DHAVE_GKEYRING")
-+  endif(GNOMEKEYRING_FOUND)
-+endif(USE_GNOME_KEYRING)
- # have a small test program, to be run as root on some systems to enable the driver to run cl stuff
- add_subdirectory(cltest)
- # build opengl slideshow viewer?
--find_package(SDL)
--find_package(OpenGL)
--if(SDL_FOUND AND OPENGL_FOUND)
--  add_subdirectory(dtview)
--endif(SDL_FOUND AND OPENGL_FOUND)
-+if(BUILD_SLIDESHOW) 
-+  find_package(SDL)
-+  find_package(OpenGL)
-+  if(SDL_FOUND AND OPENGL_FOUND)
-+    add_subdirectory(dtview)
-+  endif(SDL_FOUND AND OPENGL_FOUND)
-+endif(BUILD_SLIDESHOW)
- # needed for the file manager
- if(APRIL_FOOLS)
diff --git a/media-gfx/darktable/files/darktable-0.9.1-system-libraw.patch b/media-gfx/darktable/files/darktable-0.9.1-system-libraw.patch
deleted file mode 100644 (file)
index b631e74..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
---- darktable-0.9.1.orig/cmake/modules/FindLibraw.cmake
-+++ darktable-0.9.1/cmake/modules/FindLibraw.cmake
-@@ -0,0 +1,29 @@
-+# - Try to find libraw
-+# Once done, this will define
-+#
-+#  Libraw_FOUND - system has Libraw
-+#  Libraw_INCLUDE_DIRS - the Libraw include directories
-+#  Libraw_LIBRARIES - link these to use Libraw
-+
-+include(LibFindMacros)
-+
-+# Use pkg-config to get hints about paths
-+libfind_pkg_check_modules(Libraw_PKGCONF libraw)
-+
-+# Include dir
-+find_path(Libraw_INCLUDE_DIR
-+  NAMES libraw.h
-+  PATHS ${Libraw_PKGCONF_INCLUDE_DIRS}
-+)
-+
-+# Finally the library itself
-+find_library(Libraw_LIBRARY
-+  NAMES raw_r
-+  PATHS ${Libraw_PKGCONF_LIBRARY_DIRS}
-+)
-+
-+# Set the include dir variables and the libraries and let libfind_process do the rest.
-+# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-+set(Libraw_PROCESS_INCLUDES Libraw_INCLUDE_DIR Libraw_INCLUDE_DIRS)
-+set(Libraw_PROCESS_LIBS Libraw_LIBRARY Libraw_LIBRARIES)
-+libfind_process(Libraw)
---- darktable-0.9.1.orig/src/CMakeLists.txt
-+++ darktable-0.9.1/src/CMakeLists.txt
-@@ -65,7 +65,6 @@
- include_directories(${CMAKE_CURRENT_SOURCE_DIR})
--include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/LibRaw)
- # initial compiler flags
- add_definitions("-DHAVE_CONFIG_H")
-@@ -117,7 +116,7 @@
- endif(USE_CAMERA_SUPPORT)
- # Find all the libs that don't require extra parameters
--foreach(lib ${OUR_LIBS} LensFun GIO GThread GModule Cairo PangoCairo PThread Rsvg2 GDK-PixBuf LibXml2 INotify Sqlite3 Exiv2  CURL PNG JPEG TIFF OpenEXR LCMS2)
-+foreach(lib ${OUR_LIBS} LensFun Libraw GIO GThread GModule Cairo PangoCairo PThread Rsvg2 GDK-PixBuf LibXml2 INotify Sqlite3 Exiv2  CURL PNG JPEG TIFF OpenEXR LCMS2)
-   find_package(${lib} REQUIRED)
-   include_directories(${${lib}_INCLUDE_DIRS})
-   list(APPEND LIBS ${${lib}_LIBRARIES})
-@@ -289,17 +288,6 @@
- set_target_properties(lib_darktable PROPERTIES LINKER_LANGUAGE C)
--#
--# the libraw part is a bit of a hack:
--# the static linking didn't work since it was pulling -lstdc++ and -lm into linker flags.
--# so we do a custom dependency and pretend an imported liblibraw_r.a so no other -l are
--# appended.
--#
--add_dependencies(lib_darktable libraw_r)
--add_library(libraw_static STATIC IMPORTED)
--set_target_properties(libraw_static PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external/LibRaw/liblibraw_r.a)
--target_link_libraries(lib_darktable ${LIBS} libraw_static)
--
- # same for librawspeed (can switch it off with -DDONT_USE_RAWSPEED, for macs):
- if(NOT DONT_USE_RAWSPEED)
-   add_definitions("-DHAVE_RAWSPEED")
-@@ -314,9 +302,6 @@
- install(TARGETS lib_darktable DESTINATION ${LIB_INSTALL}/darktable)
- list(APPEND LIBS lib_darktable)
--# Compile libraw modules
--add_subdirectory(external/LibRaw)
--
- # Compile views modules
- add_subdirectory(views)
---- darktable-0.9.1.orig/src/common/imageio.c
-+++ darktable-0.9.1/src/common/imageio.c
-@@ -547,7 +547,7 @@
-   raw->params.threshold = 0;
-   raw->params.auto_bright_thr = img->raw_auto_bright_threshold;
--  raw->params.amaze_ca_refine = 0;
-+  // raw->params.amaze_ca_refine = 0;
-   raw->params.fbdd_noiserd    = 0;
-   ret = libraw_open_file(raw, filename);
index c1175e6f3005aa5de553090421e6e81c54f6bfb1..2275ca3ad8f71d3ace550561cc330f2ff4ee1b53 100644 (file)
@@ -8,7 +8,6 @@
        </maintainer>
        <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>