[PR PATCH] opentoonz: add big endian patch

[PR PATCH] opentoonz: add big endian patch

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 509 bytes --]

There is a new pull request by q66 against master on the void-packages repository

https://github.com/void-ppc/void-packages toonz
https://github.com/void-linux/void-packages/pull/15863

opentoonz: add big endian patch
This allows the package to build, and to a degree work (brief testing reveals some color issues in some of the UI though the actual main area with the frame renders correctly) on big endian systems.

A patch file from https://github.com/void-linux/void-packages/pull/15863.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-toonz-15863.patch --]
[-- Type: text/x-diff, Size: 2434 bytes --]

From 8744f083cd44aee507db1493066f9c4ee22ae423 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 28 Oct 2019 18:15:42 +0100
Subject: [PATCH] opentoonz: add big endian patch

[ci skip]
---
 srcpkgs/opentoonz/patches/big-endian.patch | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 srcpkgs/opentoonz/patches/big-endian.patch

diff --git a/srcpkgs/opentoonz/patches/big-endian.patch b/srcpkgs/opentoonz/patches/big-endian.patch
new file mode 100644
index 00000000000..253360be4ac
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/big-endian.patch
@@ -0,0 +1,38 @@
+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);
+       }
+     }
+   }

Re: opentoonz: add big endian patch

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 187 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/15863#issuecomment-547060355

Comment:
actually hold on, i messed up the patch somehow...

Re: [PR PATCH] [Updated] opentoonz: add big endian patch

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

There is an updated pull request by q66 against master on the void-packages repository

https://github.com/void-ppc/void-packages toonz
https://github.com/void-linux/void-packages/pull/15863

opentoonz: add big endian patch
This allows the package to build, and to a degree work (brief testing reveals some color issues in some of the UI though the actual main area with the frame renders correctly) on big endian systems.

A patch file from https://github.com/void-linux/void-packages/pull/15863.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-toonz-15863.patch --]
[-- Type: text/x-diff, Size: 2432 bytes --]

From 4dd035b84cc22fb014c5e8bd618c822d0459fbc3 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 28 Oct 2019 18:15:42 +0100
Subject: [PATCH] opentoonz: add big endian patch

---
 srcpkgs/opentoonz/patches/big-endian.patch | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 srcpkgs/opentoonz/patches/big-endian.patch

diff --git a/srcpkgs/opentoonz/patches/big-endian.patch b/srcpkgs/opentoonz/patches/big-endian.patch
new file mode 100644
index 00000000000..fe4573ec08d
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/big-endian.patch
@@ -0,0 +1,38 @@
+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);
+       }
+     }
+   }

Re: [PR PATCH] [Updated] opentoonz: add big endian patch

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

There is an updated pull request by q66 against master on the void-packages repository

https://github.com/void-ppc/void-packages toonz
https://github.com/void-linux/void-packages/pull/15863

opentoonz: add big endian patch
This allows the package to build, and to a degree work (brief testing reveals some color issues in some of the UI though the actual main area with the frame renders correctly) on big endian systems.

A patch file from https://github.com/void-linux/void-packages/pull/15863.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-toonz-15863.patch --]
[-- Type: text/x-diff, Size: 2432 bytes --]

From 4dd035b84cc22fb014c5e8bd618c822d0459fbc3 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 28 Oct 2019 18:15:42 +0100
Subject: [PATCH] opentoonz: add big endian patch

---
 srcpkgs/opentoonz/patches/big-endian.patch | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 srcpkgs/opentoonz/patches/big-endian.patch

diff --git a/srcpkgs/opentoonz/patches/big-endian.patch b/srcpkgs/opentoonz/patches/big-endian.patch
new file mode 100644
index 00000000000..fe4573ec08d
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/big-endian.patch
@@ -0,0 +1,38 @@
+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);
+       }
+     }
+   }

Re: opentoonz: add big endian patch

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 201 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/15863#issuecomment-547062610

Comment:
Ok, fixed. One of the files was using windows style line endings

Re: [PR PATCH] [Updated] opentoonz: add big endian patch

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

There is an updated pull request by q66 against master on the void-packages repository

https://github.com/void-ppc/void-packages toonz
https://github.com/void-linux/void-packages/pull/15863

opentoonz: add big endian patch
This allows the package to build, and to a degree work (brief testing reveals some color issues in some of the UI though the actual main area with the frame renders correctly) on big endian systems.

A patch file from https://github.com/void-linux/void-packages/pull/15863.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-toonz-15863.patch --]
[-- Type: text/x-diff, Size: 2442 bytes --]

From e2aac74c458dd103331256c94daeaaba8b793960 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 28 Oct 2019 18:15:42 +0100
Subject: [PATCH] opentoonz: add big endian patch

[ci skip]
---
 srcpkgs/opentoonz/patches/big-endian.patch | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 srcpkgs/opentoonz/patches/big-endian.patch

diff --git a/srcpkgs/opentoonz/patches/big-endian.patch b/srcpkgs/opentoonz/patches/big-endian.patch
new file mode 100644
index 00000000000..fe4573ec08d
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/big-endian.patch
@@ -0,0 +1,38 @@
+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);
+       }
+     }
+   }

Re: [PR PATCH] [Updated] opentoonz: add big endian patch

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

There is an updated pull request by q66 against master on the void-packages repository

https://github.com/void-ppc/void-packages toonz
https://github.com/void-linux/void-packages/pull/15863

opentoonz: add big endian patch
This allows the package to build, and to a degree work (brief testing reveals some color issues in some of the UI though the actual main area with the frame renders correctly) on big endian systems.

A patch file from https://github.com/void-linux/void-packages/pull/15863.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-toonz-15863.patch --]
[-- Type: text/x-diff, Size: 2442 bytes --]

From e2aac74c458dd103331256c94daeaaba8b793960 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 28 Oct 2019 18:15:42 +0100
Subject: [PATCH] opentoonz: add big endian patch

[ci skip]
---
 srcpkgs/opentoonz/patches/big-endian.patch | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 srcpkgs/opentoonz/patches/big-endian.patch

diff --git a/srcpkgs/opentoonz/patches/big-endian.patch b/srcpkgs/opentoonz/patches/big-endian.patch
new file mode 100644
index 00000000000..fe4573ec08d
--- /dev/null
+++ b/srcpkgs/opentoonz/patches/big-endian.patch
@@ -0,0 +1,38 @@
+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);
+       }
+     }
+   }

Re: opentoonz: add big endian patch

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 187 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/15863#issuecomment-547060355

Comment:
actually hold on, i messed up the patch somehow...

Re: opentoonz: add big endian patch

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 201 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/15863#issuecomment-547062610

Comment:
Ok, fixed. One of the files was using windows style line endings

Re: [PR PATCH] [Merged]: opentoonz: add big endian patch

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 363 bytes --]

There's a merged pull request on the void-packages repository

opentoonz: add big endian patch
https://github.com/void-linux/void-packages/pull/15863

Description:
This allows the package to build, and to a degree work (brief testing reveals some color issues in some of the UI though the actual main area with the frame renders correctly) on big endian systems.