diff options
author | Tim Harder <radhermit@gentoo.org> | 2012-05-30 05:58:17 +0000 |
---|---|---|
committer | Tim Harder <radhermit@gentoo.org> | 2012-05-30 05:58:17 +0000 |
commit | 646d9e3b1384ba52660f21e88f5b803d6feaa546 (patch) | |
tree | f3c01fa2b230761b779737bd3f423f742fe85fe9 /media-gfx | |
parent | Stable for x86, wrt bug #417799 (diff) | |
download | gentoo-2-646d9e3b1384ba52660f21e88f5b803d6feaa546.tar.gz gentoo-2-646d9e3b1384ba52660f21e88f5b803d6feaa546.tar.bz2 gentoo-2-646d9e3b1384ba52660f21e88f5b803d6feaa546.zip |
Re-add fping-2.4 for net-analyzer/zabbix.
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/gmic/ChangeLog | 8 | ||||
-rw-r--r-- | media-gfx/gmic/files/gmic-1.5.1.4-makefile.patch | 108 | ||||
-rw-r--r-- | media-gfx/gmic/gmic-1.5.1.4.ebuild | 73 |
3 files changed, 188 insertions, 1 deletions
diff --git a/media-gfx/gmic/ChangeLog b/media-gfx/gmic/ChangeLog index 0f329d84d832..ecc4a6e46ef8 100644 --- a/media-gfx/gmic/ChangeLog +++ b/media-gfx/gmic/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/gmic # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.14 2012/03/16 08:33:38 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.15 2012/05/30 05:58:17 radhermit Exp $ + +*gmic-1.5.1.4 (30 May 2012) + + 30 May 2012; Tim Harder <radhermit@gentoo.org> + +files/gmic-1.5.1.4-makefile.patch, +gmic-1.5.1.4.ebuild: + Re-add fping-2.4 for net-analyzer/zabbix. 16 Mar 2012; Tim Harder <radhermit@gentoo.org> -gmic-1.5.0.9.ebuild: Remove old. diff --git a/media-gfx/gmic/files/gmic-1.5.1.4-makefile.patch b/media-gfx/gmic/files/gmic-1.5.1.4-makefile.patch new file mode 100644 index 000000000000..fdb966da99df --- /dev/null +++ b/media-gfx/gmic/files/gmic-1.5.1.4-makefile.patch @@ -0,0 +1,108 @@ +--- gmic-1.5.1.4/src/Makefile ++++ gmic-1.5.1.4/src/Makefile +@@ -89,7 +89,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 +@@ -97,15 +97,7 @@ + MANDATORY_CFLAGS+=$(IS_BETA_CFLAGS) + + # Flags to enable debugging. +-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 ++DEBUG_CFLAGS = -Dcimg_use_vt100 -Dcimg_verbosity=3 + + # Flags to enable image display, using X11 + # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too). +@@ -165,12 +157,7 @@ + # This requires the presence of the OpenCV include and library files. + # (package 'libcv3-2-dev' on Debian). + OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv +-ifeq ($(OS),Darwin) + OPENCV_LDFLAGS = `pkg-config opencv --libs` # 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. + # This requires the presence of the GraphicsMagick++ include and library files. +@@ -215,11 +202,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) \ +@@ -245,7 +232,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 +@@ -291,10 +278,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) +@@ -311,10 +298,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 +@@ -344,7 +331,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) +@@ -369,7 +355,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.1.4.ebuild b/media-gfx/gmic/gmic-1.5.1.4.ebuild new file mode 100644 index 000000000000..821642d23400 --- /dev/null +++ b/media-gfx/gmic/gmic-1.5.1.4.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.5.1.4.ebuild,v 1.1 2012/05/30 05:58:17 radhermit Exp $ + +EAPI="4" + +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" +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-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.0.7-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 ; } + + if ! use X ; then + sed -i -r -e "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)" 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 ../README + + newbashcomp gmic_bashcompletion.sh ${PN} +} |