[arch-commits] Commit in gmic/repos/community-x86_64 (3 files)
Antonio Rojas
arojas at gemini.archlinux.org
Wed Jan 19 16:46:39 UTC 2022
Date: Wednesday, January 19, 2022 @ 16:46:38
Author: arojas
Revision: 1110498
archrelease: copy trunk to community-x86_64
Added:
gmic/repos/community-x86_64/PKGBUILD
(from rev 1110497, gmic/trunk/PKGBUILD)
gmic/repos/community-x86_64/fix-cmake-build.patch
(from rev 1110497, gmic/trunk/fix-cmake-build.patch)
Deleted:
gmic/repos/community-x86_64/PKGBUILD
-----------------------+
PKGBUILD | 129 +++++++++++++++++++++++++-----------------------
fix-cmake-build.patch | 31 +++++++++++
2 files changed, 99 insertions(+), 61 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-01-19 16:46:21 UTC (rev 1110497)
+++ PKGBUILD 2022-01-19 16:46:38 UTC (rev 1110498)
@@ -1,61 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
-# Contributor: farid <farid at archlinuc-br.org>
-# Contributor: Archie <Mymaud at gmail.com>
-
-pkgbase=gmic
-pkgname=(gmic gimp-plugin-gmic)
-pkgver=3.0.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)
-source=(https://gmic.eu/files/source/gmic_$pkgver.tar.gz)
-sha256sums=('6cc20a20e3ab53ce485ccf6e044a30141b3d62cf7743b83bb04906ff29453035')
-
-build() {
- cmake -B build -S gmic-$pkgver \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DENABLE_DYNAMIC_LINKING=ON \
- -DBUILD_LIB_STATIC=OFF \
- -DENABLE_OPENCV=ON
- cmake --build build
-
- export LDFLAGS="$LDFLAGS -L../build"
- 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
- cmake --build build-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
- cmake --build build-gimp
-}
-
-package_gmic() {
- pkgdesc="GREYC's Magic Image Converter: image processing framework"
- depends=(graphicsmagick opencv fftw)
- optdepends=('qt5-base: for the Qt UI')
-
- DESTDIR="$pkgdir" cmake --install build
- install -Dm644 gmic-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-
- DESTDIR="$pkgdir" cmake --install build-qt
-
- install -Dm644 gmic-$pkgver/resources/gmic_cluts.gmz -t "$pkgdir"/usr/share/gmic
-}
-
-package_gimp-plugin-gmic() {
- pkgdesc="Gimp plugin for the G'MIC image processing framework"
- depends=(gimp gmic qt5-base)
-
- DESTDIR="$pkgdir" cmake --install build-gimp
- install -Dm644 gmic-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
Copied: gmic/repos/community-x86_64/PKGBUILD (from rev 1110497, gmic/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-01-19 16:46:38 UTC (rev 1110498)
@@ -0,0 +1,68 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: farid <farid at archlinuc-br.org>
+# Contributor: Archie <Mymaud at gmail.com>
+
+pkgbase=gmic
+pkgname=(gmic gimp-plugin-gmic)
+pkgver=3.0.2
+pkgrel=1
+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
+ fix-cmake-build.patch)
+sha256sums=('68acec32c45d56fb0b0408acec4f63166171816d70722d63106787f1e7d17030'
+ 'fb6c330e88a7ba1e1f9ba62b0598e9e1a3b5eb9cea1b60d27bdf7aca992381f6')
+
+prepare() {
+ patch -d gmic-$pkgver -p1 < fix-cmake-build.patch # Fix build with cmake
+}
+
+build() {
+ cmake -B build -S gmic-$pkgver \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DENABLE_DYNAMIC_LINKING=ON \
+ -DBUILD_LIB_STATIC=OFF \
+ -DENABLE_OPENCV=ON
+ cmake --build build
+
+ export LDFLAGS="$LDFLAGS -L../build"
+ 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
+ cmake --build build-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
+ cmake --build build-gimp
+}
+
+package_gmic() {
+ pkgdesc="GREYC's Magic Image Converter: image processing framework"
+ depends=(graphicsmagick opencv fftw)
+ optdepends=('qt5-base: for the Qt UI')
+ conflicts=(cimg)
+
+ DESTDIR="$pkgdir" cmake --install build
+ install -Dm644 gmic-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+
+ DESTDIR="$pkgdir" cmake --install build-qt
+
+ install -Dm644 gmic-$pkgver/resources/gmic_cluts.gmz -t "$pkgdir"/usr/share/gmic
+}
+
+package_gimp-plugin-gmic() {
+ pkgdesc="Gimp plugin for the G'MIC image processing framework"
+ depends=(gimp gmic qt5-base)
+
+ DESTDIR="$pkgdir" cmake --install build-gimp
+ install -Dm644 gmic-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
Copied: gmic/repos/community-x86_64/fix-cmake-build.patch (from rev 1110497, gmic/trunk/fix-cmake-build.patch)
===================================================================
--- fix-cmake-build.patch (rev 0)
+++ fix-cmake-build.patch 2022-01-19 16:46:38 UTC (rev 1110498)
@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e1001ee0..be2199ac 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -96,7 +96,7 @@ endif()
+ # compile flags
+ set(CMAKE_POSITION_INDEPENDENT_CODE True)
+
+-list(APPEND GMIC_CXX_COMPILE_FLAGS -Dgmic_core -Dcimg_use_vt100 -Dgmic_is_parallel -Dcimg_use_abort)
++list(APPEND GMIC_CXX_COMPILE_FLAGS -Dcimg_use_vt100 -Dgmic_is_parallel -Dcimg_use_abort)
+ if(APPLE)
+ list(APPEND GMIC_CXX_COMPILE_FLAGS -mmacosx-version-min=10.8 -stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive)
+ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+@@ -149,7 +149,7 @@ set(CLI_Sources src/gmic.cpp)
+
+ if(BUILD_LIB)
+ add_library(libgmic SHARED ${CLI_Sources})
+- target_compile_options(libgmic PRIVATE ${GMIC_CXX_COMPILE_FLAGS})
++ target_compile_options(libgmic PRIVATE ${GMIC_CXX_COMPILE_FLAGS} -Dgmic_core)
+ set_target_properties(libgmic PROPERTIES SOVERSION "1" OUTPUT_NAME "gmic")
+ target_link_libraries(libgmic
+ CImg::CImg
+@@ -173,7 +173,7 @@ endif()
+
+ if(BUILD_LIB_STATIC)
+ add_library(libgmicstatic STATIC ${CLI_Sources})
+- target_compile_options(libgmicstatic PRIVATE ${GMIC_CXX_COMPILE_FLAGS})
++ target_compile_options(libgmicstatic PRIVATE ${GMIC_CXX_COMPILE_FLAGS} -Dgmic_core)
+ set_target_properties(libgmicstatic PROPERTIES OUTPUT_NAME "gmic")
+ target_link_libraries(libgmicstatic
+ CImg::CImg
More information about the arch-commits
mailing list