From b258a133522e8ec2d3f95715494e9d4b1afc9ca3 Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Tue, 13 Nov 2012 06:10:43 +0000 Subject: Version bump. (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3) --- media-plugins/gimp-gmic/ChangeLog | 8 +- .../gimp-gmic/files/gmic-1.5.2.2-makefile.patch | 101 +++++++++++++++++++++ media-plugins/gimp-gmic/gimp-gmic-1.5.2.2.ebuild | 43 +++++++++ 3 files changed, 151 insertions(+), 1 deletion(-) create mode 100644 media-plugins/gimp-gmic/files/gmic-1.5.2.2-makefile.patch create mode 100644 media-plugins/gimp-gmic/gimp-gmic-1.5.2.2.ebuild (limited to 'media-plugins') diff --git a/media-plugins/gimp-gmic/ChangeLog b/media-plugins/gimp-gmic/ChangeLog index 15938c12c164..a9bd61be52a3 100644 --- a/media-plugins/gimp-gmic/ChangeLog +++ b/media-plugins/gimp-gmic/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-plugins/gimp-gmic # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.21 2012/11/02 07:53:57 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.22 2012/11/13 06:10:43 radhermit Exp $ + +*gimp-gmic-1.5.2.2 (13 Nov 2012) + + 13 Nov 2012; Tim Harder +gimp-gmic-1.5.2.2.ebuild, + +files/gmic-1.5.2.2-makefile.patch: + Version bump. 02 Nov 2012; Tim Harder -gimp-gmic-1.5.1.7.ebuild, -gimp-gmic-1.5.1.8.ebuild: diff --git a/media-plugins/gimp-gmic/files/gmic-1.5.2.2-makefile.patch b/media-plugins/gimp-gmic/files/gmic-1.5.2.2-makefile.patch new file mode 100644 index 000000000000..c93c639fdaf1 --- /dev/null +++ b/media-plugins/gimp-gmic/files/gmic-1.5.2.2-makefile.patch @@ -0,0 +1,101 @@ +--- gmic-1.5.2.2/src/Makefile ++++ gmic-1.5.2.2/src/Makefile +@@ -77,7 +77,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 +@@ -85,28 +85,20 @@ + 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). + # 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. +@@ -152,14 +144,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. +@@ -287,10 +273,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) +@@ -313,10 +299,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 +@@ -346,7 +332,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_minimal: gmic.cpp + $(CC) -o gmic gmic.cpp $(CFLAGS) -Dgmic_float_only -Dgmic_main $(LDFLAGS) +@@ -371,7 +356,6 @@ + $(CC) -o gmic_double.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_double + gmic_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 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) + + def: + @echo "#ifndef gmic_gimp" > gmic_def.h diff --git a/media-plugins/gimp-gmic/gimp-gmic-1.5.2.2.ebuild b/media-plugins/gimp-gmic/gimp-gmic-1.5.2.2.ebuild new file mode 100644 index 000000000000..3f7bd4d143e0 --- /dev/null +++ b/media-plugins/gimp-gmic/gimp-gmic-1.5.2.2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/gimp-gmic-1.5.2.2.ebuild,v 1.1 2012/11/13 06:10:43 radhermit Exp $ + +EAPI="5" + +inherit eutils toolchain-funcs + +DESCRIPTION="G'MIC GIMP plugin" +HOMEPAGE="http://gmic.sourceforge.net/gimp.shtml" +SRC_URI="mirror://sourceforge/gmic/gmic_${PV}.tar.gz" + +LICENSE="CeCILL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=media-gfx/gimp-2.4.0 + media-libs/libpng + sci-libs/fftw:3.0 + sys-libs/zlib" +DEPEND="${RDEPEND}" + +S=${WORKDIR}/gmic-${PV}/src + +src_prepare() { + epatch "${FILESDIR}"/gmic-${PV}-makefile.patch +} + +src_compile() { + emake CC="$(tc-getCXX)" gimp +} + +src_install() { + exeinto $(gimptool-2.0 --gimpplugindir)/plug-ins + doexe gmic_gimp + dodoc ../README +} + +pkg_postinst() { + elog "The G'MIC plugin is accessible from the menu:" + elog "Filters -> G'MIC" +} -- cgit v1.2.3-65-gdbad