<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f9c85e272f1d0a706ade42c7ce812d3992eab1f1">https://github.com/macports/macports-ports/commit/f9c85e272f1d0a706ade42c7ce812d3992eab1f1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f9c85e272f1 gmic: update to 3.1.0
</span>f9c85e272f1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f9c85e272f1d0a706ade42c7ce812d3992eab1f1
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Thu Apr 28 20:15:41 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> gmic: update to 3.1.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> upstream the gmic subport now is back to using the Makefile
</span>---
science/gmic/Portfile | 74 ++++++++---------
science/gmic/files/FindHEIF.cmake | 93 ----------------------
science/gmic/files/patch-CMakeLists.txt.diff | 11 ---
science/gmic/files/patch-cmake-FindCImg.cmake.diff | 26 ------
science/gmic/files/patch-src-gmic_cli.cpp.diff | 11 ---
5 files changed, 34 insertions(+), 181 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmic/Portfile b/science/gmic/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0ebdd447ef9..6fe3c15204a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,19 +4,18 @@ PortSystem 1.0
</span>
PortGroup compiler_blacklist_versions 1.0
PortGroup conflicts_build 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq "gmic-clib"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup makefile 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "gmic-gimp" || ${subport} eq "gmic-qt"} {
</span> PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} ne "gmic" && ${subport} ne "gmic-clib"} {
</span> PortGroup qt5 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup makefile 1.0
</span> }
name gmic
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> license CeCILL
categories science graphics
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,9 +39,9 @@ conflicts_build opencv
</span>
distfiles ${name}_${version}${extract.suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e6976838823bdea5340f3dac9359617792be6893 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 68acec32c45d56fb0b0408acec4f63166171816d70722d63106787f1e7d17030 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10458732
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2bf9333f63ecb720658e7081babf7d41f4b137a4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f0d5ae484d43e385b028557b20242ceaf277ef76fab441c5a019f6c2aa3c30cf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10512767
</span>
depends_lib port:curl \
path:lib/libavcodec.dylib:ffmpeg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,48 +81,22 @@ subport ${name}-clib {
</span> patchfiles patch-src-Makefile.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} ne "${name}-clib"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cmake-FindCImg.cmake.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${subport} eq ${name}} {
description-append (C++ library and stand-alone binary).
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # CMakeLists.txt assumes variables CMAKE_CXX_FLAGS_${cmake.build_type}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (CMAKE_CXX_FLAGS_DEBUG and CMAKE_CXX_FLAGS_RELEASE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset debug]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake.build_type Debug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake.build_type Release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${filespath}/FindHEIF.cmake ${worksrcpath}/cmake/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-src-gmic_cli.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.dir ${worksrcpath}/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target cli
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DCUSTOM_CFLAGS=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_OPENMP=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_X=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-src-Makefile.diff
</span>
variant opencv4 description {compile with OpenCV support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_OPENCV=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -L${prefix}/lib/opencv4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pkg_config_path-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/lib/opencv4/pkgconfig
</span>
depends_lib-append path:lib/opencv4/libopencv_core.dylib:opencv4
}
variant x11 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DENABLE_X=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_X=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append port:xorg-libX11 \
port:xorg-libXext \
port:xorg-libXcursor \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,10 +105,29 @@ if {${subport} eq ${name}} {
</span> }
default_variants-append +x11
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see ${worksrcpath}/src/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set x11_cflags "-Dcimg_display=1 [exec ${prefix}/bin/pkg-config --cflags x11]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set x11_libs "[exec ${prefix}/bin/pkg-config --libs x11] -lpthread"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set x11_cflags "-Dcimg_display=0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set x11_libs "-lpthread"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append X11_CFLAGS="${x11_cflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ X11_LIBS="${x11_libs}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append NO_STDLIB=Yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPT_CFLAGS=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/include/gmic_libc.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}/plug-ins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.url https://gmic.eu/files/source/
livecheck.regex ${name}_(\[0-9.\]+)${extract.suffix}
} elseif {${subport} eq "${name}-clib"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see SOVERSION in ${worksrcpath}/CMakeLists.txt
</span> set soversion 1
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,6 +167,7 @@ if {${subport} eq ${name}} {
</span> xinstall -m 0644 ${worksrcpath}/src/libcgmic.a ${destroot}${prefix}/lib
xinstall -m 0755 ${worksrcpath}/src/libcgmic.${soversion}.dylib ${destroot}${prefix}/lib
ln -s libcgmic.${soversion}.dylib ${destroot}${prefix}/lib/libcgmic.dylib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s libcgmic.${soversion}.dylib ${destroot}${prefix}/lib/libgmic.dylib
</span> }
livecheck.type none
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -197,6 +190,7 @@ if {${subport} eq ${name}} {
</span> qt5.depends_build_component qttools
depends_lib-append port:${name} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${name}-clib \
</span> port:xorg-libX11 \
port:xorg-libXext \
port:xorg-libice \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmic/files/FindHEIF.cmake b/science/gmic/files/FindHEIF.cmake
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4c9fa5b9e10..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmic/files/FindHEIF.cmake
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,93 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# - Find the native HEIF includes and library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This module defines
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# HEIF_INCLUDE_DIR, where to find heif.h, etc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# HEIF_LIBRARIES, the libraries to link against to use HEIF.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# HEIF_FOUND, If false, do not try to use HEIF.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Also defined, but not for general use are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# HEIF_LIBRARY, where to find the HEIF library.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Redistribution and use in source and binary forms, with or without
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# modification, are permitted provided that the following conditions are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# met:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# * Redistributions of source code must retain the above copyright notice,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# this list of conditions and the following disclaimer.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# * Redistributions in binary form must reproduce the above copyright notice,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# this list of conditions and the following disclaimer in the documentation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and/or other materials provided with the distribution.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# * The names of Kitware, Inc., the Insight Consortium, or the names of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# any consortium members, or of any contributors, may not be used to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# endorse or promote products derived from this software without
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# specific prior written permission.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-SET(HEIF_FOUND "NO")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# use pkg-config to get the directories and then use these values
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# in the FIND_PATH() and FIND_LIBRARY() calls
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if( NOT WIN32 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(PkgConfig)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pkg_check_modules(HEIF_PKG libheif>=1.7.0 QUIET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-endif( NOT WIN32 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-FIND_PATH(HEIF_INCLUDE_DIR NAMES libheif/heif.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATHS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /opt/local/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /usr/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HINTS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${HEIF_PKG_INCLUDE_DIRS} # Generated by pkg-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-IF (HEIF_INCLUDE_DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(CheckStructHasMember)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CHECK_STRUCT_HAS_MEMBER("struct heif_decoding_options" convert_hdr_to_8bit libheif/heif.h HEIF_HDR_TO_8BIT LANGUAGE C)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(HEIF_PKG_FOUND 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif (WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ENDIF (HEIF_INCLUDE_DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-IF (NOT HEIF_HDR_TO_8BIT AND NOT HEIF_PKG_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE(FATAL_ERROR "libheif version found is too old")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ENDIF (NOT HEIF_HDR_TO_8BIT AND NOT HEIF_PKG_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-SET(HEIF_NAMES ${HEIF_NAMES} heif ${HEIF_PKG_LIBRARY})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-FIND_LIBRARY(HEIF_LIBRARY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NAMES ${HEIF_NAMES}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH /opt/local/lib /usr/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH_SUFFIXES lib64 lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HINTS ${HEIF_PKG_LIBRARY_DIRS} # Generated by pkg-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-IF (HEIF_LIBRARY AND HEIF_INCLUDE_DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(HEIF_FOUND "YES")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(HAVE_LIBHEIF 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(HEIF_LIBRARIES ${HEIF_LIBRARY})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ENDIF (HEIF_LIBRARY AND HEIF_INCLUDE_DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-IF (HEIF_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF (NOT HEIF_FIND_QUIETLY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE(STATUS "Find HEIF: ${HEIF_LIBRARY}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF (NOT HEIF_FIND_QUIETLY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ELSE (HEIF_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF (HEIF_FIND_REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE(FATAL_ERROR "Could not find HEIF library")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF (HEIF_FIND_REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ENDIF (HEIF_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MARK_AS_ADVANCED(HEIF_INCLUDE_DIR HEIF_LIBRARY)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmic/files/patch-CMakeLists.txt.diff b/science/gmic/files/patch-CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 53e19536a39..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmic/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2022-01-18 06:44:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2022-01-19 05:28:30.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -98,7 +98,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND GMIC_CXX_COMPILE_FLAGS -Dgmic_core -Dcimg_use_vt100 -Dgmic_is_parallel -Dcimg_use_abort)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- list(APPEND GMIC_CXX_COMPILE_FLAGS -mmacosx-version-min=10.8 -stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=c++11-narrowing -fpermissive)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmic/files/patch-cmake-FindCImg.cmake.diff b/science/gmic/files/patch-cmake-FindCImg.cmake.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9600390b589..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmic/files/patch-cmake-FindCImg.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/FindCImg.cmake.orig 2021-12-09 03:25:45.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/FindCImg.cmake 2021-12-10 15:18:02.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,6 +31,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option(ENABLE_OPENMP "Add support for parallel processing" ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option(ENABLE_PNG "Add support for handling images in PNG format" ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option(ENABLE_TIFF "Add support for handling images in Tiff format" ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+option(ENABLE_HEIF "Add support for handling images in HEIF format" ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option(ENABLE_ZLIB "Add support for data compression via Zlib" ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(COMPILE_FLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -137,6 +138,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(ENABLE_HEIF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(HEIF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(HEIF_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ list(APPEND CLI_COMPILE_FLAGS "cimg_use_heif")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ list(APPEND EXTRA_LIBRARY_TARGETS heif)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(ENABLE_JPEG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(JPEG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmic/files/patch-src-gmic_cli.cpp.diff b/science/gmic/files/patch-src-gmic_cli.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 89428fad27b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmic/files/patch-src-gmic_cli.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gmic_cli.cpp.orig 2022-01-18 06:44:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gmic_cli.cpp 2022-01-19 05:53:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,7 +49,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <signal.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "CImg.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// #include "CImg.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "gmic.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace cimg_library;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>