Skip to content

Commit

Permalink
graphics/krita: Update to 5.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
BSDKaffee committed Oct 6, 2023
1 parent 3f6b940 commit 9805a6f
Show file tree
Hide file tree
Showing 11 changed files with 119 additions and 671 deletions.
1 change: 1 addition & 0 deletions graphics/krita-gmic-plugin/Makefile
@@ -1,6 +1,7 @@
PORTNAME= gmic
DISTVERSIONPREFIX= v
DISTVERSION= 3.2.4.1
PORTREVISION= 1
CATEGORIES= graphics kde
PKGNAMEPREFIX= krita-
PKGNAMESUFFIX= -plugin
Expand Down
65 changes: 31 additions & 34 deletions graphics/krita/Makefile
@@ -1,6 +1,5 @@
PORTNAME= krita
DISTVERSION= 5.1.5
PORTREVISION= 19
DISTVERSION= 5.2.0
CATEGORIES= graphics kde
MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}
DIST_SUBDIR= KDE/${PORTNAME}
Expand All @@ -12,50 +11,59 @@ WWW= https://krita.org
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING

BUILD_DEPENDS= libheif>=1.12.0:graphics/libheif
BUILD_DEPENDS= boost-libs>=1.65:devel/boost-libs \
immer>=0:devel/immer \
lager>=0:devel/lager \
zug>=0:devel/zug
BUILD_DEPENDS+= ${BUILD_DEPENDS_${ARCH}}
BUILD_DEPENDS_aarch64= xsimd>=8.1:devel/xsimd
BUILD_DEPENDS_amd64= xsimd>=8.1:devel/xsimd
LIB_DEPENDS= libImath.so:math/Imath \
libOpenColorIO.so:graphics/opencolorio \
libX11.so:x11/libX11 \
libboost_system.so:devel/boost-libs \
libfftw3.so:math/fftw3 \
libexiv2.so:graphics/exiv2 \
libcurl.so:ftp/curl \
libfftw3.so:math/fftw3 \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libfribidi.so:converters/fribidi \
libgif.so:graphics/giflib \
libgsl.so:math/gsl \
libharfbuzz.so:print/harfbuzz \
libheif.so:graphics/libheif \
libturbojpeg.so:graphics/libjpeg-turbo \
libjson-c.so:devel/json-c \
libjxl.so:graphics/libjxl \
liblcms2.so:graphics/lcms2 \
libmypaint.so:graphics/libmypaint \
libpng.so:graphics/png \
libopenjp2.so:graphics/openjpeg \
libpng16.so:graphics/png \
libpoppler.so:graphics/poppler \
libpoppler-qt5.so:graphics/poppler-qt5 \
libquazip1-qt5.so:archivers/quazip@qt5 \
libraw.so:graphics/libraw \
libtiff.so:graphics/tiff \
libwebp.so:graphics/webp \
libxcb.so:x11/libxcb \
libxcb-util.so:x11/xcb-util
libturbojpeg.so:graphics/libjpeg-turbo \
libunibreak.so:textproc/libunibreak \
libwebp.so:graphics/webp

# Disable ninja generator for now (with gmake), until the duplicate test targets are resolved upstream.
USES= cmake compiler:c++11-lib desktop-file-utils eigen:3 gettext \
jpeg kde:5 localbase:ldflags pkgconfig python qt:5 \
shared-mime-info tar:xz xorg
USE_KDE= archive completion config coreaddons crash guiaddons i18n \
itemmodels itemviews kio service widgetsaddons windowsystem \
ecm:build
USE_QT= concurrent core dbus declarative gui multimedia network \
printsupport sql svg testlib widgets x11extras xml \
buildtools:build qmake:build \
gnome jpeg kde:5 localbase:ldflags mlt:7 pkgconfig python qt:5 \
sdl shared-mime-info tar:xz xorg
USE_GNOME= glib20
USE_KDE= completion config coreaddons crash guiaddons i18n \
itemmodels itemviews libkdcraw service widgetsaddons \
windowsystem ecm:build
USE_QT= concurrent core dbus declarative gui network \
printsupport sql svg widgets x11extras xml \
buildtools:build qmake:build testlib:build \
sql-sqlite3:run
USE_SDL= sdl2
USE_XORG= ice sm xcb xext xi

# Make Cmake use the python we installed dependencies for.
CMAKE_ARGS= -DPython_EXECUTABLE:STRING=${PYTHON_CMD}

PLIST_SUB= SHLIB_VER=19.0.0 \
SHLIB_SHVER=19

OPTIONS_DEFINE= PYTHON OPENEXR
OPTIONS_DEFAULT= PYTHON OPENEXR
OPTIONS_SUB= yes
Expand All @@ -64,20 +72,9 @@ OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr \
libKSeExpr.so:graphics/kseexpr
OPENEXR_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenEXR

PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=63.1.0:devel/py-setuptools@${PY_FLAVOR}
PYTHON_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_PyQt5
PYTHON_BUILD_DEPENDS= ${PY_SETUPTOOLS}
PYTHON_USES= pyqt:5
PYTHON_USE= PYQT=pyqt5,sip,pysip

PLIST_SUB= SHLIB_VER=18.0.0 \
SHLIB_SHVER=18

.include <bsd.port.options.mk>

.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386
BUILD_DEPENDS+= vc>=1.1.0:devel/vc
.else
CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Vc=ON
.endif
PYTHON_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_PyQt5

.include <bsd.port.mk>
8 changes: 5 additions & 3 deletions graphics/krita/distinfo
@@ -1,3 +1,5 @@
TIMESTAMP = 1673014048
SHA256 (KDE/krita/krita-5.1.5.tar.xz) = 45eac209a3c4ac285ca223e1978d35694cdca31b0075e596ad252d6619f04249
SIZE (KDE/krita/krita-5.1.5.tar.xz) = 184981952
TIMESTAMP = 1696541341
SHA256 (KDE/krita/krita-5.2.0.tar.xz) = a3791a9cbb590d9964b45c0c1ed89c37d422e38606f70885f16de1ff2f645baf
SIZE (KDE/krita/krita-5.2.0.tar.xz) = 188368484
SHA256 (KDE/krita/821259eace5d1816df0b39306ef5c6f2a2842394.patch) = f3748be2f1abf64fe4a7515fe4f67ac7696defd7256bda906b69d7a80f45e341
SIZE (KDE/krita/821259eace5d1816df0b39306ef5c6f2a2842394.patch) = 7346
12 changes: 12 additions & 0 deletions graphics/krita/files/patch-3rdparty__vendor_raqm_CMakeLists.txt
@@ -0,0 +1,12 @@
Fix linker errors. We need to build with -fPIC.

--- 3rdparty_vendor/raqm/CMakeLists.txt.orig 2023-10-04 08:06:16 UTC
+++ 3rdparty_vendor/raqm/CMakeLists.txt
@@ -86,6 +86,7 @@ set_property(TARGET libraqm PROPERTY C_STANDARD 99)

add_library(libraqm STATIC ${libraqm_SRC})
set_property(TARGET libraqm PROPERTY C_STANDARD 99)
+set_property(TARGET libraqm PROPERTY POSITION_INDEPENDENT_CODE ON)

target_include_directories(libraqm INTERFACE ${libraqm_src_SOURCE_DIR}/src)
target_include_directories(libraqm PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
13 changes: 13 additions & 0 deletions graphics/krita/files/patch-cmake_modules_FindOpenJPEG.cmake
@@ -0,0 +1,13 @@
Fix detection of OpenJPEG 2.x if 1.5 is also installed.

--- cmake/modules/FindOpenJPEG.cmake.orig 2023-09-14 09:35:53 UTC
+++ cmake/modules/FindOpenJPEG.cmake
@@ -45,7 +45,7 @@ include(FindPackageHandleStandardArgs)

# No hints in this case because the library versions semantically
# the module folder, and it's also capitalized, so let CMake handle it.
-find_package(OPENJPEG QUIET NO_MODULE NAMES OpenJPEG)
+find_package(OPENJPEG 2 QUIET NO_MODULE NAMES OpenJPEG)
mark_as_advanced(OPENJPEG_DIR)

if(OPENJPEG_FOUND)
15 changes: 15 additions & 0 deletions graphics/krita/files/patch-cmake_modules_xsimd_xsimdMacros.cmake
@@ -0,0 +1,15 @@
Avoid detecting binutils, especially for FreeBSD 12.x where the base version
gets detected and rejected for being too old. This can be safely removed
after 12.x EOL.

--- cmake/modules/xsimd/xsimdMacros.cmake.orig 2023-10-05 08:16:01 UTC
+++ cmake/modules/xsimd/xsimdMacros.cmake
@@ -60,7 +60,7 @@ macro(xsimd_check_assembler)
endmacro()

macro(xsimd_check_assembler)
- execute_process(COMMAND ${CMAKE_CXX_COMPILER} -print-prog-name=as OUTPUT_VARIABLE _as RESULT_VARIABLE _as_result)
+ set(_as_result 1)
mark_as_advanced(_as)
mark_as_advanced(_as_result)
if(_as_result) # error code is 0 == OK

0 comments on commit 9805a6f

Please sign in to comment.