From f8bd08100eab3f549feb1324928fe8bed00a7fb6 Mon Sep 17 00:00:00 2001 From: FollieHiyuki Date: Sun, 16 May 2021 17:06:07 +0300 Subject: [PATCH] opentoonz: update to 1.5.0 --- srcpkgs/opentoonz/patches/QPainterPath.patch | 35 ------------------ srcpkgs/opentoonz/patches/big-endian.patch | 38 -------------------- srcpkgs/opentoonz/patches/invalid-char.patch | 10 ------ srcpkgs/opentoonz/patches/musl.patch | 22 ------------ srcpkgs/opentoonz/patches/musl2.patch | 30 ---------------- srcpkgs/opentoonz/template | 8 ++--- 6 files changed, 4 insertions(+), 139 deletions(-) delete mode 100644 srcpkgs/opentoonz/patches/QPainterPath.patch delete mode 100644 srcpkgs/opentoonz/patches/big-endian.patch delete mode 100644 srcpkgs/opentoonz/patches/invalid-char.patch delete mode 100644 srcpkgs/opentoonz/patches/musl.patch delete mode 100644 srcpkgs/opentoonz/patches/musl2.patch diff --git a/srcpkgs/opentoonz/patches/QPainterPath.patch b/srcpkgs/opentoonz/patches/QPainterPath.patch deleted file mode 100644 index cc9ac227f74..00000000000 --- a/srcpkgs/opentoonz/patches/QPainterPath.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3ccd50532913049804bd7569fb7f88415cd45ee9 Mon Sep 17 00:00:00 2001 -From: Christophe Giboudeaux -Date: Tue, 9 Jun 2020 09:47:56 +0200 -Subject: [PATCH] Fix build with Qt 5.15. - -QPainterPath is no longer included indirectly. ---- - toonz/sources/tnztools/toolutils.cpp | 1 + - toonz/sources/toonzqt/functionpanel.cpp | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/toonz/sources/tnztools/toolutils.cpp b/toonz/sources/tnztools/toolutils.cpp -index 1ceff93722..db4032f737 100644 ---- toonz/sources/tnztools/toolutils.cpp -+++ toonz/sources/tnztools/toolutils.cpp -@@ -42,6 +42,7 @@ - #include "tools/strokeselection.h" - - #include -+#include - #include // for QGLWidget::convertToGLFormat - #include - #include -diff --git a/toonz/sources/toonzqt/functionpanel.cpp b/toonz/sources/toonzqt/functionpanel.cpp -index 4cc6612634..b6a0c09239 100644 ---- toonz/sources/toonzqt/functionpanel.cpp -+++ toonz/sources/toonzqt/functionpanel.cpp -@@ -24,6 +24,7 @@ - - // Qt includes - #include -+#include - #include - #include - #include diff --git a/srcpkgs/opentoonz/patches/big-endian.patch b/srcpkgs/opentoonz/patches/big-endian.patch deleted file mode 100644 index fe4573ec08d..00000000000 --- a/srcpkgs/opentoonz/patches/big-endian.patch +++ /dev/null @@ -1,38 +0,0 @@ -Fix up some big endian paths that did not survive refactoring. - ---- toonz/sources/image/tzl/tiio_tzl.cpp -+++ toonz/sources/image/tzl/tiio_tzl.cpp -@@ -945,7 +945,7 @@ void TLevelWriterTzl::saveImage(const TImageP &img, const TFrameId &_fid, - Header *header = (Header *)buff; - - TRasterP ras; -- m_codec->decompress(buff, buffSize, ras); -+ m_codec->decompress(buff, buffSize, ras, false); - delete[] buff; - assert((TRasterCM32P)ras); - assert(ras->getLx() == header->m_lx); ---- toonz/sources/sound/wav/tsio_wav.cpp -+++ toonz/sources/sound/wav/tsio_wav.cpp -@@ -373,17 +373,17 @@ bool TSoundTrackWriterWav::save(const TSoundTrackP &sndtrack) { - #if (!TNZ_LITTLE_ENDIAN) - { - if (fmtChunk.m_bitPerSample == 8) -- memcpy((void *)waveData, (void *)sndtrack->getRawData(), soundDataLength); -+ memcpy((void *)waveData.get(), (void *)sndtrack->getRawData(), soundDataLength); - else if (fmtChunk.m_bitPerSample == 16) { -- swapAndCopySamples((short *)sndtrack->getRawData(), (short *)waveData, -+ swapAndCopySamples((short *)sndtrack->getRawData(), (short *)waveData.get(), - sndtrack->getSampleCount() * fmtChunk.m_chans); - } else if (fmtChunk.m_bitPerSample == 24) { // swap e togliere quarto byte - UCHAR *begin = (UCHAR *)sndtrack->getRawData(); - for (int i = 0; i < (int)sndtrack->getSampleCount() * fmtChunk.m_chans; - ++i) { -- *(waveData + 3 * i) = *(begin + 4 * i + 3); -- *(waveData + 3 * i + 1) = *(begin + 4 * i + 2); -- *(waveData + 3 * i + 2) = *(begin + 4 * i + 1); -+ *(waveData.get() + 3 * i) = *(begin + 4 * i + 3); -+ *(waveData.get() + 3 * i + 1) = *(begin + 4 * i + 2); -+ *(waveData.get() + 3 * i + 2) = *(begin + 4 * i + 1); - } - } - } diff --git a/srcpkgs/opentoonz/patches/invalid-char.patch b/srcpkgs/opentoonz/patches/invalid-char.patch deleted file mode 100644 index a2d6b684419..00000000000 --- a/srcpkgs/opentoonz/patches/invalid-char.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- toonz/sources/common/twain/twain.h.orig 2021-01-22 18:20:20.834440241 +0700 -+++ toonz/sources/common/twain/twain.h 2021-01-22 18:20:28.671469813 +0700 -@@ -2209,7 +2209,6 @@ - #elif defined(TWH_CMP_GNU) - #pragma pack(pop, before_twain) - #elif defined(TWH_CMP_BORLAND) --#pragma option –a. - #elif defined(TWH_CMP_XCODE) - #if PRAGMA_STRUCT_ALIGN - #pragma options align = reset diff --git a/srcpkgs/opentoonz/patches/musl.patch b/srcpkgs/opentoonz/patches/musl.patch deleted file mode 100644 index 3b382d499ab..00000000000 --- a/srcpkgs/opentoonz/patches/musl.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- toonz/sources/common/tcore/tstopwatch.cpp.orig -+++ toonz/sources/common/tcore/tstopwatch.cpp -@@ -11,7 +11,7 @@ - #if defined(__APPLE_CC__) - #include - #else --#include -+#include - #endif - #include - #include ---- toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp.orig -+++ toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp -@@ -51,7 +51,7 @@ - #endif - - #ifdef LINUX --#include -+#include - #endif - - // forward declaration diff --git a/srcpkgs/opentoonz/patches/musl2.patch b/srcpkgs/opentoonz/patches/musl2.patch deleted file mode 100644 index fb69095d27f..00000000000 --- a/srcpkgs/opentoonz/patches/musl2.patch +++ /dev/null @@ -1,30 +0,0 @@ -Based on https://github.com/opentoonz/opentoonz/pull/3500 - -diff --git a/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp b/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp -index da51594e..c3a9da17 100644 ---- toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp -+++ toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp -@@ -1,3 +1,5 @@ -+#define _POSIX_C_SOURCE 200809L -+#undef _GNU_SOURCE - #include - #include /* memset */ - #include -@@ -120,7 +121,7 @@ HP-UX(v11.23)では、strerror_r()をサポートしない。 - 注意::strerror()はThread SafeではなくMulti Threadでは正常動作しない - */ - errmsg += ::strerror(erno); --#elif ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE) -+#elif !defined(__APPLE__) - /* - http://japanese-linux-man-pages.coding-school.com/man/X_strerror_r-3 - より、POSIX.1.2002で規定されたXSI準拠のバージョンのstrerror_r() -@@ -130,7 +131,7 @@ http://japanese-linux-man-pages.coding-school.com/man/X_strerror_r-3 - if (0 == ret) { - errmsg += buff; - } else if (-1 == ret) { -- swtich(errno) { -+ switch(errno) { - case EINVAL: - errmsg += - "strerror_r() gets Error : The value of errnum is not a " diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template index 3d697cefb54..bcb9e96a69d 100644 --- a/srcpkgs/opentoonz/template +++ b/srcpkgs/opentoonz/template @@ -1,7 +1,7 @@ # Template file for 'opentoonz' pkgname=opentoonz -version=1.4.0 -revision=2 +version=1.5.0 +revision=1 build_wrksrc="toonz/sources" build_style=cmake make_cmd=make @@ -9,13 +9,13 @@ hostmakedepends="qt5-qmake qt5-host-tools pkg-config automake libtool" makedepends="qt5-devel qt5-svg-devel qt5-script-devel qt5-tools-devel qt5-multimedia-devel superlu-devel glew-devel libjpeg-turbo-devel liblzma-devel liblz4-devel lzo-devel libusb-devel SDL2-devel libmypaint-devel boost-devel libfreeglut-devel - openblas-devel" + openblas-devel qt5-serialport-devel libopencv4-devel" short_desc="Full-featured 2D animation creation software" maintainer="bra1nwave " license="BSD-3-Clause" homepage="https://opentoonz.github.io/e/" distfiles="https://github.com/opentoonz/opentoonz/archive/v${version}.tar.gz" -checksum=176caca191bf2747964ecaf8cbb6be6a738fd04b464a2ba182b5aaf96ccaefa9 +checksum=fba0f381fb71ffda89e6423b4d461450d4851f93830342e69e36313070af5990 export CMAKE_GENERATOR="Unix Makefiles"