[gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/files/, media-gfx/gmic/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/files/, media-gfx/gmic/
@ 2015-08-25  1:37 Tim Harder
  0 siblings, 0 replies; 12+ messages in thread
From: Tim Harder @ 2015-08-25  1:37 UTC (permalink / raw
  To: gentoo-commits

commit:     0ca333e49ad2c795530d7881f4e93770f82ffb0f
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 01:35:27 2015 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 01:35:27 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ca333e4

media-gfx/gmic: remove old

 media-gfx/gmic/Manifest                          |   3 -
 media-gfx/gmic/files/gmic-1.6.0.2-makefile.patch | 155 -----------------------
 media-gfx/gmic/gmic-1.6.0.2.ebuild               |  77 -----------
 media-gfx/gmic/gmic-1.6.0.3.ebuild               |  79 ------------
 media-gfx/gmic/gmic-1.6.0.4.ebuild               |  79 ------------
 5 files changed, 393 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 0e0d1bb..7a6735d 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,5 +1,2 @@
-DIST gmic_1.6.0.2.tar.gz 3013936 SHA256 ec9fa41bb8c27f883b9f845258d41f8024936c80bdec723a1c67cfe05ef9b900 SHA512 9d754cc2c72835bd139a39f72863f5315bebc25716efadb023f54661a4bb3fbf29066ddcd258ab8f084164edc9bd02f77a5a801b5c0753322f959205ce0adaf1 WHIRLPOOL 1d8e7126901b7a269f0aae9bdc1bd05a859efa3269de892e712892aa0c06eeb856c27cf05564bac30abcacf27f3e11d2bcc8f179fc29a675960d6640567cdc0c
-DIST gmic_1.6.0.3.tar.gz 3019692 SHA256 91ce6cfe58e29a6819bf849346bf049d2d73f826bbd7b8b8de42dae7d54c7752 SHA512 377b361fc178ab73a7542a39243d32de970ad6ec5928c295d86acf1bd67efc2ebaf72ce818b55c6a7aeda17eb657fbf4176f4f4c90bc48179419842343e3619b WHIRLPOOL fb78366cd72467b2c1ac2e3f704061be173ba28cb888dabee56f7c4c7c2a4b870293c2e1ae88c87edad8f4e511944bb99218e9fae2d30226c1a4b07b001927f6
-DIST gmic_1.6.0.4.tar.gz 3073596 SHA256 ef83e4efc31280e819d02315b1ebbaec6c0b8ebb960da3e785651572853b8f58 SHA512 75c0adc8a0460c140ec656403053e4533fc6434a0b23c2ac842045aeb788a8ce5da5338832574e76e06fd710bebf5ec627a5bc894f00081ffd1b37a5c6aa852e WHIRLPOOL 1eb3afc6c9fb9c07999e5e497e6d6c5075fda46293417e889511c28c9e0ce26b0070e1356dcf0db9bb49e76b83d75941ed917c01b61c98ab537430ea938c831d
 DIST gmic_1.6.5.0.tar.gz 3005945 SHA256 ebc98c4f5848b8343d581104e072299529ac3edbcea7b565ffd6e1fb4bfd66ed SHA512 3feb5589dcc341106ce1305ce2d3f90776f074607bec3b8413519aa5f2c9dc9554a9ee7a5ba1d52d1a9e7676e6bff135d444276c989511f973cd456136d0e4e1 WHIRLPOOL 02f3f711fa9c876fba39e56a42c30f62a6c2d0848ae836f9635d7df0ef57f48f2a8f09ca361232c2239e473046fe7d085260ac365d2e7b6d49e65c3c0aa2e9bc
 DIST gmic_1.6.5.1.tar.gz 3092777 SHA256 63737973848c292ef3877e1f6af3839e20fa209dd7a1bbacbdbac03bbb6fce85 SHA512 cfbb8db9a3f884ac27b4929a774c94372523a1e59a205180dde452d34310d32df4ef76c9cdfcc4ef5adf0ba72c5e1e44564cfeb2e9bc003ec8fae45df9c606c4 WHIRLPOOL e5e0e9d4dfff7a5b0da9d613bc998e32f71925cc44eb504519811327697fd13edf2abb1b94bd22619b17fa111d1e984944a01d7417ff0e328950b4258a7172fb

diff --git a/media-gfx/gmic/files/gmic-1.6.0.2-makefile.patch b/media-gfx/gmic/files/gmic-1.6.0.2-makefile.patch
deleted file mode 100644
index 2ec9047..0000000
--- a/media-gfx/gmic/files/gmic-1.6.0.2-makefile.patch
+++ /dev/null
@@ -1,155 +0,0 @@
---- gmic-1.6.0.2/src/Makefile
-+++ gmic-1.6.0.2/src/Makefile
-@@ -85,7 +85,6 @@
- else
- MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/$(INCLUDE)
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
- ifeq ($(notdir $(CC)),g++)
- MANDATORY_CFLAGS += -Wall -W
- MANDATORY_LIBS += -lm
-@@ -142,14 +141,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_LIBS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr
-+X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr
-+X11_LIBS = -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_LIBS = -L$(USR)/X11R6/lib -lXext
-+XSHM_LIBS = -lXext
- 
- # Flags to enable image display, using GDI32.
- # This requires the presence of the GDI32 include and library files.
-@@ -177,8 +176,8 @@
- # Flags to enable native support for MINC2 image files, using the MINC2 library.
- # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )
- # (package 'libminc-dev' on Debian).
--MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include
--MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
-+MINC2_CFLAGS = -Dcimg_use_minc2
-+MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz
- 
- # Flags to enable native support for compressed .cimgz files, using the Zlib library.
- # This requires the presence of the Zlib include and library files.
-@@ -345,10 +344,10 @@
- endif
- 
- gimp:
--	$(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS) $(OPT_LIBS)" "STRIP_EXE=1" gmic_gimp
-+	$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS) $(OPT_LIBS)" gmic_gimp
- 
- lib:
--	$(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_LIB_LIBS) $(OPT_LIBS)" gmic_lib
-+	$(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_LIB_LIBS) $(OPT_LIBS)" gmic_lib
- 
- zart: lib
- ifneq ($(OS),Darwin)
-@@ -359,7 +358,7 @@
- 
- # Entries for other configurations.
- linux:
--	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS)" "STRIP_EXE=1" gmic
-+	$(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS)" gmic
- 
- solaris:
- 	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic
-@@ -386,28 +385,27 @@
- 	$(MAKE) "CFLAGS+=$(MINIMAL_MACOSX_CFLAGS)" "LIBS+=$(MINIMAL_MACOSX_LIBS)" gmic
- 
- custom:
--	$(MAKE) "CFLAGS=$(CUSTOM_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(CUSTOM_UNIX_LIBS)" "STRIP_EXE=1" gmic
-+	$(MAKE) "CFLAGS+=$(CUSTOM_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(CUSTOM_UNIX_LIBS)" gmic
- 
- # Internal rules to build compilation modules.
- gmic_lib.o: gmic.cpp
- 	$(CC) -o gmic_lib.o -c gmic.cpp -fPIC $(CFLAGS)
- 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 $(LIBS)
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so gmic_lib.o $(LIBS)
- 	$(CC) -o gmic_use_lib gmic_use_lib.cpp -L. -lgmic $(FFTW_LIBS)
- else
--	$(CC) -shared -o libgmic.so gmic_lib.o $(LIBS)
-+	$(CC) $(LDFLAGS) -shared -o libgmic.so gmic_lib.o $(LIBS)
- endif
- 
- gmic_gimp.o: gmic.cpp CImg.h
- 	$(CC) -o gmic_gimp.o -c gmic.cpp $(CFLAGS) -Dgmic_gimp
- 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` $(LIBS)
--	strip gmic_gimp$(EXE)
-+	$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o `gimptool-2.0$(EXE) --cflags` $(CFLAGS) $(LDFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS)
- 
- gmic: gmic.cpp gmic.h CImg.h
--	$(CC) -o gmic gmic.cpp $(CFLAGS) -Dgmic_main $(LIBS)
-+	$(CC) -o gmic gmic.cpp $(CFLAGS) $(LDFLAGS) -Dgmic_main $(LIBS)
- 
- gmic_def.h: gmic_def.gmic
- 	@echo "#ifndef gmic_gimp" > gmic_def.h
-@@ -422,20 +420,25 @@
- # Generate bash completion script.
- bashcompletion:
- 	@mkdir -p ../resources
--	@\gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh
-+	@./gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh
- 
- # Generate man page.
- man:
- 	@mkdir -p ../man
--	@\gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -__help man 2> ../man/gmic.1
--	@gzip -f ../man/gmic.1
-+	@./gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -__help man 2> ../man/gmic.1
-+
-+install: install-gimp install-bin install-lib install-man install-bash
- 
- # Install/uninstall/clean procedures.
--install:
-+install-gimp:
- 	mkdir -p $(DESTDIR)$(PLUGINDIR)/
- 	cp -f gmic_gimp $(DESTDIR)$(PLUGINDIR)/
-+
-+install-bin:
- 	mkdir -p $(DESTDIR)$(USR)/$(BIN)/
- 	cp -f gmic $(DESTDIR)$(USR)/$(BIN)/
-+
-+install-lib:
- 	mkdir -p $(DESTDIR)$(USR)/$(INCLUDE)/
- 	cp -f gmic.h $(DESTDIR)$(USR)/$(INCLUDE)/
- ifneq ($(OS),Darwin)
-@@ -445,13 +448,14 @@
- 	ln -s libgmic.so.1.6.0 $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
- 	ln -s libgmic.so.1 $(DESTDIR)$(USR)/$(LIB)/libgmic.so
- endif
-+
-+install-man:
- 	mkdir -p $(DESTDIR)$(USR)/share/man/
- 	mkdir -p $(DESTDIR)$(USR)/share/man/man1/
--	mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
--	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
--	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
-+	cp -f ../man/gmic.1 $(DESTDIR)$(USR)/share/man/man1/gmic.1
-+
-+install-bash:
- 	if [ -d /etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi
--	if [ -d /opt/local/etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi
- 
- uninstall:
- 	rm -f $(DESTDIR)$(USR)/$(BIN)/gmic
-@@ -460,8 +464,7 @@
- 	rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
- 	rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so
- 	rm -rf $(DESTDIR)$(USR)/share/doc/gmic/
--	rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
--	rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
-+	rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1
- 
- distclean: clean
- 

diff --git a/media-gfx/gmic/gmic-1.6.0.2.ebuild b/media-gfx/gmic/gmic-1.6.0.2.ebuild
deleted file mode 100644
index 44c0c82..0000000
--- a/media-gfx/gmic/gmic-1.6.0.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 openmp png tiff X zlib"
-
-DEPEND="
-	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 )"
-RDEPEND="${DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0 )
-"
-
-S=${WORKDIR}/${P}/src
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-
-	for i in fftw jpeg opencv openmp png tiff zlib ; do
-		use $i || { sed -i -r "s/^(${i}_(CFLAGS|LIBS) =).*/\1/I" Makefile || die ; }
-	done
-
-	use graphicsmagick || { sed -i -r "s/^(MAGICK_(CFLAGS|LIBS) =).*/\1/" Makefile || die ; }
-	use openexr || { sed -i -r "s/^(EXR_(CFLAGS|LIBS) =).*/\1/" Makefile || die ; }
-
-	if ! use X ; then
-		sed -i -r "s/^((X11|XSHM)_(CFLAGS|LIBS) =).*/\1/" Makefile || die
-
-		# disable display capabilities when X support is disabled
-		append-cxxflags -Dcimg_display=0
-	fi
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" \
-		LIB="$(get_libdir)" OPT_CFLAGS= DEBUG_CFLAGS= linux lib
-	emake man bashcompletion
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIB="$(get_libdir)" install-bin install-lib install-man install-bash
-	dodoc ../README
-}

diff --git a/media-gfx/gmic/gmic-1.6.0.3.ebuild b/media-gfx/gmic/gmic-1.6.0.3.ebuild
deleted file mode 100644
index a420b57..0000000
--- a/media-gfx/gmic/gmic-1.6.0.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 openmp png tiff X zlib"
-
-DEPEND="
-	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 )"
-RDEPEND="${DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0 )
-"
-
-S=${WORKDIR}/${P}/src
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PN}-1.6.0.2-makefile.patch "${WORKDIR}" || die
-	edos2unix "${WORKDIR}"/${PN}-1.6.0.2-makefile.patch
-	epatch "${WORKDIR}"/${PN}-1.6.0.2-makefile.patch
-
-	for i in fftw jpeg opencv openmp png tiff zlib ; do
-		use $i || { sed -i -r "s/^(${i}_(CFLAGS|LIBS) =).*/\1/I" Makefile || die ; }
-	done
-
-	use graphicsmagick || { sed -i -r "s/^(MAGICK_(CFLAGS|LIBS) =).*/\1/" Makefile || die ; }
-	use openexr || { sed -i -r "s/^(EXR_(CFLAGS|LIBS) =).*/\1/" Makefile || die ; }
-
-	if ! use X ; then
-		sed -i -r "s/^((X11|XSHM)_(CFLAGS|LIBS) =).*/\1/" Makefile || die
-
-		# disable display capabilities when X support is disabled
-		append-cxxflags -Dcimg_display=0
-	fi
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" \
-		LIB="$(get_libdir)" OPT_CFLAGS= DEBUG_CFLAGS= linux lib
-	emake man bashcompletion
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIB="$(get_libdir)" install-bin install-lib install-man install-bash
-	dodoc ../README
-}

diff --git a/media-gfx/gmic/gmic-1.6.0.4.ebuild b/media-gfx/gmic/gmic-1.6.0.4.ebuild
deleted file mode 100644
index 7e0b7f7..0000000
--- a/media-gfx/gmic/gmic-1.6.0.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs bash-completion-r1 flag-o-matic
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="http://gmic.eu/"
-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 openmp png tiff X zlib"
-
-DEPEND="
-	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 )"
-RDEPEND="${DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0 )
-"
-
-S=${WORKDIR}/${P}/src
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PN}-1.6.0.2-makefile.patch "${WORKDIR}" || die
-	edos2unix "${WORKDIR}"/${PN}-1.6.0.2-makefile.patch
-	epatch "${WORKDIR}"/${PN}-1.6.0.2-makefile.patch
-
-	for i in fftw jpeg opencv openmp png tiff zlib ; do
-		use $i || { sed -i -r "s/^(${i}_(CFLAGS|LIBS) =).*/\1/I" Makefile || die ; }
-	done
-
-	use graphicsmagick || { sed -i -r "s/^(MAGICK_(CFLAGS|LIBS) =).*/\1/" Makefile || die ; }
-	use openexr || { sed -i -r "s/^(EXR_(CFLAGS|LIBS) =).*/\1/" Makefile || die ; }
-
-	if ! use X ; then
-		sed -i -r "s/^((X11|XSHM)_(CFLAGS|LIBS) =).*/\1/" Makefile || die
-
-		# disable display capabilities when X support is disabled
-		append-cxxflags -Dcimg_display=0
-	fi
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" \
-		LIB="$(get_libdir)" OPT_CFLAGS= DEBUG_CFLAGS= linux lib
-	emake man bashcompletion
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIB="$(get_libdir)" install-bin install-lib install-man install-bash
-	dodoc ../README
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/files/, media-gfx/gmic/
@ 2015-08-25  1:37 Tim Harder
  0 siblings, 0 replies; 12+ messages in thread
From: Tim Harder @ 2015-08-25  1:37 UTC (permalink / raw
  To: gentoo-commits

commit:     ff08a3bdfc6838e1e96dde78b1e89c90c3d6104b
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 01:34:15 2015 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 01:34:15 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff08a3bd

media-gfx/gmic: version bump

 media-gfx/gmic/Manifest                          |   1 +
 media-gfx/gmic/files/gmic-1.6.5.1-makefile.patch | 153 +++++++++++++++++++++++
 media-gfx/gmic/gmic-1.6.5.1.ebuild               |  77 ++++++++++++
 3 files changed, 231 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 86fa815..0e0d1bb 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -2,3 +2,4 @@ DIST gmic_1.6.0.2.tar.gz 3013936 SHA256 ec9fa41bb8c27f883b9f845258d41f8024936c80
 DIST gmic_1.6.0.3.tar.gz 3019692 SHA256 91ce6cfe58e29a6819bf849346bf049d2d73f826bbd7b8b8de42dae7d54c7752 SHA512 377b361fc178ab73a7542a39243d32de970ad6ec5928c295d86acf1bd67efc2ebaf72ce818b55c6a7aeda17eb657fbf4176f4f4c90bc48179419842343e3619b WHIRLPOOL fb78366cd72467b2c1ac2e3f704061be173ba28cb888dabee56f7c4c7c2a4b870293c2e1ae88c87edad8f4e511944bb99218e9fae2d30226c1a4b07b001927f6
 DIST gmic_1.6.0.4.tar.gz 3073596 SHA256 ef83e4efc31280e819d02315b1ebbaec6c0b8ebb960da3e785651572853b8f58 SHA512 75c0adc8a0460c140ec656403053e4533fc6434a0b23c2ac842045aeb788a8ce5da5338832574e76e06fd710bebf5ec627a5bc894f00081ffd1b37a5c6aa852e WHIRLPOOL 1eb3afc6c9fb9c07999e5e497e6d6c5075fda46293417e889511c28c9e0ce26b0070e1356dcf0db9bb49e76b83d75941ed917c01b61c98ab537430ea938c831d
 DIST gmic_1.6.5.0.tar.gz 3005945 SHA256 ebc98c4f5848b8343d581104e072299529ac3edbcea7b565ffd6e1fb4bfd66ed SHA512 3feb5589dcc341106ce1305ce2d3f90776f074607bec3b8413519aa5f2c9dc9554a9ee7a5ba1d52d1a9e7676e6bff135d444276c989511f973cd456136d0e4e1 WHIRLPOOL 02f3f711fa9c876fba39e56a42c30f62a6c2d0848ae836f9635d7df0ef57f48f2a8f09ca361232c2239e473046fe7d085260ac365d2e7b6d49e65c3c0aa2e9bc
+DIST gmic_1.6.5.1.tar.gz 3092777 SHA256 63737973848c292ef3877e1f6af3839e20fa209dd7a1bbacbdbac03bbb6fce85 SHA512 cfbb8db9a3f884ac27b4929a774c94372523a1e59a205180dde452d34310d32df4ef76c9cdfcc4ef5adf0ba72c5e1e44564cfeb2e9bc003ec8fae45df9c606c4 WHIRLPOOL e5e0e9d4dfff7a5b0da9d613bc998e32f71925cc44eb504519811327697fd13edf2abb1b94bd22619b17fa111d1e984944a01d7417ff0e328950b4258a7172fb

diff --git a/media-gfx/gmic/files/gmic-1.6.5.1-makefile.patch b/media-gfx/gmic/files/gmic-1.6.5.1-makefile.patch
new file mode 100644
index 0000000..e2d0dd3
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-1.6.5.1-makefile.patch
@@ -0,0 +1,153 @@
+--- gmic-1.6.5.1/src/Makefile
++++ gmic-1.6.5.1/src/Makefile
+@@ -85,7 +85,6 @@
+ ifndef NO_STDLIB
+ MANDATORY_CFLAGS += -std=c++11
+ endif
+-MANDATORY_LIBS += -L$(USR)/$(LIB)
+ ifeq ($(notdir $(CC)),g++)
+ MANDATORY_CFLAGS += -Wall -W
+ MANDATORY_LIBS += -lm
+@@ -138,13 +137,13 @@
+ # 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.
+-X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
+-X11_LIBS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr
++X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr
++X11_LIBS = -lX11 -lpthread #-lXrandr
+ 
+ # Flags to enable fast display, using XShm.
+ # This requires the presence of the X11 extension include and library files.
+ XSHM_CFLAGS = -Dcimg_use_xshm
+-XSHM_LIBS = -L$(USR)/X11R6/lib -lXext
++XSHM_LIBS = -lXext
+ 
+ # Flags to enable image display, using GDI32.
+ # This requires the presence of the GDI32 include and library files.
+@@ -168,8 +167,8 @@
+ 
+ # Flags to enable native support for MINC2 image files, using the MINC2 library.
+ # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )
+-MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include
+-MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
++MINC2_CFLAGS = -Dcimg_use_minc2
++MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz
+ 
+ # Flags to enable native support for downloading files from the network.
+ # ( http://curl.haxx.se/libcurl/ )
+@@ -308,7 +307,6 @@
+ 
+ cli:
+ 	$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
+-	strip gmic$(EXE)
+ 
+ gimp:
+ 	$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS)" gmic_gimp
+@@ -318,11 +316,9 @@
+ 
+ gmicol:
+ 	$(MAKE) "CFLAGS+=$(STD_GMICOL_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GMICOL_LIBS)" gmic
+-	strip gmic$(EXE)
+ 
+ static:
+ 	$(MAKE) "CFLAGS+=$(STATIC_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STATIC_CLI_LIBS)" gmic
+-	strip gmic$(EXE)
+ 
+ debug:
+ 	$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(DEBUG_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
+@@ -338,24 +334,22 @@
+ libgmic.o: gmic.cpp gmic.h gmic_def.h CImg.h
+ 	$(CC) -o libgmic.o -c gmic.cpp -fPIC $(CFLAGS)
+ 
+-libgmic: libgmic.o gmic_use_lib.cpp
+-	ar rcs libgmic.a libgmic.o
++libgmic: libgmic.o
++	$(AR) rcs libgmic.a libgmic.o
+ ifeq ($(OS),Darwin)
+-	$(CC) -shared -o libgmic.so libgmic.o $(LIBS)
++	$(CC) $(LDFLAGS) -shared -o libgmic.so libgmic.o $(LIBS)
+ else
+-	$(CC) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so libgmic.o $(LIBS)
+-	$(CC) -o gmic_use_lib gmic_use_lib.cpp -L. -lgmic
++	$(CC) $(LDFLAGS) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so libgmic.o $(LIBS)
+ endif
+ 
+ gmic_gimp.o: gmic.cpp gmic.h gmic_def.h CImg.h
+ 	$(CC) -o gmic_gimp.o -c gmic.cpp -Dgmic_gimp $(CFLAGS)
+ 
+ gmic_gimp : gmic_gimp.o gmic_gimp.cpp
+-	$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS)
+-	strip gmic_gimp$(EXE)
++	$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) $(LDFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS)
+ 
+ gmic: gmic.cpp gmic.h gmic_def.h CImg.h
+-	$(CC) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LIBS)
++	$(CC) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LDFLAGS) $(LIBS)
+ 
+ gmic_def.h:
+ 	@wget --quiet -O gmic_def.h http://gmic.eu/gmic_def.h
+@@ -380,38 +374,43 @@
+ # Generate bash completion script (requires 'gmic' to be installed first).
+ bashcompletion:
+ 	@mkdir -p ../resources
+-	@\gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh
++	@./gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh
+ 
+ # Generate man page (requires 'gmic' to be installed first).
+ man:
+ 	@mkdir -p ../man
+-	@\gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -__help man 2> ../man/gmic.1
+-	@gzip -f ../man/gmic.1
++	@./gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -__help man 2> ../man/gmic.1
+ 
+ # Install/uninstall/clean procedures.
+-install:
++install-gimp:
+ 	mkdir -p $(DESTDIR)$(PLUGINDIR)/
+ 	cp -f gmic_gimp $(DESTDIR)$(PLUGINDIR)/
++
++install-bin:
+ 	mkdir -p $(DESTDIR)$(USR)/$(BIN)/
+ 	cp -f gmic $(DESTDIR)$(USR)/$(BIN)/
++
++install-lib:
+ 	mkdir -p $(DESTDIR)$(USR)/$(INCLUDE)/
+ 	cp -f gmic.h $(DESTDIR)$(USR)/$(INCLUDE)/
+-
+ ifneq ($(OS),Darwin)
+ 	mkdir -p $(DESTDIR)$(USR)/share
+ 	mkdir -p $(DESTDIR)$(USR)/$(LIB)
+ 	cp -f libgmic.so $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.6.5
+ 	ln -fs libgmic.so.1.6.5 $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
+ 	ln -fs libgmic.so.1 $(DESTDIR)$(USR)/$(LIB)/libgmic.so
+-	cp -f ../zart/zart $(DESTDIR)$(USR)/$(BIN)/
+ endif
++
++install-zart:
++	cp -f ../zart/zart $(DESTDIR)$(USR)/$(BIN)/
++
++install-man:
+ 	mkdir -p $(DESTDIR)$(USR)/share/man/
+ 	mkdir -p $(DESTDIR)$(USR)/share/man/man1/
+-	mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
+-	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
+-	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
++	cp -f ../man/gmic.1 $(DESTDIR)$(USR)/share/man/man1/gmic.1
++
++install-bash:
+ 	if [ -d /etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi
+-	if [ -d /opt/local/etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)$(USR)/$(BIN)/gmic
+@@ -421,8 +420,7 @@
+ 	rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
+ 	rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so
+ 	rm -rf $(DESTDIR)$(USR)/share/doc/gmic/
+-	rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
+-	rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
++	rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1
+ 
+ distclean: clean
+ 

diff --git a/media-gfx/gmic/gmic-1.6.5.1.ebuild b/media-gfx/gmic/gmic-1.6.5.1.ebuild
new file mode 100644
index 0000000..f7502c8
--- /dev/null
+++ b/media-gfx/gmic/gmic-1.6.5.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs bash-completion-r1 flag-o-matic
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="http://gmic.eu/"
+SRC_URI="http://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+
+LICENSE="CeCILL-2 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ffmpeg fftw graphicsmagick jpeg opencv openexr openmp png tiff X zlib"
+
+DEPEND="
+	fftw? ( sci-libs/fftw:3.0[threads] )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg? ( virtual/jpeg:0 )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
+	openexr? (
+		media-libs/ilmbase
+		media-libs/openexr
+	)
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0 )
+"
+
+S=${WORKDIR}/${P}/src
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if ! test-flag-CXX -std=c++11 ; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+
+	for i in fftw jpeg opencv openmp png tiff zlib ; do
+		use $i || { sed -i -r "s/^(${i}_(CFLAGS|LIBS) =).*/\1/I" Makefile || die ; }
+	done
+
+	use graphicsmagick || { sed -i -r "s/^(MAGICK_(CFLAGS|LIBS) =).*/\1/" Makefile || die ; }
+	use openexr || { sed -i -r "s/^(EXR_(CFLAGS|LIBS) =).*/\1/" Makefile || die ; }
+
+	if ! use X ; then
+		sed -i -r "s/^((X11|XSHM)_(CFLAGS|LIBS) =).*/\1/" Makefile || die
+
+		# disable display capabilities when X support is disabled
+		append-cxxflags -Dcimg_display=0
+	fi
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" \
+		LIB="$(get_libdir)" OPT_CFLAGS= DEBUG_CFLAGS= cli lib
+	emake man bashcompletion
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIB="$(get_libdir)" install-bin install-lib install-man install-bash
+	dodoc ../README
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/files/, media-gfx/gmic/
@ 2016-11-30  7:07 Tim Harder
  0 siblings, 0 replies; 12+ messages in thread
From: Tim Harder @ 2016-11-30  7:07 UTC (permalink / raw
  To: gentoo-commits

commit:     7ffad3e3f37f1fc90e63fd5741ecd75206cdc60c
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 07:05:54 2016 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 07:07:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ffad3e3

media-gfx/gmic: version bump to 1.7.9

 media-gfx/gmic/Manifest                     |  1 +
 media-gfx/gmic/files/gmic-1.7.9-flags.patch | 15 +++++
 media-gfx/gmic/files/gmic-1.7.9-man.patch   | 17 ++++++
 media-gfx/gmic/gmic-1.7.9.ebuild            | 87 +++++++++++++++++++++++++++++
 4 files changed, 120 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 8e45643..348ab5c 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,3 +1,4 @@
 DIST gmic_1.6.5.0.tar.gz 3005945 SHA256 ebc98c4f5848b8343d581104e072299529ac3edbcea7b565ffd6e1fb4bfd66ed SHA512 3feb5589dcc341106ce1305ce2d3f90776f074607bec3b8413519aa5f2c9dc9554a9ee7a5ba1d52d1a9e7676e6bff135d444276c989511f973cd456136d0e4e1 WHIRLPOOL 02f3f711fa9c876fba39e56a42c30f62a6c2d0848ae836f9635d7df0ef57f48f2a8f09ca361232c2239e473046fe7d085260ac365d2e7b6d49e65c3c0aa2e9bc
 DIST gmic_1.6.5.1.tar.gz 3092777 SHA256 63737973848c292ef3877e1f6af3839e20fa209dd7a1bbacbdbac03bbb6fce85 SHA512 cfbb8db9a3f884ac27b4929a774c94372523a1e59a205180dde452d34310d32df4ef76c9cdfcc4ef5adf0ba72c5e1e44564cfeb2e9bc003ec8fae45df9c606c4 WHIRLPOOL e5e0e9d4dfff7a5b0da9d613bc998e32f71925cc44eb504519811327697fd13edf2abb1b94bd22619b17fa111d1e984944a01d7417ff0e328950b4258a7172fb
 DIST gmic_1.7.8.tar.gz 3013635 SHA256 3a2f32d79714239cfa56ecb10799b7d73362b4e2a852444bc24866272cd041a4 SHA512 2bfa7bb9ff3a99a76c71f7c4e0d619e9c205dafc02b5a2d1f097b6285c141e5413f7016b92d974327f787010a6832d272ab21a89842eee2484151072c2d4c559 WHIRLPOOL a81e135031ac095e700302d1b59428b6f86df4543643d17e759fcde3bcd7ceac950b7418d89854d2ee8c55af18efc67efc65f41984ca1dbbe5c12c3a12c36539
+DIST gmic_1.7.9.tar.gz 3069082 SHA256 932fd2ad89d090864bd7bf3860f1751c14d34276c542416114b77fd30cc8642b SHA512 749611748c9fe2a141efc9b0a445411c1ece842f4c576b68b3b17cbbffdc1cf43a2aee55dc399b899dc03882f240289beaef96d9ec85b10ffc0ad986412cd4bc WHIRLPOOL cce3788a095d115afaa1c5641ac240d9b9977e62cdced9e0876bd53a623b91bb951faa07a404b4247c6b84e3e81eca8d3edac4bd0ff29a63efef8cf9a35a66f0

diff --git a/media-gfx/gmic/files/gmic-1.7.9-flags.patch b/media-gfx/gmic/files/gmic-1.7.9-flags.patch
new file mode 100644
index 00000000..aea11ed
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-1.7.9-flags.patch
@@ -0,0 +1,15 @@
+--- gmic-1.7.9/CMakeLists.txt
++++ gmic-1.7.9/CMakeLists.txt
+@@ -190,9 +190,9 @@
+     "Choose the type of build, options are: Debug Release RelWithDebInfo."
+     FORCE)
+ endif(NOT CMAKE_BUILD_TYPE)
+-SET(CMAKE_CXX_FLAGS_DEBUG " -O0 -g -ansi -pedantic -Dcimg_verbosity=3 ${COMPILE_FLAGS}")
+-SET(CMAKE_CXX_FLAGS_RELEASE " -O3 -mtune=generic ${COMPILE_FLAGS}")
+-SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO " -O3 -g -mtune=generic ${COMPILE_FLAGS}")
++SET(CMAKE_CXX_FLAGS_DEBUG " -ansi -pedantic -Dcimg_verbosity=3 ${COMPILE_FLAGS}")
++SET(CMAKE_CXX_FLAGS_RELEASE " ${COMPILE_FLAGS}")
++SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO " ${COMPILE_FLAGS}")
+ 
+ 
+ # source files

diff --git a/media-gfx/gmic/files/gmic-1.7.9-man.patch b/media-gfx/gmic/files/gmic-1.7.9-man.patch
new file mode 100644
index 00000000..44353a2
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-1.7.9-man.patch
@@ -0,0 +1,17 @@
+--- gmic-1.7.9/CMakeLists.txt
++++ gmic-1.7.9/CMakeLists.txt
+@@ -334,11 +334,10 @@
+ if(BUILD_MAN)
+   file(MAKE_DIRECTORY ${CMAKE_SOURCE_DIR}/man)
+   add_custom_command(
+-    OUTPUT ${CMAKE_SOURCE_DIR}/man/gmic.1.gz
++    OUTPUT ${CMAKE_SOURCE_DIR}/man/gmic.1
+     DEPENDS gmic
+     COMMAND ${CMAKE_BINARY_DIR}/gmic -v - ${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic raw:${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic,uchar -__help man 2> ${CMAKE_SOURCE_DIR}/man/gmic.1
+-    COMMAND gzip -f ${CMAKE_SOURCE_DIR}/man/gmic.1
+   )
+-  add_custom_target(man ALL DEPENDS ${CMAKE_SOURCE_DIR}/man/gmic.1.gz)
+-  INSTALL(FILES ${CMAKE_SOURCE_DIR}/man/gmic.1.gz DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)
++  add_custom_target(man ALL DEPENDS ${CMAKE_SOURCE_DIR}/man/gmic.1)
++  INSTALL(FILES ${CMAKE_SOURCE_DIR}/man/gmic.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)
+ endif(BUILD_MAN)

diff --git a/media-gfx/gmic/gmic-1.7.9.ebuild b/media-gfx/gmic/gmic-1.7.9.ebuild
new file mode 100644
index 00000000..ea54559
--- /dev/null
+++ b/media-gfx/gmic/gmic-1.7.9.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="http://gmic.eu/ https://github.com/dtschump/gmic"
+SRC_URI="http://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+
+LICENSE="CeCILL-2 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cli ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png static-libs tiff X zlib"
+REQUIRED_USE="|| ( cli gimp )"
+
+COMMON_DEPEND="
+	fftw? ( sci-libs/fftw:3.0[threads] )
+	gimp? ( >=media-gfx/gimp-2.4.0 )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg? ( virtual/jpeg:0 )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
+	openexr? (
+		media-libs/ilmbase
+		media-libs/openexr
+	)
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0 )
+	gimp? ( !media-plugins/gimp-gmic )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${P}-man.patch
+)
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if ! test-flag-CXX -std=c++11 ; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_PLUGIN=$(usex gimp)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+	)
+
+	local CMAKE_BUILD_TYPE="Release"
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README
+	use cli && newbashcomp resources/${PN}_bashcompletion.sh ${PN}
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/files/, media-gfx/gmic/
@ 2016-12-09  7:06 Tim Harder
  0 siblings, 0 replies; 12+ messages in thread
From: Tim Harder @ 2016-12-09  7:06 UTC (permalink / raw
  To: gentoo-commits

commit:     9564f7452bcbd4bd86630ae53a7709dc39bcc551
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  9 07:03:15 2016 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Fri Dec  9 07:03:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9564f745

media-gfx/gmic: remove old

 media-gfx/gmic/Manifest                          |   2 -
 media-gfx/gmic/files/gmic-1.6.5.0-makefile.patch | 154 -----------------------
 media-gfx/gmic/files/gmic-1.6.5.1-makefile.patch | 153 ----------------------
 media-gfx/gmic/gmic-1.6.5.0.ebuild               |  77 ------------
 media-gfx/gmic/gmic-1.6.5.1.ebuild               |  77 ------------
 5 files changed, 463 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 348ab5c..a21f4ab 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,4 +1,2 @@
-DIST gmic_1.6.5.0.tar.gz 3005945 SHA256 ebc98c4f5848b8343d581104e072299529ac3edbcea7b565ffd6e1fb4bfd66ed SHA512 3feb5589dcc341106ce1305ce2d3f90776f074607bec3b8413519aa5f2c9dc9554a9ee7a5ba1d52d1a9e7676e6bff135d444276c989511f973cd456136d0e4e1 WHIRLPOOL 02f3f711fa9c876fba39e56a42c30f62a6c2d0848ae836f9635d7df0ef57f48f2a8f09ca361232c2239e473046fe7d085260ac365d2e7b6d49e65c3c0aa2e9bc
-DIST gmic_1.6.5.1.tar.gz 3092777 SHA256 63737973848c292ef3877e1f6af3839e20fa209dd7a1bbacbdbac03bbb6fce85 SHA512 cfbb8db9a3f884ac27b4929a774c94372523a1e59a205180dde452d34310d32df4ef76c9cdfcc4ef5adf0ba72c5e1e44564cfeb2e9bc003ec8fae45df9c606c4 WHIRLPOOL e5e0e9d4dfff7a5b0da9d613bc998e32f71925cc44eb504519811327697fd13edf2abb1b94bd22619b17fa111d1e984944a01d7417ff0e328950b4258a7172fb
 DIST gmic_1.7.8.tar.gz 3013635 SHA256 3a2f32d79714239cfa56ecb10799b7d73362b4e2a852444bc24866272cd041a4 SHA512 2bfa7bb9ff3a99a76c71f7c4e0d619e9c205dafc02b5a2d1f097b6285c141e5413f7016b92d974327f787010a6832d272ab21a89842eee2484151072c2d4c559 WHIRLPOOL a81e135031ac095e700302d1b59428b6f86df4543643d17e759fcde3bcd7ceac950b7418d89854d2ee8c55af18efc67efc65f41984ca1dbbe5c12c3a12c36539
 DIST gmic_1.7.9.tar.gz 3069082 SHA256 932fd2ad89d090864bd7bf3860f1751c14d34276c542416114b77fd30cc8642b SHA512 749611748c9fe2a141efc9b0a445411c1ece842f4c576b68b3b17cbbffdc1cf43a2aee55dc399b899dc03882f240289beaef96d9ec85b10ffc0ad986412cd4bc WHIRLPOOL cce3788a095d115afaa1c5641ac240d9b9977e62cdced9e0876bd53a623b91bb951faa07a404b4247c6b84e3e81eca8d3edac4bd0ff29a63efef8cf9a35a66f0

diff --git a/media-gfx/gmic/files/gmic-1.6.5.0-makefile.patch b/media-gfx/gmic/files/gmic-1.6.5.0-makefile.patch
deleted file mode 100644
index ebf5e45..00000000
--- a/media-gfx/gmic/files/gmic-1.6.5.0-makefile.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- gmic-1.6.5.0/src/Makefile
-+++ gmic-1.6.5.0/src/Makefile
-@@ -85,7 +85,6 @@
- ifndef NO_STDLIB
- MANDATORY_CFLAGS += -std=c++11
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
- ifeq ($(notdir $(CC)),g++)
- MANDATORY_CFLAGS += -Wall -W
- MANDATORY_LIBS += -lm
-@@ -139,14 +138,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_LIBS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr
-+X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr
-+X11_LIBS = -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_LIBS = -L$(USR)/X11R6/lib -lXext
-+XSHM_LIBS = -lXext
- 
- # Flags to enable image display, using GDI32.
- # This requires the presence of the GDI32 include and library files.
-@@ -174,8 +173,8 @@
- # Flags to enable native support for MINC2 image files, using the MINC2 library.
- # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )
- # (package 'libminc-dev' on Debian).
--MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include
--MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
-+MINC2_CFLAGS = -Dcimg_use_minc2
-+MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz
- 
- # Flags to enable native support for downloading files from the network.
- # ( https://curl.haxx.se/libcurl/ )
-@@ -325,7 +324,6 @@
- 
- cli:
- 	$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
--	strip gmic$(EXE)
- 
- gimp:
- 	$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS)" gmic_gimp
-@@ -335,11 +333,9 @@
- 
- gmicol:
- 	$(MAKE) "CFLAGS+=$(STD_GMICOL_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GMICOL_LIBS)" gmic
--	strip gmic$(EXE)
- 
- static:
- 	$(MAKE) "CFLAGS+=$(STATIC_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STATIC_CLI_LIBS)" gmic
--	strip gmic$(EXE)
- 
- debug:
- 	$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(DEBUG_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
-@@ -355,24 +351,22 @@
- libgmic.o: gmic.cpp gmic.h gmic_def.h CImg.h
- 	$(CC) -o libgmic.o -c gmic.cpp -fPIC $(CFLAGS)
- 
--libgmic: libgmic.o gmic_use_lib.cpp
--	ar rcs libgmic.a libgmic.o
-+libgmic: libgmic.o
-+	$(AR) rcs libgmic.a libgmic.o
- ifeq ($(OS),Darwin)
--	$(CC) -shared -o libgmic.so libgmic.o $(LIBS)
-+	$(CC) $(LDFLAGS) -shared -o libgmic.so libgmic.o $(LIBS)
- else
--	$(CC) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so libgmic.o $(LIBS)
--	$(CC) -o gmic_use_lib gmic_use_lib.cpp -L. -lgmic
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so libgmic.o $(LIBS)
- endif
- 
- gmic_gimp.o: gmic.cpp gmic.h gmic_def.h CImg.h
- 	$(CC) -o gmic_gimp.o -c gmic.cpp -Dgmic_gimp $(CFLAGS)
- 
- gmic_gimp : gmic_gimp.o gmic_gimp.cpp
--	$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS)
--	strip gmic_gimp$(EXE)
-+	$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) $(LDFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS)
- 
- gmic: gmic.cpp gmic.h gmic_def.h CImg.h
--	$(CC) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LIBS)
-+	$(CC) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LDFLAGS) $(LIBS)
- 
- gmic_def.h:
- 	@wget --quiet -O gmic_def.h http://gmic.eu/gmic_def.h
-@@ -397,38 +391,43 @@
- # Generate bash completion script (requires 'gmic' to be installed first).
- bashcompletion:
- 	@mkdir -p ../resources
--	@\gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh
-+	@./gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh
- 
- # Generate man page (requires 'gmic' to be installed first).
- man:
- 	@mkdir -p ../man
--	@\gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -__help man 2> ../man/gmic.1
--	@gzip -f ../man/gmic.1
-+	@./gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -__help man 2> ../man/gmic.1
- 
- # Install/uninstall/clean procedures.
--install:
-+install-gimp:
- 	mkdir -p $(DESTDIR)$(PLUGINDIR)/
- 	cp -f gmic_gimp $(DESTDIR)$(PLUGINDIR)/
-+
-+install-bin:
- 	mkdir -p $(DESTDIR)$(USR)/$(BIN)/
- 	cp -f gmic $(DESTDIR)$(USR)/$(BIN)/
-+
-+install-lib:
- 	mkdir -p $(DESTDIR)$(USR)/$(INCLUDE)/
- 	cp -f gmic.h $(DESTDIR)$(USR)/$(INCLUDE)/
--
- ifneq ($(OS),Darwin)
- 	mkdir -p $(DESTDIR)$(USR)/share
- 	mkdir -p $(DESTDIR)$(USR)/$(LIB)
- 	cp -f libgmic.so $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.6.5
- 	ln -fs libgmic.so.1.6.5 $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
- 	ln -fs libgmic.so.1 $(DESTDIR)$(USR)/$(LIB)/libgmic.so
--	cp -f ../zart/zart $(DESTDIR)$(USR)/$(BIN)/
- endif
-+
-+install-zart:
-+	cp -f ../zart/zart $(DESTDIR)$(USR)/$(BIN)/
-+
-+install-man:
- 	mkdir -p $(DESTDIR)$(USR)/share/man/
- 	mkdir -p $(DESTDIR)$(USR)/share/man/man1/
--	mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
--	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
--	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
-+	cp -f ../man/gmic.1 $(DESTDIR)$(USR)/share/man/man1/gmic.1
-+
-+install-bash:
- 	if [ -d /etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi
--	if [ -d /opt/local/etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi
- 
- uninstall:
- 	rm -f $(DESTDIR)$(USR)/$(BIN)/gmic
-@@ -438,8 +437,7 @@
- 	rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
- 	rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so
- 	rm -rf $(DESTDIR)$(USR)/share/doc/gmic/
--	rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
--	rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
-+	rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1
- 
- distclean: clean
- 

diff --git a/media-gfx/gmic/files/gmic-1.6.5.1-makefile.patch b/media-gfx/gmic/files/gmic-1.6.5.1-makefile.patch
deleted file mode 100644
index 4dfe9b7..00000000
--- a/media-gfx/gmic/files/gmic-1.6.5.1-makefile.patch
+++ /dev/null
@@ -1,153 +0,0 @@
---- gmic-1.6.5.1/src/Makefile
-+++ gmic-1.6.5.1/src/Makefile
-@@ -85,7 +85,6 @@
- ifndef NO_STDLIB
- MANDATORY_CFLAGS += -std=c++11
- endif
--MANDATORY_LIBS += -L$(USR)/$(LIB)
- ifeq ($(notdir $(CC)),g++)
- MANDATORY_CFLAGS += -Wall -W
- MANDATORY_LIBS += -lm
-@@ -138,13 +137,13 @@
- # 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.
--X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
--X11_LIBS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr
-+X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr
-+X11_LIBS = -lX11 -lpthread #-lXrandr
- 
- # Flags to enable fast display, using XShm.
- # This requires the presence of the X11 extension include and library files.
- XSHM_CFLAGS = -Dcimg_use_xshm
--XSHM_LIBS = -L$(USR)/X11R6/lib -lXext
-+XSHM_LIBS = -lXext
- 
- # Flags to enable image display, using GDI32.
- # This requires the presence of the GDI32 include and library files.
-@@ -168,8 +167,8 @@
- 
- # Flags to enable native support for MINC2 image files, using the MINC2 library.
- # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )
--MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include
--MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
-+MINC2_CFLAGS = -Dcimg_use_minc2
-+MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz
- 
- # Flags to enable native support for downloading files from the network.
- # ( https://curl.haxx.se/libcurl/ )
-@@ -308,7 +307,6 @@
- 
- cli:
- 	$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
--	strip gmic$(EXE)
- 
- gimp:
- 	$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS)" gmic_gimp
-@@ -318,11 +316,9 @@
- 
- gmicol:
- 	$(MAKE) "CFLAGS+=$(STD_GMICOL_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GMICOL_LIBS)" gmic
--	strip gmic$(EXE)
- 
- static:
- 	$(MAKE) "CFLAGS+=$(STATIC_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STATIC_CLI_LIBS)" gmic
--	strip gmic$(EXE)
- 
- debug:
- 	$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(DEBUG_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
-@@ -338,24 +334,22 @@
- libgmic.o: gmic.cpp gmic.h gmic_def.h CImg.h
- 	$(CC) -o libgmic.o -c gmic.cpp -fPIC $(CFLAGS)
- 
--libgmic: libgmic.o gmic_use_lib.cpp
--	ar rcs libgmic.a libgmic.o
-+libgmic: libgmic.o
-+	$(AR) rcs libgmic.a libgmic.o
- ifeq ($(OS),Darwin)
--	$(CC) -shared -o libgmic.so libgmic.o $(LIBS)
-+	$(CC) $(LDFLAGS) -shared -o libgmic.so libgmic.o $(LIBS)
- else
--	$(CC) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so libgmic.o $(LIBS)
--	$(CC) -o gmic_use_lib gmic_use_lib.cpp -L. -lgmic
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so libgmic.o $(LIBS)
- endif
- 
- gmic_gimp.o: gmic.cpp gmic.h gmic_def.h CImg.h
- 	$(CC) -o gmic_gimp.o -c gmic.cpp -Dgmic_gimp $(CFLAGS)
- 
- gmic_gimp : gmic_gimp.o gmic_gimp.cpp
--	$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS)
--	strip gmic_gimp$(EXE)
-+	$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) $(LDFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS)
- 
- gmic: gmic.cpp gmic.h gmic_def.h CImg.h
--	$(CC) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LIBS)
-+	$(CC) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LDFLAGS) $(LIBS)
- 
- gmic_def.h:
- 	@wget --quiet -O gmic_def.h http://gmic.eu/gmic_def.h
-@@ -380,38 +374,43 @@
- # Generate bash completion script (requires 'gmic' to be installed first).
- bashcompletion:
- 	@mkdir -p ../resources
--	@\gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh
-+	@./gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh
- 
- # Generate man page (requires 'gmic' to be installed first).
- man:
- 	@mkdir -p ../man
--	@\gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -__help man 2> ../man/gmic.1
--	@gzip -f ../man/gmic.1
-+	@./gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -__help man 2> ../man/gmic.1
- 
- # Install/uninstall/clean procedures.
--install:
-+install-gimp:
- 	mkdir -p $(DESTDIR)$(PLUGINDIR)/
- 	cp -f gmic_gimp $(DESTDIR)$(PLUGINDIR)/
-+
-+install-bin:
- 	mkdir -p $(DESTDIR)$(USR)/$(BIN)/
- 	cp -f gmic $(DESTDIR)$(USR)/$(BIN)/
-+
-+install-lib:
- 	mkdir -p $(DESTDIR)$(USR)/$(INCLUDE)/
- 	cp -f gmic.h $(DESTDIR)$(USR)/$(INCLUDE)/
--
- ifneq ($(OS),Darwin)
- 	mkdir -p $(DESTDIR)$(USR)/share
- 	mkdir -p $(DESTDIR)$(USR)/$(LIB)
- 	cp -f libgmic.so $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.6.5
- 	ln -fs libgmic.so.1.6.5 $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
- 	ln -fs libgmic.so.1 $(DESTDIR)$(USR)/$(LIB)/libgmic.so
--	cp -f ../zart/zart $(DESTDIR)$(USR)/$(BIN)/
- endif
-+
-+install-zart:
-+	cp -f ../zart/zart $(DESTDIR)$(USR)/$(BIN)/
-+
-+install-man:
- 	mkdir -p $(DESTDIR)$(USR)/share/man/
- 	mkdir -p $(DESTDIR)$(USR)/share/man/man1/
--	mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
--	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
--	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
-+	cp -f ../man/gmic.1 $(DESTDIR)$(USR)/share/man/man1/gmic.1
-+
-+install-bash:
- 	if [ -d /etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi
--	if [ -d /opt/local/etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi
- 
- uninstall:
- 	rm -f $(DESTDIR)$(USR)/$(BIN)/gmic
-@@ -421,8 +420,7 @@
- 	rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
- 	rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so
- 	rm -rf $(DESTDIR)$(USR)/share/doc/gmic/
--	rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
--	rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
-+	rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1
- 
- distclean: clean
- 

diff --git a/media-gfx/gmic/gmic-1.6.5.0.ebuild b/media-gfx/gmic/gmic-1.6.5.0.ebuild
deleted file mode 100644
index f7502c8..00000000
--- a/media-gfx/gmic/gmic-1.6.5.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs bash-completion-r1 flag-o-matic
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="http://gmic.eu/"
-SRC_URI="http://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-
-LICENSE="CeCILL-2 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ffmpeg fftw graphicsmagick jpeg opencv openexr openmp png tiff X zlib"
-
-DEPEND="
-	fftw? ( sci-libs/fftw:3.0[threads] )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg? ( virtual/jpeg:0 )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
-	openexr? (
-		media-libs/ilmbase
-		media-libs/openexr
-	)
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0 )
-"
-
-S=${WORKDIR}/${P}/src
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-
-	for i in fftw jpeg opencv openmp png tiff zlib ; do
-		use $i || { sed -i -r "s/^(${i}_(CFLAGS|LIBS) =).*/\1/I" Makefile || die ; }
-	done
-
-	use graphicsmagick || { sed -i -r "s/^(MAGICK_(CFLAGS|LIBS) =).*/\1/" Makefile || die ; }
-	use openexr || { sed -i -r "s/^(EXR_(CFLAGS|LIBS) =).*/\1/" Makefile || die ; }
-
-	if ! use X ; then
-		sed -i -r "s/^((X11|XSHM)_(CFLAGS|LIBS) =).*/\1/" Makefile || die
-
-		# disable display capabilities when X support is disabled
-		append-cxxflags -Dcimg_display=0
-	fi
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" \
-		LIB="$(get_libdir)" OPT_CFLAGS= DEBUG_CFLAGS= cli lib
-	emake man bashcompletion
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIB="$(get_libdir)" install-bin install-lib install-man install-bash
-	dodoc ../README
-}

diff --git a/media-gfx/gmic/gmic-1.6.5.1.ebuild b/media-gfx/gmic/gmic-1.6.5.1.ebuild
deleted file mode 100644
index f7502c8..00000000
--- a/media-gfx/gmic/gmic-1.6.5.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs bash-completion-r1 flag-o-matic
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="http://gmic.eu/"
-SRC_URI="http://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-
-LICENSE="CeCILL-2 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ffmpeg fftw graphicsmagick jpeg opencv openexr openmp png tiff X zlib"
-
-DEPEND="
-	fftw? ( sci-libs/fftw:3.0[threads] )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg? ( virtual/jpeg:0 )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
-	openexr? (
-		media-libs/ilmbase
-		media-libs/openexr
-	)
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0 )
-"
-
-S=${WORKDIR}/${P}/src
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-
-	for i in fftw jpeg opencv openmp png tiff zlib ; do
-		use $i || { sed -i -r "s/^(${i}_(CFLAGS|LIBS) =).*/\1/I" Makefile || die ; }
-	done
-
-	use graphicsmagick || { sed -i -r "s/^(MAGICK_(CFLAGS|LIBS) =).*/\1/" Makefile || die ; }
-	use openexr || { sed -i -r "s/^(EXR_(CFLAGS|LIBS) =).*/\1/" Makefile || die ; }
-
-	if ! use X ; then
-		sed -i -r "s/^((X11|XSHM)_(CFLAGS|LIBS) =).*/\1/" Makefile || die
-
-		# disable display capabilities when X support is disabled
-		append-cxxflags -Dcimg_display=0
-	fi
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" \
-		LIB="$(get_libdir)" OPT_CFLAGS= DEBUG_CFLAGS= cli lib
-	emake man bashcompletion
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIB="$(get_libdir)" install-bin install-lib install-man install-bash
-	dodoc ../README
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/files/, media-gfx/gmic/
@ 2020-01-03  6:34 Tim Harder
  0 siblings, 0 replies; 12+ messages in thread
From: Tim Harder @ 2020-01-03  6:34 UTC (permalink / raw
  To: gentoo-commits

commit:     4e9ad7bfce476e056f61fcaba6b256038bc6598e
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  3 06:29:28 2020 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Fri Jan  3 06:31:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e9ad7bf

media-gfx/gmic: remove old

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 media-gfx/gmic/Manifest                        |   2 -
 media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch |  54 --------
 media-gfx/gmic/gmic-2.7.0.ebuild               | 171 -------------------------
 media-gfx/gmic/gmic-2.7.1.ebuild               | 171 -------------------------
 4 files changed, 398 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index edf579caa75..ccf872e7f68 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,4 +1,2 @@
-DIST gmic_2.7.0.tar.gz 5823828 BLAKE2B 5a59e247ca5eb5f1aad841597fb008d9816e3c968224b8f59e51bc443218292601f8b5eea76353429677eb3ddc3fcf8f8ff28eaedd3a8ec66d84ebeb825fe7d3 SHA512 8269540253774061b108b309463dfbadb76b925e36f5d62be59020fef4178fc83b79a221f32104880b51cd9d7aef67a698beb648c6e544e4e58b88796e46a0c4
-DIST gmic_2.7.1.tar.gz 5843308 BLAKE2B 8a348d9444ba0879816a438161c130e9fc706178f93c6a1202586209f2d3779dfce48d2bd3147b47dec9614e4a3687108913b45e6c91afc8bc6266aabee26012 SHA512 9a2f8536217ba449207022bb1dfc92d3826bea80f8e7a048880c5c4451070e7a09b21c0c17199941284040b8f3661dc93737d0f67975c58b6a7015038c49465e
 DIST gmic_2.7.2.tar.gz 5848157 BLAKE2B 192eb02c1079072064d67d4cc834e8d674b55e0ce663501775ca2d31a4627129d9c1075d217800049e150c3dc7b6059c2521be1a594034df04beef416c6d888a SHA512 d8e26720d30235d613a618ce01615bd82fe0caf73979e5797865a459d7d7f877169111da98db88bfff62d0383e0301789aae7d3449ca9869d43847c6a5cbd7fb
 DIST gmic_2.8.1.tar.gz 5995556 BLAKE2B 3f3c35290d18c927745b4b527f5297a9c3beb109a34b7e8b70dcff064f2587e022616e0fe5063d79e94b8fbd0ce3f70b6b5417ebaa0f0cc0f61891d79330afa9 SHA512 0f9ae9454c6f053026cdace43b24e32183f384d79099bc654c3b154647d24ef6541b1fae62cb17e27e527fb51ed8cef03a46490af3ace1551646fc8b3cd64eb9

diff --git a/media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch b/media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch
deleted file mode 100644
index e268558a95e..00000000000
--- a/media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Fix linking with fftw when thread support is enabled and fix source code file
-name typo.
-
---- gmic-qt/CMakeLists.txt
-+++ gmic-qt/CMakeLists.txt
-@@ -13,6 +13,7 @@
- set(CMAKE_AUTOUIC OFF)
- set(CMAKE_AUTORCC ON)
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
-+set(EXTRA_LIBRARIES)
- 
- set (GMIC_QT_HOST "gimp" CACHE STRING "Define for which host qmic-qt will be built: gimp, krita or none.")
- if (${GMIC_QT_HOST} STREQUAL "none")
-@@ -143,8 +144,13 @@
- #
- find_package(FFTW3 REQUIRED)
- add_definitions(-Dcimg_use_fftw3 )
--add_definitions(-Dcimg_use_fftw3_singlethread )
- include_directories(${FFTW3_INCLUDE_DIR})
-+find_library(FFTW3_THREADS_LIB fftw3_threads PATHS ${FFTW3_LIBRARY_DIRS})
-+if(FFTW3_THREADS_LIB STREQUAL "FFTW3_THREADS_LIB-NOTFOUND")
-+    add_definitions(-Dcimg_use_fftw3_singlethread)
-+else()
-+    list(APPEND EXTRA_LIBRARIES "-lfftw3_threads")
-+endif()
- 
- #
- # CURL
-@@ -185,6 +191,7 @@
-         ${PNG_LIBRARIES}
-         ${FFTW3_LIBRARIES}
-         ${ZLIB_LIBRARIES}
-+        ${EXTRA_LIBRARIES}
- )
- 
- if (CURL_FOUND)
-@@ -278,7 +285,7 @@
-   src/FilterParameters/ChoiceParameter.h
-   src/FilterParameters/ColorParameter.h
-   src/FilterParameters/ConstParameter.h
--  src/FilterParameters/CustomDoubleSpinbox.h
-+  src/FilterParameters/CustomDoubleSpinBox.h
-   src/FilterParameters/FileParameter.h
-   src/FilterParameters/FilterParametersWidget.h
-   src/FilterParameters/FloatParameter.h
-@@ -350,7 +357,7 @@
-   src/FilterParameters/ChoiceParameter.cpp
-   src/FilterParameters/ColorParameter.cpp
-   src/FilterParameters/ConstParameter.cpp
--  src/FilterParameters/CustomDoubleSpinbox.cpp
-+  src/FilterParameters/CustomDoubleSpinBox.cpp
-   src/FilterParameters/FileParameter.cpp
-   src/FilterParameters/FilterParametersWidget.cpp
-   src/FilterParameters/FloatParameter.cpp

diff --git a/media-gfx/gmic/gmic-2.7.0.ebuild b/media-gfx/gmic/gmic-2.7.0.ebuild
deleted file mode 100644
index 1edb9254ff0..00000000000
--- a/media-gfx/gmic/gmic-2.7.0.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-CMAKE_MIN_VERSION=3.9
-
-inherit cmake-utils bash-completion-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	|| ( cli gimp krita qt5 )
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		>=media-gfx/gimp-2.8.0
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
-	cmake-utils_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use krita || use qt5; then
-		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		PATCHES=( "${FILESDIR}"/${PN}-2.6.7-qt-cmake.patch )
-		cmake-utils_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake-utils_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}

diff --git a/media-gfx/gmic/gmic-2.7.1.ebuild b/media-gfx/gmic/gmic-2.7.1.ebuild
deleted file mode 100644
index 2a575ef1eb6..00000000000
--- a/media-gfx/gmic/gmic-2.7.1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-CMAKE_MIN_VERSION=3.9
-
-inherit cmake-utils bash-completion-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	|| ( cli gimp krita qt5 )
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		>=media-gfx/gimp-2.8.0
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
-	cmake-utils_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use krita || use qt5; then
-		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
-		cmake-utils_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake-utils_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/files/, media-gfx/gmic/
@ 2020-04-05 10:05 Tim Harder
  0 siblings, 0 replies; 12+ messages in thread
From: Tim Harder @ 2020-04-05 10:05 UTC (permalink / raw
  To: gentoo-commits

commit:     fcac582e2ae9b489eb154d1bdd527afd2934b0b2
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  5 08:08:16 2020 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sun Apr  5 10:02:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcac582e

media-gfx/gmic: remove old

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 media-gfx/gmic/Manifest                        |   2 -
 media-gfx/gmic/files/gmic-2.4.3-curl.patch     | 100 ---------------
 media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch |  35 -----
 media-gfx/gmic/gmic-2.8.1.ebuild               | 171 -------------------------
 media-gfx/gmic/gmic-2.8.2.ebuild               | 170 ------------------------
 5 files changed, 478 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index ec37d729338..e743820e3bd 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,4 +1,2 @@
-DIST gmic_2.8.1.tar.gz 5995556 BLAKE2B 3f3c35290d18c927745b4b527f5297a9c3beb109a34b7e8b70dcff064f2587e022616e0fe5063d79e94b8fbd0ce3f70b6b5417ebaa0f0cc0f61891d79330afa9 SHA512 0f9ae9454c6f053026cdace43b24e32183f384d79099bc654c3b154647d24ef6541b1fae62cb17e27e527fb51ed8cef03a46490af3ace1551646fc8b3cd64eb9
-DIST gmic_2.8.2.tar.gz 6170087 BLAKE2B 36bea32531fef3694c4bf295603c2327dba2391f8cb868393d01a86dd9dcc52a127584e8eaeeba79425aceb07fd3ee31e0383a182eb0956daa920122463c4a08 SHA512 80fbba0dd1f02fe23986f57190e6e4bb0df31ac8b4084ddcfa088fcf352b44484ada47704b42c9cd27f52a55e42247447c73181c0a84a4f0e54f064e9fc9ca9a
 DIST gmic_2.8.3.tar.gz 6172645 BLAKE2B 51a910ca9bb146173863f7f72dafec8ed42334757223055a5e174bebbed9e23372e1fdeb5b522c2120b203f4cbac0f255a9ada58fa62c7f83c745016d11bcabb SHA512 cde0e3fc50a97dae2b6d1dac1e7292a3d0af5e963586ec3e7ab6890721bc9617ea80b3bc86ec4cdc897d8b4ddc0fde552eea8322f8f337c447c603bcbc1403fd
 DIST gmic_2.9.0.tar.gz 6195597 BLAKE2B 3e1f83aa7e2024c545cab16c15cbd108ecaa33e7b0423c37cbb7e19fc9179280dfb31d819926110f06ff10a8b2b3e22b3c7f6c3e8bdece8b51c7295b8e78a974 SHA512 3b3703520998e5ad547316683158d7b60541a8cea2a7c1e7118f8de88492e0961bf1fe1da360dfb26d0ba7eaf997e7005a864364297db2bb405d532dedc4241d

diff --git a/media-gfx/gmic/files/gmic-2.4.3-curl.patch b/media-gfx/gmic/files/gmic-2.4.3-curl.patch
deleted file mode 100644
index f91f86ff0d4..00000000000
--- a/media-gfx/gmic/files/gmic-2.4.3-curl.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Add curl support for the cli app and base library and make it truly optional
-for gmic-qt instead of automagic.
-
---- gmic-2.4.3/CMakeLists.txt
-+++ gmic-2.4.3/CMakeLists.txt
-@@ -83,6 +83,7 @@
- option(BUILD_MAN "Build the manpage" ON)
- option(BUILD_BASH_COMPLETION "Build Bash completion" ON)
- option(CUSTOM_CFLAGS "Override default compiler optimization flags" OFF)
-+option(ENABLE_CURL "Add support for curl" ON)
- option(ENABLE_X "Add support for X11" ON)
- option(ENABLE_FFMPEG "Add support for FFMpeg" ON)
- option(ENABLE_FFTW "Add support for FFTW" ON)
-@@ -136,6 +137,16 @@
-   link_directories(${ZLIB_LIBRARY_DIRS})
- endif()
- 
-+# curl support
-+if(ENABLE_CURL)
-+  find_package(CURL)
-+endif()
-+if(CURL_FOUND)
-+  set(COMPILE_FLAGS "${COMPILE_FLAGS} -Dcimg_use_curl")
-+  include_directories(${CURL_INCLUDE_DIRS})
-+  link_directories(${CURL_LIBRARY_DIRS})
-+endif()
-+
- #X11 support
- if(ENABLE_X)
-   find_package(X11)
-@@ -288,6 +299,7 @@
-     ${OPENEXR_LIBRARIES}
-     ${OPENCV_LIBRARIES}
-     ${ZLIB_LIBRARIES}
-+    ${CURL_LIBRARIES}
-     ${FFTW3_LIBRARIES}
-     ${EXTRA_LIBRARIES}
-   )
-@@ -316,6 +328,7 @@
-     ${OPENEXR_LIBRARIES}
-     ${OPENCV_LIBRARIES}
-     ${ZLIB_LIBRARIES}
-+    ${CURL_LIBRARIES}
-     ${FFTW3_LIBRARIES}
-     ${EXTRA_LIBRARIES}
-   )
-@@ -345,6 +358,7 @@
-       ${OPENEXR_LIBRARIES}
-       ${OPENCV_LIBRARIES}
-       ${ZLIB_LIBRARIES}
-+      ${CURL_LIBRARIES}
-       ${FFTW3_LIBRARIES}
-       ${EXTRA_LIBRARIES}
-     )
---- gmic-2.4.3/gmic-qt/CMakeLists.txt
-+++ gmic-2.4.3/gmic-qt/CMakeLists.txt
-@@ -30,6 +30,7 @@
- message("G'MIC path: " ${GMIC_PATH})
- 
- option(ENABLE_DYNAMIC_LINKING "Dynamically link the binaries to the GMIC shared library" OFF)
-+option(ENABLE_CURL "Add support for curl" ON)
- set (GMIC_LIB_PATH "${GMIC_PATH}" CACHE STRING "Define the path to the GMIC shared library")
- 
- #
-@@ -149,10 +150,12 @@
- #
- # CURL
- #
--find_package(CURL)
--if (CURL_FOUND)
--    add_definitions(-Dcimg_use_curl)
--    include_directories(SYSTEM ${CURL_INCLUDE_DIRS} )
-+if(ENABLE_CURL)
-+    find_package(CURL)
-+    if (CURL_FOUND)
-+        add_definitions(-Dcimg_use_curl)
-+        include_directories(SYSTEM ${CURL_INCLUDE_DIRS} )
-+    endif()
- endif()
- 
- #
-@@ -187,11 +190,13 @@
-         ${ZLIB_LIBRARIES}
- )
- 
--if (CURL_FOUND)
--    set(gmic_qt_LIBRARIES
--        ${gmic_qt_LIBRARIES}
--        ${CURL_LIBRARIES}
--    )
-+if(ENABLE_CURL)
-+    if (CURL_FOUND)
-+        set(gmic_qt_LIBRARIES
-+            ${gmic_qt_LIBRARIES}
-+            ${CURL_LIBRARIES}
-+        )
-+    endif()
- endif()
- 
- add_definitions(-Dgmic_build)

diff --git a/media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch b/media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch
deleted file mode 100644
index caf22d04ce9..00000000000
--- a/media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Fix linking with fftw when thread support is enabled.
-
---- gmic-qt/CMakeLists.txt
-+++ gmic-qt/CMakeLists.txt
-@@ -13,6 +13,7 @@
- set(CMAKE_AUTOUIC OFF)
- set(CMAKE_AUTORCC ON)
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
-+set(EXTRA_LIBRARIES)
- 
- set (GMIC_QT_HOST "gimp" CACHE STRING "Define for which host qmic-qt will be built: gimp, krita, none, paintdotnet, or digikam.")
- if (${GMIC_QT_HOST} STREQUAL "none")
-@@ -145,8 +146,13 @@
- #
- find_package(FFTW3 REQUIRED)
- add_definitions(-Dcimg_use_fftw3 )
--add_definitions(-Dcimg_use_fftw3_singlethread )
- include_directories(${FFTW3_INCLUDE_DIR})
-+find_library(FFTW3_THREADS_LIB fftw3_threads PATHS ${FFTW3_LIBRARY_DIRS})
-+if(FFTW3_THREADS_LIB STREQUAL "FFTW3_THREADS_LIB-NOTFOUND")
-+    add_definitions(-Dcimg_use_fftw3_singlethread)
-+else()
-+    list(APPEND EXTRA_LIBRARIES "-lfftw3_threads")
-+endif()
- 
- #
- # CURL
-@@ -187,6 +193,7 @@
-         ${PNG_LIBRARIES}
-         ${FFTW3_LIBRARIES}
-         ${ZLIB_LIBRARIES}
-+        ${EXTRA_LIBRARIES}
- )
- 
- if (CURL_FOUND)

diff --git a/media-gfx/gmic/gmic-2.8.1.ebuild b/media-gfx/gmic/gmic-2.8.1.ebuild
deleted file mode 100644
index a4b190fb319..00000000000
--- a/media-gfx/gmic/gmic-2.8.1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-inherit cmake bash-completion-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	|| ( cli gimp krita qt5 )
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		>=media-gfx/gimp-2.8.0
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
-	cmake_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use krita || use qt5; then
-		# respect user flags
-		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		# fix linking with fftw when thread support is enabled
-		PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
-		cmake_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}

diff --git a/media-gfx/gmic/gmic-2.8.2.ebuild b/media-gfx/gmic/gmic-2.8.2.ebuild
deleted file mode 100644
index 660e4b3ff4d..00000000000
--- a/media-gfx/gmic/gmic-2.8.2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-inherit cmake bash-completion-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	|| ( cli gimp krita qt5 )
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		>=media-gfx/gimp-2.8.0
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use krita || use qt5; then
-		# respect user flags
-		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
-			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
-			-i gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		cmake_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/files/, media-gfx/gmic/
@ 2022-09-01 14:54 Marek Szuba
  0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2022-09-01 14:54 UTC (permalink / raw
  To: gentoo-commits

commit:     acb79ff2418e54589a4c3d0eebed048054e27889
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 14:53:35 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 14:54:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acb79ff2

media-gfx/gmic: add 3.1.6

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest                            |   1 +
 .../gmic/files/gmic-3.1.6-makefile_automagic.patch | 131 ++++++++++++++++++++
 .../gmic/files/gmic-3.1.6-relative_rpath.patch     |  11 ++
 media-gfx/gmic/gmic-3.1.6.ebuild                   | 136 +++++++++++++++++++++
 4 files changed, 279 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 12e056f95844..faa5c8711243 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1 +1,2 @@
 DIST gmic_3.0.1.tar.gz 10457923 BLAKE2B b495d10237abf5abe3d7df166119d2fc0b04142975d97db01ab0c5aa177f6e681931799fb392844e5c34d0503874a16d946a7146c5152cca1e64107948c02c03 SHA512 4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a
+DIST gmic_3.1.6.tar.gz 10843311 BLAKE2B c50bcb9bd6c3d7d68a06f72faf0061d22b37c6fa357b40c16963c16a8841dba5ee8cf4509076a6734bb4eedbddfa2870897cb30687715ee6d7d84f2520700c17 SHA512 7d1ab97e8dfdf75b647cb7248eaa153e3ebcd5d1b799c67a6e027a5e2e8746047d348ea8e25485aed615d62f485dd06895fe6234f67a055cab423997b96f9775

diff --git a/media-gfx/gmic/files/gmic-3.1.6-makefile_automagic.patch b/media-gfx/gmic/files/gmic-3.1.6-makefile_automagic.patch
new file mode 100644
index 000000000000..8dbe50d6e194
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-3.1.6-makefile_automagic.patch
@@ -0,0 +1,131 @@
+Includes the OpenEXR3 patch as well as support for building with USE=-X,
+as the relevant lines are deeply embedded in the automagic stuff.
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -226,8 +226,10 @@
+ 
+ # Enable parallelization in CImg, using OpenMP.
+ # (http://www.openmp.org/)
++ifeq ($(GMIC_USE_OPENMP),yes)
+ OPENMP_CFLAGS = -fopenmp -Dcimg_use_openmp
+ OPENMP_LIBS = -lgomp
++endif
+ 
+ # Enable software debugging.
+ # (Use address sanitizer and thus slows down the code)
+@@ -249,9 +251,13 @@
+ # Enable image display, using X11 (Unix).
+ # (Keep /usr/ dirname here since X11 is located in /usr/ on Mac too)
+ ifneq ($(OS),Darwin)
++ifeq ($(GMIC_USE_X11),yes)
+ X11_CFLAGS = -Dcimg_display=1 $(shell pkg-config --cflags x11 || echo -I/usr/X11R6/include) #-Dcimg_use_xrandr
+ X11_LIBS = $(shell pkg-config --libs x11 || echo -L/usr/X11R6/lib -lX11) -lpthread # $(shell pkg-config --libs xrandr || echo -lXrandr)
+ else
++X11_CFLAGS = -Dcimg_display=0
++endif
++else
+ ifeq (,$(wildcard /usr/X11))
+ X11_CFLAGS = -Dcimg_display=0 #-Dcimg_use_xrandr
+ X11_LIBS = -lpthread # $(shell pkg-config --libs xrandr || echo -lXrandr)
+@@ -263,8 +269,10 @@
+ 
+ # Enable faster X11 display, using XShm extension.
+ # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
++ifeq ($(GMIC_USE_XSHM),yes)
+ XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
+ XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
++endif
+ 
+ # Enable image display, using GDI32 (Windows).
+ GDI32_CFLAGS = -Dcimg_display=2
+@@ -273,8 +281,10 @@
+ # Enable native support of PNG image files, using the PNG library.
+ # (http://www.libpng.org/pub/png/libpng.html)
+ ifneq ($(OS),Darwin)
++ifeq ($(GMIC_USE_PNG),yes)
+ PNG_CFLAGS = -Dcimg_use_png $(shell pkg-config --cflags libpng)
+ PNG_LIBS = $(shell pkg-config --libs libpng || echo -lpng -lz)
++endif
+ else
+ ifeq (,$(wildcard /tmp/skl))
+ PNG_CFLAGS = -Dcimg_use_png $(shell pkg-config --cflags libpng)
+@@ -287,56 +297,76 @@
+ 
+ # Enable native support of JPEG image files, using the JPEG library.
+ # (http://libjpeg.sourceforge.net/)
++ifeq ($(GMIC_USE_JPEG),yes)
+ JPEG_CFLAGS = -Dcimg_use_jpeg $(shell pkg-config --cflags libjpeg)
+ JPEG_LIBS = $(shell pkg-config --libs libjpeg || echo -ljpeg)
++endif
+ 
+ # Enable native support of TIFF image files, using the TIFF library.
+ # (http://www.libtiff.org/)
++ifeq ($(GMIC_USE_TIFF),yes)
+ TIFF_CFLAGS = -Dcimg_use_tiff $(shell pkg-config --cflags libtiff-4)
+ TIFF_LIBS = $(shell pkg-config --libs libtiff-4 || echo -ltiff)
++endif
+ 
+ # Enable native support for loading HEIC/AVIF image files, using the libheif library.
+ # ( https://github.com/strukturag/libheif )
++ifeq ($(GMIC_USE_HEIF),yes)
+ HEIF_CFLAGS = -Dcimg_use_heif
+ HEIF_LIBS = -lheif
++endif
+ 
+ # Enable native support of MINC2 image files, using the MINC2 library.
+ # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )
++ifeq ($(GMIC_USE_MINC2),yes)
+ MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include
+ MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
++endif
+ 
+ # Enable native support for downloading files from the network.
+ # ( http://curl.haxx.se/libcurl/ )
++ifeq ($(GMIC_USE_CURL),yes)
+ CURL_CFLAGS = -Dcimg_use_curl $(shell pkg-config --cflags libcurl)
+ CURL_LIBS = $(shell pkg-config --libs libcurl || echo -lcurl)
++endif
+ 
+ # Enable native support of webcams and video streaming, using the OpenCV library.
+ # (https://opencv.org/)
++ifeq ($(GMIC_USE_OPENCV),yes)
+ OPENCV_CFLAGS = -Dcimg_use_opencv $(shell pkg-config opencv --cflags) -I/usr/include/opencv -I/usr/include/opencv4
+ OPENCV_LIBS = $(shell pkg-config opencv --libs || echo -lopencv_core -lopencv_highgui -lopencv_videoio)
++endif
+ 
+ # Enable support of most classical image file formats, using the GraphicsMagick++ library.
+ # (http://www.graphicsmagick.org/Magick++/)
++ifeq ($(GMIC_USE_GRAPHICSMAGICK),yes)
+ MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
+ MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
++endif
+ 
+ # Enable native support of EXR image files, using the OpenEXR library.
+ # (http://www.openexr.com/)
+-OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR)
+-OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lIlmImf -lHalf)
++ifeq ($(GMIC_USE_EXR),yes)
++OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath)
++OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lOpenEXR -lImath)
++endif
+ 
+ # Enable Fast Fourier Transforms, using the FFTW3 library.
+ # (http://www.fftw.org/)
++ifeq ($(GMIC_USE_FFTW),yes)
+ FFTW_CFLAGS = -Dcimg_use_fftw3 $(shell pkg-config --cflags fftw3)
+ FFTW_LIBS = $(shell pkg-config --libs fftw3 || echo -lfftw3)
+ ifneq ($(OS),Windows)
+ FFTW_LIBS += -lfftw3_threads
+ endif
++endif
+ 
+ # Enable native support of the BOARD library.
+ # (https://github.com/c-koi/libboard)
++ifeq ($(GMIC_USE_BOARD),yes)
+ BOARD_CFLAGS = -Dcimg_use_board
+ BOARD_LIBS = -lboard
++endif
+ 
+ GMIC_STD_CFLAGS = $(MANDATORY_CFLAGS) $(ABORT_CFLAGS) $(PARALLEL_CFLAGS) $(FFTW_CFLAGS) $(CURL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS)
+ GMIC_STD_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(FFTW_LIBS) $(CURL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS)

diff --git a/media-gfx/gmic/files/gmic-3.1.6-relative_rpath.patch b/media-gfx/gmic/files/gmic-3.1.6-relative_rpath.patch
new file mode 100644
index 000000000000..e2da793f31a8
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-3.1.6-relative_rpath.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -187,7 +187,7 @@
+ ifndef NO_SRIPDLIB
+ MANDATORY_CFLAGS += -std=c++11 -pedantic
+ endif
+-MANDATORY_LIBS += -L. -L$(USR)/$(LIB) -Wl,-rpath,.
++MANDATORY_LIBS += -L. -L$(USR)/$(LIB)
+ ifdef IS_GCC
+ MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
+ GCC_VER_GTEQ5 = $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 5)

diff --git a/media-gfx/gmic/gmic-3.1.6.ebuild b/media-gfx/gmic/gmic-3.1.6.ebuild
new file mode 100644
index 000000000000..06ca0c8a4cc3
--- /dev/null
+++ b/media-gfx/gmic/gmic-3.1.6.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X"
+REQUIRED_USE="
+	gimp? ( png fftw X )
+	qt5? ( png fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5
+	>=dev-qt/qtgui-${MIN_QT_VER}:5
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5
+"
+DEPEND="
+	sys-libs/zlib:0=
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		media-gfx/gimp:0/2
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		dev-libs/imath:=
+		media-libs/openexr:=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)"
+RDEPEND="${DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+BDEPEND="
+	virtual/pkgconfig
+	gimp? (
+		dev-qt/linguist-tools:5
+		media-gfx/gimp:0/2
+	)
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.6-makefile_automagic.patch
+	"${FILESDIR}"/${PN}-3.1.6-relative_rpath.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+gmic_emake() {
+	emake -j1 -C src \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		STRIP="/bin/true" \
+		LIB="$(get_libdir)" \
+		OPT_CFLAGS="${CXXFLAGS}" \
+		OPT_LIBS="${LDFLAGS}" \
+		GMIC_USE_CURL=$(usex curl) \
+		GMIC_USE_EXR=$(usex openexr) \
+		GMIC_USE_FFTW=$(usex fftw) \
+		GMIC_USE_GRAPHICSMAGICK=$(usex graphicsmagick) \
+		GMIC_USE_JPEG=$(usex jpeg) \
+		GMIC_USE_OPENCV=$(usex opencv) \
+		GMIC_USE_OPENMP=$(usex openmp) \
+		GMIC_USE_PNG=$(usex png) \
+		GMIC_USE_TIFF=$(usex tiff) \
+		GMIC_USE_X11=$(usex X) \
+		QMAKE="qmake5" \
+		$@
+}
+
+# FIXME:
+#  - honour user CFLAGS while building C binaries (i.e. 'use_libcgmic')
+src_compile() {
+	gmic_emake lib libc
+	use cli && gmic_emake cli_shared
+	use gimp && gmic_emake gimp_shared
+	use qt5 && gmic_emake gmic_qt_shared
+}
+
+src_install() {
+	# See below for why this has to name a directory even if USE=-gimp
+	local gimp_plugindir="/deleteme"
+	if use gimp; then
+		if type gimptool &>/dev/null; then
+			gimp_plugindir="$(gimptool --gimpplugindir)/plug-ins"
+		elif type gimptool-2.0 &>/dev/null; then
+			gimp_plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
+		elif type gimptool-2.99 &>/dev/null; then
+			gimp_plugindir="$(gimptool-2.99 --gimpplugindir)/plug-ins"
+		else
+			die "Cannot find GIMP plugin directory"
+		fi
+	fi
+
+	gmic_emake DESTDIR="${ED}" PLUGINDIR="${gimp_plugindir}" install
+
+	# Upstream build scripts create PLUGINDIR and write some files to it
+	# regardless of whether the GIMP plug-in has been built or not, or even
+	# when they haven't been able to execute gimptool to get the base path.
+	use gimp || rm -rf "${ED}/${gimp_plugindir}"
+
+	# These are already gzipped in the source tarballs
+	find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} \; || die
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/files/, media-gfx/gmic/
@ 2023-02-28 10:42 Marek Szuba
  0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2023-02-28 10:42 UTC (permalink / raw
  To: gentoo-commits

commit:     2ce0cae31bea5242b5dc16fba53b61f837fe3f12
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 09:50:31 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 10:42:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ce0cae3

media-gfx/gmic: drop 3.0.1-r3

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest                            |   1 -
 media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch      |  16 --
 .../gmic/files/gmic-3.0.1-openexr-3-imath.patch    |  28 ----
 media-gfx/gmic/gmic-3.0.1-r3.ebuild                | 176 ---------------------
 4 files changed, 221 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 26174056ae0b..ccbaa655c45e 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,3 +1,2 @@
-DIST gmic_3.0.1.tar.gz 10457923 BLAKE2B b495d10237abf5abe3d7df166119d2fc0b04142975d97db01ab0c5aa177f6e681931799fb392844e5c34d0503874a16d946a7146c5152cca1e64107948c02c03 SHA512 4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a
 DIST gmic_3.1.6.tar.gz 10843311 BLAKE2B c50bcb9bd6c3d7d68a06f72faf0061d22b37c6fa357b40c16963c16a8841dba5ee8cf4509076a6734bb4eedbddfa2870897cb30687715ee6d7d84f2520700c17 SHA512 7d1ab97e8dfdf75b647cb7248eaa153e3ebcd5d1b799c67a6e027a5e2e8746047d348ea8e25485aed615d62f485dd06895fe6234f67a055cab423997b96f9775
 DIST gmic_3.2.0.tar.gz 10933655 BLAKE2B 6b87acb2a356d3d0c00e795d8b66de75acffa1f87b63caf58986ab52730fcd58bb9dfa37caf057ac2ab2a58695dd783c09018305f21d258427d9c1e450d1c14d SHA512 2eccf179e865416ce5a6cc38fd5587fe79fb30cda381ca2bcb1e587f101a55c502422121d4696834bc25b6200aa3c2292ff30947f2704a610f46e61460685f5b

diff --git a/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch b/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch
deleted file mode 100644
index 04cfa560f193..000000000000
--- a/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-A GCC-specific setting from years ago. gcc-9 quietly ignores it (the
-resulting binaries appear to be the same whether -fno-ipa-sra has been
-specified or not), clang fails on it as not recognised.
-Just get rid of it altogether.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -100,7 +100,7 @@
- if(APPLE)
-     list(APPEND GMIC_CXX_COMPILE_FLAGS -mmacosx-version-min=10.8 -stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive)
- else()
--    list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fno-ipa-sra -fpermissive)
-+    list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fpermissive)
- endif()
- 
- if(NOT "${PRERELEASE_TAG}" STREQUAL "")

diff --git a/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch b/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch
deleted file mode 100644
index e97ef6bf6138..000000000000
--- a/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://src.fedoraproject.org/rpms/gmic/raw/rawhide/f/gmic-openexr3.patch
---- a/cmake/FindCImg.cmake
-+++ b/cmake/FindCImg.cmake
-@@ -147,7 +147,10 @@ if(ENABLE_JPEG)
- endif()
- 
- if(ENABLE_OPENEXR)
--  find_package(OpenEXR)
-+  find_package(OpenEXR CONFIG)
-+  if(NOT TARGET OpenEXR::OpenEXR)
-+    find_package(OpenEXR)
-+  endif()
- 
-   if(OpenEXR_FOUND)
-     list(APPEND CLI_COMPILE_FLAGS "cimg_use_openexr")
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -307,8 +307,8 @@
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR)
--OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lIlmImf -lHalf)
-+OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath)
-+OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lOpenEXR -lImath)
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
- # (http://www.fftw.org/)

diff --git a/media-gfx/gmic/gmic-3.0.1-r3.ebuild b/media-gfx/gmic/gmic-3.0.1-r3.ebuild
deleted file mode 100644
index bb07cf674b67..000000000000
--- a/media-gfx/gmic/gmic-3.0.1-r3.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake bash-completion-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X zlib"
-REQUIRED_USE="
-	gimp? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		media-gfx/gimp:0/2
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:= )
-	openexr? (
-		dev-libs/imath:=
-		media-libs/openexr:=
-	)
-	png? ( media-libs/libpng:= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:= )"
-RDEPEND="${DEPEND}
-	ffmpeg? ( media-video/ffmpeg:= )
-"
-BDEPEND="
-	virtual/pkgconfig
-	gimp? ( dev-qt/linguist-tools:5 )
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.0_ipa-sra.patch
-	"${FILESDIR}"/${PN}-3.0.1-openexr-3-imath.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use qt5; then
-		# respect user flags
-		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
-			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
-			-i gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		# Bug #753377
-		local PATCHES=()
-		cmake_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=no
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	local mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake_src_install
-
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -le "3.0.0"; then
-				einfo "Note that starting with version 3.0.1 ${CATEGORY}/${PN} no longer provides a Krita interface."
-				einfo "Please use the built-in G'MIC plugin provided with Krita 5 instead."
-				break
-			fi
-		done
-	fi
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/files/, media-gfx/gmic/
@ 2023-04-02 22:20 Marek Szuba
  0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2023-04-02 22:20 UTC (permalink / raw
  To: gentoo-commits

commit:     befe18f11de94a39094f23513a2fc94db233ab0e
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  2 22:17:15 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Apr  2 22:19:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=befe18f1

media-gfx/gmic: drop 3.1.6-r1

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest                            |   1 -
 media-gfx/gmic/files/gmic-3.1.6-grep38.patch       |  27 ----
 .../gmic/files/gmic-3.1.6-makefile_automagic.patch | 131 -------------------
 .../gmic/files/gmic-3.1.6-relative_rpath.patch     |  11 --
 media-gfx/gmic/gmic-3.1.6-r1.ebuild                | 142 ---------------------
 5 files changed, 312 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 01aac4b89f1e..eae50d0177ae 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,3 +1,2 @@
-DIST gmic_3.1.6.tar.gz 10843311 BLAKE2B c50bcb9bd6c3d7d68a06f72faf0061d22b37c6fa357b40c16963c16a8841dba5ee8cf4509076a6734bb4eedbddfa2870897cb30687715ee6d7d84f2520700c17 SHA512 7d1ab97e8dfdf75b647cb7248eaa153e3ebcd5d1b799c67a6e027a5e2e8746047d348ea8e25485aed615d62f485dd06895fe6234f67a055cab423997b96f9775
 DIST gmic_3.2.0.tar.gz 10933655 BLAKE2B 6b87acb2a356d3d0c00e795d8b66de75acffa1f87b63caf58986ab52730fcd58bb9dfa37caf057ac2ab2a58695dd783c09018305f21d258427d9c1e450d1c14d SHA512 2eccf179e865416ce5a6cc38fd5587fe79fb30cda381ca2bcb1e587f101a55c502422121d4696834bc25b6200aa3c2292ff30947f2704a610f46e61460685f5b
 DIST gmic_3.2.2.tar.gz 11321544 BLAKE2B e6786fdb0342e1dfa62043837fedeea25961b375af5d1dde247be373c0ef3e35a556dc78d6dd09b5b4c4ead3b531e2bb6a7b671a400dc9d477b22f1c6c7da6b9 SHA512 be695107f8cceb94789aaa021ca431ead3e0a7f87533478df0942ea6ad94f81639de8af827bb24fbef1baccc6ded8d41b4f5386ed9ee37704c2483ea7596800e

diff --git a/media-gfx/gmic/files/gmic-3.1.6-grep38.patch b/media-gfx/gmic/files/gmic-3.1.6-grep38.patch
deleted file mode 100644
index ec1df70002c3..000000000000
--- a/media-gfx/gmic/files/gmic-3.1.6-grep38.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Starting with version 3.8, grep no longer quietly ignores backslashes
-preceding a white-space character.
-
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -88,16 +88,16 @@
- EXE =
- WGET = wget --no-check-certificate --quiet -O
- PLUGINDIR = $(shell gimptool-2.0 --gimpplugindir)/plug-ins
--VERSION = $(shell grep 'gmic_version\ ' gmic.h | tail -c4 | head -c3)
--VERSION1 = $(shell grep 'gmic_version\ ' gmic.h | tail -c4 | head -c1)
--VERSION2 = $(shell grep 'gmic_version\ ' gmic.h | tail -c3 | head -c1)
--VERSION3 = $(shell grep 'gmic_version\ ' gmic.h | tail -c2 | head -c1)
-+VERSION = $(shell grep 'gmic_version ' gmic.h | tail -c4 | head -c3)
-+VERSION1 = $(shell grep 'gmic_version ' gmic.h | tail -c4 | head -c1)
-+VERSION2 = $(shell grep 'gmic_version ' gmic.h | tail -c3 | head -c1)
-+VERSION3 = $(shell grep 'gmic_version ' gmic.h | tail -c2 | head -c1)
- SVERSION=$(VERSION1).$(VERSION2).$(VERSION3)
- SRC_PATH=$(shell pwd)
- 
- # Check that versions of files 'CImg.h' and 'gmic.h' match.
- ifneq (,$(wildcard CImg.h))
--CIMG_VERSION = $(shell grep 'cimg_version\ ' CImg.h | tail -c4 | head -c3)
-+CIMG_VERSION = $(shell grep 'cimg_version ' CImg.h | tail -c4 | head -c3)
- else
- CIMG_VERSION = $(VERSION)
- endif

diff --git a/media-gfx/gmic/files/gmic-3.1.6-makefile_automagic.patch b/media-gfx/gmic/files/gmic-3.1.6-makefile_automagic.patch
deleted file mode 100644
index a716de6e55cc..000000000000
--- a/media-gfx/gmic/files/gmic-3.1.6-makefile_automagic.patch
+++ /dev/null
@@ -1,131 +0,0 @@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -226,8 +226,12 @@
- 
- # Enable parallelization in CImg, using OpenMP.
- # (http://www.openmp.org/)
--OPENMP_CFLAGS = -fopenmp -Dcimg_use_openmp
-+ifeq ($(GMIC_USE_OPENMP),yes)
-+OPENMP_CFLAGS = -fopenmp -Dcimg_use_openmp=1
- OPENMP_LIBS = -lgomp
-+else
-+OPENMP_CFLAGS = -Dcimg_use_openmp=0
-+endif
- 
- # Enable software debugging.
- # (Use address sanitizer and thus slows down the code)
-@@ -249,9 +253,13 @@
- # Enable image display, using X11 (Unix).
- # (Keep /usr/ dirname here since X11 is located in /usr/ on Mac too)
- ifneq ($(OS),Darwin)
-+ifeq ($(GMIC_USE_X11),yes)
- X11_CFLAGS = -Dcimg_display=1 $(shell pkg-config --cflags x11 || echo -I/usr/X11R6/include) #-Dcimg_use_xrandr
- X11_LIBS = $(shell pkg-config --libs x11 || echo -L/usr/X11R6/lib -lX11) -lpthread # $(shell pkg-config --libs xrandr || echo -lXrandr)
- else
-+X11_CFLAGS = -Dcimg_display=0
-+endif
-+else
- ifeq (,$(wildcard /usr/X11))
- X11_CFLAGS = -Dcimg_display=0 #-Dcimg_use_xrandr
- X11_LIBS = -lpthread # $(shell pkg-config --libs xrandr || echo -lXrandr)
-@@ -263,8 +271,10 @@
- 
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
-+ifeq ($(GMIC_USE_XSHM),yes)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
- XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib) -lXext
-+endif
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -273,8 +283,10 @@
- # Enable native support of PNG image files, using the PNG library.
- # (http://www.libpng.org/pub/png/libpng.html)
- ifneq ($(OS),Darwin)
-+ifeq ($(GMIC_USE_PNG),yes)
- PNG_CFLAGS = -Dcimg_use_png $(shell pkg-config --cflags libpng)
- PNG_LIBS = $(shell pkg-config --libs libpng || echo -lpng -lz)
-+endif
- else
- ifeq (,$(wildcard /tmp/skl))
- PNG_CFLAGS = -Dcimg_use_png $(shell pkg-config --cflags libpng)
-@@ -287,56 +299,76 @@
- 
- # Enable native support of JPEG image files, using the JPEG library.
- # (http://libjpeg.sourceforge.net/)
-+ifeq ($(GMIC_USE_JPEG),yes)
- JPEG_CFLAGS = -Dcimg_use_jpeg $(shell pkg-config --cflags libjpeg)
- JPEG_LIBS = $(shell pkg-config --libs libjpeg || echo -ljpeg)
-+endif
- 
- # Enable native support of TIFF image files, using the TIFF library.
- # (http://www.libtiff.org/)
-+ifeq ($(GMIC_USE_TIFF),yes)
- TIFF_CFLAGS = -Dcimg_use_tiff $(shell pkg-config --cflags libtiff-4)
- TIFF_LIBS = $(shell pkg-config --libs libtiff-4 || echo -ltiff)
-+endif
- 
- # Enable native support for loading HEIC/AVIF image files, using the libheif library.
- # ( https://github.com/strukturag/libheif )
-+ifeq ($(GMIC_USE_HEIF),yes)
- HEIF_CFLAGS = -Dcimg_use_heif
- HEIF_LIBS = -lheif
-+endif
- 
- # Enable native support of MINC2 image files, using the MINC2 library.
- # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )
-+ifeq ($(GMIC_USE_MINC2),yes)
- MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include
- MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
-+endif
- 
- # Enable native support for downloading files from the network.
- # ( http://curl.haxx.se/libcurl/ )
-+ifeq ($(GMIC_USE_CURL),yes)
- CURL_CFLAGS = -Dcimg_use_curl $(shell pkg-config --cflags libcurl)
- CURL_LIBS = $(shell pkg-config --libs libcurl || echo -lcurl)
-+endif
- 
- # Enable native support of webcams and video streaming, using the OpenCV library.
- # (https://opencv.org/)
-+ifeq ($(GMIC_USE_OPENCV),yes)
- OPENCV_CFLAGS = -Dcimg_use_opencv $(shell pkg-config opencv --cflags) -I/usr/include/opencv -I/usr/include/opencv4
- OPENCV_LIBS = $(shell pkg-config opencv --libs || echo -lopencv_core -lopencv_highgui -lopencv_videoio)
-+endif
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
-+ifeq ($(GMIC_USE_GRAPHICSMAGICK),yes)
- MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
-+endif
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR)
--OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lIlmImf -lHalf)
-+ifeq ($(GMIC_USE_EXR),yes)
-+OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath)
-+OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lOpenEXR -lImath)
-+endif
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
- # (http://www.fftw.org/)
-+ifeq ($(GMIC_USE_FFTW),yes)
- FFTW_CFLAGS = -Dcimg_use_fftw3 $(shell pkg-config --cflags fftw3)
- FFTW_LIBS = $(shell pkg-config --libs fftw3 || echo -lfftw3)
- ifneq ($(OS),Windows)
- FFTW_LIBS += -lfftw3_threads
- endif
-+endif
- 
- # Enable native support of the BOARD library.
- # (https://github.com/c-koi/libboard)
-+ifeq ($(GMIC_USE_BOARD),yes)
- BOARD_CFLAGS = -Dcimg_use_board
- BOARD_LIBS = -lboard
-+endif
- 
- GMIC_STD_CFLAGS = $(MANDATORY_CFLAGS) $(ABORT_CFLAGS) $(PARALLEL_CFLAGS) $(FFTW_CFLAGS) $(CURL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS)
- GMIC_STD_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(FFTW_LIBS) $(CURL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS)

diff --git a/media-gfx/gmic/files/gmic-3.1.6-relative_rpath.patch b/media-gfx/gmic/files/gmic-3.1.6-relative_rpath.patch
deleted file mode 100644
index e2da793f31a8..000000000000
--- a/media-gfx/gmic/files/gmic-3.1.6-relative_rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -187,7 +187,7 @@
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L. -L$(USR)/$(LIB) -Wl,-rpath,.
-+MANDATORY_LIBS += -L. -L$(USR)/$(LIB)
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- GCC_VER_GTEQ5 = $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 5)

diff --git a/media-gfx/gmic/gmic-3.1.6-r1.ebuild b/media-gfx/gmic/gmic-3.1.6-r1.ebuild
deleted file mode 100644
index 900c5180f8da..000000000000
--- a/media-gfx/gmic/gmic-3.1.6-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X"
-REQUIRED_USE="
-	gimp? ( png fftw X )
-	qt5? ( png fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5
-	>=dev-qt/qtgui-${MIN_QT_VER}:5
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5
-"
-DEPEND="
-	sys-libs/zlib:0=
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		media-gfx/gimp:0/2
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:= )
-	openexr? (
-		dev-libs/imath:=
-		media-libs/openexr:=
-	)
-	png? ( media-libs/libpng:= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)"
-RDEPEND="${DEPEND}
-	ffmpeg? ( media-video/ffmpeg:= )
-"
-BDEPEND="
-	virtual/pkgconfig
-	gimp? (
-		dev-qt/linguist-tools:5
-		media-gfx/gimp:0/2
-	)
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.6-ar_so.patch
-	"${FILESDIR}"/${PN}-3.1.6-grep38.patch
-	"${FILESDIR}"/${PN}-3.1.6-makefile_automagic.patch
-	"${FILESDIR}"/${PN}-3.1.6-relative_rpath.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-gmic_emake() {
-	local mymakeargs=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		STRIP="/bin/true"
-		LIB="$(get_libdir)"
-		OPT_CFLAGS="${CXXFLAGS}"
-		OPT_LIBS="${LDFLAGS}"
-		GMIC_USE_CURL=$(usex curl)
-		GMIC_USE_EXR=$(usex openexr)
-		GMIC_USE_FFTW=$(usex fftw)
-		GMIC_USE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		GMIC_USE_JPEG=$(usex jpeg)
-		GMIC_USE_OPENCV=$(usex opencv)
-		GMIC_USE_OPENMP=$(usex openmp)
-		GMIC_USE_PNG=$(usex png)
-		GMIC_USE_TIFF=$(usex tiff)
-		GMIC_USE_X11=$(usex X)
-		QMAKE="qmake5"
-	)
-
-	tc-is-clang && mymakeargs+=( OPENMP_LIBS="-lomp" )
-
-	emake -j1 -C src \
-		"${mymakeargs[@]}" \
-		$@
-}
-
-src_compile() {
-	gmic_emake lib libc
-	use cli && gmic_emake cli_shared
-	use gimp && gmic_emake gimp_shared
-	use qt5 && gmic_emake gmic_qt_shared
-}
-
-src_install() {
-	# See below for why this has to name a directory even if USE=-gimp
-	local gimp_plugindir="/deleteme"
-	if use gimp; then
-		if type gimptool &>/dev/null; then
-			gimp_plugindir="$(gimptool --gimpplugindir)/plug-ins"
-		elif type gimptool-2.0 &>/dev/null; then
-			gimp_plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
-		elif type gimptool-2.99 &>/dev/null; then
-			gimp_plugindir="$(gimptool-2.99 --gimpplugindir)/plug-ins"
-		else
-			die "Cannot find GIMP plugin directory"
-		fi
-	fi
-
-	gmic_emake DESTDIR="${ED}" PLUGINDIR="${gimp_plugindir}" install
-
-	# Upstream build scripts create PLUGINDIR and write some files to it
-	# regardless of whether the GIMP plug-in has been built or not, or even
-	# when they haven't been able to execute gimptool to get the base path.
-	use gimp || rm -rf "${ED}/${gimp_plugindir}"
-
-	# These are already gzipped in the source tarballs
-	find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} \; || die
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/files/, media-gfx/gmic/
@ 2023-05-23 20:36 Marek Szuba
  0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2023-05-23 20:36 UTC (permalink / raw
  To: gentoo-commits

commit:     c15ab45aee5eda067e918b0416484eb480638e34
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 20:35:31 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue May 23 20:36:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c15ab45a

media-gfx/gmic: add 3.2.4

Closes: https://bugs.gentoo.org/904972
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest                            |   1 +
 .../gmic/files/gmic-3.2.4-makefile_automagic.patch | 131 +++++++++++++++++++
 media-gfx/gmic/gmic-3.2.4.ebuild                   | 139 +++++++++++++++++++++
 3 files changed, 271 insertions(+)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index eae50d0177ae..b6befc696e45 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1,3 @@
 DIST gmic_3.2.0.tar.gz 10933655 BLAKE2B 6b87acb2a356d3d0c00e795d8b66de75acffa1f87b63caf58986ab52730fcd58bb9dfa37caf057ac2ab2a58695dd783c09018305f21d258427d9c1e450d1c14d SHA512 2eccf179e865416ce5a6cc38fd5587fe79fb30cda381ca2bcb1e587f101a55c502422121d4696834bc25b6200aa3c2292ff30947f2704a610f46e61460685f5b
 DIST gmic_3.2.2.tar.gz 11321544 BLAKE2B e6786fdb0342e1dfa62043837fedeea25961b375af5d1dde247be373c0ef3e35a556dc78d6dd09b5b4c4ead3b531e2bb6a7b671a400dc9d477b22f1c6c7da6b9 SHA512 be695107f8cceb94789aaa021ca431ead3e0a7f87533478df0942ea6ad94f81639de8af827bb24fbef1baccc6ded8d41b4f5386ed9ee37704c2483ea7596800e
+DIST gmic_3.2.4.tar.gz 11342611 BLAKE2B f189683e0d12e707c839009449804c9db7b8afc3ff02dd033e0f9b820e889f51f4ae84b0d1e790e836761384778f4da33d79bc7b159484bbf00ec9cf88df92b2 SHA512 0a261d6242b485d7661919c14680f25d7b15d175619d8115077808c5502edb4ed313f37b3b6c6981709751d49bc7df40332aaefc03e626303135a827a5d41daf

diff --git a/media-gfx/gmic/files/gmic-3.2.4-makefile_automagic.patch b/media-gfx/gmic/files/gmic-3.2.4-makefile_automagic.patch
new file mode 100644
index 000000000000..965ba65ae624
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-3.2.4-makefile_automagic.patch
@@ -0,0 +1,131 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -230,6 +230,7 @@
+ 
+ # Enable parallelization in CImg, using OpenMP.
+ # (http://www.openmp.org/)
++ifeq ($(GMIC_USE_OPENMP),yes)
+ ifdef IS_CLANG
+ OPENMP_CFLAGS = -I/usr/lib/gcc/x86_64-linux-gnu/9/include -Dcimg_use_openmp -fopenmp=libomp
+ OPENMP_LIBS =
+@@ -237,6 +238,7 @@
+ OPENMP_CFLAGS = -fopenmp -Dcimg_use_openmp
+ OPENMP_LIBS = -lgomp
+ endif
++endif
+ 
+ # Enable software debugging.
+ # (Use address sanitizer and thus slows down the code)
+@@ -258,9 +260,13 @@
+ # Enable image display, using X11 (Unix).
+ # (Keep /usr/ dirname here since X11 is located in /usr/ on Mac too)
+ ifneq ($(OS),Darwin)
++ifeq ($(GMIC_USE_X11),yes)
+ X11_CFLAGS = -Dcimg_display=1 $(shell pkg-config --cflags x11 || echo -I/usr/X11R6/include) #-Dcimg_use_xrandr
+ X11_LIBS = $(shell pkg-config --libs x11 || echo -L/usr/X11R6/lib -lX11) -lpthread # $(shell pkg-config --libs xrandr || echo -lXrandr)
+ else
++X11_CFLAGS = -Dcimg_display=0
++endif
++else
+ ifeq (,$(wildcard /usr/X11))
+ X11_CFLAGS = -Dcimg_display=0 #-Dcimg_use_xrandr
+ X11_LIBS = -lpthread # $(shell pkg-config --libs xrandr || echo -lXrandr)
+@@ -272,8 +278,10 @@
+ 
+ # Enable faster X11 display, using XShm extension.
+ # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
++ifeq ($(GMIC_USE_XSHM),yes)
+ XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
+ XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(PREFIX)/X11R6/lib) -lXext
++endif
+ 
+ # Enable image display, using GDI32 (Windows).
+ GDI32_CFLAGS = -Dcimg_display=2
+@@ -282,8 +290,10 @@
+ # Enable native support of PNG image files, using the PNG library.
+ # (http://www.libpng.org/pub/png/libpng.html)
+ ifneq ($(OS),Darwin)
++ifeq ($(GMIC_USE_PNG),yes)
+ PNG_CFLAGS = -Dcimg_use_png $(shell pkg-config --cflags libpng)
+ PNG_LIBS = $(shell pkg-config --libs libpng || echo -lpng -lz)
++endif
+ else
+ ifeq (,$(wildcard /tmp/skl))
+ PNG_CFLAGS = -Dcimg_use_png $(shell pkg-config --cflags libpng)
+@@ -296,54 +306,74 @@
+ 
+ # Enable native support of JPEG image files, using the JPEG library.
+ # (http://libjpeg.sourceforge.net/)
++ifeq ($(GMIC_USE_JPEG),yes)
+ JPEG_CFLAGS = -Dcimg_use_jpeg $(shell pkg-config --cflags libjpeg)
+ JPEG_LIBS = $(shell pkg-config --libs libjpeg || echo -ljpeg)
++endif
+ 
+ # Enable native support of TIFF image files, using the TIFF library.
+ # (http://www.libtiff.org/)
++ifeq ($(GMIC_USE_TIFF),yes)
+ TIFF_CFLAGS = -Dcimg_use_tiff $(shell pkg-config --cflags libtiff-4)
+ TIFF_LIBS = $(shell pkg-config --libs libtiff-4 || echo -ltiff)
++endif
+ 
+ # Enable native support for loading HEIC/AVIF image files, using the libheif library.
+ # ( https://github.com/strukturag/libheif )
++ifeq ($(GMIC_USE_HEIF),yes)
+ HEIF_CFLAGS = -Dcimg_use_heif
+ HEIF_LIBS = -lheif
++endif
+ 
+ # Enable native support of MINC2 image files, using the MINC2 library.
+ # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )
++ifeq ($(GMIC_USE_MINC2),yes)
+ MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include
+ MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
++endif
+ 
+ # Enable native support for downloading files from the network.
+ # ( http://curl.haxx.se/libcurl/ )
++ifeq ($(GMIC_USE_CURL),yes)
+ CURL_CFLAGS = -Dcimg_use_curl $(shell pkg-config --cflags libcurl)
+ CURL_LIBS = $(shell pkg-config --libs libcurl || echo -lcurl)
++endif
+ 
+ # Enable native support of webcams and video streaming, using the OpenCV library.
+ # (https://opencv.org/)
++ifeq ($(GMIC_USE_OPENCV),yes)
+ OPENCV_CFLAGS = -Dcimg_use_opencv $(shell pkg-config opencv --cflags) -I/usr/include/opencv -I/usr/include/opencv4
+ OPENCV_LIBS = $(shell pkg-config opencv --libs || echo -lopencv_core -lopencv_highgui -lopencv_videoio)
++endif
+ 
+ # Enable support of most classical image file formats, using the GraphicsMagick++ library.
+ # (http://www.graphicsmagick.org/Magick++/)
++ifeq ($(GMIC_USE_GRAPHICSMAGICK),yes)
+ MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(PREFIX)/$(INCLUDE)/GraphicsMagick)
+ MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
++endif
+ 
+ # Enable native support of EXR image files, using the OpenEXR library.
+ # (http://www.openexr.com/)
+-OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(PREFIX)/$(INCLUDE)/OpenEXR)
+-OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lIlmImf -lHalf)
++ifeq ($(GMIC_USE_EXR),yes)
++OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath)
++OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lOpenEXR -lImath)
++endif
+ 
+ # Enable Fast Fourier Transforms, using the FFTW3 library.
+ # (http://www.fftw.org/)
++ifeq ($(GMIC_USE_FFTW),yes)
+ FFTW_CFLAGS = -Dcimg_use_fftw3 $(shell pkg-config --cflags fftw3)
+ FFTW_LIBS = $(shell pkg-config --libs fftw3 || echo -lfftw3)
+ FFTW_LIBS += -lfftw3_threads
++endif
+ 
+ # Enable native support of the BOARD library.
+ # (https://github.com/c-koi/libboard)
++ifeq ($(GMIC_USE_BOARD),yes)
+ BOARD_CFLAGS = -Dcimg_use_board
+ BOARD_LIBS = -lboard
++endif
+ 
+ GMIC_STD_CFLAGS = $(MANDATORY_CFLAGS) $(ABORT_CFLAGS) $(PARALLEL_CFLAGS) $(FFTW_CFLAGS) $(CURL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS)
+ GMIC_STD_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(FFTW_LIBS) $(CURL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS)

diff --git a/media-gfx/gmic/gmic-3.2.4.ebuild b/media-gfx/gmic/gmic-3.2.4.ebuild
new file mode 100644
index 000000000000..c8691f8d98b3
--- /dev/null
+++ b/media-gfx/gmic/gmic-3.2.4.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic"
+SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X"
+
+REQUIRED_USE="
+	gimp? ( png fftw X )
+	qt5? ( png fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5
+	>=dev-qt/qtgui-${MIN_QT_VER}:5
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5
+"
+DEPEND="
+	sys-libs/zlib:0=
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		media-gfx/gimp:0/2
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:= )
+	openexr? (
+		dev-libs/imath:=
+		media-libs/openexr:=
+	)
+	png? ( media-libs/libpng:= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)"
+RDEPEND="${DEPEND}
+	ffmpeg? ( media-video/ffmpeg:= )
+"
+BDEPEND="
+	virtual/pkgconfig
+	gimp? (
+		dev-qt/linguist-tools:5
+		media-gfx/gimp:0/2
+	)
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.6-ar_so.patch
+	"${FILESDIR}"/${PN}-3.2.0-grep38.patch
+	"${FILESDIR}"/${PN}-3.2.0-relative_rpath.patch
+	"${FILESDIR}"/${PN}-3.2.4-makefile_automagic.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+gmic_emake() {
+	local mymakeargs=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		STRIP="/bin/true"
+		LIB="$(get_libdir)"
+		OPT_CFLAGS="${CXXFLAGS}"
+		OPT_LIBS="${LDFLAGS}"
+		GMIC_USE_CURL=$(usex curl)
+		GMIC_USE_EXR=$(usex openexr)
+		GMIC_USE_FFTW=$(usex fftw)
+		GMIC_USE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		GMIC_USE_JPEG=$(usex jpeg)
+		GMIC_USE_OPENCV=$(usex opencv)
+		GMIC_USE_OPENMP=$(usex openmp)
+		GMIC_USE_PNG=$(usex png)
+		GMIC_USE_TIFF=$(usex tiff)
+		GMIC_USE_X11=$(usex X)
+		QMAKE="qmake5"
+	)
+
+	# Possibly unnecessary since 3.2.0, just in case though.
+	tc-is-clang && mymakeargs+=( OPENMP_LIBS="-lomp" )
+
+	emake -j1 -C src \
+		"${mymakeargs[@]}" \
+		$@
+}
+
+src_compile() {
+	gmic_emake lib
+	gmic_emake libc
+	use cli && gmic_emake cli_shared
+	use gimp && gmic_emake gimp_shared
+	use qt5 && gmic_emake gmic_qt_shared
+}
+
+src_install() {
+	# See below for why this has to name a directory even if USE=-gimp
+	local gimp_plugindir="/deleteme"
+	if use gimp; then
+		if type gimptool &>/dev/null; then
+			gimp_plugindir="$(gimptool --gimpplugindir)/plug-ins"
+		elif type gimptool-2.0 &>/dev/null; then
+			gimp_plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
+		elif type gimptool-2.99 &>/dev/null; then
+			gimp_plugindir="$(gimptool-2.99 --gimpplugindir)/plug-ins"
+		else
+			die "Cannot find GIMP plugin directory"
+		fi
+	fi
+
+	gmic_emake DESTDIR="${ED}" PLUGINDIR="${gimp_plugindir}" install
+
+	# Upstream build scripts create PLUGINDIR and write some files to it
+	# regardless of whether the GIMP plug-in has been built or not, or even
+	# when they haven't been able to execute gimptool to get the base path.
+	use gimp || rm -rf "${ED}/${gimp_plugindir}"
+
+	# These are already gzipped in the source tarballs
+	find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} \; || die
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/files/, media-gfx/gmic/
@ 2023-08-21 15:49 Marek Szuba
  0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2023-08-21 15:49 UTC (permalink / raw
  To: gentoo-commits

commit:     8fc99cd067618885adf566cb2437d7f056e2d1a9
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 15:21:40 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 15:49:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc99cd0

media-gfx/gmic: fix Makefile dependency chain

It helps if libcgmic.so exists before make attempts to link use_libcgmic
against it.

Closes: https://bugs.gentoo.org/912239
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/files/gmic-3.2.6-makefile_target_deps.patch | 11 +++++++++++
 media-gfx/gmic/gmic-3.2.6.ebuild                           |  1 +
 2 files changed, 12 insertions(+)

diff --git a/media-gfx/gmic/files/gmic-3.2.6-makefile_target_deps.patch b/media-gfx/gmic/files/gmic-3.2.6-makefile_target_deps.patch
new file mode 100644
index 000000000000..6aea9e1579eb
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-3.2.6-makefile_target_deps.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -503,7 +503,7 @@
+ libcgmic.o: gmic_libc.cpp CImg.h gmic_libc.h gmic.h
+ 	$(CXX) -o libcgmic.o -c gmic_libc.cpp -Dgmic_core $(PIC) $(CFLAGS)
+ 
+-use_libcgmic: use_libcgmic.c gmic_libc.h
++use_libcgmic: use_libcgmic.c libcgmic.so
+ 	$(CC) -std=c99 -o use_libcgmic use_libcgmic.c -lcgmic $(LIBS)
+ 
+ # libcgmic (static).

diff --git a/media-gfx/gmic/gmic-3.2.6.ebuild b/media-gfx/gmic/gmic-3.2.6.ebuild
index e49f4fe6fe0d..6987b6673d70 100644
--- a/media-gfx/gmic/gmic-3.2.6.ebuild
+++ b/media-gfx/gmic/gmic-3.2.6.ebuild
@@ -65,6 +65,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.2.0-grep38.patch
 	"${FILESDIR}"/${PN}-3.2.4-makefile_automagic.patch
 	"${FILESDIR}"/${PN}-3.2.5-relative_rpath.patch
+	"${FILESDIR}"/${PN}-3.2.6-makefile_target_deps.patch
 )
 
 pkg_pretend() {


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/files/, media-gfx/gmic/
@ 2023-08-22 21:35 Marek Szuba
  0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2023-08-22 21:35 UTC (permalink / raw
  To: gentoo-commits

commit:     e18393d61fe02273afefbabe8b7f7b4dddfd2494
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 22 21:31:09 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 21:35:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e18393d6

media-gfx/gmic: drop 3.2.0

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest                            |   1 -
 .../gmic/files/gmic-3.2.0-makefile_automagic.patch | 133 --------------------
 .../gmic/files/gmic-3.2.0-relative_rpath.patch     |  11 --
 media-gfx/gmic/gmic-3.2.0.ebuild                   | 138 ---------------------
 4 files changed, 283 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index a17dec1164a6..05b82272c3e9 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1 @@
-DIST gmic_3.2.0.tar.gz 10933655 BLAKE2B 6b87acb2a356d3d0c00e795d8b66de75acffa1f87b63caf58986ab52730fcd58bb9dfa37caf057ac2ab2a58695dd783c09018305f21d258427d9c1e450d1c14d SHA512 2eccf179e865416ce5a6cc38fd5587fe79fb30cda381ca2bcb1e587f101a55c502422121d4696834bc25b6200aa3c2292ff30947f2704a610f46e61460685f5b
 DIST gmic_3.2.6.tar.gz 11574989 BLAKE2B abd33048a448ca8406169c61a9d97bf6e785cbb286cec1d5104f12960640de9eb292677256c074eee5371fa77ed7041671f77a63140c2fa58070c01404962be6 SHA512 26b222c94d68273a8ad4a0c72dca315cb0e17695e601f69cb06d44c49166b8c1050926b8c5d73d21a64613e6ba3b0462e730617db83d2c67b53674bf22e50395

diff --git a/media-gfx/gmic/files/gmic-3.2.0-makefile_automagic.patch b/media-gfx/gmic/files/gmic-3.2.0-makefile_automagic.patch
deleted file mode 100644
index 6cab84226e98..000000000000
--- a/media-gfx/gmic/files/gmic-3.2.0-makefile_automagic.patch
+++ /dev/null
@@ -1,133 +0,0 @@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -230,6 +230,7 @@
- 
- # Enable parallelization in CImg, using OpenMP.
- # (http://www.openmp.org/)
-+ifeq ($(GMIC_USE_OPENMP),yes)
- ifdef IS_CLANG
- OPENMP_CFLAGS = -I/usr/lib/gcc/x86_64-linux-gnu/9/include -Dcimg_use_openmp -fopenmp=libomp
- OPENMP_LIBS =
-@@ -237,6 +238,7 @@
- OPENMP_CFLAGS = -fopenmp -Dcimg_use_openmp
- OPENMP_LIBS = -lgomp
- endif
-+endif
- 
- # Enable software debugging.
- # (Use address sanitizer and thus slows down the code)
-@@ -258,9 +260,13 @@
- # Enable image display, using X11 (Unix).
- # (Keep /usr/ dirname here since X11 is located in /usr/ on Mac too)
- ifneq ($(OS),Darwin)
-+ifeq ($(GMIC_USE_X11),yes)
- X11_CFLAGS = -Dcimg_display=1 $(shell pkg-config --cflags x11 || echo -I/usr/X11R6/include) #-Dcimg_use_xrandr
- X11_LIBS = $(shell pkg-config --libs x11 || echo -L/usr/X11R6/lib -lX11) -lpthread # $(shell pkg-config --libs xrandr || echo -lXrandr)
- else
-+X11_CFLAGS = -Dcimg_display=0
-+endif
-+else
- ifeq (,$(wildcard /usr/X11))
- X11_CFLAGS = -Dcimg_display=0 #-Dcimg_use_xrandr
- X11_LIBS = -lpthread # $(shell pkg-config --libs xrandr || echo -lXrandr)
-@@ -272,8 +278,10 @@
- 
- # Enable faster X11 display, using XShm extension.
- # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
-+ifeq ($(GMIC_USE_XSHM),yes)
- XSHM_CFLAGS = -Dcimg_use_xshm $(shell pkg-config --cflags xcb-shm)
- XSHM_LIBS = $(shell pkg-config --libs xcb-shm || echo -L$(PREFIX)/X11R6/lib) -lXext
-+endif
- 
- # Enable image display, using GDI32 (Windows).
- GDI32_CFLAGS = -Dcimg_display=2
-@@ -282,8 +290,10 @@
- # Enable native support of PNG image files, using the PNG library.
- # (http://www.libpng.org/pub/png/libpng.html)
- ifneq ($(OS),Darwin)
-+ifeq ($(GMIC_USE_PNG),yes)
- PNG_CFLAGS = -Dcimg_use_png $(shell pkg-config --cflags libpng)
- PNG_LIBS = $(shell pkg-config --libs libpng || echo -lpng -lz)
-+endif
- else
- ifeq (,$(wildcard /tmp/skl))
- PNG_CFLAGS = -Dcimg_use_png $(shell pkg-config --cflags libpng)
-@@ -296,56 +306,76 @@
- 
- # Enable native support of JPEG image files, using the JPEG library.
- # (http://libjpeg.sourceforge.net/)
-+ifeq ($(GMIC_USE_JPEG),yes)
- JPEG_CFLAGS = -Dcimg_use_jpeg $(shell pkg-config --cflags libjpeg)
- JPEG_LIBS = $(shell pkg-config --libs libjpeg || echo -ljpeg)
-+endif
- 
- # Enable native support of TIFF image files, using the TIFF library.
- # (http://www.libtiff.org/)
-+ifeq ($(GMIC_USE_TIFF),yes)
- TIFF_CFLAGS = -Dcimg_use_tiff $(shell pkg-config --cflags libtiff-4)
- TIFF_LIBS = $(shell pkg-config --libs libtiff-4 || echo -ltiff)
-+endif
- 
- # Enable native support for loading HEIC/AVIF image files, using the libheif library.
- # ( https://github.com/strukturag/libheif )
-+ifeq ($(GMIC_USE_HEIF),yes)
- HEIF_CFLAGS = -Dcimg_use_heif
- HEIF_LIBS = -lheif
-+endif
- 
- # Enable native support of MINC2 image files, using the MINC2 library.
- # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )
-+ifeq ($(GMIC_USE_MINC2),yes)
- MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include
- MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
-+endif
- 
- # Enable native support for downloading files from the network.
- # ( http://curl.haxx.se/libcurl/ )
-+ifeq ($(GMIC_USE_CURL),yes)
- CURL_CFLAGS = -Dcimg_use_curl $(shell pkg-config --cflags libcurl)
- CURL_LIBS = $(shell pkg-config --libs libcurl || echo -lcurl)
-+endif
- 
- # Enable native support of webcams and video streaming, using the OpenCV library.
- # (https://opencv.org/)
-+ifeq ($(GMIC_USE_OPENCV),yes)
- OPENCV_CFLAGS = -Dcimg_use_opencv $(shell pkg-config opencv --cflags) -I/usr/include/opencv -I/usr/include/opencv4
- OPENCV_LIBS = $(shell pkg-config opencv --libs || echo -lopencv_core -lopencv_highgui -lopencv_videoio)
-+endif
- 
- # Enable support of most classical image file formats, using the GraphicsMagick++ library.
- # (http://www.graphicsmagick.org/Magick++/)
-+ifeq ($(GMIC_USE_GRAPHICSMAGICK),yes)
- MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(PREFIX)/$(INCLUDE)/GraphicsMagick)
- MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++)
-+endif
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(PREFIX)/$(INCLUDE)/OpenEXR)
--OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lIlmImf -lHalf)
-+ifeq ($(GMIC_USE_EXR),yes)
-+OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath)
-+OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lOpenEXR -lImath)
-+endif
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
- # (http://www.fftw.org/)
-+ifeq ($(GMIC_USE_FFTW),yes)
- FFTW_CFLAGS = -Dcimg_use_fftw3 $(shell pkg-config --cflags fftw3)
- FFTW_LIBS = $(shell pkg-config --libs fftw3 || echo -lfftw3)
- ifneq ($(OS),Windows)
- FFTW_LIBS += -lfftw3_threads
- endif
-+endif
- 
- # Enable native support of the BOARD library.
- # (https://github.com/c-koi/libboard)
-+ifeq ($(GMIC_USE_BOARD),yes)
- BOARD_CFLAGS = -Dcimg_use_board
- BOARD_LIBS = -lboard
-+endif
- 
- GMIC_STD_CFLAGS = $(MANDATORY_CFLAGS) $(ABORT_CFLAGS) $(PARALLEL_CFLAGS) $(FFTW_CFLAGS) $(CURL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS)
- GMIC_STD_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(FFTW_LIBS) $(CURL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS)

diff --git a/media-gfx/gmic/files/gmic-3.2.0-relative_rpath.patch b/media-gfx/gmic/files/gmic-3.2.0-relative_rpath.patch
deleted file mode 100644
index 85db75fbb4c4..000000000000
--- a/media-gfx/gmic/files/gmic-3.2.0-relative_rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -188,7 +188,7 @@
- ifndef NO_SRIPDLIB
- MANDATORY_CFLAGS += -std=c++11 -pedantic
- endif
--MANDATORY_LIBS += -L. -L$(PREFIX)/$(LIB) -Wl,-rpath,.
-+MANDATORY_LIBS += -L. -L$(PREFIX)/$(LIB)
- ifdef IS_GCC
- MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
- GCC_VER_GTEQ5 = $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 5)

diff --git a/media-gfx/gmic/gmic-3.2.0.ebuild b/media-gfx/gmic/gmic-3.2.0.ebuild
deleted file mode 100644
index d7382d8cbecc..000000000000
--- a/media-gfx/gmic/gmic-3.2.0.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic"
-SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X"
-
-REQUIRED_USE="
-	gimp? ( png fftw X )
-	qt5? ( png fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5
-	>=dev-qt/qtgui-${MIN_QT_VER}:5
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5
-"
-DEPEND="
-	sys-libs/zlib:0=
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		media-gfx/gimp:0/2
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:= )
-	openexr? (
-		dev-libs/imath:=
-		media-libs/openexr:=
-	)
-	png? ( media-libs/libpng:= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)"
-RDEPEND="${DEPEND}
-	ffmpeg? ( media-video/ffmpeg:= )
-"
-BDEPEND="
-	virtual/pkgconfig
-	gimp? (
-		dev-qt/linguist-tools:5
-		media-gfx/gimp:0/2
-	)
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.6-ar_so.patch
-	"${FILESDIR}"/${PN}-3.2.0-grep38.patch
-	"${FILESDIR}"/${PN}-3.2.0-makefile_automagic.patch
-	"${FILESDIR}"/${PN}-3.2.0-relative_rpath.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-gmic_emake() {
-	local mymakeargs=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		STRIP="/bin/true"
-		LIB="$(get_libdir)"
-		OPT_CFLAGS="${CXXFLAGS}"
-		OPT_LIBS="${LDFLAGS}"
-		GMIC_USE_CURL=$(usex curl)
-		GMIC_USE_EXR=$(usex openexr)
-		GMIC_USE_FFTW=$(usex fftw)
-		GMIC_USE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		GMIC_USE_JPEG=$(usex jpeg)
-		GMIC_USE_OPENCV=$(usex opencv)
-		GMIC_USE_OPENMP=$(usex openmp)
-		GMIC_USE_PNG=$(usex png)
-		GMIC_USE_TIFF=$(usex tiff)
-		GMIC_USE_X11=$(usex X)
-		QMAKE="qmake5"
-	)
-
-	# Possibly unnecessary since 3.2.0, just in case though.
-	tc-is-clang && mymakeargs+=( OPENMP_LIBS="-lomp" )
-
-	emake -j1 -C src \
-		"${mymakeargs[@]}" \
-		$@
-}
-
-src_compile() {
-	gmic_emake lib libc
-	use cli && gmic_emake cli_shared
-	use gimp && gmic_emake gimp_shared
-	use qt5 && gmic_emake gmic_qt_shared
-}
-
-src_install() {
-	# See below for why this has to name a directory even if USE=-gimp
-	local gimp_plugindir="/deleteme"
-	if use gimp; then
-		if type gimptool &>/dev/null; then
-			gimp_plugindir="$(gimptool --gimpplugindir)/plug-ins"
-		elif type gimptool-2.0 &>/dev/null; then
-			gimp_plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
-		elif type gimptool-2.99 &>/dev/null; then
-			gimp_plugindir="$(gimptool-2.99 --gimpplugindir)/plug-ins"
-		else
-			die "Cannot find GIMP plugin directory"
-		fi
-	fi
-
-	gmic_emake DESTDIR="${ED}" PLUGINDIR="${gimp_plugindir}" install
-
-	# Upstream build scripts create PLUGINDIR and write some files to it
-	# regardless of whether the GIMP plug-in has been built or not, or even
-	# when they haven't been able to execute gimptool to get the base path.
-	use gimp || rm -rf "${ED}/${gimp_plugindir}"
-
-	# These are already gzipped in the source tarballs
-	find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} \; || die
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2023-08-22 21:35 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-28 10:42 [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/files/, media-gfx/gmic/ Marek Szuba
  -- strict thread matches above, loose matches on Subject: below --
2023-08-22 21:35 Marek Szuba
2023-08-21 15:49 Marek Szuba
2023-05-23 20:36 Marek Szuba
2023-04-02 22:20 Marek Szuba
2022-09-01 14:54 Marek Szuba
2020-04-05 10:05 Tim Harder
2020-01-03  6:34 Tim Harder
2016-12-09  7:06 Tim Harder
2016-11-30  7:07 Tim Harder
2015-08-25  1:37 Tim Harder
2015-08-25  1:37 Tim Harder

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox