G'mic released a new version, 2.9.8.
Here's a patch to adjust to the new version (mostly removal of upstreamed
patch). There are some minor tweaks (there's no debug info in the plugins,
so the debug packages do not make sense)
There's a small twist: gmic-qt actually has a stand-alone version.
Also attached is a sub-port to enable that version.
(And a few tweaks to the common generated stuff, since the stand-alone
version is not a plugin.)
I didn't include it previously, because the stand-alone version didn't seem
to be of much interest, but 3.9.8 introduces a batch mode for gmic-qt,
and apparently, software like blender may make use of it.
Index: gmic/Makefile
===================================================================
RCS file: /cvs/ports/graphics/gmic/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- gmic/Makefile 16 May 2021 09:40:38 -0000 1.1.1.1
+++ gmic/Makefile 1 Aug 2021 11:13:45 -0000
@@ -2,10 +2,10 @@
COMMENT = image processing framework
-V = 2.9.7
+V = 2.9.8
DISTNAME = gmic-$V
-SHARED_LIBS += gmic 0.0 # 1
+SHARED_LIBS += gmic 1.0 # 1
CATEGORIES = graphics
HOMEPAGE = https://gmic.eu/
Index: gmic/distinfo
===================================================================
RCS file: /cvs/ports/graphics/gmic/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- gmic/distinfo 16 May 2021 09:40:38 -0000 1.1.1.1
+++ gmic/distinfo 1 Aug 2021 11:13:45 -0000
@@ -1,2 +1,2 @@
-SHA256 (gmic_2.9.7.tar.gz) = lCU3SH6nIhQSMFeds81DMTaEKcDjPLOP7hsXqulVfxY=
-SIZE (gmic_2.9.7.tar.gz) = 7401418
+SHA256 (gmic_2.9.8.tar.gz) = GNa7xzGuO02oplasGJR2eTsRGp3Rn3LbIxLwdN983II=
+SIZE (gmic_2.9.8.tar.gz) = 7311372
Index: gmic/patches/patch-src_gmic_cpp
===================================================================
RCS file: /cvs/ports/graphics/gmic/patches/patch-src_gmic_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_gmic_cpp
--- gmic/patches/patch-src_gmic_cpp 16 May 2021 09:47:28 -0000 1.2
+++ gmic/patches/patch-src_gmic_cpp 1 Aug 2021 11:13:45 -0000
@@ -13,7 +13,7 @@ Index: src/gmic.cpp
// Define convenience macros, variables and functions.
//----------------------------------------------------
-@@ -2454,6 +2454,8 @@ CImgList<void*> gmic::list_p_is_abort = CImgList<void*
+@@ -2445,6 +2445,8 @@ CImgList<void*> gmic::list_p_is_abort = CImgList<void*
bool *gmic::abort_ptr(bool *const p_is_abort) {
#if defined(__MACOSX__) || defined(__APPLE__)
void* tid = (void*)(cimg_ulong)getpid();
@@ -22,7 +22,7 @@ Index: src/gmic.cpp
#elif cimg_OS==1
void* tid = (void*)(cimg_ulong)syscall(SYS_gettid);
#elif cimg_OS==2
-@@ -2794,6 +2796,8 @@ gmic::~gmic() {
+@@ -2783,6 +2785,8 @@ gmic::~gmic() {
cimg::mutex(21);
#if defined(__MACOSX__) || defined(__APPLE__)
void* tid = (void*)(cimg_ulong)getpid();
Index: gmic-qt/Makefile
===================================================================
RCS file: /cvs/ports/graphics/gmic-qt/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- gmic-qt/Makefile 16 May 2021 09:42:24 -0000 1.1.1.1
+++ gmic-qt/Makefile 1 Aug 2021 11:13:45 -0000
@@ -2,5 +2,6 @@
SUBDIR += gimp
SUBDIR += krita
+ SUBDIR += none
.include <bsd.port.subdir.mk>
Index: gmic-qt/Makefile.inc
===================================================================
RCS file: /cvs/ports/graphics/gmic-qt/Makefile.inc,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile.inc
--- gmic-qt/Makefile.inc 16 May 2021 09:42:24 -0000 1.1.1.1
+++ gmic-qt/Makefile.inc 1 Aug 2021 11:13:45 -0000
@@ -1,9 +1,9 @@
# $OpenBSD: Makefile.inc,v 1.1.1.1 2021/05/16 09:42:24 espie Exp $
-COMMENT = gmic plugin for ${QT_HOST}
-V = 2.9.7
+COMMENT = gmic-qt ${GMIC_WHAT}
+V = 2.9.8
-DISTNAME = gmic-qt-${QT_HOST}-$V
+DISTNAME ?= gmic-qt-${QT_HOST}-$V
CATEGORIES = graphics
HOMEPAGE = https://gmic.eu/
@@ -45,9 +45,12 @@ CONFIGURE_ARGS += -DCMAKE_SHARED_LINKER_
CONFIGURE_ARGS += -DENABLE_DYNAMIC_LINKING=ON
CONFIGURE_ARGS += -DGMIC_PATH=${WRKDIST}/src
-SUBST_VARS += ${QT_HOST}
-DEBUG_PACKAGES = ${BUILD_PACKAGES}
+SUBST_VARS += QT_HOST GMIC_WHAT
+# XXX somehow there's no debug info generated ?
+#DEBUG_PACKAGES = ${BUILD_PACKAGES}
+GMIC_WHAT ?= plugin for ${QT_HOST}
+
CHECKSUM_FILE = ${.CURDIR}/../distinfo
DESCR = ${.CURDIR}/../pkg/DESCR
-PATCHDIR = ${.CURDIR}/..patches
+PATCHDIR = ${.CURDIR}/../patches
Index: gmic-qt/distinfo
===================================================================
RCS file: /cvs/ports/graphics/gmic-qt/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- gmic-qt/distinfo 16 May 2021 09:42:24 -0000 1.1.1.1
+++ gmic-qt/distinfo 1 Aug 2021 11:13:45 -0000
@@ -1,2 +1,2 @@
-SHA256 (gmic_2.9.7.tar.gz) = lCU3SH6nIhQSMFeds81DMTaEKcDjPLOP7hsXqulVfxY=
-SIZE (gmic_2.9.7.tar.gz) = 7401418
+SHA256 (gmic_2.9.8.tar.gz) = GNa7xzGuO02oplasGJR2eTsRGp3Rn3LbIxLwdN983II=
+SIZE (gmic_2.9.8.tar.gz) = 7311372
Index: gmic-qt/pkg/DESCR
===================================================================
RCS file: /cvs/ports/graphics/gmic-qt/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- gmic-qt/pkg/DESCR 16 May 2021 09:42:24 -0000 1.1.1.1
+++ gmic-qt/pkg/DESCR 1 Aug 2021 11:13:45 -0000
@@ -1,3 +1,4 @@
-gmic is full-featured open-source framework for digital image processing,
+gmic is a full-featured open-source framework for digital image processing,
+which includes some qt interface
-This package is the plugin for ${QT_HOST}
+This package is the ${GMIC_WHAT}
No comments:
Post a Comment