Version bump.

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

3 files changed, 189 insertions, 1 deletions

diff --git a/media-gfx/gmic/ChangeLog b/media-gfx/gmic/ChangeLog
index af9af89edc5d..796056117a7e 100644
--- a/media-gfx/gmic/ChangeLog
+++ b/media-gfx/gmic/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gmic
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.45 2014/02/11 05:30:27 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.46 2014/03/19 08:03:17 radhermit Exp $
+
+*gmic-1.5.8.4 (19 Mar 2014)
+
+  19 Mar 2014; Tim Harder <radhermit@gentoo.org> +gmic-1.5.8.4.ebuild,
+  +files/gmic-1.5.8.4-makefile.patch:
+  Version bump.
 
 *gmic-1.5.8.3 (11 Feb 2014)
 
diff --git a/media-gfx/gmic/files/gmic-1.5.8.4-makefile.patch b/media-gfx/gmic/files/gmic-1.5.8.4-makefile.patch
new file mode 100644
index 000000000000..53f511fdfba9
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-1.5.8.4-makefile.patch
@@ -0,0 +1,109 @@
+--- gmic-1.5.8.4/src/Makefile
++++ gmic-1.5.8.4/src/Makefile
+@@ -77,7 +77,6 @@
+ 

+ # Flags that are mandatory to compile 'gmic'.

+ MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/include

+-MANDATORY_LDFLAGS += -L$(USR)/lib

+ ifeq ($(CC),g++)

+ MANDATORY_CFLAGS += -Wall -W

+ MANDATORY_LDFLAGS += -lm

+@@ -121,14 +120,14 @@
+ # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).

+ # This requires the presence of the X11 include and library files.

+ # (package 'libx11-dev' on Debian).

+-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_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr

++X11_LDFLAGS = -lX11 -lpthread #-lXrandr

+ 

+ # Flags to enable fast display, using XShm.

+ # This requires the presence of the X11 extension include and library files.

+ # (package 'libx11-dev' on Debian).

+ XSHM_CFLAGS = -Dcimg_use_xshm

+-XSHM_LDFLAGS = -L$(USR)/X11R6/lib -lXext

++XSHM_LDFLAGS = -lXext

+ 

+ # Flags to enable image display, using GDI32.

+ # This requires the presence of the GDI32 include and library files.

+@@ -163,7 +162,7 @@
+ # This requires the presence of the FFMPEG include and library files.

+ # (packages 'libavcodec-dev', 'libavutil-dev', 'libavformat-dev' and 'libswscale-dev' on Debian).

+ FFMPEG_CFLAGS = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS -I$(USR)/include/libavcodec -I$(USR)/include/libavformat -I$(USR)/include/libswscale -I$(USR)/include/ffmpeg

+-FFMPEG_LDFLAGS = -lavcodec -lavformat -lswscale

++FFMPEG_LDFLAGS = -lavcodec -lavformat -lavutil -lswscale

+ 

+ # Flags to enable native support for compressed .cimgz files, using the Zlib library.

+ # This requires the presence of the Zlib include and library files.

+@@ -174,14 +173,8 @@
+ # Flags to enable native support of webcams, using the OpenCV library.

+ # This requires the presence of the OpenCV include and library files.

+ # (package 'libcv3-2-dev' on Debian).

+-ifeq ($(OS),Darwin)

+ OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv

+ OPENCV_LDFLAGS = `pkg-config opencv --libs`   #-> Use this for OpenCV 2.2.0 !

+-else

+-OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv

+-# 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.

+ # This requires the presence of the GraphicsMagick++ include and library files.

+@@ -308,10 +301,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) $(OPT_LDFLAGS)" gmic_lib

++	$(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib

+ 

+ zart: lib

+ ifneq ($(OS),Darwin)

+@@ -331,13 +324,13 @@
+ 	$(MAKE) "CFLAGS+=$(MINIMAL_UNIX_CFLAGS)" "LDFLAGS+=$(MINIMAL_UNIX_LDFLAGS)" gmic_cli_standard

+ 

+ linux:

+-	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_cli_standard

++	$(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_UNIX_LDFLAGS)" gmic_cli_standard

+ 

+ linux_alltypes:

+ 	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_cli_alltypes

+ 

+ custom:

+-	$(MAKE) "CFLAGS=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(CUST_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_cli_alltypes

++	$(MAKE) "CFLAGS+=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(CUST_UNIX_LDFLAGS)" gmic_cli_alltypes

+ 

+ solaris:

+ 	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic_cli_standard

+@@ -355,10 +348,9 @@
+ gmic_lib.o: gmic.cpp gmic_def.h

+ 	$(CC) -o gmic_lib.o -c gmic.cpp -fPIC $(CFLAGS) -Dgmic_float_only

+ gmic_lib: gmic_lib.o

+-	ar rcs libgmic.a gmic_lib.o

++	$(AR) rcs libgmic.a gmic_lib.o

+ ifneq ($(OS),Darwin)

+ 	$(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)

+ else

+ 	$(CC) -shared -o libgmic.so gmic_lib.o $(LDFLAGS)

+ endif

+@@ -367,7 +359,6 @@
+ 	$(CC) -o gmic_gimp.o -c gmic.cpp $(CFLAGS) -Dgmic_gimp -Dgmic_float_only

+ 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_bool.o: gmic.cpp

+ 	$(CC) -o gmic_bool.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_bool

+@@ -389,7 +380,6 @@
+ 	$(CC) -o gmic_double.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_double

+ gmic_cli_alltypes: 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_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)

+ 

+ gmic_cli_standard: gmic.cpp

+ 	$(CC) -o gmic gmic.cpp $(CFLAGS) -Dgmic_float_only -Dgmic_main $(LDFLAGS)

diff --git a/media-gfx/gmic/gmic-1.5.8.4.ebuild b/media-gfx/gmic/gmic-1.5.8.4.ebuild
new file mode 100644
index 000000000000..04553acd8093
--- /dev/null
+++ b/media-gfx/gmic/gmic-1.5.8.4.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.4.ebuild,v 1.1 2014/03/19 08:03:17 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}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.5.8.2-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}" OPT_CFLAGS= DEBUG_CFLAGS= 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}
+}