*ping*
Stefan Hagen wrote (2023-05-07 16:42 CEST):
> Hi,
>
> this is an update to the krita gmic plugin for the gmic version 3.2.1.
>
> There's no changelog for the plugin itself. But this repo is used to
> develop the plugin:
> https://github.com/amyspark/gmic/compare/v3.1.6.1...v3.2.1.1
>
> I added post-configure bits to build the translation files. Otherwise the
> build fails.
>
> Comments / OKs?
>
> Best Regards,
> Stefan
Same diff again for convenience
Index: graphics/krita-gmic-plugin/Makefile
===================================================================
RCS file: /cvs/ports/graphics/krita-gmic-plugin/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- graphics/krita-gmic-plugin/Makefile 26 Sep 2022 11:03:06 -0000 1.7
+++ graphics/krita-gmic-plugin/Makefile 7 May 2023 14:20:12 -0000
@@ -1,12 +1,18 @@
COMMENT = krita gmic plugin
-V = 3.1.6.1
+V = 3.2.1.1
DISTNAME = krita-gmic-plugin-${V}
CATEGORIES = graphics
HOMEPAGE = https://krita.org
+# Info about this plugin:
+# https://invent.kde.org/graphics/krita/-/blob/master/README.packagers.mr
+
+# Actually developed here:
+# https://github.com/amyspark/gmic
+
MAINTAINER = Stefan Hagen <sh+po...@codevoid.de>
# CeCILL, GPLv3
@@ -27,10 +33,16 @@ LIB_DEPENDS = graphics/krita \
WRKSRC = ${WRKDIST}/gmic-qt
+USE_GMAKE = Yes
+
CONFIGURE_ARGS += -DENABLE_SYSTEM_GMIC=false \
-DGMIC_QT_HOST=krita-plugin
post-extract:
mv ${WRKDIR}/gmic-${V}-patched ${WRKDIST}
+
+post-configure:
+ chmod +x ${WRKSRC}/translations/lrelease.sh
+ cd ${WRKSRC}/translations/filters && gmake
.include <bsd.port.mk>
Index: graphics/krita-gmic-plugin/distinfo
===================================================================
RCS file: /cvs/ports/graphics/krita-gmic-plugin/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- graphics/krita-gmic-plugin/distinfo 26 Sep 2022 11:03:06 -0000 1.7
+++ graphics/krita-gmic-plugin/distinfo 7 May 2023 14:20:12 -0000
@@ -1,2 +1,2 @@
-SHA256 (gmic-3.1.6.1-patched.tar.gz) =
FeGVqnKKXYjTERoZnscwadBJGATdSa+0m+7D6F6T2ZQ=
-SIZE (gmic-3.1.6.1-patched.tar.gz) = 12025532
+SHA256 (gmic-3.2.1.1-patched.tar.gz) =
c5n1+HyguVYfOPe5sAMxRjruHFAzYf961VGmTyqg4Ow=
+SIZE (gmic-3.2.1.1-patched.tar.gz) = 11700523
Index: graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp
===================================================================
RCS file: /cvs/ports/graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_gmic_cpp
--- graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp 29 May 2022
07:41:37 -0000 1.2
+++ graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp 7 May 2023
14:20:12 -0000
@@ -1,19 +1,12 @@
Index: src/gmic.cpp
--- src/gmic.cpp.orig
+++ src/gmic.cpp
-@@ -2518,6 +2518,8 @@ CImgList<void*> gmic::list_p_is_abort = CImgList<void*
- bool *gmic::abort_ptr(bool *const p_is_abort) {
+@@ -2203,6 +2203,10 @@ inline CImgList<void*>& gmic_runs() {
+ inline void* get_tid() {
#if defined(__MACOSX__) || defined(__APPLE__)
void* tid = (void*)(cimg_ulong)getpid();
+#elif defined(__OpenBSD__)
+ void* tid = (void*)pthread_self();
- #elif cimg_OS==1
- void* tid = (void*)(cimg_ulong)syscall(SYS_gettid);
- #elif cimg_OS==2
-@@ -2860,6 +2862,8 @@ gmic::~gmic() {
- cimg::mutex(21);
- #if defined(__MACOSX__) || defined(__APPLE__)
- void* tid = (void*)(cimg_ulong)getpid();
+#elif defined(__OpenBSD__)
+ void* tid = (void*)pthread_self();
#elif cimg_OS==1
