From 80a58dacab25c910084f80139df3acb9b7849712 Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Thu, 4 Mar 2010 16:14:47 +0000 Subject: Version bump. Drop unused and broken. (Portage version: 2.2_rc63/cvs/Linux x86_64) --- media-gfx/dcraw/ChangeLog | 8 ++- media-gfx/dcraw/dcraw-8.86.ebuild | 83 ------------------------ media-gfx/dcraw/dcraw-8.99.ebuild | 132 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 139 insertions(+), 84 deletions(-) delete mode 100644 media-gfx/dcraw/dcraw-8.86.ebuild create mode 100644 media-gfx/dcraw/dcraw-8.99.ebuild (limited to 'media-gfx') diff --git a/media-gfx/dcraw/ChangeLog b/media-gfx/dcraw/ChangeLog index 406a5a066f01..642a4e4c06ec 100644 --- a/media-gfx/dcraw/ChangeLog +++ b/media-gfx/dcraw/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/dcraw # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/ChangeLog,v 1.53 2010/03/04 10:09:29 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/ChangeLog,v 1.54 2010/03/04 16:14:47 pva Exp $ + +*dcraw-8.99 (04 Mar 2010) + + 04 Mar 2010; Peter Volkov -dcraw-8.86.ebuild, + +dcraw-8.99.ebuild: + Version bump. Drop unused and broken. 04 Mar 2010; Pawel Hajdan jr dcraw-8.98-r1.ebuild: x86 stable wrt bug #304229 diff --git a/media-gfx/dcraw/dcraw-8.86.ebuild b/media-gfx/dcraw/dcraw-8.86.ebuild deleted file mode 100644 index 75103c1c53d5..000000000000 --- a/media-gfx/dcraw/dcraw-8.86.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-8.86.ebuild,v 1.2 2009/09/23 15:11:57 ssuominen Exp $ - -inherit eutils toolchain-funcs - -DESCRIPTION="Converts the native (RAW) format of various digital cameras into netpbm portable pixmap (.ppm) image" -HOMEPAGE="http://www.cybercom.net/~dcoffin/dcraw/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="freedist GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="gimp jpeg lcms" - -DEPEND="jpeg? ( >=media-libs/jpeg-6b ) - lcms? ( media-libs/lcms ) - gimp? ( media-gfx/gimp )" - -RDEPEND="${DEPEND} - media-libs/netpbm" - -src_compile() { - local mymakeopts - use lcms || mymakeopts="${mymakeopts} NO_LCMS=yes" - use jpeg || mymakeopts="${mymakeopts} NO_JPEG=yes" - emake CC=$(tc-getCC) ${mymakeopts} || die "make failed" - - # rawphoto gimp plugin - if use gimp; then - - # find gimptool (ugly!) - local gimptool=/usr/bin/gimptool - if [ ! -x ${gimptool} ]; then - gimptool=${gimptool}-2.0 - if [ ! -x ${gimptool} ]; then - die "Couldn't find gimptool. Please reinstall gimp." - fi - fi - - # build plugin - ${gimptool} --build rawphoto.c || die "gimptool failed" - - fi -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - dodoc doc/conversion-examples.txt doc/dcwrap - - # rawphoto gimp plugin - if use gimp; then - - # find gimptool (ugly!) - local gimptool=/usr/bin/gimptool - if [ ! -x ${gimptool} ]; then - gimptool=${gimptool}-2.0 - if [ ! -x ${gimptool} ]; then - die "Couldn't find gimptool. Please reinstall gimp." - fi - fi - - # install plugin - env DESTDIR="${D}" ${gimptool} --install-admin-bin rawphoto || die "gimptool failed" - - fi -} - -pkg_postinst() { - elog "" - elog "See conversion-examples.txt.gz on how to convert" - elog "the PPM files produced by dcraw to other image formats." - elog "" - ewarn "The functionality of the external program 'fujiturn' was" - ewarn "incoporated into dcraw and is automatically used now." - elog "" - elog "There's an example wrapper script included called 'dcwrap'." - elog "" - elog "This package also includes 'dcparse', which extracts" - elog "thumbnail images (preferably JPEGs) from any raw digital" - elog "camera formats that have them, and shows table contents." - elog "" -} diff --git a/media-gfx/dcraw/dcraw-8.99.ebuild b/media-gfx/dcraw/dcraw-8.99.ebuild new file mode 100644 index 000000000000..6468aa96cb63 --- /dev/null +++ b/media-gfx/dcraw/dcraw-8.99.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-8.99.ebuild,v 1.1 2010/03/04 16:14:47 pva Exp $ + +EAPI="2" + +inherit eutils toolchain-funcs + +DESCRIPTION="Converts the native (RAW) format of various digital cameras into netpbm portable pixmap (.ppm) image" +HOMEPAGE="http://www.cybercom.net/~dcoffin/dcraw/" +SRC_URI="http://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz + mirror://gentoo/parse-1.69.tar.bz2 + gimp? ( mirror://gentoo/rawphoto-1.32.tar.bz2 )" + +LICENSE="freedist GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="nls gimp jpeg lcms" + +COMMON_DEPEND="jpeg? ( >=media-libs/jpeg-6b ) + lcms? ( media-libs/lcms ) + gimp? ( media-gfx/gimp )" +DEPEND="${COMMON_DEPEND} + nls? ( sys-devel/gettext ) + gimp? ( dev-util/pkgconfig )" +RDEPEND="${COMMON_DEPEND} + media-libs/netpbm" + +S=${WORKDIR}/dcraw + +LANGS="ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW" + +for lng in ${LANGS}; do + IUSE+=" linguas_${lng}" +done + +# Helper function to list only langs listed in LANGS or +linguas_list() { + local nolangs=true + for lng in ${LANGS}; do + if use linguas_${lng}; then + nolangs=false + echo " ${lng}" + fi + done + if ${nolangs}; then + echo ${LANGS} + fi +} + +run_build() { + einfo "${@}" + ${@} || die +} + +src_prepare() { + rename dcraw_ dcraw. dcraw_*.1 || die "Failed to rename" +} + +src_compile() { + local ECFLAGS="-O2" # Without optimisation build fails + local ELIBS="-lm" + if use lcms; then + ELIBS="-llcms ${ELIBS}" + else + ECFLAGS+=" -DNO_LCMS=yes" + fi + if use jpeg; then + ELIBS="-ljpeg ${ELIBS}" + else + ECFLAGS+=" -DNO_JPEG=yes" + fi + if use nls; then + ECFLAGS+=" -DLOCALEDIR=\"/usr/share/locale/\"" + fi + + run_build $(tc-getCC) ${ECFLAGS} ${CFLAGS} ${LDFLAGS} \ + -o dcraw dcraw.c ${ELIBS} + + run_build $(tc-getCC) -O2 ${CFLAGS} ${LDFLAGS} \ + -o dcparse parse.c + + # rawphoto gimp plugin + if use gimp; then + run_build $(tc-getCC) ${CFLAGS} ${LDFLAGS} \ + $(pkg-config --cflags gimpui-2.0) rawphoto.c -o rawphoto \ + $(pkg-config --libs gimpui-2.0) + fi + + if use nls; then + for lng in $(linguas_list); do + run_build msgfmt -c -o dcraw_${lng}.mo dcraw_${lng}.po + done + fi +} + +src_install() { + dobin dcraw dcparse || die + dodoc "${FILESDIR}"/{conversion-examples.txt,dcwrap} || die + + # rawphoto gimp plugin + if use gimp; then + insinto "$(pkg-config --variable=gimplibdir gimp-2.0)/plug-ins" + insopts -m0755 + doins rawphoto || die + fi + + doman dcraw.1 || die + if use nls; then + for lng in $(linguas_list); do + [[ -f dcraw.${lng}.1 ]] && doman dcraw.${lng}.1 + insinto /usr/share/locale/${lng}/LC_MESSAGES + newins dcraw_${lng}.mo dcraw.mo || die "failed to install dcraw_${lng}.mo" + done + fi +} + +pkg_postinst() { + elog "" + elog "See conversion-examples.txt.gz on how to convert" + elog "the PPM files produced by dcraw to other image formats." + elog "" + ewarn "The functionality of the external program 'fujiturn' was" + ewarn "incorporated into dcraw and is automatically used now." + elog "" + elog "There's an example wrapper script included called 'dcwrap'." + elog "" + elog "This package also includes 'dcparse', which extracts" + elog "thumbnail images (preferably JPEGs) from any raw digital" + elog "camera formats that have them, and shows table contents." + elog "" +} -- cgit v1.2.3-65-gdbad