From 06ae558c2b8301e1d0016d7aeb8bc6697e5728db Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 9 Mar 2023 18:35:27 +0100 Subject: [PATCH] opentoonz: update patch and recipe for to be released 1.7.0, enable fix #3615 --- ....6.0.recipe => opentoonz-1.7.0~git.recipe} | 17 +++++++-- ....patchset => opentoonz-1.7.0~git.patchset} | 35 ++++++++++++------- 2 files changed, 36 insertions(+), 16 deletions(-) rename media-gfx/opentoonz/{opentoonz-1.6.0.recipe => opentoonz-1.7.0~git.recipe} (84%) rename media-gfx/opentoonz/patches/{opentoonz-1.6.0.patchset => opentoonz-1.7.0~git.patchset} (93%) diff --git a/media-gfx/opentoonz/opentoonz-1.6.0.recipe b/media-gfx/opentoonz/opentoonz-1.7.0~git.recipe similarity index 84% rename from media-gfx/opentoonz/opentoonz-1.6.0.recipe rename to media-gfx/opentoonz/opentoonz-1.7.0~git.recipe index cecc372cc..3399d51c2 100644 --- a/media-gfx/opentoonz/opentoonz-1.6.0.recipe +++ b/media-gfx/opentoonz/opentoonz-1.7.0~git.recipe @@ -8,11 +8,13 @@ HOMEPAGE="https://github.com/opentoonz/opentoonz/" COPYRIGHT="2016-2018, DWANGO Co., Ltd." LICENSE="BSD (3-clause)" REVISION="1" -SOURCE_URI="${HOMEPAGE}archive/refs/tags/v$portVersion.tar.gz" -CHECKSUM_SHA256="9a6c28cb3933756dbebb45e849bdafc9e6d93d0328c4fd4d7bc8ec3ae481f684" +srcGitRev="79abc3c572f9ec45b8a1c08d822bc36aecbe06bd" +SOURCE_URI="${HOMEPAGE}archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="705b3d4488cafc55536281d982257be76ceb035b985242b7b38dee076b06370b" +SOURCE_DIR="opentoonz-$srcGitRev" PATCHES="opentoonz-$portVersion.patchset" -ARCHITECTURES="?all !x86_gcc2" +ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="?x86" PROVIDES=" @@ -28,12 +30,14 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix + lib:libexecinfo$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libglew$secondaryArchSuffix lib:libGLU$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libjson_c$secondaryArchSuffix lib:liblz4$secondaryArchSuffix + lib:liblzo2$secondaryArchSuffix lib:liblzma$secondaryArchSuffix lib:libmypaint$secondaryArchSuffix lib:libopenblas$secondaryArchSuffix @@ -50,12 +54,14 @@ REQUIRES=" lib:libQt5Xml$secondaryArchSuffix lib:libSDL2_2.0$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix + lib:libsuperlu$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libboost_system$secondaryArchSuffix + devel:libexecinfo$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libGL$secondaryArchSuffix devel:libglew$secondaryArchSuffix @@ -90,6 +96,9 @@ BUILD_PREREQUIRES=" BUILD() { + sed -i -e 's|share/opentoonz|data/opentoonz|g' \ + -e 's|.config/OpenToonz|config/settings/OpenToonz/OpenToonz|g' \ + toonz/sources/toonz/CMakeLists.txt cd thirdparty/tiff-4.0.3 autoreconf -fi ./configure --with-pic --disable-jbig @@ -107,4 +116,6 @@ BUILD() INSTALL() { ninja -C toonz/build install + + rm -rf $prefix/share } diff --git a/media-gfx/opentoonz/patches/opentoonz-1.6.0.patchset b/media-gfx/opentoonz/patches/opentoonz-1.7.0~git.patchset similarity index 93% rename from media-gfx/opentoonz/patches/opentoonz-1.6.0.patchset rename to media-gfx/opentoonz/patches/opentoonz-1.7.0~git.patchset index 46f000eb0..b4e7965d4 100644 --- a/media-gfx/opentoonz/patches/opentoonz-1.6.0.patchset +++ b/media-gfx/opentoonz/patches/opentoonz-1.7.0~git.patchset @@ -1,11 +1,11 @@ -From 06b9efbb85f7f3613419b77c3ad0d7419d3d8d29 Mon Sep 17 00:00:00 2001 +From 3265d7fd80e1bcf75eaf6f83096905b578459260 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 22 Mar 2017 22:05:39 +0100 Subject: Haiku patch diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt -index 7cf3d7c..132833d 100644 +index e01cde8..c3847a0 100644 --- a/toonz/sources/CMakeLists.txt +++ b/toonz/sources/CMakeLists.txt @@ -188,8 +188,12 @@ elseif(BUILD_ENV_APPLE) @@ -52,7 +52,7 @@ index 453c07a..88c6989 100644 TGlContext tglGetCurrentContext() { return reinterpret_cast( diff --git a/toonz/sources/common/tipc/tipc.cpp b/toonz/sources/common/tipc/tipc.cpp -index bf2703a..6e5bf37 100644 +index d61b973..df5877b 100644 --- a/toonz/sources/common/tipc/tipc.cpp +++ b/toonz/sources/common/tipc/tipc.cpp @@ -18,7 +18,7 @@ @@ -195,7 +195,7 @@ index 130d28b..524cc5f 100644 @ @ @ERROR : PLATFORM NOT SUPPORTED #endif diff --git a/toonz/sources/common/tvrender/tofflinegl.cpp b/toonz/sources/common/tvrender/tofflinegl.cpp -index 3e89013..e8be899 100644 +index 3b50a5a..0908fe8 100644 --- a/toonz/sources/common/tvrender/tofflinegl.cpp +++ b/toonz/sources/common/tvrender/tofflinegl.cpp @@ -19,7 +19,7 @@ @@ -207,7 +207,7 @@ index 3e89013..e8be899 100644 #include "qtofflinegl.h" -@@ -490,7 +490,7 @@ static std::shared_ptr defaultOfflineGLGenerator( +@@ -500,7 +500,7 @@ static std::shared_ptr defaultOfflineGLGenerator( return std::make_shared(dim, shared); } @@ -291,10 +291,10 @@ index df4d586..d003e5e 100644 T abs_workaround(T a) { return (a > 0) ? a : -a; diff --git a/toonz/sources/image/tiio.cpp b/toonz/sources/image/tiio.cpp -index 1bbf33a..4f2d4c4 100644 +index 0bfd43f..97d766e 100644 --- a/toonz/sources/image/tiio.cpp +++ b/toonz/sources/image/tiio.cpp -@@ -53,7 +53,7 @@ +@@ -54,7 +54,7 @@ #include "./mov/tiio_movM.h" #include "./3gp/tiio_3gpM.h" @@ -317,7 +317,7 @@ index 3b5e5b3..499d13b 100644 #include #endif diff --git a/toonz/sources/include/tgl.h b/toonz/sources/include/tgl.h -index b13c754..a9e723b 100644 +index 09e64fb..5c993b1 100644 --- a/toonz/sources/include/tgl.h +++ b/toonz/sources/include/tgl.h @@ -21,7 +21,7 @@ @@ -383,7 +383,7 @@ index 75ebe74..e2efddb 100644 #elif defined(MACOSX) #define TNZ_MACHINE_CHANNEL_ORDER_MRGB 1 diff --git a/toonz/sources/include/tpixel.h b/toonz/sources/include/tpixel.h -index 0b8fe5b..803fc06 100644 +index 45a67a1..2b01366 100644 --- a/toonz/sources/include/tpixel.h +++ b/toonz/sources/include/tpixel.h @@ -177,7 +177,7 @@ undefined machine order !!!! @@ -396,10 +396,19 @@ index 0b8fe5b..803fc06 100644 #ifdef powerpc diff --git a/toonz/sources/toonz/CMakeLists.txt b/toonz/sources/toonz/CMakeLists.txt -index c8abe15..5414264 100644 +index 770d6b7..d3aee49 100644 --- a/toonz/sources/toonz/CMakeLists.txt +++ b/toonz/sources/toonz/CMakeLists.txt -@@ -682,7 +682,7 @@ TOONZSTUDIOPALETTE=\"\$HOME/.config/OpenToonz/stuff/studiopalette\" +@@ -540,7 +540,7 @@ elseif(BUILD_ENV_UNIXLIKE) + # 変なところにライブラリ生成するカスども + set(EXTRA_LIBS ${EXTRA_LIBS} "$" "$") + +- set(EXTRA_LIBS ${EXTRA_LIBS} ${Boost_LIBRARIES} ${OPENBLAS_LIB}) ++ set(EXTRA_LIBS ${EXTRA_LIBS} ${Boost_LIBRARIES} ${OPENBLAS_LIB} ${EXECINFO_LIBRARY}) + if(PLATFORM EQUAL 64) + set(EXTRA_LIBS ${EXTRA_LIBS} Qt5::SerialPort ${TURBOJPEG_LIB} ${OpenCV_LIBS}) + endif() +@@ -701,7 +701,7 @@ TOONZSTUDIOPALETTE=\"\$HOME/.config/OpenToonz/stuff/studiopalette\" EOF fi @@ -409,7 +418,7 @@ index c8abe15..5414264 100644 exec \$OPENTOONZ_BASE/bin/OpenToonz \"\$@\" ") diff --git a/toonz/sources/toonz/sceneviewer.cpp b/toonz/sources/toonz/sceneviewer.cpp -index 40fd9d6..3cbfa6f 100644 +index 9b71873..ca4e52c 100644 --- a/toonz/sources/toonz/sceneviewer.cpp +++ b/toonz/sources/toonz/sceneviewer.cpp @@ -1,5 +1,5 @@ @@ -420,5 +429,5 @@ index 40fd9d6..3cbfa6f 100644 #endif -- -2.30.2 +2.37.3