gentoo auto-resync : 16:09:2022 - 17:15:17

2 files changed, 10 insertions, 10 deletions

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 3f6e28ea4062..2858ab28ce06 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,7 +1,7 @@
 AUX gmic-3.0.0_ipa-sra.patch 665 BLAKE2B d1b47e2f0e8e63251172ee6cbc2c5b1bd86d100904a3d7bb0c5df39c051769b8b6c0aa0bb1f81010fd9ca195886a0dbce41528d31a811627ee28d1af58a83432 SHA512 4677fc93e72ed5e71a91197d364a04e1f8c6c13bb3f5b6eb5402a03c0d6ab395b54788669e028b932e207986121138419a58ed5f4333c0a45cbe6c0b9638ed96
 AUX gmic-3.0.1-openexr-3-imath.patch 1051 BLAKE2B 03d1cd6be5c5af76b6ecb071b46ee20abc4bd05d055fcd3ee21943ae5821c8c41e080b20d054b2f5e53cfbeb7326b8af6fa599182cdfd5e47679a57b47fa2f1d SHA512 83e9ec847328eef9f275f747ca6d2ac1071151cc7eb62ad70fa9de121d790e45d60514993274a44fe980537a793eaa56d397da5e207355fa2c9723bdafe7ff88
 AUX gmic-3.1.6-ar_so.patch 758 BLAKE2B 95031f8c3af292ef91d5cdf94406db158c74864c644571ad98630f9b3bd57d816c512a103cf6dd2adc86aa859d06bf73b3596f0c789d3e0d373f0ae0a7a6505f SHA512 19b424e189ddd3b3660a8a80821a907de86f79f22f6014f9af9f8f895bdef0e61c023b9d6859370bfec018274bacf3d13a0da5addf62430b6020f290ccca3f6f
-AUX gmic-3.1.6-makefile_automagic.patch 5378 BLAKE2B 161a06be29e9dc4ac9d4f6234d0da70831c2fd4be4f5f849a16957afee8b4436644591f0f5aecfdfb2b3b33b8ac4f65b8daa966afeb4ee97d340290fce83bfda SHA512 79157c017566e4d0b277169e9356dfaf71c2b46b7e70aa6c6bcc81c664006524bc8b2a86be83e88a1128c3dc527e294b5ea2a685d924975b8a22161e9adc6df0
+AUX gmic-3.1.6-makefile_automagic.patch 5327 BLAKE2B 0df03edbba289d327957a2e703be955dc357e12047e6f1d95a19fc906e4f42d395c2964d10220f642e9a0091b9349d2872066b787b3ae29ca7e231b21bec280f SHA512 80b28b476c61d80466d389924758a218591f5a50edd4583dfd8239d4f8f5a684da1403f7638ca2c99d8038a1135b15b95a87c51bdb65c7f637ce613429922143
 AUX gmic-3.1.6-relative_rpath.patch 400 BLAKE2B 0f457f585d7efde1b05937f1baa240f6fd4590a3c05c2d988e88d8ee62e79c8ac39adb92bee247dcb999ef7654bf9c558802781e9933cb6de4b078cfe7b06ab9 SHA512 1c7da7542005d76f67a553ddec1d9291e34ff99adad3aae6c9761dde8aa93bba8f79eb388072fd43976ae4e45bae066d4726d642698bce36aafbca5dbae009b0
 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
index 8dbe50d6e194..a716de6e55cc 100644
--- a/media-gfx/gmic/files/gmic-3.1.6-makefile_automagic.patch
+++ b/media-gfx/gmic/files/gmic-3.1.6-makefile_automagic.patch
@@ -1,20 +1,20 @@
-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 @@
+@@ -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
++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 +251,13 @@
+@@ -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)
@@ -28,7 +28,7 @@ as the relevant lines are deeply embedded in the automagic stuff.
  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 @@
+@@ -263,8 +271,10 @@
  
  # Enable faster X11 display, using XShm extension.
  # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml)
@@ -39,7 +39,7 @@ as the relevant lines are deeply embedded in the automagic stuff.
  
  # Enable image display, using GDI32 (Windows).
  GDI32_CFLAGS = -Dcimg_display=2
-@@ -273,8 +281,10 @@
+@@ -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)
@@ -50,7 +50,7 @@ as the relevant lines are deeply embedded in the automagic stuff.
  else
  ifeq (,$(wildcard /tmp/skl))
  PNG_CFLAGS = -Dcimg_use_png $(shell pkg-config --cflags libpng)
-@@ -287,56 +297,76 @@
+@@ -287,56 +299,76 @@
  
  # Enable native support of JPEG image files, using the JPEG library.
  # (http://libjpeg.sourceforge.net/)