g'mic released a new major(!) version 3.0.
Things seem to work just fine.
I've removed my junk for rebuilding the script file since the new one
includes some community scripts.
okay ?
Index: gmic/Makefile
===================================================================
RCS file: /cvs/ports/graphics/gmic/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- gmic/Makefile 4 Oct 2021 13:28:27 -0000 1.5
+++ gmic/Makefile 9 Dec 2021 20:21:28 -0000
@@ -4,7 +4,7 @@ BROKEN-powerpc64 = update297.gmic is not
COMMENT = image processing framework
-V = 2.9.9
+V = 3.0.0
DISTNAME = gmic-$V
SHARED_LIBS += gmic 1.0 # 1
@@ -60,13 +60,6 @@ DEBUG_PACKAGES = ${BUILD_PACKAGES}
pre-build:
mkdir -p ${WRKDIR}/tmp
-
-do-build:
- @${MODCMAKE_BUILD_TARGET}
- @cd ${WRKSRC}/src && ${WRKBUILD}/gmic gmic_stdlib.gmic it
gmic_stdlib.gmic parse_gui update "(0)" a y serialize uchar,1,0 o -.h | sed
's/unsigned char/const unsigned char/' | sed 's/unnamed/gmic_stdlib/' >
gmic_stdlib.h
- @echo "\nconst unsigned long size_data_gmic_stdlib = (unsigned
long)sizeof(data_gmic_stdlib);" >> ${WRKSRC}/src/gmic_stdlib.h
- # rebuild with the boostrapped include
- @${MODCMAKE_BUILD_TARGET}
.include <bsd.port.mk>
Index: gmic/distinfo
===================================================================
RCS file: /cvs/ports/graphics/gmic/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- gmic/distinfo 4 Oct 2021 13:28:27 -0000 1.3
+++ gmic/distinfo 9 Dec 2021 20:21:28 -0000
@@ -1,2 +1,2 @@
-SHA256 (gmic_2.9.9.tar.gz) = nwUzOHUuyWprYZcYA3dnaCxf1Y4kccCPN0D9sHBgW8A=
-SIZE (gmic_2.9.9.tar.gz) = 7325061
+SHA256 (gmic_3.0.0.tar.gz) = PwVruebb8GdK9Mjc5Z9BmBchh2Yvf7s2zGPryMG3ESA=
+SIZE (gmic_3.0.0.tar.gz) = 10225122
Index: gmic/patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/graphics/gmic/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-CMakeLists_txt
--- gmic/patches/patch-CMakeLists_txt 16 May 2021 09:47:28 -0000 1.2
+++ gmic/patches/patch-CMakeLists_txt 9 Dec 2021 20:21:28 -0000
@@ -1,35 +1,16 @@
$OpenBSD: patch-CMakeLists_txt,v 1.2 2021/05/16 09:47:28 espie Exp $
- remove flags that make no sense for us
-- separate compressed macros so they can be rebuilt properly
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -100,7 +100,7 @@ set(COMPILE_FLAGS "-Dgmic_build -Dcimg_use_vt100 -Dgmi
+@@ -100,7 +100,7 @@ list(APPEND GMIC_CXX_COMPILE_FLAGS -Dgmic_build -Dcimg
if(APPLE)
- set(COMPILE_FLAGS "${COMPILE_FLAGS} -mmacosx-version-min=10.8
-stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive")
+ list(APPEND GMIC_CXX_COMPILE_FLAGS -mmacosx-version-min=10.8
-stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive)
else()
-- set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-error=narrowing -fno-ipa-sra
-fpermissive")
-+ set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-error=narrowing -fpermissive")
+- list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fno-ipa-sra
-fpermissive)
++ list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fpermissive)
endif()
if(NOT "${PRERELEASE_TAG}" STREQUAL "")
-@@ -137,7 +137,7 @@ if(NOT CUSTOM_CFLAGS)
- endif()
-
- # source files
--set(CLI_Sources src/gmic.cpp)
-+set(CLI_Sources src/gmic.cpp src/gmic_stdlib.cpp)
-
- if(BUILD_LIB)
- add_library(libgmic SHARED ${CLI_Sources})
-@@ -181,7 +181,7 @@ endif()
-
-
- if(BUILD_CLI)
-- add_executable(gmic src/gmic_cli.cpp)
-+ add_executable(gmic src/gmic_cli.cpp src/gmic_stdlib.cpp)
- if(ENABLE_DYNAMIC_LINKING)
- target_link_libraries(gmic libgmic)
- else()
Index: gmic/patches/patch-src_gmic_cpp
===================================================================
RCS file: /cvs/ports/graphics/gmic/patches/patch-src_gmic_cpp,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_gmic_cpp
--- gmic/patches/patch-src_gmic_cpp 4 Oct 2021 13:28:27 -0000 1.4
+++ gmic/patches/patch-src_gmic_cpp 9 Dec 2021 20:21:28 -0000
@@ -4,16 +4,7 @@ pthread_self will do in a pinch
Index: src/gmic.cpp
--- src/gmic.cpp.orig
+++ src/gmic.cpp
-@@ -2046,7 +2046,7 @@ const CImgList<T>& _gmic_display(CImgDisplay &disp, co
- #include "gmic.h"
- using namespace cimg_library;
-
--#include "gmic_stdlib.h"
-+#include "stdlib_defs.h"
-
- // Define convenience macros, variables and functions.
- //----------------------------------------------------
-@@ -2469,6 +2469,8 @@ CImgList<void*> gmic::list_p_is_abort = CImgList<void*
+@@ -2473,6 +2473,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 +13,7 @@ Index: src/gmic.cpp
#elif cimg_OS==1
void* tid = (void*)(cimg_ulong)syscall(SYS_gettid);
#elif cimg_OS==2
-@@ -2807,6 +2809,8 @@ gmic::~gmic() {
+@@ -2815,6 +2817,8 @@ gmic::~gmic() {
cimg::mutex(21);
#if defined(__MACOSX__) || defined(__APPLE__)
void* tid = (void*)(cimg_ulong)getpid();
Index: gmic/patches/patch-src_gmic_stdlib_cpp
===================================================================
RCS file: gmic/patches/patch-src_gmic_stdlib_cpp
diff -N gmic/patches/patch-src_gmic_stdlib_cpp
--- gmic/patches/patch-src_gmic_stdlib_cpp 16 May 2021 09:47:28 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-src_gmic_stdlib_cpp,v 1.2 2021/05/16 09:47:28 espie Exp $
-
-separated compiled macros
-Index: src/gmic_stdlib.cpp
---- src/gmic_stdlib.cpp.orig
-+++ src/gmic_stdlib.cpp
-@@ -0,0 +1,2 @@
-+#include "stdlib_defs.h"
-+#include "gmic_stdlib.h"
Index: gmic/patches/patch-src_stdlib_defs_h
===================================================================
RCS file: gmic/patches/patch-src_stdlib_defs_h
diff -N gmic/patches/patch-src_stdlib_defs_h
--- gmic/patches/patch-src_stdlib_defs_h 16 May 2021 09:47:28 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-src_stdlib_defs_h,v 1.2 2021/05/16 09:47:28 espie Exp $
-
-separated compiled macros
-Index: src/stdlib_defs.h
---- src/stdlib_defs.h.orig
-+++ src/stdlib_defs.h
-@@ -0,0 +1,2 @@
-+extern const unsigned char data_gmic_stdlib[];
-+extern const unsigned long size_data_gmic_stdlib;
Index: gmic-qt/Makefile.inc
===================================================================
RCS file: /cvs/ports/graphics/gmic-qt/Makefile.inc,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.inc
--- gmic-qt/Makefile.inc 4 Oct 2021 13:28:27 -0000 1.3
+++ gmic-qt/Makefile.inc 9 Dec 2021 20:21:28 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile.inc,v 1.3 2021/10/04 13:28:27 espie Exp $
COMMENT = gmic-qt ${GMIC_WHAT}
-V = 2.9.9
+V = 3.0.0
DISTNAME ?= gmic-qt-${QT_HOST}-$V
CATEGORIES = graphics
Index: gmic-qt/distinfo
===================================================================
RCS file: /cvs/ports/graphics/gmic-qt/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- gmic-qt/distinfo 4 Oct 2021 13:28:27 -0000 1.3
+++ gmic-qt/distinfo 9 Dec 2021 20:21:28 -0000
@@ -1,2 +1,2 @@
-SHA256 (gmic_2.9.9.tar.gz) = nwUzOHUuyWprYZcYA3dnaCxf1Y4kccCPN0D9sHBgW8A=
-SIZE (gmic_2.9.9.tar.gz) = 7325061
+SHA256 (gmic_3.0.0.tar.gz) = PwVruebb8GdK9Mjc5Z9BmBchh2Yvf7s2zGPryMG3ESA=
+SIZE (gmic_3.0.0.tar.gz) = 10225122
Index: gmic-qt/patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/graphics/gmic-qt/patches/patch-CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-CMakeLists_txt
--- gmic-qt/patches/patch-CMakeLists_txt 16 May 2021 09:42:24 -0000
1.1.1.1
+++ gmic-qt/patches/patch-CMakeLists_txt 9 Dec 2021 20:21:28 -0000
@@ -3,12 +3,12 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1.1.1
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -100,7 +100,7 @@ set(COMPILE_FLAGS "-Dgmic_build -Dcimg_use_vt100 -Dgmi
+@@ -100,7 +100,7 @@ list(APPEND GMIC_CXX_COMPILE_FLAGS -Dgmic_build -Dcimg
if(APPLE)
- set(COMPILE_FLAGS "${COMPILE_FLAGS} -mmacosx-version-min=10.8
-stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive")
+ list(APPEND GMIC_CXX_COMPILE_FLAGS -mmacosx-version-min=10.8
-stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive)
else()
-- set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-error=narrowing -fno-ipa-sra
-fpermissive")
-+ set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-error=narrowing -fpermissive")
+- list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fno-ipa-sra
-fpermissive)
++ list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fpermissive)
endif()
if(NOT "${PRERELEASE_TAG}" STREQUAL "")
Index: gmic-qt/patches/patch-src_gmic_cpp
===================================================================
RCS file: /cvs/ports/graphics/gmic-qt/patches/patch-src_gmic_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_gmic_cpp
--- gmic-qt/patches/patch-src_gmic_cpp 4 Oct 2021 13:28:27 -0000 1.2
+++ gmic-qt/patches/patch-src_gmic_cpp 9 Dec 2021 20:21:28 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_gmic_cpp,v 1.2 2021/
Index: src/gmic.cpp
--- src/gmic.cpp.orig
+++ src/gmic.cpp
-@@ -2469,6 +2469,8 @@ CImgList<void*> gmic::list_p_is_abort = CImgList<void*
+@@ -2473,6 +2473,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();
@@ -12,7 +12,7 @@ Index: src/gmic.cpp
#elif cimg_OS==1
void* tid = (void*)(cimg_ulong)syscall(SYS_gettid);
#elif cimg_OS==2
-@@ -2807,6 +2809,8 @@ gmic::~gmic() {
+@@ -2815,6 +2817,8 @@ gmic::~gmic() {
cimg::mutex(21);
#if defined(__MACOSX__) || defined(__APPLE__)
void* tid = (void*)(cimg_ulong)getpid();
