Version bump.

(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

4 files changed, 247 insertions, 1 deletions

diff --git a/media-gfx/gmic/ChangeLog b/media-gfx/gmic/ChangeLog
index e8a8108bd593..40aa7407339a 100644
--- a/media-gfx/gmic/ChangeLog
+++ b/media-gfx/gmic/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gmic
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.4 2011/11/07 05:57:36 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.5 2011/12/06 10:10:56 radhermit Exp $
+
+*gmic-1.5.0.7 (06 Dec 2011)
+
+  06 Dec 2011; Tim Harder <radhermit@gentoo.org> +gmic-1.5.0.7.ebuild,
+  +files/gmic-1.5.0.7-ffmpeg.patch, +files/gmic-1.5.0.7-makefile.patch:
+  Version bump.
 
 *gmic-1.5.0.6 (07 Nov 2011)
 
diff --git a/media-gfx/gmic/files/gmic-1.5.0.7-ffmpeg.patch b/media-gfx/gmic/files/gmic-1.5.0.7-ffmpeg.patch
new file mode 100644
index 000000000000..7c7e1bf873cb
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-1.5.0.7-ffmpeg.patch
@@ -0,0 +1,46 @@
+--- gmic-1.5.0.7/src/CImg.h.orig
++++ gmic-1.5.0.7/src/CImg.h
+@@ -310,6 +310,7 @@
+ extern "C" {
+ #include "avformat.h"
+ #include "avcodec.h"
++#include "libavutil/mathematics.h"
+ #include "swscale.h"
+ }
+ #endif
+@@ -41744,7 +41745,7 @@
+         // as a vector 1x4 containing : (nb_frames,width,height,fps).
+         if (!first_frame && !last_frame && !step_frame) {
+           for (vstream = 0; vstream<(int)(format_ctx->nb_streams); ++vstream)
+-            if (format_ctx->streams[vstream]->codec->codec_type==CODEC_TYPE_VIDEO) break;
++            if (format_ctx->streams[vstream]->codec->codec_type==AVMEDIA_TYPE_VIDEO) break;
+           if (vstream==(int)format_ctx->nb_streams) assign();
+           else {
+             CImgList<doubleT> timestamps;
+@@ -41774,7 +41775,7 @@
+         }
+ 
+         for (vstream = 0; vstream<(int)(format_ctx->nb_streams) &&
+-               format_ctx->streams[vstream]->codec->codec_type!=CODEC_TYPE_VIDEO; ) ++vstream;
++               format_ctx->streams[vstream]->codec->codec_type!=AVMEDIA_TYPE_VIDEO; ) ++vstream;
+         if (vstream==(int)format_ctx->nb_streams) {
+           av_close_input_file(format_ctx); format_ctx = 0;
+           return load_ffmpeg_external(filename);
+@@ -42350,7 +42351,7 @@
+ 
+       AVCodecContext *c = video_str->codec;
+       c->codec_id = fmt->video_codec;
+-      c->codec_type = CODEC_TYPE_VIDEO;
++      c->codec_type = AVMEDIA_TYPE_VIDEO;
+       c->bit_rate = 1024*bitrate;
+       c->width = frame_dimx;
+       c->height = frame_dimy;
+@@ -42510,7 +42511,7 @@
+           AVPacket pkt;
+           av_init_packet(&pkt);
+           pkt.pts = av_rescale_q(c->coded_frame->pts,c->time_base,video_str->time_base);
+-          if (c->coded_frame->key_frame) pkt.flags|=PKT_FLAG_KEY;
++          if (c->coded_frame->key_frame) pkt.flags|=AV_PKT_FLAG_KEY;
+           pkt.stream_index = video_str->index;
+           pkt.data = video_outbuf;
+           pkt.size = out_size;
diff --git a/media-gfx/gmic/files/gmic-1.5.0.7-makefile.patch b/media-gfx/gmic/files/gmic-1.5.0.7-makefile.patch
new file mode 100644
index 000000000000..162872afbf3a
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-1.5.0.7-makefile.patch
@@ -0,0 +1,130 @@
+--- gmic-1.5.0.7/src/Makefile.orig
++++ gmic-1.5.0.7/src/Makefile
+@@ -90,7 +90,7 @@
+ 
+ # Flags that are mandatory to compile 'gmic'.
+ MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/include
+-MANDATORY_LDFLAGS += -L$(USR)/lib
++MANDATORY_LDFLAGS +=
+ ifeq ($(IS_GCC),yes)
+ MANDATORY_CFLAGS += -Wall -W
+ MANDATORY_LDFLAGS += -lm
+@@ -101,21 +101,21 @@
+ DEBUG_CFLAGS = -Dcimg_use_vt100 -Dcimg_verbosity=3 -g
+ 
+ # Flags to enable optimizations.
+-ifeq ($(IS_GCC),yes)
+-OPT_CFLAGS = -O3 -fno-tree-pre # -ffast-math
+-endif
+-ifeq ($(CC),icc)
+-OPT_CFLAGS = -O3 -ipo -no-prec-div -override-limits
+-endif
++#ifeq ($(IS_GCC),yes)
++#OPT_CFLAGS = -O3 -fno-tree-pre # -ffast-math
++#endif
++#ifeq ($(CC),icc)
++#OPT_CFLAGS = -O3 -ipo -no-prec-div -override-limits
++#endif
+ 
+ # Flags to enable image display, using X11
+ # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
+ X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
+-X11_LDFLAGS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr
++X11_LDFLAGS = -lX11 -lpthread #-lXrandr
+ 
+ # Flags to enable fast display, using XShm.
+ XSHM_CFLAGS = -Dcimg_use_xshm
+-XSHM_LDFLAGS = -L$(USR)/X11R6/lib -lXext
++XSHM_LDFLAGS = -lXext
+ 
+ # Flags to enable image display, using GDI32.
+ GDI32_CFLAGS = -Dcimg_display=2 -Dcimg_appname=\\\"gmic\\\"
+@@ -147,12 +147,7 @@
+ 
+ # Flags to enable native support of webcams, using the OpenCV library.
+ OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include/opencv
+-ifeq ($(OS),Darwin)
+ OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui   # Use this for OpenCV 2.2.0 !
+-else
+-OPENCV_LDFLAGS = -lcv -lhighgui
+-# OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui   # Use this for OpenCV 2.2.0 !
+-endif
+ 
+ # Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library.
+ MAGICK_CFLAGS = -Dcimg_use_magick -I$(USR)/include/GraphicsMagick
+@@ -189,11 +184,11 @@
+ 	           $(EXR_LDFLAGS) $(FFTW_LDFLAGS) $(OPENCV_LDFLAGS) # $(FFMPEG_LDFLAGS) $(XSHM_LDFLAGS) # $(MAGICK_LDFLAGS)
+ 
+ CUST_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
+-                   $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(MINC2_CFLAGS) $(ZLIB_CFLAGS) \
+-	           $(FFTW_CFLAGS) $(BOARD_CFLAGS) $(EXR_CFLAGS) $(MAGICK_CFLAGS) # $(FFMPEG_CFLAGS) $(OPENCV_CFLAGS)
++                   $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \
++	           $(FFTW_CFLAGS) $(EXR_CFLAGS) $(MAGICK_CFLAGS) $(FFMPEG_CFLAGS) $(OPENCV_CFLAGS)
+ CUST_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(X11_LDFLAGS) $(XSHM_LDFLAGS) $(PNG_LDFLAGS) \
+-                    $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(MINC2_LDFLAGS) $(ZLIB_LDFLAGS) \
+-	    	    $(FFTW_LDFLAGS) $(BOARD_LDFLAGS) $(EXR_LDFLAGS) $(MAGICK_LDFLAGS) # $(FFMPEG_LDFLAGS) $(OPENCV_LDFLAGS)
++                    $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(ZLIB_LDFLAGS) \
++	    	    $(FFTW_LDFLAGS) $(EXR_LDFLAGS) $(MAGICK_LDFLAGS) $(FFMPEG_LDFLAGS) $(OPENCV_LDFLAGS)
+ 
+ DEBUG_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
+                     $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) \
+@@ -219,7 +214,7 @@
+ STD_WINDOWS_LDFLAGS = $(MANDATORY_LDFLAGS) $(GDI32_LDFLAGS) $(ZLIB_LDFLAGS) $(PNG_LDFLAGS) $(JPEG_LDFLAGS) $(FFTW_LDFLAGS)
+ 
+ STD_GIMP_CFLAGS = -Dgmic_build -Dcimg_display=0 -Dcimg_use_rng -I$(USR)/include $(FFTW_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) ${IS_BETA_CFLAGS}
+-STD_GIMP_LDFLAGS = -L$(USR)/lib -lpthread $(FFTW_LDFLAGS) $(PNG_LDFLAGS) $(ZLIB_LDFLAGS)
++STD_GIMP_LDFLAGS = -lpthread $(FFTW_LDFLAGS) $(PNG_LDFLAGS) $(ZLIB_LDFLAGS)
+ ifeq ($(OS),MINGW32_NT-5.1)
+ STD_GIMP_LDFLAGS += -mwindows
+ endif
+@@ -263,10 +258,10 @@
+ endif
+ 
+ gimp:
+-	$(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" "STRIP_EXE=1" gmic_gimp
++	$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" gmic_gimp
+ 
+ lib:
+-	$(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS)" gmic_lib
++	$(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS)" gmic_lib
+ 
+ # Entries for non-default configurations.
+ minimal:
+@@ -276,10 +271,10 @@
+ 	$(MAKE) "CFLAGS+=$(DEBUG_UNIX_CFLAGS)" "LDFLAGS+=$(DEBUG_UNIX_LDFLAGS)" gmic_minimal
+ 
+ linux:
+-	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
++	$(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_UNIX_LDFLAGS)" gmic_gmic
+ 
+ custom:
+-	$(MAKE) "CFLAGS=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(CUST_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
++	$(MAKE) "CFLAGS+=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(CUST_UNIX_LDFLAGS)" gmic_gmic
+ 
+ solaris:
+ 	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic_gmic
+@@ -297,7 +292,7 @@
+ gmic_lib.o: gmic.cpp gmic_def.h
+ 	$(CC) -o gmic_lib.o -c gmic.cpp -fPIC -Dgmic_minimal -Dgmic_float $(CFLAGS)
+ gmic_lib: gmic_lib.o
+-	ar rcs libgmic.a gmic_lib.o
++	$(AR) rcs libgmic.a gmic_lib.o
+ 	$(CC) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so gmic_lib.o $(LDFLAGS)
+ 	$(CC) -o gmic_use_lib gmic_use_lib.cpp -L. -lgmic $(FFTW_LDFLAGS)
+ 
+@@ -305,7 +300,6 @@
+ 	$(CC) -o gmic_gimp.o -c gmic.cpp -Dgmic_gimp -Dgmic_minimal -Dgmic_float $(CFLAGS)
+ gmic_gimp : gmic_gimp.o gmic_gimp.cpp
+ 	$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LDFLAGS)
+-	strip gmic_gimp$(EXE)
+ 
+ gmic_minimal: gmic.cpp
+ 	$(CC) -o gmic gmic.cpp -Dgmic_minimal -Dgmic_float -Dgmic_main $(CFLAGS) $(LDFLAGS)
+@@ -330,7 +324,6 @@
+ 	$(CC) -o gmic_double.o -c gmic.cpp -Dgmic_separate_compilation -Dgmic_double $(CFLAGS)
+ gmic_gmic: gmic.cpp gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o gmic_def.h
+ 	$(CC) -o gmic gmic.cpp -Dgmic_separate_compilation -Dgmic_main $(CFLAGS) gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o $(LDFLAGS)
+-	strip gmic$(EXE)
+ 
+ def:
+ 	@echo "#ifndef gmic_gimp" > gmic_def.h
diff --git a/media-gfx/gmic/gmic-1.5.0.7.ebuild b/media-gfx/gmic/gmic-1.5.0.7.ebuild
new file mode 100644
index 000000000000..2aa4f20d9d26
--- /dev/null
+++ b/media-gfx/gmic/gmic-1.5.0.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.5.0.7.ebuild,v 1.1 2011/12/06 10:10:56 radhermit Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs bash-completion-r1
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="http://gmic.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="CeCILL-2"
+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 )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg? ( virtual/jpeg )
+	opencv? ( media-libs/opencv )
+	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}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-ffmpeg.patch
+
+	for i in ffmpeg fftw jpeg opencv png tiff zlib ; do
+		use $i || { sed -i -r -e "s/^(${i}_(C|LD)FLAGS =).*/\1/I" Makefile || die ; }
+	done
+
+	use graphicsmagick || { sed -i -r -e "s/^(MAGICK_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
+	use openexr || { sed -i -r -e "s/^(EXR_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
+	use X || { sed -i -r -e "s/^((X11|XSHM)_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCXX)" custom bashcompletion lib
+}
+
+src_install() {
+	dobin gmic
+	newlib.so libgmic.so libgmic.so.1
+	insinto /usr/include
+	doins gmic.h
+	doman ../man/gmic.1.gz
+	dodoc ../{AUTHORS,README}
+	newbashcomp gmic_bashcompletion.sh ${PN}
+}