Date: Wednesday, June 10, 2020 @ 21:24:23 Author: arojas Revision: 641848
Update to 2.9.1 Modified: gmic/trunk/PKGBUILD Deleted: gmic/trunk/gmic-fix-cmake.patch gmic/trunk/zart-opencv4.patch ----------------------+ PKGBUILD | 75 +++++++++++++++++++------------------------------ gmic-fix-cmake.patch | 25 ---------------- zart-opencv4.patch | 22 -------------- 3 files changed, 30 insertions(+), 92 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-06-10 20:45:17 UTC (rev 641847) +++ PKGBUILD 2020-06-10 21:24:23 UTC (rev 641848) @@ -6,72 +6,62 @@ pkgbase=gmic pkgname=(gmic zart gimp-plugin-gmic krita-plugin-gmic digikam-plugin-gmic) -pkgver=2.9.0 -pkgrel=11 +pkgver=2.9.1 +pkgrel=1 arch=(x86_64) url="https://gmic.eu/" license=(custom:CeCILL) makedepends=(cmake gimp qt5-base fftw openexr opencv eigen graphicsmagick qt5-tools digikam) -source=(https://gmic.eu/files/source/gmic_$pkgver.tar.gz zart-opencv4.patch gmic-fix-cmake.patch) -sha256sums=('6233695f9b27999dcc7cc3aa7480b0f192bd44de85209091a3b4b8a65ae8c4b5' - 'f4295a2b9a6730060e1dd763c602bd5156570d623bc69c2214dfd11e94943296' - 'f4fd5e274347777e9d5a030c22a0f279e32dc023bb4723ca09a6c10c7d2cac75') +source=(https://gmic.eu/files/source/gmic_$pkgver.tar.gz + gmic-source-$pkgver.tar.gz::https://github.com/dtschump/gmic/archive/v.2.9.1.tar.gz) +sha256sums=('55b1f6514f3e4f8861ef61b66e061b509abd82f87fb72bad0be3b9401dd20a00' + '18a38c175b32340508fdc3282087505d056ab113088003141bb85ae6483f4c19') prepare() { mkdir -p build{,-qt,-krita,-gimp,-digikam,-zart} - sed -e 's|pkg_check_modules(OPENCV opencv)|pkg_check_modules(OPENCV opencv4)|' -i gmic-$pkgver/CMakeLists.txt +# Move cmake modules + cp -r gmic-v.$pkgver/cmake gmic-$pkgver - cd gmic-$pkgver - patch -p1 -i "$srcdir"/gmic-fix-cmake.patch - -# fix build with openCV 4.0 - cd zart - patch -p1 -i ../../zart-opencv4.patch - sed -e 's|opencv|opencv4|' -i zart.pro + sed -e 's|opencv|opencv4|' -i gmic-$pkgver/zart/zart.pro } build() { - cd build - cmake ../gmic-$pkgver \ + cmake -B build -S gmic-$pkgver \ -DCMAKE_INSTALL_PREFIX=/usr \ -DENABLE_DYNAMIC_LINKING=ON - make + cmake --build build export LDFLAGS="$LDFLAGS -L../build" - cd ../build-qt - cmake ../gmic-$pkgver/gmic-qt \ + cmake -B build-qt -S gmic-$pkgver/gmic-qt \ -DCMAKE_INSTALL_PREFIX=/usr \ -DENABLE_DYNAMIC_LINKING=ON \ -DGMIC_PATH="$srcdir"/gmic-$pkgver/src \ -DGMIC_QT_HOST=none - make + cmake --build build-qt - cd ../build-gimp - cmake ../gmic-$pkgver/gmic-qt \ + cmake -B build-gimp -S gmic-$pkgver/gmic-qt \ -DCMAKE_INSTALL_PREFIX=/usr \ -DENABLE_DYNAMIC_LINKING=ON \ -DGMIC_PATH="$srcdir"/gmic-$pkgver/src \ -DGMIC_QT_HOST=gimp - make + cmake --build build-gimp - cd ../build-krita - cmake ../gmic-$pkgver/gmic-qt \ + cmake -B build-krita -S gmic-$pkgver/gmic-qt \ -DCMAKE_INSTALL_PREFIX=/usr \ -DENABLE_DYNAMIC_LINKING=ON \ -DGMIC_PATH="$srcdir"/gmic-$pkgver/src \ -DGMIC_QT_HOST=krita - make + cmake --build build-krita - cd ../build-digikam - cmake ../gmic-$pkgver/gmic-qt \ + cmake -B build-digikam -S gmic-$pkgver/gmic-qt \ -DCMAKE_INSTALL_PREFIX=/usr \ -DENABLE_DYNAMIC_LINKING=ON \ -DGMIC_PATH="$srcdir"/gmic-$pkgver/src \ -DGMIC_QT_HOST=digikam - make + cmake --build build-digikam - cd ../build-zart + cd build-zart unset CXXFLAGS # https://github.com/c-koi/zart/issues/14 qmake ../gmic-$pkgver/zart \ GMIC_PATH="$srcdir"/gmic-$pkgver/src GMIC_DYNAMIC_LINKING=on QMAKE_CXXFLAGS+=" -DOPENCV2_HEADERS" @@ -83,14 +73,12 @@ depends=(graphicsmagick opencv fftw) optdepends=('qt5-base: for the Qt UI') - cd build - make DESTDIR="$pkgdir" install - install -Dm644 ../gmic-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + DESTDIR="$pkgdir" cmake --install build + install -Dm644 gmic-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE - cd ../build-qt - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" cmake --install build-qt - install -Dm644 "$srcdir"/gmic-$pkgver/resources/gmic_cluts.gmz -t "$pkgdir"/usr/share/gmic + install -Dm644 gmic-$pkgver/resources/gmic_cluts.gmz -t "$pkgdir"/usr/share/gmic } package_zart() { @@ -106,9 +94,8 @@ pkgdesc="Gimp plugin for the G'MIC image processing framework" depends=(gimp gmic qt5-base) - cd build-gimp - make DESTDIR="$pkgdir" install - install -Dm644 ../gmic-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + DESTDIR="$pkgdir" cmake --install build-gimp + install -Dm644 gmic-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } package_krita-plugin-gmic() { @@ -115,9 +102,8 @@ pkgdesc="Krita plugin for the G'MIC image processing framework" depends=(krita gmic) - cd build-krita - make DESTDIR="$pkgdir" install - install -Dm644 ../gmic-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + DESTDIR="$pkgdir" cmake --install build-krita + install -Dm644 gmic-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } package_digikam-plugin-gmic() { @@ -124,7 +110,6 @@ pkgdesc="DigiKam plugin for the G'MIC image processing framework" depends=(digikam gmic) - cd build-digikam - make DESTDIR="$pkgdir" install - install -Dm644 ../gmic-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + DESTDIR="$pkgdir" cmake --install build-digikam + install -Dm644 gmic-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } Deleted: gmic-fix-cmake.patch =================================================================== --- gmic-fix-cmake.patch 2020-06-10 20:45:17 UTC (rev 641847) +++ gmic-fix-cmake.patch 2020-06-10 21:24:23 UTC (rev 641848) @@ -1,25 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c7c63f22..e6e4a155 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -377,7 +377,7 @@ if(BUILD_MAN) - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/man/gmic.1 - DEPENDS gmic -- COMMAND LD_LIBRARY_PATH=${GMIC_BINARIES_PATH} ${GMIC_BINARIES_PATH}/gmic -v - ${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic raw:${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic,uchar -__help man 2> ${CMAKE_BINARY_DIR}/man/gmic.1 -+ COMMAND LD_LIBRARY_PATH=${GMIC_BINARIES_PATH} ${GMIC_BINARIES_PATH}/gmic -v - ${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic raw:${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic,uchar -__help man > ${CMAKE_BINARY_DIR}/man/gmic.1 - ) - add_custom_target(man ALL DEPENDS ${CMAKE_BINARY_DIR}/man/gmic.1) - install(FILES ${CMAKE_BINARY_DIR}/man/gmic.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/) -@@ -388,9 +388,10 @@ if(BUILD_BASH_COMPLETION) - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/resources/gmic_bashcompletion.sh - DEPENDS gmic -- COMMAND LD_LIBRARY_PATH=${GMIC_BINARIES_PATH} ${GMIC_BINARIES_PATH}/gmic -v - ${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic raw:${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic,uchar -document_gmic bash 2> ${CMAKE_BINARY_DIR}/resources/gmic_bashcompletion.sh -+ COMMAND LD_LIBRARY_PATH=${GMIC_BINARIES_PATH} ${GMIC_BINARIES_PATH}/gmic -v - ${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic raw:${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic,uchar -document_gmic bash > ${CMAKE_BINARY_DIR}/resources/gmic_bashcompletion.sh - ) - add_custom_target(bashcompletion ALL DEPENDS ${CMAKE_BINARY_DIR}/resources/gmic_bashcompletion.sh) -+ install(FILES ${CMAKE_BINARY_DIR}/resources/gmic_bashcompletion.sh RENAME gmic DESTINATION ${CMAKE_INSTALL_DATADIR}/bash-completion/completions) - endif() - - include(CMakePackageConfigHelpers) Deleted: zart-opencv4.patch =================================================================== --- zart-opencv4.patch 2020-06-10 20:45:17 UTC (rev 641847) +++ zart-opencv4.patch 2020-06-10 21:24:23 UTC (rev 641848) @@ -1,22 +0,0 @@ -diff --git a/src/ImageConverter.cpp b/src/ImageConverter.cpp -index dc7605b..56f59db 100644 ---- a/src/ImageConverter.cpp -+++ b/src/ImageConverter.cpp -@@ -70,7 +70,7 @@ void ImageConverter::convert(const cv::Mat * in, QImage * out) - - cv::Mat tmp(in->cols, in->rows, in->depth()); - -- cvtColor(*in, tmp, (in->channels() == 1) ? CV_GRAY2RGB : CV_BGR2RGB); -+ cvtColor(*in, tmp, (in->channels() == 1) ? cv::COLOR_GRAY2RGB : cv::COLOR_BGR2RGB); - - const unsigned int w3 = 3 * tmp.cols; - unsigned char * src = reinterpret_cast<unsigned char *>(tmp.ptr()); -@@ -106,7 +106,7 @@ void ImageConverter::convert(const QImage & in, cv::Mat ** out) - dst += step; - } - } -- cvtColor(**out, **out, CV_BGR2RGB); -+ cvtColor(**out, **out, cv::COLOR_BGR2RGB); - } - - void ImageConverter::convert(const cimg_library::CImg<float> & in, QImage * out)