diff options
author | Tim Harder <radhermit@gentoo.org> | 2011-08-14 23:41:46 +0000 |
---|---|---|
committer | Tim Harder <radhermit@gentoo.org> | 2011-08-14 23:41:46 +0000 |
commit | 6487be8e16c3f1cefd959e240a1c20fc8a7efb84 (patch) | |
tree | f4e65c2e00a7c2e40b169ce89b56329bedf91ea5 /media-gfx/darktable | |
parent | Revision bump. Add rawspeed flag to allow for libraw backend only support (bu... (diff) | |
download | gentoo-2-6487be8e16c3f1cefd959e240a1c20fc8a7efb84.tar.gz gentoo-2-6487be8e16c3f1cefd959e240a1c20fc8a7efb84.tar.bz2 gentoo-2-6487be8e16c3f1cefd959e240a1c20fc8a7efb84.zip |
Remove old
(Portage version: 2.2.0_alpha50/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/darktable')
-rw-r--r-- | media-gfx/darktable/ChangeLog | 7 | ||||
-rw-r--r-- | media-gfx/darktable/darktable-0.9-r1.ebuild | 91 | ||||
-rw-r--r-- | media-gfx/darktable/darktable-0.9.1.ebuild | 91 | ||||
-rw-r--r-- | media-gfx/darktable/darktable-0.9.ebuild | 63 | ||||
-rw-r--r-- | media-gfx/darktable/files/darktable-0.9-system-libraw.patch | 90 |
5 files changed, 6 insertions, 336 deletions
diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog index 2d742c99c9a5..79e1c460553f 100644 --- a/media-gfx/darktable/ChangeLog +++ b/media-gfx/darktable/ChangeLog @@ -1,6 +1,11 @@ # 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.4 2011/08/14 23:38:26 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.5 2011/08/14 23:41:46 radhermit Exp $ + + 14 Aug 2011; Tim Harder <radhermit@gentoo.org> -darktable-0.9.ebuild, + -darktable-0.9-r1.ebuild, -darktable-0.9.1.ebuild, + -files/darktable-0.9-system-libraw.patch: + Remove old *darktable-0.9.1-r1 (14 Aug 2011) diff --git a/media-gfx/darktable/darktable-0.9-r1.ebuild b/media-gfx/darktable/darktable-0.9-r1.ebuild deleted file mode 100644 index 04cda9639951..000000000000 --- a/media-gfx/darktable/darktable-0.9-r1.ebuild +++ /dev/null @@ -1,91 +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-r1.ebuild,v 1.1 2011/07/21 08:55:05 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/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="debug flickr gconf gnome-keyring gphoto2 kde nls openmp +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}-automagic-deps.patch - "${FILESDIR}"/${P}-system-libraw.patch - "${FILESDIR}"/${P}-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_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.1.ebuild b/media-gfx/darktable/darktable-0.9.1.ebuild deleted file mode 100644 index f3de6c4aaaae..000000000000 --- a/media-gfx/darktable/darktable-0.9.1.ebuild +++ /dev/null @@ -1,91 +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.ebuild,v 1.1 2011/07/28 06:57:48 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 +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}"/${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_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.ebuild b/media-gfx/darktable/darktable-0.9.ebuild deleted file mode 100644 index 94c359a67baa..000000000000 --- a/media-gfx/darktable/darktable-0.9.ebuild +++ /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-0.9.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-system-libraw.patch b/media-gfx/darktable/files/darktable-0.9-system-libraw.patch deleted file mode 100644 index 1ac8afab03b3..000000000000 --- a/media-gfx/darktable/files/darktable-0.9-system-libraw.patch +++ /dev/null @@ -1,90 +0,0 @@ ---- darktable-0.9.orig/cmake/modules/FindLibraw.cmake -+++ darktable-0.9/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.orig/src/CMakeLists.txt -+++ darktable-0.9/src/CMakeLists.txt -@@ -65,7 +65,6 @@ - - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}) --include_directories(${CMAKE_CURRENT_SOURCE_DIR}/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}) -@@ -280,17 +279,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}/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") -@@ -305,9 +293,6 @@ - install(TARGETS lib_darktable DESTINATION ${LIB_INSTALL}/darktable) - list(APPEND LIBS lib_darktable) - --# Compile libraw modules --add_subdirectory(LibRaw) -- - # Compile views modules - add_subdirectory(views) - ---- darktable-0.9.orig/src/common/imageio.c -+++ darktable-0.9/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); |