diff --git a/graphics/krita-gmic-plugin/Makefile b/graphics/krita-gmic-plugin/Makefile index 9f07dfd117e5..a59b03c7e7e0 100644 --- a/graphics/krita-gmic-plugin/Makefile +++ b/graphics/krita-gmic-plugin/Makefile @@ -1,45 +1,51 @@ PORTNAME= gmic DISTVERSIONPREFIX= v -DISTVERSION= 3.6.4.1 +DISTVERSION= 3.7.4.1 CATEGORIES= graphics kde MASTER_SITES= https://github.com/vanyossi/${PORTNAME}/releases/download/v${PORTVERSION}/ PKGNAMEPREFIX= krita- PKGNAMESUFFIX= -plugin DISTNAME= ${PORTNAME}-${PORTVERSION} DIST_SUBDIR= KDE/${PKGBASE}/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Krita native plugin for G'MIC WWW= https://github.com/vanyossi/gmic -LICENSE= GPLv3+ -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/gmic-qt/COPYING BUILD_DEPENDS= bash:shells/bash \ gmake:devel/gmake LIB_DEPENDS= libcurl.so:ftp/curl \ libfftw3.so:math/fftw3 \ libkritaqmicinterface.so:graphics/krita \ libpng16.so:graphics/png -USES= cmake compiler:c++14-lang kde:5 pkgconfig qt:5 shebangfix xorg +USES= cmake compiler:c++17-lang kde:6 pkgconfig qt:6 shebangfix xorg USE_KDE= coreaddons ecm:build -USE_QT= core gui network widgets \ - buildtools:build linguisttools:build qmake:build +USE_QT= base \ + tools:build USE_XORG= ice sm x11 xext -SHEBANG_FILES= translations/lrelease.sh \ - translations/filters/csv2ts.sh \ - translations/filters/ts2csv.sh +SHEBANG_FILES= gmic-qt/translations/lrelease.sh \ + gmic-qt/translations/filters/csv2ts.sh \ + gmic-qt/translations/filters/ts2csv.sh CMAKE_ARGS= -DGMIC_QT_HOST:STRING="krita-plugin" +CMAKE_ON= BUILD_WITH_QT6 CMAKE_OFF= ENABLE_SYSTEM_GMIC +CMAKE_SOURCE_PATH= ${WRKSRC}/gmic-qt WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSIONFULL} -WRKSRC_SUBDIR= gmic-qt PLIST_FILES= lib/kritaplugins/krita_gmic_qt.so \ share/gmic/gmic_cluts.gmz \ - share/gmic/gmic_denoise_cnn.gmz + share/gmic/gmic_denoise_cnn.gmz \ + share/gmic/gmic_lightleaks.gmz \ + share/gmic/gmic_scale2x_cnn.gmz +post-patch: + ${REINPLACE_CMD} "s,lrelease-qt5,${LRELEASE}," \ + ${WRKSRC}/gmic-qt/translations/lrelease.sh .include diff --git a/graphics/krita-gmic-plugin/distinfo b/graphics/krita-gmic-plugin/distinfo index 0a400f033611..ed5f09fe9066 100644 --- a/graphics/krita-gmic-plugin/distinfo +++ b/graphics/krita-gmic-plugin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1766282335 -SHA256 (KDE/krita-gmic-plugin/3.6.4.1/gmic-3.6.4.1.tar.gz) = a6b6c69301560be2ea2b5583a8ec19bd7e50e4b41a977745517ce920bc05fafe -SIZE (KDE/krita-gmic-plugin/3.6.4.1/gmic-3.6.4.1.tar.gz) = 21834300 +TIMESTAMP = 1783961911 +SHA256 (KDE/krita-gmic-plugin/3.7.4.1/gmic-3.7.4.1.tar.gz) = 15674b544264fbc3f020be6fae27477aee6ac49316416f538e578a18ddb23879 +SIZE (KDE/krita-gmic-plugin/3.7.4.1/gmic-3.7.4.1.tar.gz) = 22004700 diff --git a/graphics/krita-gmic-plugin/files/patch-CMakeLists.txt b/graphics/krita-gmic-plugin/files/patch-gmic-qt_CMakeLists.txt similarity index 60% rename from graphics/krita-gmic-plugin/files/patch-CMakeLists.txt rename to graphics/krita-gmic-plugin/files/patch-gmic-qt_CMakeLists.txt index 74427219efe4..ed4840483393 100644 --- a/graphics/krita-gmic-plugin/files/patch-CMakeLists.txt +++ b/graphics/krita-gmic-plugin/files/patch-gmic-qt_CMakeLists.txt @@ -1,35 +1,22 @@ -Hunk 1: Don't find Qt6 until we can land a KF6-based Krita -Hunk 2: Link to -lpthread -Hunk 3: bmake doesn't work for this - ---- CMakeLists.txt.orig 2023-05-04 22:27:01 UTC -+++ CMakeLists.txt -@@ -153,7 +153,7 @@ find_package(Threads REQUIRED) - # - # Qt - # --find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core) -+find_package(QT NAMES Qt5 REQUIRED COMPONENTS Core) - find_package(Qt${QT_VERSION_MAJOR} ${MIN_QT_VERSION} - REQUIRED COMPONENTS - Core -@@ -328,6 +328,7 @@ if (UNIX) +--- gmic-qt/CMakeLists.txt.orig 2026-03-21 17:28:14 UTC ++++ gmic-qt/CMakeLists.txt +@@ -327,6 +327,7 @@ if (UNIX) set(gmic_qt_LIBRARIES ${gmic_qt_LIBRARIES} ${X11_LIBRARIES} # XXX: Search for X11: Wayland is coming! + Threads::Threads ) endif() endif() -@@ -645,9 +646,9 @@ if (UNIX OR APPLE OR MSYS) +@@ -648,9 +649,9 @@ if (UNIX OR APPLE OR MSYS) if (UNIX OR APPLE OR MSYS) message("Producing translation .qm files") - execute_process(COMMAND make WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/translations OUTPUT_QUIET) + execute_process(COMMAND gmake WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/translations OUTPUT_QUIET) message("Producing filter translation .qm files") - execute_process(COMMAND make WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/translations/filters OUTPUT_QUIET) + execute_process(COMMAND gmake WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/translations/filters OUTPUT_QUIET) else() set(gmic_translation_files translations/cs.ts diff --git a/graphics/krita-gmic-plugin/files/patch-src_CImg.h b/graphics/krita-gmic-plugin/files/patch-src_CImg.h new file mode 100644 index 000000000000..2593f9a7fc42 --- /dev/null +++ b/graphics/krita-gmic-plugin/files/patch-src_CImg.h @@ -0,0 +1,11 @@ +--- src/CImg.h.orig 2026-03-21 17:28:13 UTC ++++ src/CImg.h +@@ -663,7 +663,7 @@ extern "C" { + #endif + + // Define cimg_use_pthread +-#if defined(PTHREAD_H) || defined(_PTHREAD_H) ++#if defined(PTHREAD_H) || defined(_PTHREAD_H) || defined(_PTHREAD_H_) + #define cimg_use_pthread 1 + #else + #define cimg_use_pthread 0