Version bump. Drop doc use flag, online reference manual should be used or downloaded instead.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

3 files changed, 104 insertions, 2 deletions

diff --git a/media-gfx/gmic/ChangeLog b/media-gfx/gmic/ChangeLog
index 417f870a90ca..0775d19fc854 100644
--- a/media-gfx/gmic/ChangeLog
+++ b/media-gfx/gmic/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/gmic
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.43 2013/12/20 19:23:33 radhermit Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.44 2014/01/27 02:51:07 radhermit Exp $
+
+*gmic-1.5.8.2 (27 Jan 2014)
+
+  27 Jan 2014; Tim Harder <radhermit@gentoo.org> +gmic-1.5.8.2.ebuild,
+  +files/gmic-1.5.8.2-ffmpeg.patch:
+  Version bump. Drop doc use flag, online reference manual should be used or
+  downloaded instead.
 
   20 Dec 2013; Tim Harder <radhermit@gentoo.org> -gmic-1.5.5.1.ebuild,
   -gmic-1.5.5.2.ebuild, -gmic-1.5.6.1.ebuild, -gmic-1.5.7.1.ebuild,
diff --git a/media-gfx/gmic/files/gmic-1.5.8.2-ffmpeg.patch b/media-gfx/gmic/files/gmic-1.5.8.2-ffmpeg.patch
new file mode 100644
index 000000000000..474dae9f8016
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-1.5.8.2-ffmpeg.patch
@@ -0,0 +1,22 @@
+--- gmic-1.5.8.2/src/CImg.h
++++ gmic-1.5.8.2/src/CImg.h
+@@ -319,6 +319,7 @@
+ extern "C" {
+ #include <libavformat/avformat.h>
+ #include <libavcodec/avcodec.h>
++#include <libavutil/mathematics.h>
+ #include <libswscale/swscale.h>
+ }
+ #endif
+@@ -45789,7 +45790,11 @@
+         AVPacket pkt;
+         int got_packet;
+         av_init_packet(&pkt);
++#if LIBAVCODEC_VERSION_INT<AV_VERSION_INT(54,1,0)
++        out_size = avcodec_encode_video(c,video_outbuf,video_outbuf_size,picture);
++#else
+         out_size = avcodec_encode_video2(c,&pkt,picture,&got_packet);
++#endif
+         if (got_packet) {
+           pkt.pts = av_rescale_q(c->coded_frame->pts,c->time_base,video_str->time_base);
+           if (c->coded_frame->key_frame) pkt.flags|=AV_PKT_FLAG_KEY;
diff --git a/media-gfx/gmic/gmic-1.5.8.2.ebuild b/media-gfx/gmic/gmic-1.5.8.2.ebuild
new file mode 100644
index 000000000000..6c39a2e4bc62
--- /dev/null
+++ b/media-gfx/gmic/gmic-1.5.8.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.5.8.2.ebuild,v 1.1 2014/01/27 02:51:07 radhermit Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs bash-completion-r1 flag-o-matic
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="http://gmic.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="CeCILL-2 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ffmpeg fftw graphicsmagick jpeg opencv openexr png tiff X zlib"
+
+RDEPEND="
+	ffmpeg? ( virtual/ffmpeg )
+	fftw? ( sci-libs/fftw:3.0[threads] )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg? ( virtual/jpeg )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
+	openexr? (
+		media-libs/ilmbase
+		media-libs/openexr
+	)
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}/src
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.5.8.0-makefile.patch
+	epatch "${FILESDIR}"/${P}-ffmpeg.patch
+
+	for i in ffmpeg fftw jpeg opencv png tiff zlib ; do
+		use $i || { sed -i -r "s/^(${i}_(C|LD)FLAGS =).*/\1/I" Makefile || die ; }
+	done
+
+	use graphicsmagick || { sed -i -r "s/^(MAGICK_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
+	use openexr || { sed -i -r "s/^(EXR_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
+
+	if ! use X ; then
+		sed -i -r "s/^((X11|XSHM)_(C|LD)FLAGS =).*/\1/" Makefile || die
+
+		# disable display capabilities when X support is disabled
+		append-cppflags -Dcimg_display=0
+	fi
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" custom lib
+}
+
+src_install() {
+	dobin gmic
+	newlib.so libgmic.so libgmic.so.1
+
+	insinto /usr/include
+	doins gmic.h
+
+	doman ../man/gmic.1.gz
+	dodoc ../README
+
+	newbashcomp gmic_bashcompletion.sh ${PN}
+}