# 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)
Hash: SHA512
AUX gmic-1.5.0.4-makefile.patch 6103 RMD160 20467bf823bdde29e554f29d18cc64328ccb5079 SHA1 6ea32fef37a2b2971bf23cf7f17ef9c408fe79c5 SHA256 98e27d448764fe3704ae38d0eba08b19be3fdd7c9356e02b7f580f513b2ac5b3
+AUX gmic-1.5.0.7-ffmpeg.patch 1927 RMD160 bb0d018a362b84d9b9ecea1a82f5c46c9f620206 SHA1 075a441d8f9f0e62f7d507ad8d785462642c2d8e SHA256 57e36922ecd33f8b05666ff707ed7f8cba2d9c732ae3bad7bd379a52bf2c0b25
+AUX gmic-1.5.0.7-makefile.patch 6120 RMD160 83e29d43ad174a478efe89e6c455dccdafd451e5 SHA1 2ab0ea1e0c1f2da6c4ab3a41328ad3e62c548afa SHA256 5a6954258f0ed7ec82fa85ad548fb6df6fc4540bbb4c75908bc58a49aacddea0
DIST gmic_1.5.0.4.tar.gz 1250701 RMD160 007a7bfbdec30fd42868fa2eabe9d52a69c001cc SHA1 b466bad3c5feec25c17a0004e7e3e4bdab1b64ba SHA256 0be5a5a7360f155b5f7e152035acaf936452dd613e518b427b81669b318de7ed
DIST gmic_1.5.0.5.tar.gz 1262276 RMD160 78eeb10bcb493eb0a3b7b917244349514c87520e SHA1 30c626339d6060b3bc22a0d5cea13a41491861df SHA256 8856b18241dfd49871df5b5fa2198cb79e60f3a7ee5a1b69306ac8ff9b8719cc
DIST gmic_1.5.0.6.tar.gz 1219169 RMD160 dc994f0abb6110ee4aa98e0beb8ac1da49f1d716 SHA1 618fa03c88f470790c341d82461db2d23c0443fa SHA256 6eb4370242637854f806bb8fb9b69781e2f75d066e795cad8b450b9ce5154c68
+DIST gmic_1.5.0.7.tar.gz 1228525 RMD160 c1fadcb904b25c8b0056204a9124ab461212c5f6 SHA1 45c85e0ed09caf6c2a41bd3d01747fcc5b5bf284 SHA256 b74d873d5d57947ae7848fb926faa73d98a0aea6fc7b5a305b3b824a67762f54
EBUILD gmic-1.5.0.4.ebuild 1682 RMD160 ca186689a2c366ae961834e01e71cc55b319fc0c SHA1 2ff76e5b9678ed57aff899a1db6ad38dbd5d49bf SHA256 c4163074e1f9ad1065ff2b4159e823acea95280edfa5927edb61a7dfaaefe854
EBUILD gmic-1.5.0.5.ebuild 1691 RMD160 b1ca8cee9d573c12d2cb5fb9a0ba3cc60448a56a SHA1 ebafc9f63b9c6c773574d1c44755a87a18b68b52 SHA256 6bb94f071552ce0689920ce36114ad942737b9f92ee860aed26cdba8293a5534
EBUILD gmic-1.5.0.6.ebuild 1708 RMD160 0d02d975655bf03c1f298a0cba813b7dd0ada9b2 SHA1 bacc70e1d74e331025fd9c6cdebabf0bd895d7f7 SHA256 8057d394d1cf804547e2b1a391f820c3af8e1430276d7482735787d66322b8d4
-MISC ChangeLog 765 RMD160 dedd8d431bd838dd52a4b48ef734f9c3599faa08 SHA1 4cb712d004afc98d2767aef978d0b6c31f85e2d5 SHA256 e41b3167cbbce4bbd41e17eb2339169593aed12cb95e03e0142303566ade192b
+EBUILD gmic-1.5.0.7.ebuild 1722 RMD160 d95b9adfbb7b10850e23fb5cf2418a3bd392c3f1 SHA1 9e523a25d5fc290453b993bff4a4693680f17694 SHA256 d990c7c9b1f49a9dc682b85cb696f223466ead41cd97eed818b0cd4b496258c9
+MISC ChangeLog 954 RMD160 40bbe47c655e94c24182b6e9c0d4ac1eb94075ba SHA1 d2d1c09a03a6140aa62853252c88c49f1c2e94b1 SHA256 a0c4713f3415639d546157f3a605513dc63ae91ef79324a933042eb8b17bce46
MISC metadata.xml 473 RMD160 680f8739786ae6d9221c0f6d2734cb16682c1b7c SHA1 1ce57e832b27b5e349e070cdeaf37ff11f500b18 SHA256 def06af4d0283b01f9313231ff05df286129ff57afbcac23fcc7c45d8f735a6c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBCgAGBQJOt3NZAAoJEEqz6FtPBkyj/WIIALLrHobYHbtLDJNCKrtaFHxC
-hlEW7sPk1U5CtzyeX5B0LBOycdtIZCFz1q/idDhVPPNNYjjusOqjnU2zCUCSIIjg
-bNFom+v/ZeEhTzK41faZvuv5BavYyofJPB5D2LSSEt2KBntGLIiVVdGH+vsSjJpu
-Cit8Ykgf4+BABJEiKc4ZtoCvpKCxheLf1314/uyPMAPAYQqYLWnMae3Os9dazaYf
-Irdh2MD36oF/ByXCmqdld8cprhgriX+wiPIhtptpomy3tQCcwzrFIuj1LvjbhHpV
-P1qv/jFKC1SezhOh93VyCUh7UPDvJksPmAfmI/ALSGMGko2EELFg9euIsqO8O3s=
-=2iLP
+iQEcBAEBCgAGBQJO3eo2AAoJEEqz6FtPBkyjzyUIAKOs/ZtWnQzFzAjzeRpaGdRw
+ODWRuI4FEnRK5E3ygxgm5yO7EKDqAdUsRsrv7Ld+Ui45m/PaiRZfcCeHxx8im/pc
+04V9jaHzcMq1yxgo1rHESAd8JqEox1vFF4PtNzeOJuC7lX8nL84QnfpcL9vETXUD
+ySc74L/ornJW8AazG1FRs48jULXnHEg4ygY1teWielY6G2am4hWpaIPLJts+5ulA
+WvG6B53i6wAK1XjVJtcAE0jZW4+xIOKWgl1p1ZRDM3YAuVJPionLXwdVBIp+xxTX
+ptAc+Ieiro8dTHfWu6g8AFI2sfdL5mqaARLn+mndXxdPn6rXygCH/TTgzliqxPk=
+=iX+f
-----END PGP SIGNATURE-----
--- /dev/null
+--- 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;
--- /dev/null
+--- 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
--- /dev/null
+# 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}
+}
projects / gentoo.git / commitdiff