Attachment 226000 Details for Bug 256713 – patch

[patch] patch

42ad6a4463.patch (text/plain), 5.28 KB, created by Ivan Rozhuk on 2021-06-23 00:19:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Rozhuk

Created: 2021-06-23 00:19:16 UTC

Size: 5.28 KB

patch

obsolete

>From 42ad6a44630c24724cc7e52f59fabd19aaf3d435 Mon Sep 17 00:00:00 2001
>From: Rozhuk Ivan <rozhuk.im@gmail.com>
>Date: Wed, 23 Dec 2020 06:16:07 +0300
>Subject: [PATCH] multimedia/opentoonz: update port
>
>https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256713
>---
> multimedia/opentoonz/Makefile    | 46 +++++++++++++++++++++++++++-----
> multimedia/opentoonz/pkg-descr   |  9 ++++---
> multimedia/opentoonz/pkg-message | 12 +++++++++
> multimedia/opentoonz/pkg-plist   |  6 ++---
> 4 files changed, 59 insertions(+), 14 deletions(-)
> create mode 100644 multimedia/opentoonz/pkg-message
>
>diff --git a/multimedia/opentoonz/Makefile b/multimedia/opentoonz/Makefile
>index cf058a6cd6e3..3b1a22723c4d 100644
>--- a/multimedia/opentoonz/Makefile
>+++ b/multimedia/opentoonz/Makefile
>@@ -5,13 +5,13 @@ PORTREVISION=	1
> CATEGORIES=	multimedia
> 
> MAINTAINER=	kde@FreeBSD.org
>-COMMENT=	2D animation software
>+COMMENT=	Open-source full-featured 2D animation creation software
> 
>+LICENSE=	GPLv2+
> LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 
> BUILD_DEPENDS=	boost-libs>0:devel/boost-libs
>-LIB_DEPENDS=	libgslcblas.so:math/gsl \
>-		libjson-c.so:devel/json-c \
>+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
> 		liblz4.so:archivers/liblz4 \
> 		liblzo2.so:archivers/lzo2 \
> 		libmypaint.so:graphics/libmypaint \
>@@ -19,16 +19,48 @@ LIB_DEPENDS=	libgslcblas.so:math/gsl \
> 		libpng.so:graphics/png \
> 		libsuperlu.so:math/superlu \
> 		libturbojpeg.so:graphics/libjpeg-turbo
>+RUN_DEPENDS=	${LOCALBASE}/bin/ffprobe:multimedia/ffmpeg
> 
>-USES=		cmake:noninja compiler:c++11-lang gettext-runtime gl \
>-		gnome jpeg pkgconfig qt:5
>+USES=		blaslapack:openblas cmake:noninja compiler:c++11-lang \
>+		gl gnome jpeg pkgconfig qt:5
> USE_GITHUB=	yes
> USE_GL=		gl glew glu glut
>-USE_GNOME=	glib20
> USE_QT=		core gui multimedia network opengl printsupport \
> 		script serialport svg widgets xml \
> 		buildtools_build linguisttools_build qmake_build
>-
>+CMAKE_ARGS=	-DWITH_SYSTEM_LZO:BOOL=ON \
>+		-DWITH_SYSTEM_SUPERLU:BOOL=ON
> CMAKE_SOURCE_PATH=	${WRKSRC}/toonz/sources
>+INSTALLS_ICONS=	yes
>+
>+OPTIONS_SINGLE=		BLASLIB
>+OPTIONS_SINGLE_BLASLIB=	CBLAS GSLCBLAS NETLIB OPENBLAS
>+OPTIONS_DEFAULT=	OPENBLAS
>+
>+CBLAS_LIB_DEPENDS=	libcblas.so:math/cblas
>+CBLAS_VARS=		BLASLIBS="cblas"
>+CBLAS_DESC=		C interface to the legacy Fortran BLAS
>+GSLCBLAS_LIB_DEPENDS=	libgslcblas.so:math/gsl
>+GSLCBLAS_VARS=		BLASLIBS="gslcblas"
>+GSLCBLAS_DESC=		The GNU Scientific Library - mathematical libs
>+NETLIB_USES=		blaslapack:netlib
>+NETLIB_VARS=		BLASLIBS="blas"
>+OPENBLAS_USES=		blaslapack:openblas
>+OPENBLAS_VARS=		BLASLIBS="openblas"
>+
>+.include <bsd.port.options.mk>
>+
>+.if defined(WITH_DEBUG)
>+CXXFLAGS+=	-DDEBUG -g3 -ggdb
>+.else
>+CXXFLAGS+=	-DNDEBUG
>+.endif
>+
>+post-extract:
>+	${FIND} ${WRKSRC} -name '*.gitkeep' -delete
>+
>+post-patch:
>+	@${REINPLACE_CMD} -e "s|find_library(OPENBLAS_LIB NAMES.*|find_library(OPENBLAS_LIB NAMES ${BLASLIBS})|g" \
>+		${WRKSRC}/toonz/sources/CMakeLists.txt
> 
> .include <bsd.port.mk>
>diff --git a/multimedia/opentoonz/pkg-descr b/multimedia/opentoonz/pkg-descr
>index 0ad2bd7f1d4a..f3e84cc04aec 100644
>--- a/multimedia/opentoonz/pkg-descr
>+++ b/multimedia/opentoonz/pkg-descr
>@@ -1,5 +1,6 @@
>-OpenToonz is a 2D animation software published by DWANGO. It is based on Toonz
>-Studio Ghibli Version, originally developed in Italy by Digital Video, Inc.,
>-and customized by Studio Ghibli over many years of production.
>+OpenToonz is a 2D animation software published by DWANGO.
>+It is based on Toonz Studio Ghibli Version, originally developed in
>+Italy by Digital Video, Inc., and customized by Studio Ghibli over
>+many years of production.
> 
>-WWW: https://github.com/opentoonz/opentoonz
>+WWW: https://opentoonz.github.io/e/
>diff --git a/multimedia/opentoonz/pkg-message b/multimedia/opentoonz/pkg-message
>new file mode 100644
>index 000000000000..93e93725b9aa
>--- /dev/null
>+++ b/multimedia/opentoonz/pkg-message
>@@ -0,0 +1,12 @@
>+[
>+{ type: install
>+  message: <<EOM
>+
>+!!! ATTENTION !!!
>+
>+No TIFF support now, set in settings some other image format!
>+SSE2 available only on Windows.
>+
>+EOM
>+}
>+]
>diff --git a/multimedia/opentoonz/pkg-plist b/multimedia/opentoonz/pkg-plist
>index 48ad54fa733b..6f08fed4fdb5 100644
>--- a/multimedia/opentoonz/pkg-plist
>+++ b/multimedia/opentoonz/pkg-plist
>@@ -1338,7 +1338,6 @@ share/metainfo/io.github.OpenToonz.appdata.xml
> %%DATADIR%%/stuff/library/vector brushes/thickening.pli
> %%DATADIR%%/stuff/library/vector brushes/trail_shape1.pli
> %%DATADIR%%/stuff/library/vector brushes/trail_shape2.pli
>-%%DATADIR%%/stuff/plugins/.gitkeep
> %%DATADIR%%/stuff/profiles/layouts/check.bmp
> %%DATADIR%%/stuff/profiles/layouts/fxs/SHADER_caustics.xml
> %%DATADIR%%/stuff/profiles/layouts/fxs/SHADER_fireball.xml
>@@ -1526,10 +1525,11 @@ share/metainfo/io.github.OpenToonz.appdata.xml
> %%DATADIR%%/stuff/profiles/layouts/shortcuts/otretas.ini
> %%DATADIR%%/stuff/profiles/layouts/toolbars/maintoolbar.xml
> %%DATADIR%%/stuff/profiles/project_folders.txt
>-%%DATADIR%%/stuff/projects/.gitkeep
> %%DATADIR%%/stuff/studiopalette/Global Palettes/basics.tpl
> %%DATADIR%%/stuff/studiopalette/Global Palettes/color_key.tpl
> %%DATADIR%%/stuff/studiopalette/Global Palettes/skin.tpl
> %%DATADIR%%/stuff/studiopalette/Global Palettes/variety.tpl
> %%DATADIR%%/stuff/studiopalette/cleanup_default.tpl
>-%%DATADIR%%/stuff/toonzfarm/.gitkeep
>+@dir %%DATADIR%%/stuff/plugins
>+@dir %%DATADIR%%/stuff/projects
>+@dir %%DATADIR%%/stuff/toonzfarm

Actions: View | Diff

Attachments on bug 256713: 225928 | 225998 | 226000 | 226001 | 226021