diff options
| -rw-r--r-- | media-gfx/rawstudio/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/rawstudio/files/rawstudio-1.2-glibc-2.10.patch | 27 | ||||
| -rw-r--r-- | media-gfx/rawstudio/rawstudio-1.2.ebuild | 40 | ||||
| -rw-r--r-- | media-gfx/rawstudio/rawstudio-2.0.ebuild | 56 |
4 files changed, 6 insertions, 124 deletions
diff --git a/media-gfx/rawstudio/ChangeLog b/media-gfx/rawstudio/ChangeLog index 94103baf945a..3bb7027eb666 100644 --- a/media-gfx/rawstudio/ChangeLog +++ b/media-gfx/rawstudio/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/rawstudio # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/ChangeLog,v 1.32 2013/08/18 13:27:21 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/ChangeLog,v 1.33 2013/08/18 15:58:06 ssuominen Exp $ + + 18 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> + -files/rawstudio-1.2-glibc-2.10.patch, -rawstudio-1.2.ebuild, + -rawstudio-2.0.ebuild: + old 18 Aug 2013; Agostino Sarubbo <ago@gentoo.org> rawstudio-2.0-r1.ebuild: Stable for x86, wrt bug #479810 diff --git a/media-gfx/rawstudio/files/rawstudio-1.2-glibc-2.10.patch b/media-gfx/rawstudio/files/rawstudio-1.2-glibc-2.10.patch deleted file mode 100644 index a9f19a85f2a2..000000000000 --- a/media-gfx/rawstudio/files/rawstudio-1.2-glibc-2.10.patch +++ /dev/null @@ -1,27 +0,0 @@ -backported from upstream revision 2534 -http://bugzilla.rawstudio.org/show_bug.cgi?id=259 - -diff -ru rawstudio-1.2.orig/src/dcraw.cc rawstudio-1.2/src/dcraw.cc ---- rawstudio-1.2.orig/src/dcraw.cc 2009-08-08 09:09:30.000000000 +0200 -+++ rawstudio-1.2/src/dcraw.cc 2009-08-08 09:11:07.000000000 +0200 -@@ -8446,7 +8446,7 @@ - static int user_qual=-1, user_black=-1, user_sat=-1, user_flip=-1; - static int use_fuji_rotate=1, write_to_stdout=0, quality, i, c; - static char opm, opt, *ofname, *cp, *bpfile=0; -- static const char *sp, *dark_frame=0, *write_ext; -+ static const char *dark_frame=0, *write_ext; - static struct utimbuf ut; - static FILE *ofp; - #ifndef NO_LCMS -@@ -8510,8 +8510,9 @@ - argv[argc] = ""; - for (arg=1; (((opm = argv[arg][0]) - 2) | 2) == '+'; ) { - opt = argv[arg++][1]; -- if ((cp = strchr (sp="nbrkStqmHACg", opt))) -- for (i=0; i < "114111111422"[cp-sp]-'0'; i++) -+ /* creates warning on newer gcc's - doesn't matter, we'll never call main() */ -+// if ((cp = strchr (sp="nbrkStqmHACg", opt))) -+// for (i=0; i < "114111111422"[cp-sp]-'0'; i++) - if (!isdigit(argv[arg+i][0])) { - dcraw_message (DCRAW_ERROR,_("Non-numeric argument to \"-%c\"\n"), opt); - return 1; diff --git a/media-gfx/rawstudio/rawstudio-1.2.ebuild b/media-gfx/rawstudio/rawstudio-1.2.ebuild deleted file mode 100644 index 270c7792d5f0..000000000000 --- a/media-gfx/rawstudio/rawstudio-1.2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/rawstudio-1.2.ebuild,v 1.9 2013/02/07 22:29:07 ulm Exp $ - -EAPI=2 -inherit eutils - -DESCRIPTION="a program to read and manipulate raw images from digital cameras." -HOMEPAGE="http://rawstudio.org" -SRC_URI="http://${PN}.org/files/release/${P}.tar.gz" - -LICENSE="GPL-2 CC-BY-ND-2.5" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=">=dev-libs/libxml2-2.4 - >=gnome-base/gconf-2 - media-gfx/exiv2 - =media-libs/lcms-1* - media-libs/tiff - sys-apps/dbus - virtual/jpeg - >=x11-libs/gtk+-2.8:2" -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/gettext" - -src_prepare() { - epatch "${FILESDIR}"/${P}-glibc-2.10.patch -} - -src_configure() { - econf --disable-dependency-tracking -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed." - dodoc AUTHORS ChangeLog NEWS README TODO -} diff --git a/media-gfx/rawstudio/rawstudio-2.0.ebuild b/media-gfx/rawstudio/rawstudio-2.0.ebuild deleted file mode 100644 index 8dbda5c10197..000000000000 --- a/media-gfx/rawstudio/rawstudio-2.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/rawstudio-2.0.ebuild,v 1.6 2013/02/07 22:29:08 ulm Exp $ - -EAPI=4 -inherit autotools eutils - -DESCRIPTION="A program for reading and manipulating raw images from digital cameras" -HOMEPAGE="http://rawstudio.org/" -SRC_URI="http://${PN}.org/files/release/${P}.tar.gz" - -LICENSE="GPL-2 CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="dev-db/sqlite:3 - dev-libs/libxml2 - >=dev-libs/openssl-1 - >=gnome-base/gconf-2 - media-libs/flickcurl - =media-libs/lcms-1* - media-libs/lensfun - media-libs/libgphoto2 - media-libs/tiff - media-gfx/exiv2 - net-misc/curl - sci-libs/fftw:3.0 - sys-apps/dbus - sys-libs/zlib - virtual/jpeg - x11-libs/gtk+:2 - x11-libs/libX11" -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/gettext" - -DOCS=( AUTHORS NEWS README TODO ) - -src_prepare() { - find . -name Makefile.am -exec sed -i -e 's:-O4:-Wall:' {} + - sed -i -e '/^icondir/s:icons:pixmaps:' pixmaps/Makefile.am || die - epatch \ - "${FILESDIR}"/${P}-libpng15.patch \ - "${FILESDIR}"/${P}-g_thread_init.patch - eautoreconf -} - -src_configure() { - econf --disable-static -} - -src_install() { - default - prune_libtool_files --all -} |