diff --git a/common/shlibs b/common/shlibs index 0dfe72b68bd..130f805fd6f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -563,8 +563,8 @@ libgimpconfig-3.0.so.0 libgimp-3.0.0_1 libgimpmath-3.0.so.0 libgimp-3.0.0_1 libgimpcolor-3.0.so.0 libgimp-3.0.0_1 libgimpmodule-3.0.so.0 libgimp-3.0.0_1 -libgmic.so.3 gmic-3.1.6_1 -libcgmic.so.3 gmic-3.1.6_1 +libgmic.so.3 libgmic-3.5.3_1 +libcgmic.so.3 libgmic-3.5.3_1 libexiv2.so.28 exiv2-0.28.1_1 libKF5Holidays.so.5 kholidays-5.47.0_1 libPhabricatorHelpers.so.5 purpose-5.48.0_1 diff --git a/srcpkgs/gmic/patches/03-plugindir-and-no-wget.patch b/srcpkgs/gmic/patches/03-plugindir-and-no-wget.patch index 5b403240efc..5476a40dee8 100644 --- a/srcpkgs/gmic/patches/03-plugindir-and-no-wget.patch +++ b/srcpkgs/gmic/patches/03-plugindir-and-no-wget.patch @@ -1,15 +1,11 @@ -Index: gmic-2.9.9/src/Makefile -=================================================================== ---- gmic-2.9.9.orig/src/Makefile -+++ gmic-2.9.9/src/Makefile -@@ -67,8 +67,8 @@ INCLUDE = include - SO = .so +--- a/src/Makefile ++++ b/src/Makefile +@@ -86,7 +86,7 @@ + INCLUDE ?= include PIC = -fPIC EXE = -WGET = wget --no-check-certificate --quiet -O --PLUGINDIR = $(shell gimptool-2.0 --gimpplugindir)/plug-ins +WGET = false -+PLUGINDIR = /usr/lib/gimp/2.0/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) + GIMPTOOL = $(shell command -v gimptool-3.0 >/dev/null 2>&1 && echo gimptool-3.0 || echo gimptool-2.0) + PLUGIN = $(shell $(GIMPTOOL) --gimpplugindir)/plug-ins + SHARE = $(PREFIX)/share diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template index 24d10147e3a..86542340004 100644 --- a/srcpkgs/gmic/template +++ b/srcpkgs/gmic/template @@ -1,48 +1,56 @@ # Template file for 'gmic' pkgname=gmic -version=3.1.6 -revision=6 -_zart_hash=34ebf6cce0bafb98abe57cec83c4a02cd1abeca0 -create_wrksrc=yes +version=3.5.3 +revision=1 +_zart_hash=d014169343f835381ad232ee11e077326561c9eb build_wrksrc="src" build_style=gnu-makefile build_helper=qmake -make_build_args="NOSTRIP=yes" +make_build_args="NOSTRIP=yes lib libc cli gmic_qt gimp_shared zart" make_use_env=yes hostmakedepends="pkg-config gimp qt5-host-tools qt5-qmake" makedepends="fftw-devel imath-devel libopenexr-devel MesaLib-devel libopencv-devel libgomp-devel lcms2-devel libpng-devel libjpeg-turbo-devel tiff-devel libcurl-devel - gtk+-devel gimp-devel qt5-devel" + gimp-devel qt5-devel libwebp-devel" short_desc="GREYC's Magic for Image Computing (image processing framework)" maintainer="Orphaned " license="CECILL-2.1, CECILL-C" homepage="https://gmic.eu/" distfiles="https://gmic.eu/files/source/gmic_${version}.tar.gz - https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz" -checksum="e73d63ba6520637c782b6e5e6805037a27b6255c011c9e2a60a56f9c28822ce4 - 257baa7e8b32ccfac0841c61ec317ad3ad1c2bfe2d44474b2ca879dc33f755f8" -disable_parallel_build="yes" + https://github.com/c-koi/zart/archive/${_zart_hash}.tar.gz>zart-${_zart_hash}.tar.gz" +checksum="e91a7cac4d0dc7c0ca2620f03bb14af82aa738c85a11b4f82fcc738654606442 + baebe339566993194f98a71895bff09520b08f38e66eae215758aaa260557bcf" +disable_parallel_build=yes +skip_extraction="zart-${_zart_hash}.tar.gz" post_extract() { - mv gmic-${version}/* . - mv zart-${_zart_hash} zart + vsrcextract -C zart zart-${_zart_hash}.tar.gz } post_install() { vlicense ../COPYING + if [ "$CROSS_BUILD" -a "$XBPS_TARGET_WORDSIZE" -eq 32 ]; then + mv "$DESTDIR/usr/lib64"/* "$DESTDIR/usr/lib" + fi +} + +libgmic_package() { + short_desc+=" - libraries" + pkg_install() { + vmove "usr/lib/*.so.*" + } } gmic-gimp_package() { short_desc+=" - GIMP plugin" - depends="gimp ${sourcepkg}>=${version}_${revision}" + depends="gimp" pkg_install() { - vmove usr/lib/gimp + vmove "usr/lib/gimp" } } gmic-zart_package() { short_desc+=" - ZArt tool" - depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/bin/zart vmove usr/share/applications/zart.desktop diff --git a/srcpkgs/libgmic b/srcpkgs/libgmic new file mode 120000 index 00000000000..433883885ce --- /dev/null +++ b/srcpkgs/libgmic @@ -0,0 +1 @@ +gmic \ No newline at end of file