gentoo auto-resync : 05:02:2023 - 03:15:29

5 files changed, 221 insertions, 0 deletions

diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index 8ce1ec3a8d68..d2ddb1da1262 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -1,3 +1,8 @@
+AUX opentoonz-1.4.0-fix-header.patch 374 BLAKE2B 3ba2857ceea33e5cbaff5e79a8e5790ef2e9813d4366211c155033cfed51e27cd8de61ab3dda1f7d005e1dfab6d43f90de099bd0121f537dc7d756b04f766a15 SHA512 ed4e34d75c43cb4de536ea0b662372edd43cb6f8221350b6214a0decaa9d0038901c86e78e3c55a77ae07956391f81b6ce2834a4498472a7adf5cad101fd8feb
+AUX opentoonz-1.4.0-qt-5.15.patch 543 BLAKE2B f4000bf965cbf2f8723b8a05a69f8bdb3ee83180ddfef59d9830d3321ca22aef3bfc0632ebe7a58a87085bc5d0e2a625f519e64726a448f0ab03ec50dc22c9db SHA512 34d0b641aa27ee0b218e2c9c00da3df1ac1f69ca34c56e1d92f1abd1ccb05fc4a2d59097b9fd1ec2a9d0fd9bdfdddcfc64df0d86215ee18dcee467fc0cca14bf
 DIST opentoonz-1.4.0.tar.gz 53531141 BLAKE2B adb7a85fb0581d92119b5f6b75dc320428ea0763955f8c883072cba78045acdeea75a5cea82065a29d2c59f53b4843d8ff92690c9a47c01605b4702fd36d6c13 SHA512 777f5d59ec8076e1e53a81347e15bef198bea77449073f1e9d5fdd371a61e20fd6dc8b26c6656c783959782bd71008fbb63c05742aaa50c92bd317aded7d0649
+DIST opentoonz-1.6.0.tar.gz 55011226 BLAKE2B e7e27d530ee8356071d38bb3d58de89edcdc6e7e0b28cdb9ba8f7681eda929e13211664a5502499aa3eccfcf090ad81970e9caef365e762b53b7a57f19310afe SHA512 5ee7b724d51f058867d2c7e9c540e68ee3cb6d1350e32c5fd817b10b92ad79cc2a106d36dccc9234503e62788903e6058841dcd8dc39450c889393d0300636e9
+EBUILD opentoonz-1.4.0-r1.ebuild 1939 BLAKE2B 24aec475c6629c1fc5f55154473efc92e6c6ceb30c835c89a9a3f5bdf2d1b1093d8c76ead7995bd3934b8b9e5750a6ba6581af174667525beeb8d262e2027816 SHA512 4a8fdd5f5e0e682aae2eadd375ccf9e1e6ee1adf6774388ecdd8f6e0fe05edeec29289c4211a6e774e940685160fd64e291e2da0967c0aecdbf7dc3dac6a4532
 EBUILD opentoonz-1.4.0.ebuild 1808 BLAKE2B 4f7afd3c03cad0af76e203e03c95241d1ff4938232f93ba1b940c6a4132add71356ea0e46ee8f5a58cca76abb7d57e1b02400423052b44d1be1ab359317e60a4 SHA512 8caf8fa2241d0d33abddfd7e36ed2dfe68afa8d446afeb2b238b094e3042fc02d30bfbe1e103aecf5511e71d6bbe770299f510b4a76f1891f0f16efad78ce7ef
+EBUILD opentoonz-1.6.0.ebuild 1964 BLAKE2B 6afa50e8c6b720d2ce925c7f9f1fc8a7979fc92b3a758daa49cadf4ce4913dd2945cfa2c75dff3c12649f540af3fd38c36eeb520cc0fa4a78756a37e53512dae SHA512 e8c0dba3ee7d940d47d6efe8b7ea7fc8aa04b9399d3f15155dbaa745f7cec9787772bae2156db77e565b100b7ce6b66bc7cc3c89ebd96dcf9dd88861b5fed4f3
 MISC metadata.xml 484 BLAKE2B 3850af092b035bf6ef637fcf1d09fa79526011ab3629a6e918f952bba06de73b21a0ca3dcb2e6532faaab444404d3e767bff25d59c042650a4ab9b356c1f5a2e SHA512 5daa54628d2d677dc10934d3d43b1df1972f5515461bdaaa0684d4f9f26fb2b065f3fa64a3f0eed8403570ab64a919b7831269dcc68638b7da2e3d40730c01dd
diff --git a/media-gfx/opentoonz/files/opentoonz-1.4.0-fix-header.patch b/media-gfx/opentoonz/files/opentoonz-1.4.0-fix-header.patch
new file mode 100644
index 000000000000..299c927a5817
--- /dev/null
+++ b/media-gfx/opentoonz/files/opentoonz-1.4.0-fix-header.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/723946k
+--- a/toonz/sources/common/twain/twain.h
++++ b/toonz/sources/common/twain/twain.h
+@@ -2209,7 +2209,7 @@ typedef struct {
+ #elif defined(TWH_CMP_GNU)
+ #pragma pack(pop, before_twain)
+ #elif defined(TWH_CMP_BORLAND)
+-#pragma option –a.
++#pragma option_a.
+ #elif defined(TWH_CMP_XCODE)
+ #if PRAGMA_STRUCT_ALIGN
+ #pragma options align = reset
+ 
diff --git a/media-gfx/opentoonz/files/opentoonz-1.4.0-qt-5.15.patch b/media-gfx/opentoonz/files/opentoonz-1.4.0-qt-5.15.patch
new file mode 100644
index 000000000000..1a4f54e2ebb4
--- /dev/null
+++ b/media-gfx/opentoonz/files/opentoonz-1.4.0-qt-5.15.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/723946
+--- a/toonz/sources/tnztools/toolutils.cpp
++++ b/toonz/sources/tnztools/toolutils.cpp
+@@ -42,6 +42,7 @@
+ #include "tools/strokeselection.h"
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QGLWidget>  // for QGLWidget::convertToGLFormat
+ #include <QFont>
+ #include <QFontMetrics>
+--- a/toonz/sources/toonzqt/functionpanel.cpp
++++ b/toonz/sources/toonzqt/functionpanel.cpp
+@@ -28,6 +28,7 @@
+ #include <QWheelEvent>
+ #include <QMenu>
+ #include <QSettings>
++#include <QPainterPath>
+ 
+ #include <cmath>
+ 
+
diff --git a/media-gfx/opentoonz/opentoonz-1.4.0-r1.ebuild b/media-gfx/opentoonz/opentoonz-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..4d3987c46011
--- /dev/null
+++ b/media-gfx/opentoonz/opentoonz-1.4.0-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake xdg-utils
+
+DESCRIPTION="An open-source full-featured 2D animation creation software"
+HOMEPAGE="https://github.com/opentoonz/opentoonz"
+SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD libtiff"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	app-arch/lz4:=
+	dev-libs/boost:=
+	dev-libs/lzo:2
+	>=dev-qt/qtcore-5.9:5
+	>=dev-qt/qtgui-5.9:5
+	>=dev-qt/qtmultimedia-5.9:5[widgets]
+	>=dev-qt/qtnetwork-5.9:5
+	>=dev-qt/qtopengl-5.9:5
+	>=dev-qt/qtprintsupport-5.9:5
+	>=dev-qt/qtscript-5.9:5
+	>=dev-qt/qtsvg-5.9:5
+	>=dev-qt/qtwidgets-5.9:5
+	>=dev-qt/qtxml-5.9:5
+	media-libs/freeglut
+	media-libs/freetype:2
+	media-libs/glew:=
+	media-libs/libjpeg-turbo
+	>=media-libs/libmypaint-1.3.0:=
+	media-libs/libpng:=
+	>=sci-libs/superlu-4.1:=
+	sys-libs/zlib
+	virtual/cblas
+	virtual/libusb:1
+	virtual/opengl
+"
+DEPEND="
+	${RDEPEND}
+"
+
+CMAKE_USE_DIR="${S}"/toonz/sources
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-fix-header.patch
+	"${FILESDIR}"/${PN}-1.4.0-qt-5.15.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
+		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
+		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
+		-DCMAKE_SKIP_RPATH=ON
+	)
+
+	# The upstream uses their own modified libtiff
+	# See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff
+	cd thirdparty/tiff-4.0.3 || die
+	CONFIG_SHELL="${BROOT}"/bin/bash econf \
+		--with-pic \
+		--disable-jbig \
+		--enable-static \
+		--disable-shared
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cd "${S}"/thirdparty/tiff-4.0.3 || die
+	emake
+
+	cmake_src_compile
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-gfx/opentoonz/opentoonz-1.6.0.ebuild b/media-gfx/opentoonz/opentoonz-1.6.0.ebuild
new file mode 100644
index 000000000000..455a47d16a18
--- /dev/null
+++ b/media-gfx/opentoonz/opentoonz-1.6.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake flag-o-matic xdg-utils
+
+DESCRIPTION="An open-source full-featured 2D animation creation software"
+HOMEPAGE="https://github.com/opentoonz/opentoonz"
+SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD libtiff"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	app-arch/lz4:=
+	dev-libs/boost:=
+	dev-libs/lzo:2
+	>=dev-qt/qtcore-5.9:5
+	>=dev-qt/qtgui-5.9:5
+	>=dev-qt/qtmultimedia-5.9:5[widgets]
+	>=dev-qt/qtnetwork-5.9:5
+	>=dev-qt/qtopengl-5.9:5
+	>=dev-qt/qtprintsupport-5.9:5
+	>=dev-qt/qtscript-5.9:5
+	>=dev-qt/qtserialport-5.9:5
+	>=dev-qt/qtsvg-5.9:5
+	>=dev-qt/qtwidgets-5.9:5
+	>=dev-qt/qtxml-5.9:5
+	media-libs/freeglut
+	media-libs/freetype:2
+	media-libs/glew:=
+	media-libs/libjpeg-turbo
+	>=media-libs/libmypaint-1.3.0:=
+	media-libs/libpng:=
+	media-libs/opencv:=
+	>=sci-libs/superlu-4.1:=
+	sys-libs/zlib
+	virtual/cblas
+	virtual/libusb:1
+	virtual/opengl
+"
+DEPEND="${RDEPEND}"
+
+CMAKE_USE_DIR="${S}"/toonz/sources
+
+src_configure() {
+	# bug #859778
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	local mycmakeargs=(
+		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
+		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
+		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
+		-DCMAKE_SKIP_RPATH=ON
+	)
+
+	# The upstream uses their own modified libtiff
+	# See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff
+	cd thirdparty/tiff-4.0.3 || die
+	CONFIG_SHELL="${BROOT}"/bin/bash econf \
+		--with-pic \
+		--disable-jbig \
+		--enable-static \
+		--disable-shared
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cd "${S}"/thirdparty/tiff-4.0.3 || die
+	emake
+
+	cmake_src_compile
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}