CVS commit: pkgsrc/graphics/gmic

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics/gmic
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Tue, 18 Apr 2023 16:00:09 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Apr 18 16:00:08 UTC 2023

Modified Files:
        pkgsrc/graphics/gmic: Makefile PLIST distinfo
        pkgsrc/graphics/gmic/patches: patch-gmic-qt_gmic__qt.pro
            patch-src_gmic.cpp
Removed Files:
        pkgsrc/graphics/gmic/patches: patch-src_Makefile

Log Message:
gmic: update to 3.2.3.

Three years of development.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/graphics/gmic/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/gmic/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/gmic/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro
cvs rdiff -u -r1.7 -r0 pkgsrc/graphics/gmic/patches/patch-src_Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/gmic/patches/patch-src_gmic.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/gmic/Makefile
diff -u pkgsrc/graphics/gmic/Makefile:1.40 pkgsrc/graphics/gmic/Makefile:1.41
--- pkgsrc/graphics/gmic/Makefile:1.40  Tue Apr 11 06:10:59 2023
+++ pkgsrc/graphics/gmic/Makefile       Tue Apr 18 16:00:08 2023
@@ -1,36 +1,44 @@
-# $NetBSD: Makefile,v 1.40 2023/04/11 06:10:59 adam Exp $
+# $NetBSD: Makefile,v 1.41 2023/04/18 16:00:08 wiz Exp $
 
-DISTNAME=      gmic_2.9.0
+DISTNAME=      gmic_3.2.3
 PKGNAME=       ${DISTNAME:S/_/-/}
-PKGREVISION=   20
 CATEGORIES=    graphics
 MASTER_SITES=  https://gmic.eu/files/source/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://gmic.eu/
 COMMENT=       Full-featured image processing framework
-LICENSE=       gnu-gpl-v2
+LICENSE=       cecill-2.1 AND cecill-c-v1
 
 WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
 BUILD_DIRS=    src
 USE_LANGUAGES= c c++11
 USE_TOOLS+=    gmake pkg-config bash
 MAKE_FLAGS+=   USR=${PREFIX}
+# TODO: make it an option
+#MAKE_FLAGS+=  HOST=gimp # default
+MAKE_FLAGS+=   HOST=gimp3
 MAKE_FLAGS+=   QMAKE=${QTDIR}/bin/qmake
-BUILD_TARGET=  cli gimp lib zart
+# zart is not in distfile, but would be downloaded with git, so we can't use 'all' target
+BUILD_TARGET=  cli lib gmic_qt
 
 MANCOMPRESSED= yes
 
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/opencv/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
+INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
+INSTALLATION_DIRS+=    ${PKGMANDIR}/fr/man1
+
+post-install:
+       cd ${DESTDIR}${PREFIX} && ${MV} share/man/man1/* ${PKGMANDIR}/man1/
+       cd ${DESTDIR}${PREFIX} && ${MV} share/man/fr/man1/* ${PKGMANDIR}/fr/man1/
+
+#.include "../../graphics/gimp/buildlink3.mk"
+.include "../../graphics/gimp-devel/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
-.include "../../graphics/gimp/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/gmic/PLIST
diff -u pkgsrc/graphics/gmic/PLIST:1.2 pkgsrc/graphics/gmic/PLIST:1.3
--- pkgsrc/graphics/gmic/PLIST:1.2      Sat May 23 10:44:02 2020
+++ pkgsrc/graphics/gmic/PLIST  Tue Apr 18 16:00:08 2023
@@ -1,12 +1,14 @@
-@comment $NetBSD: PLIST,v 1.2 2020/05/23 10:44:02 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/04/18 16:00:08 wiz Exp $
 bin/gmic
-bin/zart
+bin/gmic_qt
 include/gmic.h
 include/gmic_libc.h
-lib/gimp/2.0/plug-ins/gmic_cluts.gmz
-lib/gimp/2.0/plug-ins/gmic_gimp_qt
 lib/libgmic.so
-lib/libgmic.so.2
-lib/libgmic.so.290
+lib/libgmic.so.3
+lib/libgmic.so.323
 man/fr/man1/gmic.1
 man/man1/gmic.1
+share/applications/gmic_qt.desktop
+share/bash-completion/completions/gmic
+share/icons/hicolor/48x48/apps/gmic_qt.png
+share/icons/hicolor/scalable/apps/gmic_qt.svg

Index: pkgsrc/graphics/gmic/distinfo
diff -u pkgsrc/graphics/gmic/distinfo:1.12 pkgsrc/graphics/gmic/distinfo:1.13
--- pkgsrc/graphics/gmic/distinfo:1.12  Thu Mar 16 07:15:48 2023
+++ pkgsrc/graphics/gmic/distinfo       Tue Apr 18 16:00:08 2023
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.12 2023/03/16 07:15:48 wiz Exp $
+$NetBSD: distinfo,v 1.13 2023/04/18 16:00:08 wiz Exp $
 
-BLAKE2s (gmic_2.9.0.tar.gz) = 80b2dcb145ad70f9e7ea0c1824922f3524a9299cfeb5c1f3ec4135b7e76bd323
-SHA512 (gmic_2.9.0.tar.gz) = 3b3703520998e5ad547316683158d7b60541a8cea2a7c1e7118f8de88492e0961bf1fe1da360dfb26d0ba7eaf997e7005a864364297db2bb405d532dedc4241d
-Size (gmic_2.9.0.tar.gz) = 6195597 bytes
-SHA1 (patch-gmic-qt_gmic__qt.pro) = 2c6bdf80a9b34cfbd07cbae962e17e6191ade007
-SHA1 (patch-src_Makefile) = 30327a1860885d93d8f0a59ff5d024b41ca1f836
-SHA1 (patch-src_gmic.cpp) = f74d2f444b9b8121fce5aa14e3266a88bf749da1
+BLAKE2s (gmic_3.2.3.tar.gz) = 6229e4d4ca77127c2898bfec2bd5500f3dbf0ce84f04c1e66cccf3ab217966e4
+SHA512 (gmic_3.2.3.tar.gz) = 0b25de8e5b52ed0f996373155743c176925e8d158d974bcdfb8eb99fd5ac8c6e99acc9e4f31e2fccdb64a5e998b93cc3d596c7cab40b40f8f9ef62ed2810ed37
+Size (gmic_3.2.3.tar.gz) = 11332026 bytes
+SHA1 (patch-gmic-qt_gmic__qt.pro) = ca6d85196ba775ee133b92499bd4a74d11315e7b
+SHA1 (patch-src_gmic.cpp) = 2904d66c58702eeee49029f5e71347e0ad2a1ed7

Index: pkgsrc/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro
diff -u pkgsrc/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro:1.2 pkgsrc/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro:1.3
--- pkgsrc/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro:1.2 Thu Mar 16 07:15:48 2023
+++ pkgsrc/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro     Tue Apr 18 16:00:08 2023
@@ -1,12 +1,10 @@
-$NetBSD: patch-gmic-qt_gmic__qt.pro,v 1.2 2023/03/16 07:15:48 wiz Exp $
+$NetBSD: patch-gmic-qt_gmic__qt.pro,v 1.3 2023/04/18 16:00:08 wiz Exp $
 
 Link against libX11 on everything except macOS which might not use X11.
 
-Stop using lto by default.
-
---- gmic-qt/gmic_qt.pro.orig   2020-03-28 13:25:12.000000000 +0000
+--- gmic-qt/gmic_qt.pro.orig   2023-04-04 16:20:27.000000000 +0000
 +++ gmic-qt/gmic_qt.pro
-@@ -147,7 +147,7 @@ win32 {
+@@ -180,7 +180,7 @@ win32 {
   DEFINES += cimg_display=2
  }
  
@@ -15,16 +13,3 @@ Stop using lto by default.
    DEFINES += _IS_LINUX_
    PKGCONFIG += x11
    message( Linux platform )
-@@ -227,12 +227,6 @@ win32:equals(LTO,"on") {
-     LTO = off
- }
- 
--!win32:CONFIG(release, debug|release):gcc|clang:equals(LTO,"on") {
--    message("Link Time Optimizer enabled")
--    QMAKE_CXXFLAGS_RELEASE += -flto
--    QMAKE_LFLAGS_RELEASE += -flto
--}
--
- DEFINES += gmic_gui gmic_build gmic_is_parallel cimg_use_abort
- 
- INCLUDEPATH   += $$PWD $$PWD/src $$GMIC_PATH

Index: pkgsrc/graphics/gmic/patches/patch-src_gmic.cpp
diff -u pkgsrc/graphics/gmic/patches/patch-src_gmic.cpp:1.1 pkgsrc/graphics/gmic/patches/patch-src_gmic.cpp:1.2
--- pkgsrc/graphics/gmic/patches/patch-src_gmic.cpp:1.1 Sat May 23 10:44:02 2020
+++ pkgsrc/graphics/gmic/patches/patch-src_gmic.cpp     Tue Apr 18 16:00:08 2023
@@ -1,22 +1,10 @@
-$NetBSD: patch-src_gmic.cpp,v 1.1 2020/05/23 10:44:02 ryoon Exp $
+$NetBSD: patch-src_gmic.cpp,v 1.2 2023/04/18 16:00:08 wiz Exp $
 
 * Support NetBSD.
 
---- src/gmic.cpp.orig  2020-03-28 13:25:12.000000000 +0000
+--- src/gmic.cpp.orig  2023-04-04 16:20:28.000000000 +0000
 +++ src/gmic.cpp
-@@ -2324,7 +2324,11 @@ bool *gmic::abort_ptr(bool *const p_is_a
- #if defined(__MACOSX__) || defined(__APPLE__)
-   void* tid = (void*)(cimg_ulong)getpid();
- #elif cimg_OS==1
-+#if defined(__NetBSD__)
-+  void* tid = (void*)(cimg_ulong)pthread_self();
-+#else
-   void* tid = (void*)(cimg_ulong)syscall(SYS_gettid);
-+#endif
- #elif cimg_OS==2
-   void* tid = (void*)(cimg_ulong)GetCurrentThreadId();
- #else
-@@ -2677,7 +2681,11 @@ gmic::~gmic() {
+@@ -2205,7 +2205,11 @@ inline void* get_tid() {
  #if defined(__MACOSX__) || defined(__APPLE__)
    void* tid = (void*)(cimg_ulong)getpid();
  #elif cimg_OS==1

Prev by Date: CVS commit: pkgsrc/pkgtools/pkg_install/files/lib
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/pkgtools/pkg_install/files/lib
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index