Here's an update to gmic and gmic-qt.
This uses the newly commited framework parts that ditch $OpenBSD$
Hence a bit of churn.
Apart from that, things seem okay.
There was a fuck-up wrt the cmake framework with upstream, taken care of
with (merged) pr264, so that part of the patch should go away when the next
minor release comes out.
Tested lightly with the gmic demos and the gimp filters.
okay ?
Index: gmic/Makefile
===================================================================
RCS file: /cvs/ports/graphics/gmic/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- gmic/Makefile 10 Dec 2021 10:16:48 -0000 1.6
+++ gmic/Makefile 1 Mar 2022 16:41:14 -0000
@@ -1,10 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2021/12/10 10:16:48 espie Exp $
-
BROKEN-powerpc64 = update297.gmic is not a valid G'MIC update file
COMMENT = image processing framework
-V = 3.0.0
+V = 3.0.2
DISTNAME = gmic-$V
SHARED_LIBS += gmic 1.0 # 1
Index: gmic/distinfo
===================================================================
RCS file: /cvs/ports/graphics/gmic/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- gmic/distinfo 10 Dec 2021 10:16:48 -0000 1.4
+++ gmic/distinfo 1 Mar 2022 16:41:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (gmic_3.0.0.tar.gz) = PwVruebb8GdK9Mjc5Z9BmBchh2Yvf7s2zGPryMG3ESA=
-SIZE (gmic_3.0.0.tar.gz) = 10225122
+SHA256 (gmic_3.0.2.tar.gz) = aKzsMsRdVvsLBAis7E9jFmFxgW1wci1jEGeH8efRcDA=
+SIZE (gmic_3.0.2.tar.gz) = 10458732
Index: gmic/patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/graphics/gmic/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CMakeLists_txt
--- gmic/patches/patch-CMakeLists_txt 10 Dec 2021 10:16:48 -0000 1.3
+++ gmic/patches/patch-CMakeLists_txt 1 Mar 2022 16:41:14 -0000
@@ -1,16 +1,40 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.3 2021/12/10 10:16:48 espie Exp $
-
- remove flags that make no sense for us
+- fix CMake boo-boo (pr#364 on the gmic repo)
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -100,7 +100,7 @@ list(APPEND GMIC_CXX_COMPILE_FLAGS -Dgmic_build -Dcimg
+@@ -96,13 +96,13 @@ 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")
+ list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=c++11-narrowing
-fpermissive)
else()
- 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 "")
+@@ -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
Index: gmic/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/gmic/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- gmic/pkg/PLIST 16 May 2021 09:40:38 -0000 1.1.1.1
+++ gmic/pkg/PLIST 1 Mar 2022 16:41:14 -0000
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2021/05/16 09:40:38 espie Exp $
@bin bin/gmic
+include/CImg.h
include/gmic.h
lib/cmake/gmic/
lib/cmake/gmic/GmicConfig.cmake
Index: gmic-qt/Makefile
===================================================================
RCS file: /cvs/ports/graphics/gmic-qt/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- gmic-qt/Makefile 6 Sep 2021 14:54:05 -0000 1.2
+++ gmic-qt/Makefile 1 Mar 2022 16:41:14 -0000
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.2 2021/09/06 14:54:05 espie Exp $
-
SUBDIR += gimp
SUBDIR += krita
SUBDIR += none
Index: gmic-qt/Makefile.inc
===================================================================
RCS file: /cvs/ports/graphics/gmic-qt/Makefile.inc,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.inc
--- gmic-qt/Makefile.inc 10 Dec 2021 10:16:48 -0000 1.4
+++ gmic-qt/Makefile.inc 1 Mar 2022 16:41:14 -0000
@@ -1,7 +1,5 @@
-# $OpenBSD: Makefile.inc,v 1.4 2021/12/10 10:16:48 espie Exp $
-
COMMENT = gmic-qt ${GMIC_WHAT}
-V = 3.0.0
+V = 3.0.2
DISTNAME ?= gmic-qt-${QT_HOST}-$V
CATEGORIES = graphics
Index: gmic-qt/distinfo
===================================================================
RCS file: /cvs/ports/graphics/gmic-qt/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- gmic-qt/distinfo 10 Dec 2021 10:16:48 -0000 1.4
+++ gmic-qt/distinfo 1 Mar 2022 16:41:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (gmic_3.0.0.tar.gz) = PwVruebb8GdK9Mjc5Z9BmBchh2Yvf7s2zGPryMG3ESA=
-SIZE (gmic_3.0.0.tar.gz) = 10225122
+SHA256 (gmic_3.0.2.tar.gz) = aKzsMsRdVvsLBAis7E9jFmFxgW1wci1jEGeH8efRcDA=
+SIZE (gmic_3.0.2.tar.gz) = 10458732
Index: gmic-qt/gimp/Makefile
===================================================================
RCS file: /cvs/ports/graphics/gmic-qt/gimp/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- gmic-qt/gimp/Makefile 16 May 2021 09:42:24 -0000 1.1.1.1
+++ gmic-qt/gimp/Makefile 1 Mar 2022 16:41:14 -0000
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2021/05/16 09:42:24 espie Exp $
-
QT_HOST = gimp
WANTLIB += gimp-2.0 gimpbase-2.0 gimpcolor-2.0 gimpconfig-2.0 gimpmath-2.0
Index: gmic-qt/gimp/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/gmic-qt/gimp/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- gmic-qt/gimp/pkg/PLIST 16 May 2021 09:42:24 -0000 1.1.1.1
+++ gmic-qt/gimp/pkg/PLIST 1 Mar 2022 16:41:14 -0000
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2021/05/16 09:42:24 espie Exp $
lib/gimp/2.0/plug-ins/gmic_gimp_qt/
@bin lib/gimp/2.0/plug-ins/gmic_gimp_qt/gmic_gimp_qt
Index: gmic-qt/krita/Makefile
===================================================================
RCS file: /cvs/ports/graphics/gmic-qt/krita/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- gmic-qt/krita/Makefile 6 Sep 2021 14:54:05 -0000 1.2
+++ gmic-qt/krita/Makefile 1 Mar 2022 16:41:14 -0000
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.2 2021/09/06 14:54:05 espie Exp $
-
COMMENT = gmic plugin for krita
RUN_DEPENDS = graphics/krita
Index: gmic-qt/krita/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/gmic-qt/krita/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- gmic-qt/krita/pkg/PLIST 16 May 2021 09:42:24 -0000 1.1.1.1
+++ gmic-qt/krita/pkg/PLIST 1 Mar 2022 16:41:14 -0000
@@ -1,2 +1 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2021/05/16 09:42:24 espie Exp $
@bin bin/gmic_krita_qt
Index: gmic-qt/none/Makefile
===================================================================
RCS file: /cvs/ports/graphics/gmic-qt/none/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- gmic-qt/none/Makefile 6 Sep 2021 14:54:05 -0000 1.1
+++ gmic-qt/none/Makefile 1 Mar 2022 16:41:14 -0000
@@ -1,5 +1,3 @@
-# $OpenBSD: Makefile,v 1.1 2021/09/06 14:54:05 espie Exp $
-
COMMENT = gmic plugin, stand-alone cli
QT_HOST = none
Index: gmic-qt/none/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/gmic-qt/none/pkg/PLIST,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST
--- gmic-qt/none/pkg/PLIST 6 Sep 2021 14:54:05 -0000 1.1
+++ gmic-qt/none/pkg/PLIST 1 Mar 2022 16:41:14 -0000
@@ -1,2 +1 @@
-@comment $OpenBSD: PLIST,v 1.1 2021/09/06 14:54:05 espie Exp $
@bin bin/gmic_qt
Index: gmic-qt/patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/graphics/gmic-qt/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-CMakeLists_txt
--- gmic-qt/patches/patch-CMakeLists_txt 10 Dec 2021 10:16:48 -0000
1.2
+++ gmic-qt/patches/patch-CMakeLists_txt 1 Mar 2022 16:41:14 -0000
@@ -1,11 +1,12 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.2 2021/12/10 10:16:48 espie Exp $
+- remove flags that make no sense for us
+- fix CMake boo-boo (pr#364 on the gmic repo)
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -100,7 +100,7 @@ list(APPEND GMIC_CXX_COMPILE_FLAGS -Dgmic_build -Dcimg
- if(APPLE)
- list(APPEND GMIC_CXX_COMPILE_FLAGS -mmacosx-version-min=10.8
-stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive)
+@@ -102,7 +102,7 @@ if(APPLE)
+ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+ list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=c++11-narrowing
-fpermissive)
else()
- list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fno-ipa-sra
-fpermissive)
+ list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fpermissive)
