From 158e7d0067767d034ef3a86a07afbf5bb9bf579f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 28 Feb 2023 16:04:24 +0000 Subject: gentoo auto-resync : 28:02:2023 - 16:04:24 --- media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch | 16 ------------- .../gmic/files/gmic-3.0.1-openexr-3-imath.patch | 28 ---------------------- 2 files changed, 44 deletions(-) delete mode 100644 media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch delete mode 100644 media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch (limited to 'media-gfx/gmic/files') 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/) -- cgit v1.2.3