diff --git a/abi_symbols b/abi_symbols
--- a/abi_symbols
+++ b/abi_symbols
@@ -1,67 +1,31 @@
-libcgmic.so.2:_ZN4gmic11levenshteinEPKcS1_
-libcgmic.so.2:_ZN4gmic12_levenshteinEPKcS1_RN12cimg_library4CImgIiEEii
-libcgmic.so.2:_ZN4gmic12add_commandsEP8_IO_FILEPKcPjS4_Pb
-libcgmic.so.2:_ZN4gmic12add_commandsEPKcS1_PjS2_Pb
-libcgmic.so.2:_ZN4gmic12set_variableEPKcRKN12cimg_library4CImgIhEEPKj
-libcgmic.so.2:_ZN4gmic12set_variableEPKcS1_cPKj
-libcgmic.so.2:_ZN4gmic13strreplace_bwEPc
-libcgmic.so.2:_ZN4gmic13strreplace_fwEPc
-libcgmic.so.2:_ZN4gmic14check_filenameEPKc
-libcgmic.so.2:_ZN4gmic14get_debug_infoEPKcRjS2_
-libcgmic.so.2:_ZN4gmic14selection2cimgEPKcjRKN12cimg_library8CImgListIcEES1_b
-libcgmic.so.2:_ZN4gmic17decompress_stdlibEv
-libcgmic.so.2:_ZN4gmic21command_has_argumentsEPKc
-libcgmic.so.2:_ZN4gmic25commands_line_to_CImgListEPKc
-libcgmic.so.2:_ZN4gmic5debugEPKcz
-libcgmic.so.2:_ZN4gmic5errorEbPKcz
-libcgmic.so.2:_ZN4gmic5printEPKcz
-libcgmic.so.2:_ZN4gmic7init_rcEPKc
-libcgmic.so.2:_ZN4gmic7path_rcEPKc
-libcgmic.so.2:_ZN4gmic8basenameEPKc
-libcgmic.so.2:_ZN4gmic8hashcodeEPKcb
-libcgmic.so.2:_ZN4gmic9abort_ptrEPb
-libcgmic.so.2:_ZN4gmic9path_userEPKc
-libcgmic.so.2:_ZN4gmic9strescapeEPKcPc
-libcgmic.so.2:_ZN4gmicC1Ev
-libcgmic.so.2:_ZN4gmicC2Ev
-libcgmic.so.2:_ZN4gmicD1Ev
-libcgmic.so.2:_ZN4gmicD2Ev
-libcgmic.so.2:_ZNK4gmic16callstack2stringEPKN12cimg_library4CImgIjEEb
-libcgmic.so.2:_ZNK4gmic16callstack2stringERKN12cimg_library4CImgIjEEb
-libcgmic.so.2:_ZNK4gmic16callstack2stringEb
-libcgmic.so.2:_ZNK4gmic16selection2stringERKN12cimg_library4CImgIjEERKNS0_8CImgListIcEEjRNS1_IcEE
-libcgmic.so.2:gmic_call
-libcgmic.so.2:gmic_delete_external
-libcgmic.so.2:gmic_get_stdlib
-libgmic.so.2:_ZN4gmic11levenshteinEPKcS1_
-libgmic.so.2:_ZN4gmic12_levenshteinEPKcS1_RN12cimg_library4CImgIiEEii
-libgmic.so.2:_ZN4gmic12add_commandsEP8_IO_FILEPKcPjS4_Pb
-libgmic.so.2:_ZN4gmic12add_commandsEPKcS1_PjS2_Pb
-libgmic.so.2:_ZN4gmic12set_variableEPKcRKN12cimg_library4CImgIhEEPKj
-libgmic.so.2:_ZN4gmic12set_variableEPKcS1_cPKj
-libgmic.so.2:_ZN4gmic13strreplace_bwEPc
-libgmic.so.2:_ZN4gmic13strreplace_fwEPc
-libgmic.so.2:_ZN4gmic14check_filenameEPKc
-libgmic.so.2:_ZN4gmic14get_debug_infoEPKcRjS2_
-libgmic.so.2:_ZN4gmic14selection2cimgEPKcjRKN12cimg_library8CImgListIcEES1_b
-libgmic.so.2:_ZN4gmic17decompress_stdlibEv
-libgmic.so.2:_ZN4gmic21command_has_argumentsEPKc
-libgmic.so.2:_ZN4gmic25commands_line_to_CImgListEPKc
-libgmic.so.2:_ZN4gmic5debugEPKcz
-libgmic.so.2:_ZN4gmic5errorEbPKcz
-libgmic.so.2:_ZN4gmic5printEPKcz
-libgmic.so.2:_ZN4gmic7init_rcEPKc
-libgmic.so.2:_ZN4gmic7path_rcEPKc
-libgmic.so.2:_ZN4gmic8basenameEPKc
-libgmic.so.2:_ZN4gmic8hashcodeEPKcb
-libgmic.so.2:_ZN4gmic9abort_ptrEPb
-libgmic.so.2:_ZN4gmic9path_userEPKc
-libgmic.so.2:_ZN4gmic9strescapeEPKcPc
-libgmic.so.2:_ZN4gmicC1Ev
-libgmic.so.2:_ZN4gmicC2Ev
-libgmic.so.2:_ZN4gmicD1Ev
-libgmic.so.2:_ZN4gmicD2Ev
-libgmic.so.2:_ZNK4gmic16callstack2stringEPKN12cimg_library4CImgIjEEb
-libgmic.so.2:_ZNK4gmic16callstack2stringERKN12cimg_library4CImgIjEEb
-libgmic.so.2:_ZNK4gmic16callstack2stringEb
-libgmic.so.2:_ZNK4gmic16selection2stringERKN12cimg_library4CImgIjEERKNS0_8CImgListIcEEjRNS1_IcEE
+libgmic.so.1:_ZN4gmic11levenshteinEPKcS1_
+libgmic.so.1:_ZN4gmic12_levenshteinEPKcS1_RN12cimg_library4CImgIiEEii
+libgmic.so.1:_ZN4gmic12add_commandsEP8_IO_FILEPKcPjS4_Pb
+libgmic.so.1:_ZN4gmic12add_commandsEPKcS1_PjS2_Pb
+libgmic.so.1:_ZN4gmic12set_variableEPKcRKN12cimg_library4CImgIhEEPKj
+libgmic.so.1:_ZN4gmic12set_variableEPKcS1_cPKj
+libgmic.so.1:_ZN4gmic13strreplace_bwEPc
+libgmic.so.1:_ZN4gmic13strreplace_fwEPc
+libgmic.so.1:_ZN4gmic14get_debug_infoEPKcRjS2_
+libgmic.so.1:_ZN4gmic14selection2cimgEPKcjRKN12cimg_library8CImgListIcEES1_b
+libgmic.so.1:_ZN4gmic17decompress_stdlibEv
+libgmic.so.1:_ZN4gmic21command_has_argumentsEPKc
+libgmic.so.1:_ZN4gmic25commands_line_to_CImgListEPKc
+libgmic.so.1:_ZN4gmic5debugEPKcz
+libgmic.so.1:_ZN4gmic5errorEbPKcz
+libgmic.so.1:_ZN4gmic5printEPKcz
+libgmic.so.1:_ZN4gmic7init_rcEPKc
+libgmic.so.1:_ZN4gmic7path_rcEPKc
+libgmic.so.1:_ZN4gmic8basenameEPKc
+libgmic.so.1:_ZN4gmic8hashcodeEPKcb
+libgmic.so.1:_ZN4gmic9abort_ptrEPb
+libgmic.so.1:_ZN4gmic9path_userEPKc
+libgmic.so.1:_ZN4gmic9strescapeEPKcPc
+libgmic.so.1:_ZN4gmicC1Ev
+libgmic.so.1:_ZN4gmicC2Ev
+libgmic.so.1:_ZN4gmicD1Ev
+libgmic.so.1:_ZN4gmicD2Ev
+libgmic.so.1:_ZNK4gmic16callstack2stringEPKN12cimg_library4CImgIjEEb
+libgmic.so.1:_ZNK4gmic16callstack2stringERKN12cimg_library4CImgIjEEb
+libgmic.so.1:_ZNK4gmic16callstack2stringEb
+libgmic.so.1:_ZNK4gmic16selection2stringERKN12cimg_library4CImgIjEERKNS0_8CImgListIcEEjRNS1_IcEE
diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -1,3 +1,4 @@
+libGraphicsMagick++.so.12
libHalf.so.24
libIlmImf-2_3.so.24
libQt5Core.so.5
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,15 +1,15 @@
name : gmic
-version : 2.8.4
-release : 38
+version : 2.9.1
+release : 39
source :
- - https://gmic.eu/files/source/gmic_2.8.4.tar.gz : b2a279bdf981595b30d8d7828fabf9a620cde06eae8db345a8cddf2160c25379
+ - https://gmic.eu/files/source/gmic_2.9.1.tar.gz : 50c9dd418b8d0e80c703c2e2b179b6049343567483d37d9ff6c642c6ede95d8d
+homepage : https://gmic.eu/
license :
- CECILL-2.1
- CECILL-C
component :
- multimedia.graphics
- gimp : multimedia.graphics
-homepage : https://gmic.eu/
summary :
- GREYC's Magic for Image Computing
- gimp : G'MIC plugin for GIMP
@@ -20,7 +20,7 @@
builddeps :
- pkgconfig(GraphicsMagick)
- pkgconfig(OpenEXR)
- - pkgconfig(Qt5Core)
+ - pkgconfig(Qt5UiTools)
- pkgconfig(eigen3)
- pkgconfig(fftw3)
- pkgconfig(gimp-2.0)
@@ -33,10 +33,52 @@
- hdf5-devel
rundeps :
- gimp : gmic
-build : |
+setup : |
# Workaround : Parse error at "std"
rm zart/.qmake.stash
+build : |
+ # Build gmic
+ %cmake -B build -DENABLE_DYNAMIC_LINKING=ON \
+ -DBUILD_LIB_STATIC=OFF
+ %make -C build -j1
+
+ # Symlink so zart can be build with dynamic linking
+ ln -s ../build/libgmic.so src/libgmic.so
+
+ # Build gmic-qt gimp and krita plugins
+ pushd gmic-qt
+ export LDFLAGS="$LDFLAGS -L../build"
+ %cmake -B build-qt -DENABLE_DYNAMIC_LINKING=ON \
+ -DGMIC_PATH=$workdir/src \
+ -DGMIC_LIB_PATH=$workdir/build \
+ -DGMIC_QT_HOST=none
+ %make -C build-qt -j1
+
+ %cmake -B build-gimp -DENABLE_DYNAMIC_LINKING=ON \
+ -DGMIC_PATH=$workdir/src \
+ -DGMIC_LIB_PATH=$workdir/build \
+ -DGMIC_QT_HOST=gimp
+ %make -C build-gimp -j1
+
+ %cmake -B build-krita -DENABLE_DYNAMIC_LINKING=ON \
+ -DGMIC_PATH=$workdir/src \
+ -DGMIC_LIB_PATH=$workdir/build \
+ -DGMIC_QT_HOST=krita
+ %make -C build-krita -j1
+ popd
- %make -C src all -j1
+ # Build Zart
+ pushd zart
+ %qmake zart.pro \
+ GMIC_DYNAMIC_LINKING=on \
+ GMIC_PATH=$workdir/src \
+ GMIC_LIB_PATH=$workdir/build
+ %make
+ popd
install : |
- %make_install -C src
+ %make_install -C build
+ %make_install -C gmic-qt/build-qt
+ %make_install -C gmic-qt/build-gimp
+ %make_install -C gmic-qt/build-krita
+ cd zart
+ %make_install INSTALL_ROOT="$installdir"
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -3,8 +3,8 @@
gmic
https://gmic.eu/
- Joshua Strobl
- joshua@streambits.io
+ F. von Gellhorn
+ flinux@vongellhorn.ch
CECILL-2.1
CECILL-C
@@ -25,13 +25,9 @@
/usr/bin/gmic_krita_qt
/usr/bin/gmic_qt
/usr/bin/zart
- /usr/lib/libcgmic.so.2
- /usr/lib/libcgmic.so.284
- /usr/lib/libgmic.so.2
- /usr/lib/libgmic.so.284
+ /usr/lib64/libgmic.so.1
/usr/share/bash-completion/completions/gmic
- /usr/share/man/fr/man1/gmic.1.gz
- /usr/share/man/man1/gmic.1.gz
+ /usr/share/man/man1/gmic.1
@@ -41,13 +37,14 @@
programming.devel
- gmic
+ gmic
/usr/include/gmic.h
- /usr/include/gmic_libc.h
- /usr/lib/libcgmic.so
- /usr/lib/libgmic.so
+ /usr/lib64/cmake/gmic/GmicConfig.cmake
+ /usr/lib64/cmake/gmic/GmicTargets-relwithdebinfo.cmake
+ /usr/lib64/cmake/gmic/GmicTargets.cmake
+ /usr/lib64/libgmic.so
@@ -57,20 +54,19 @@
multimedia.graphics
- gmic
+ gmic
- /usr/lib64/gimp/2.0/plug-ins/gmic_cluts.gmz
/usr/lib64/gimp/2.0/plug-ins/gmic_gimp_qt
-
- 2020-06-11
- 2.8.4
+
+ 2020-06-14
+ 2.9.1
Packaging update
- Joshua Strobl
- joshua@streambits.io
+ F. von Gellhorn
+ flinux@vongellhorn.ch
\ No newline at end of file