commit: 7bb9e1e31cea91de1ec806917a077c92018a7737 Author: Philip Miess <Philip_Miess <AT> yahoo <DOT> com> AuthorDate: Sun Dec 10 19:25:35 2023 +0000 Commit: Philip Miess <Phil_miess <AT> yahoo <DOT> com> CommitDate: Sun Dec 10 19:25:35 2023 +0000 URL: https://gitweb.gentoo.org/repo/user/superposition.git/commit/?id=7bb9e1e3
opentoonz 1.6 with no translatiosn for bug workaround Signed-off-by: Philip Miess <Philip_Miess <AT> yahoo.com> media-gfx/opentoonz/Manifest | 4 + .../opentoonz/files/opentoonz-1.6.0-gcc13.patch | 36 ++++++++ media-gfx/opentoonz/metadata.xml | 15 ++++ media-gfx/opentoonz/opentoonz-1.6.0.ebuild | 96 ++++++++++++++++++++++ 4 files changed, 151 insertions(+) diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest new file mode 100644 index 0000000..9b50c05 --- /dev/null +++ b/media-gfx/opentoonz/Manifest @@ -0,0 +1,4 @@ +AUX opentoonz-1.6.0-gcc13.patch 1152 BLAKE2B 931f7c7f5a98e53fdd93fa86c55fa6dcaaf8d6dbb51634439370e00444ba8d5e6cceeff9bc81289dfafee24153432124e62c54a80d31f82f2af1f3073a5d1364 SHA512 3862135ecaf850bad8bf8ad09c3f25ca5d00201acf98549cc68a2f3c5cf8b3db99369a61d9bf4a28761dee67043d9e5b961fcaa272d8ff1b3a4ef4fbdfe5a57b +DIST opentoonz-1.6.0.tar.gz 55011226 BLAKE2B e7e27d530ee8356071d38bb3d58de89edcdc6e7e0b28cdb9ba8f7681eda929e13211664a5502499aa3eccfcf090ad81970e9caef365e762b53b7a57f19310afe SHA512 5ee7b724d51f058867d2c7e9c540e68ee3cb6d1350e32c5fd817b10b92ad79cc2a106d36dccc9234503e62788903e6058841dcd8dc39450c889393d0300636e9 +EBUILD opentoonz-1.6.0.ebuild 2122 BLAKE2B 4e01564f73dc671111deb483a9bfd59539e5464b3bec63147f18293a5cd4c1891759114e5ee3b767ae7d7302a05e03e6a9a6734cdc1ef89dc6524292dae9add3 SHA512 d1dfebda3d8415886faffc50df6d712dbd29c28e51bb7c4d84f4281a93e281519a877aa0ef1fbfac4ac775af2e176a7a60866056e19132db8a23c370848f09e4 +MISC metadata.xml 484 BLAKE2B 3850af092b035bf6ef637fcf1d09fa79526011ab3629a6e918f952bba06de73b21a0ca3dcb2e6532faaab444404d3e767bff25d59c042650a4ab9b356c1f5a2e SHA512 5daa54628d2d677dc10934d3d43b1df1972f5515461bdaaa0684d4f9f26fb2b065f3fa64a3f0eed8403570ab64a919b7831269dcc68638b7da2e3d40730c01dd diff --git a/media-gfx/opentoonz/files/opentoonz-1.6.0-gcc13.patch b/media-gfx/opentoonz/files/opentoonz-1.6.0-gcc13.patch new file mode 100644 index 0000000..cd9f936 --- /dev/null +++ b/media-gfx/opentoonz/files/opentoonz-1.6.0-gcc13.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/899748 +https://github.com/opentoonz/opentoonz/issues/4738 +https://github.com/opentoonz/opentoonz/pull/4739 + +From d28d005d2a8fcb81461516a37e30526063aba448 Mon Sep 17 00:00:00 2001 +From: Grillo <11585030+grillo-del...@users.noreply.github.com> +Date: Mon, 6 Feb 2023 20:48:32 -0300 +Subject: [PATCH] Clarify size_t origin for tgc::hash::BucketNode + +--- a/toonz/sources/include/tcg/hash.h ++++ b/toonz/sources/include/tcg/hash.h +@@ -21,6 +21,11 @@ class hash { + typedef T value_type; + typedef Hash_functor hash_type; + ++ struct BucketNode; ++ typedef typename tcg::list<BucketNode>::size_t size_t; ++ typedef typename tcg::list<BucketNode>::iterator iterator; ++ typedef typename tcg::list<BucketNode>::const_iterator const_iterator; ++ + struct BucketNode { + K m_key; + T m_val; +@@ -34,11 +39,6 @@ class hash { + ~BucketNode() {} + }; + +- typedef typename tcg::list<BucketNode>::size_t size_t; +- +- typedef typename tcg::list<BucketNode>::iterator iterator; +- typedef typename tcg::list<BucketNode>::const_iterator const_iterator; +- + private: + std::vector<size_t> m_bucketsIdx; + tcg::list<BucketNode> m_items; + diff --git a/media-gfx/opentoonz/metadata.xml b/media-gfx/opentoonz/metadata.xml new file mode 100644 index 0000000..4094909 --- /dev/null +++ b/media-gfx/opentoonz/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>otakuto.gen...@gmail.com</email> + <name>Tact Yoshida</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-ma...@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">opentoonz/opentoonz</remote-id> + </upstream> +</pkgmetadata> 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 0000000..7eb65bd --- /dev/null +++ b/media-gfx/opentoonz/opentoonz-1.6.0.ebuild @@ -0,0 +1,96 @@ +# 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 + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.0-gcc13.patch +) + +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 + -DWITH_TRANSLATION=OFF + ) + # -DWITH_TRANSLATION=OFF allows building without https://bugs.gentoo.org/905698 + + # 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 +}
