From c87a29854fcab4492399487be13c2480b28473d8 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 6 Sep 2022 20:20:48 +0200 Subject: [PATCH] gmic: update to 3.1.6. --- common/shlibs | 4 +- srcpkgs/gmic/patches/01-includedir.patch | 44 ------------------- srcpkgs/gmic/patches/02-opt-flags.patch | 28 ------------ .../gmic/patches/04-no-krita-and-order.patch | 39 ---------------- srcpkgs/gmic/template | 12 ++--- 5 files changed, 8 insertions(+), 119 deletions(-) delete mode 100644 srcpkgs/gmic/patches/01-includedir.patch delete mode 100644 srcpkgs/gmic/patches/02-opt-flags.patch delete mode 100644 srcpkgs/gmic/patches/04-no-krita-and-order.patch diff --git a/common/shlibs b/common/shlibs index 71ddd09f345..3a7a0fd043b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -557,8 +557,8 @@ libgimpconfig-2.0.so.0 libgimp-2.10.0_1 libgimpmath-2.0.so.0 libgimp-2.10.0_1 libgimpcolor-2.0.so.0 libgimp-2.10.0_1 libgimpmodule-2.0.so.0 libgimp-2.10.0_1 -libgmic.so.2 gmic-2.1.8_1 -libcgmic.so.2 gmic-2.1.8_1 +libgmic.so.3 gmic-3.1.6_1 +libcgmic.so.3 gmic-3.1.6_1 libexiv2.so.27 exiv2-0.27_1 libKF5Holidays.so.5 kholidays-5.47.0_1 libPhabricatorHelpers.so.5 purpose-5.48.0_1 diff --git a/srcpkgs/gmic/patches/01-includedir.patch b/srcpkgs/gmic/patches/01-includedir.patch deleted file mode 100644 index 2cf9031443e..00000000000 --- a/srcpkgs/gmic/patches/01-includedir.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: gmic-2.9.9/src/Makefile -=================================================================== ---- gmic-2.9.9.orig/src/Makefile -+++ gmic-2.9.9/src/Makefile -@@ -163,13 +163,13 @@ NO_PRERELEASE = $(shell date +%y%m%d) - NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"$(PRERELEASE)\\\"" - - # Minimal set of flags mandatory to compile G'MIC. --MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib || echo -I$(USR)/$(INCLUDE)) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS) -+MANDATORY_CFLAGS = -Dgmic_build -Dcimg_date=\\\"\\\" -Dcimg_time=\\\"\\\" -Dcimg_use_zlib -I. $(shell pkg-config --cflags zlib) $(PRERELEASE_CFLAGS) $(EXTRA_CFLAGS) - MANDATORY_LIBS = $(shell pkg-config --libs zlib || echo -lz) $(EXTRA_LIBS) - - ifndef NO_SRIPDLIB - MANDATORY_CFLAGS += -std=c++11 -pedantic - endif --MANDATORY_LIBS += -L$(USR)/$(LIB) -+MANDATORY_LIBS += - ifdef IS_GCC - MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label - MANDATORY_LIBS += -lm -@@ -250,7 +250,7 @@ endif - # Enable faster X11 display, using XShm extension. - # (ftp://www.x.org/pub/X11R7.7/doc/man/man3/XShm.3.xhtml) - 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 -+XSHM_LIBS = $(shell pkg-config --libs xcb-shm) -lXext - - # Enable image display, using GDI32 (Windows). - GDI32_CFLAGS = -Dcimg_display=2 -@@ -303,12 +303,12 @@ OPENCV_LIBS = $(shell pkg-config opencv - - # Enable support of most classical image file formats, using the GraphicsMagick++ library. - # (http://www.graphicsmagick.org/Magick++/) --MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(USR)/$(INCLUDE)/GraphicsMagick) -+MAGICK_CFLAGS = -Dcimg_use_magick $(shell pkg-config --cflags GraphicsMagick++ || echo -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/GraphicsMagick) - MAGICK_LIBS = $(shell pkg-config --libs GraphicsMagick++ || echo -lGraphicsMagick++) - - # Enable native support of EXR image files, using the OpenEXR library. - # (http://www.openexr.com/) --OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/$(INCLUDE)/OpenEXR -+OPENEXR_CFLAGS = -Dcimg_use_openexr -I$(XBPS_CROSS_BASE)$(USR)/$(INCLUDE)/OpenEXR - OPENEXR_LIBS = -lIlmImf -lHalf - - # Enable Fast Fourier Transforms, using the FFTW3 library. diff --git a/srcpkgs/gmic/patches/02-opt-flags.patch b/srcpkgs/gmic/patches/02-opt-flags.patch deleted file mode 100644 index 0d3a5894e58..00000000000 --- a/srcpkgs/gmic/patches/02-opt-flags.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: gmic-2.9.9/src/Makefile -=================================================================== ---- gmic-2.9.9.orig/src/Makefile -+++ gmic-2.9.9/src/Makefile -@@ -192,9 +192,9 @@ endif - - # Enable optimizations for 'cli'. - FLTO = -flto --OPT_CLI_CFLAGS = -Ofast -+OPT_CLI_CFLAGS = - ifdef IS_GCC --OPT_CLI_CFLAGS = -Ofast -mtune=generic $(FLTO) -+OPT_CLI_CFLAGS = $(FLTO) - OPT_CLI_LIBS = $(FLTO) - endif - ifdef icpc -Index: gmic-2.9.9/gmic-qt/gmic_qt.pro -=================================================================== ---- gmic-2.9.9.orig/gmic-qt/gmic_qt.pro -+++ gmic-2.9.9/gmic-qt/gmic_qt.pro -@@ -445,7 +445,6 @@ translations/zh_tw.ts - - # PRE_TARGETDEPS += - --QMAKE_CXXFLAGS_RELEASE += -Ofast # -O3 -s - QMAKE_LFLAGS_RELEASE += -s - QMAKE_CXXFLAGS_DEBUG += -Dcimg_verbosity=3 - diff --git a/srcpkgs/gmic/patches/04-no-krita-and-order.patch b/srcpkgs/gmic/patches/04-no-krita-and-order.patch deleted file mode 100644 index 18ce17a97a7..00000000000 --- a/srcpkgs/gmic/patches/04-no-krita-and-order.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: gmic-2.9.9/src/Makefile -=================================================================== ---- gmic-2.9.9.orig/src/Makefile -+++ gmic-2.9.9/src/Makefile -@@ -327,25 +327,32 @@ BOARD_LIBS = -lboard - #------------------------------- - # Define main Makefile entries. - #------------------------------- - - # Multi-targets - #-------------- --all: -+all: cli lib gimp gmic_qt libc zart -+ -+gmic_qt: gimp -+ -+gimp zart: cli lib libc -+ -+cli lib libc: all-banner -+ -+all-banner: - @echo "**" - ifeq ($(OS),Unix) - @echo "** Start building G'MIC with default Unix configuration." - else - ifeq ($(OS),Darwin) - @echo "** Start building G'MIC with default MacOSX configuration." - else - @echo "** Start building G'MIC with default Windows configuration." - endif - endif - @echo "**" -- $(MAKE) cli lib gimp krita gmic_qt libc zart - - native: - $(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli - - # CLI (standard) - #--------------- diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template index fce3b7639df..f591b833295 100644 --- a/srcpkgs/gmic/template +++ b/srcpkgs/gmic/template @@ -1,8 +1,8 @@ # Template file for 'gmic' pkgname=gmic -version=2.9.9 -revision=3 -_zart_hash=939cf381c5871e506aabd066037acf2b55143c1d +version=3.1.6 +revision=1 +_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0 create_wrksrc=yes build_wrksrc="src" build_style=gnu-makefile @@ -19,9 +19,9 @@ license="CECILL-2.1, CECILL-C" homepage="http://gmic.eu/" distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz" -checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0 - eec47cc9b572cb3e3c26b424381948e12161e129f3d0d3ceca87ff4a8f99fe5d" -# disable_parallel_build="yes" +checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4 + 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8" +disable_parallel_build="yes" post_extract() { mv gmic-${version}/* .