git: 5c85328abe9e - main - graphics/krita: follow ICIOv1 port (+)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 01 Feb 2022 17:04:37 UTC
The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=5c85328abe9e15b35a6e581997c1b8791eefb671 commit 5c85328abe9e15b35a6e581997c1b8791eefb671 Author: Dima Panov <fluffy@FreeBSD.org> AuthorDate: 2022-02-01 16:43:35 +0000 Commit: Dima Panov <fluffy@FreeBSD.org> CommitDate: 2022-02-01 17:04:14 +0000 graphics/krita: follow ICIOv1 port (+) Due to updating opencolorio to v2.1.0 krita fails to compile. This patch adjusts krita to build using ociov1 provided by new port. PR: 260313 Sponsored by: Netzkommune GmbH. --- graphics/krita/Makefile | 11 +++++++++-- graphics/krita/files/patch-cmake_modules_FindOCIO.cmake | 16 ++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile index dfcc937a7217..ee3bca9bf174 100644 --- a/graphics/krita/Makefile +++ b/graphics/krita/Makefile @@ -1,6 +1,6 @@ PORTNAME= krita DISTVERSION= 4.4.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION} DIST_SUBDIR= KDE/${PORTNAME} @@ -12,7 +12,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libImath.so:math/Imath \ - libOpenColorIO.so:graphics/opencolorio \ + libOpenColorIOv1.so:graphics/opencoloriov1 \ libX11.so:x11/libX11 \ libboost_system.so:devel/boost-libs \ libfftw3.so:math/fftw3 \ @@ -63,4 +63,11 @@ PLIST_SUB= SHLIB_VER=20.0.0 \ CFLAGS+= -I${LOCALBASE}/include/Imath LDFLAGS+= -lpthread +post-patch: + ${REINPLACE_CMD} -e 's|<OpenColorIO/|<OpenColorIOv1/|g' \ + ${WRKSRC}/libs/ui/canvas/kis_image_pyramid.cpp \ + ${WRKSRC}/plugins/dockers/lut/lutdocker_dock.h \ + ${WRKSRC}/plugins/dockers/lut/ocio_display_filter.h \ + ${WRKSRC}/plugins/dockers/lut/lutdocker.cpp + .include <bsd.port.mk> diff --git a/graphics/krita/files/patch-cmake_modules_FindOCIO.cmake b/graphics/krita/files/patch-cmake_modules_FindOCIO.cmake new file mode 100644 index 000000000000..968acdbc56c3 --- /dev/null +++ b/graphics/krita/files/patch-cmake_modules_FindOCIO.cmake @@ -0,0 +1,16 @@ +--- cmake/modules/FindOCIO.cmake.orig 2021-08-24 07:56:28 UTC ++++ cmake/modules/FindOCIO.cmake +@@ -33,11 +33,11 @@ find_path(OCIO_INCLUDE_DIR OpenColorIO.h + /usr/local/include + /sw/include + /opt/local/include +- PATH_SUFFIXES OpenColorIO ++ PATH_SUFFIXES OpenColorIOv1 + DOC "The directory where OpenColorIO/OpenColorIO.h resides" + ) + +-find_library(OCIO_LIBRARIES OpenColorIO ++find_library(OCIO_LIBRARIES OpenColorIOv1 + PATHS + ${OCIO_LIBRARY_PATH} + ${OCIO_PATH}/lib/