Date: Friday, May 15, 2020 @ 18:30:10 Author: arojas Revision: 628075
archrelease: copy trunk to community-x86_64 Added: gmic/repos/community-x86_64/PKGBUILD (from rev 628074, gmic/trunk/PKGBUILD) gmic/repos/community-x86_64/gmic-fix-cmake.patch (from rev 628074, gmic/trunk/gmic-fix-cmake.patch) gmic/repos/community-x86_64/zart-opencv4.patch (from rev 628074, gmic/trunk/zart-opencv4.patch) Deleted: gmic/repos/community-x86_64/PKGBUILD gmic/repos/community-x86_64/gmic-fix-cmake.patch gmic/repos/community-x86_64/zart-opencv4.patch ----------------------+ PKGBUILD | 226 ++++++++++++++++++++++++------------------------- gmic-fix-cmake.patch | 50 +++++----- zart-opencv4.patch | 44 ++++----- 3 files changed, 160 insertions(+), 160 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-05-15 18:29:52 UTC (rev 628074) +++ PKGBUILD 2020-05-15 18:30:10 UTC (rev 628075) @@ -1,113 +0,0 @@ -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: Jan "heftig" Steffens <jan.steff...@gmail.com> -# Contributor: farid <farid at archlinuc-br.org> -# Contributor: Archie <mym...@gmail.com> - -pkgbase=gmic -pkgname=(gmic zart gimp-plugin-gmic krita-plugin-gmic) -pkgver=2.9.0 -pkgrel=8 -arch=(x86_64) -url="https://gmic.eu/" -license=(custom:CeCILL) -makedepends=(cmake gimp qt5-base fftw openexr opencv eigen graphicsmagick qt5-tools) -source=(https://gmic.eu/files/source/gmic_$pkgver.tar.gz zart-opencv4.patch gmic-fix-cmake.patch) -sha256sums=('6233695f9b27999dcc7cc3aa7480b0f192bd44de85209091a3b4b8a65ae8c4b5' - 'f4295a2b9a6730060e1dd763c602bd5156570d623bc69c2214dfd11e94943296' - 'ef26ddb0d6c7df5ceed9aa5414aab6e2ad219a1a739f24b44d414852bcb50dde') - -prepare() { - mkdir -p build{,-qt,-krita,-gimp,-zart} - - sed -e 's|pkg_check_modules(OPENCV opencv)|pkg_check_modules(OPENCV opencv4)|' -i gmic-$pkgver/CMakeLists.txt - - 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 -} - -build() { - cd build - cmake ../gmic-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DENABLE_DYNAMIC_LINKING=ON - make - - export LDFLAGS="$LDFLAGS -L../build" - cd ../build-qt - cmake ../gmic-$pkgver/gmic-qt \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DENABLE_DYNAMIC_LINKING=ON \ - -DGMIC_PATH="$srcdir"/gmic-$pkgver/src \ - -DGMIC_QT_HOST=none - make - - cd ../build-gimp - cmake ../gmic-$pkgver/gmic-qt \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DENABLE_DYNAMIC_LINKING=ON \ - -DGMIC_PATH="$srcdir"/gmic-$pkgver/src \ - -DGMIC_QT_HOST=gimp - make - - cd ../build-krita - cmake ../gmic-$pkgver/gmic-qt \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DENABLE_DYNAMIC_LINKING=ON \ - -DGMIC_PATH="$srcdir"/gmic-$pkgver/src \ - -DGMIC_QT_HOST=krita - make - - cd ../build-zart - export CXXFLAGS=${CXXFLAGS/-O2/} # 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" - make -} - -package_gmic() { - pkgdesc="GREYC's Magic Image Converter: image processing framework" - 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 - - cd ../build-qt - make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir"/gmic-$pkgver/resources/gmic_cluts.gmz -t "$pkgdir"/usr/share/gmic -} - -package_zart() { - pkgdesc="A GUI for G'MIC real-time manipulations on the output of a webcam" - depends=(gmic qt5-base) - - cd build-zart - install -Dm755 zart -t "$pkgdir"/usr/bin - install -Dm644 ../gmic-$pkgver/zart/Licence_CeCILL_V2-en.html -t "$pkgdir"/usr/share/licenses/$pkgname -} - -package_gimp-plugin-gmic() { - 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 -} - -package_krita-plugin-gmic() { - 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 -} Copied: gmic/repos/community-x86_64/PKGBUILD (from rev 628074, gmic/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-05-15 18:30:10 UTC (rev 628075) @@ -0,0 +1,113 @@ +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Jan "heftig" Steffens <jan.steff...@gmail.com> +# Contributor: farid <farid at archlinuc-br.org> +# Contributor: Archie <mym...@gmail.com> + +pkgbase=gmic +pkgname=(gmic zart gimp-plugin-gmic krita-plugin-gmic) +pkgver=2.9.0 +pkgrel=9 +arch=(x86_64) +url="https://gmic.eu/" +license=(custom:CeCILL) +makedepends=(cmake gimp qt5-base fftw openexr opencv eigen graphicsmagick qt5-tools) +source=(https://gmic.eu/files/source/gmic_$pkgver.tar.gz zart-opencv4.patch gmic-fix-cmake.patch) +sha256sums=('6233695f9b27999dcc7cc3aa7480b0f192bd44de85209091a3b4b8a65ae8c4b5' + 'f4295a2b9a6730060e1dd763c602bd5156570d623bc69c2214dfd11e94943296' + 'f4fd5e274347777e9d5a030c22a0f279e32dc023bb4723ca09a6c10c7d2cac75') + +prepare() { + mkdir -p build{,-qt,-krita,-gimp,-zart} + + sed -e 's|pkg_check_modules(OPENCV opencv)|pkg_check_modules(OPENCV opencv4)|' -i gmic-$pkgver/CMakeLists.txt + + 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 +} + +build() { + cd build + cmake ../gmic-$pkgver \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DENABLE_DYNAMIC_LINKING=ON + make + + export LDFLAGS="$LDFLAGS -L../build" + cd ../build-qt + cmake ../gmic-$pkgver/gmic-qt \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DENABLE_DYNAMIC_LINKING=ON \ + -DGMIC_PATH="$srcdir"/gmic-$pkgver/src \ + -DGMIC_QT_HOST=none + make + + cd ../build-gimp + cmake ../gmic-$pkgver/gmic-qt \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DENABLE_DYNAMIC_LINKING=ON \ + -DGMIC_PATH="$srcdir"/gmic-$pkgver/src \ + -DGMIC_QT_HOST=gimp + make + + cd ../build-krita + cmake ../gmic-$pkgver/gmic-qt \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DENABLE_DYNAMIC_LINKING=ON \ + -DGMIC_PATH="$srcdir"/gmic-$pkgver/src \ + -DGMIC_QT_HOST=krita + make + + cd ../build-zart + export CXXFLAGS=${CXXFLAGS/-O2/} # 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" + make +} + +package_gmic() { + pkgdesc="GREYC's Magic Image Converter: image processing framework" + 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 + + cd ../build-qt + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir"/gmic-$pkgver/resources/gmic_cluts.gmz -t "$pkgdir"/usr/share/gmic +} + +package_zart() { + pkgdesc="A GUI for G'MIC real-time manipulations on the output of a webcam" + depends=(gmic qt5-base) + + cd build-zart + install -Dm755 zart -t "$pkgdir"/usr/bin + install -Dm644 ../gmic-$pkgver/zart/Licence_CeCILL_V2-en.html -t "$pkgdir"/usr/share/licenses/$pkgname +} + +package_gimp-plugin-gmic() { + 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 +} + +package_krita-plugin-gmic() { + 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 +} Deleted: gmic-fix-cmake.patch =================================================================== --- gmic-fix-cmake.patch 2020-05-15 18:29:52 UTC (rev 628074) +++ gmic-fix-cmake.patch 2020-05-15 18:30:10 UTC (rev 628075) @@ -1,25 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c7c63f22..e07d15ab 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/completion) - endif() - - include(CMakePackageConfigHelpers) Copied: gmic/repos/community-x86_64/gmic-fix-cmake.patch (from rev 628074, gmic/trunk/gmic-fix-cmake.patch) =================================================================== --- gmic-fix-cmake.patch (rev 0) +++ gmic-fix-cmake.patch 2020-05-15 18:30:10 UTC (rev 628075) @@ -0,0 +1,25 @@ +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-05-15 18:29:52 UTC (rev 628074) +++ zart-opencv4.patch 2020-05-15 18:30:10 UTC (rev 628075) @@ -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) Copied: gmic/repos/community-x86_64/zart-opencv4.patch (from rev 628074, gmic/trunk/zart-opencv4.patch) =================================================================== --- zart-opencv4.patch (rev 0) +++ zart-opencv4.patch 2020-05-15 18:30:10 UTC (rev 628075) @@ -0,0 +1,22 @@ +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)