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

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

media-gfx/gmic: drop 3.2.0

Signed-off-by: Marek Szuba  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..
--- 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.
- # (

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

2023-08-21 Thread Marek Szuba 
commit: 8fc99cd067618885adf566cb2437d7f056e2d1a9
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Aug 21 15:21:40 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Aug 21 15:49:26 2023 +
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  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 ..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() {

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

2023-05-23 Thread Marek Szuba 
commit: c15ab45aee5eda067e918b0416484eb480638e34
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue May 23 20:35:31 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue May 23 20:36:52 2023 +
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  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 ..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.
+ # (

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

2023-04-02 Thread Marek Szuba 
commit: befe18f11de94a39094f23513a2fc94db233ab0e
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Apr  2 22:17:15 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Apr  2 22:19:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=befe18f1

media-gfx/gmic: drop 3.1.6-r1

Signed-off-by: Marek Szuba  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..
--- 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..
--- 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

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

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

media-gfx/gmic: drop 3.0.1-r3

Signed-off-by: Marek Szuba  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..
--- 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..
--- 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..
--- 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} == "" ]]; 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? (

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

2022-09-01 Thread Marek Szuba 
commit: acb79ff2418e54589a4c3d0eebed048054e27889
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Sep  1 14:53:35 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Sep  1 14:54:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acb79ff2

media-gfx/gmic: add 3.1.6

Signed-off-by: Marek Szuba  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 ..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

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

2020-04-05 Thread Tim Harder 
commit: fcac582e2ae9b489eb154d1bdd527afd2934b0b2
Author: Tim Harder  gentoo  org>
AuthorDate: Sun Apr  5 08:08:16 2020 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sun Apr  5 10:02:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcac582e

media-gfx/gmic: remove old

Signed-off-by: Tim Harder  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..000
--- 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()
- 
-

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

2020-01-02 Thread Tim Harder 
commit: 4e9ad7bfce476e056f61fcaba6b256038bc6598e
Author: Tim Harder  gentoo  org>
AuthorDate: Fri Jan  3 06:29:28 2020 +
Commit: Tim Harder  gentoo  org>
CommitDate: Fri Jan  3 06:31:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e9ad7bf

media-gfx/gmic: remove old

Signed-off-by: Tim Harder  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..000
--- 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..000
--- 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} == "" ]]; 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

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

2016-12-08 Thread Tim Harder 
commit: 9564f7452bcbd4bd86630ae53a7709dc39bcc551
Author: Tim Harder  gentoo  org>
AuthorDate: Fri Dec  9 07:03:15 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Fri Dec  9 07:03:15 2016 +
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..
--- 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

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

2016-11-29 Thread Tim Harder 
commit: 7ffad3e3f37f1fc90e63fd5741ecd75206cdc60c
Author: Tim Harder  gentoo  org>
AuthorDate: Wed Nov 30 07:05:54 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Wed Nov 30 07:07:03 2016 +
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 ..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 ..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 ..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

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

2015-08-24 Thread Tim Harder 
commit: 0ca333e49ad2c795530d7881f4e93770f82ffb0f
Author: Tim Harder radhermit AT gentoo DOT org
AuthorDate: Tue Aug 25 01:35:27 2015 +
Commit: Tim Harder radhermit AT gentoo DOT org
CommitDate: Tue Aug 25 01:35:27 2015 +
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..000
--- 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)

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

2015-08-24 Thread Tim Harder 
commit: ff08a3bdfc6838e1e96dde78b1e89c90c3d6104b
Author: Tim Harder radhermit AT gentoo DOT org
AuthorDate: Tue Aug 25 01:34:15 2015 +
Commit: Tim Harder radhermit AT gentoo DOT org
CommitDate: Tue Aug 25 01:34:15 2015 +
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 000..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)
+