opentoonz: fix x86 build

2026-04-09 05:10:05 +02:00 · 2023-03-10 11:07:36 +01:00
parent eeeb4634d1
commit e47affad62
2 changed files with 116 additions and 2 deletions
--- a/media-gfx/opentoonz/opentoonz-1.7.0~git.recipe
+++ b/media-gfx/opentoonz/opentoonz-1.7.0~git.recipe
@@ -7,7 +7,7 @@ Studio Ghibli (http://www.ghibli.jp/) over many years of production."
 HOMEPAGE="https://github.com/opentoonz/opentoonz/"
 COPYRIGHT="2016-2018, DWANGO Co., Ltd."
 LICENSE="BSD (3-clause)"
-REVISION="2"
+REVISION="3"
 srcGitRev="79abc3c572f9ec45b8a1c08d822bc36aecbe06bd"
 SOURCE_URI="${HOMEPAGE}archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="705b3d4488cafc55536281d982257be76ceb035b985242b7b38dee076b06370b"
--- a/media-gfx/opentoonz/patches/opentoonz-1.7.0~git.patchset
+++ b/media-gfx/opentoonz/patches/opentoonz-1.7.0~git.patchset
@@ -1,4 +1,4 @@
-From da048323884c9dd11141be463a1b2b1ae708e888 Mon Sep 17 00:00:00 2001
+From 3823ca2c0bbb1fc3e91e52896cd2a057120728cb Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Wed, 22 Mar 2017 22:05:39 +0100
 Subject: Haiku patch
@@ -88,6 +88,19 @@ index 453c07a..88c6989 100644
 
 TGlContext tglGetCurrentContext() {
   return reinterpret_cast<TGlContext>(
+diff --git a/toonz/sources/common/tiio/movsettings.cpp b/toonz/sources/common/tiio/movsettings.cpp
+index dcb302c..4904050 100644
+--- a/toonz/sources/common/tiio/movsettings.cpp
+++ b/toonz/sources/common/tiio/movsettings.cpp
+@@ -8,7 +8,7 @@
+ #include "tiio.h"
+ 
+ #if !defined(x64) && !defined(__LP64__) &&                                     \
+-    !(defined(LINUX) || defined(FREEBSD)) &&                                   \
+    !(defined(LINUX) || defined(FREEBSD) || defined(HAIKU)) &&                                   \
+     !(defined(__GNUC__) && defined(_WIN32))
+ 
+ //*******************************************************************************
 diff --git a/toonz/sources/common/tipc/tipc.cpp b/toonz/sources/common/tipc/tipc.cpp
 index d61b973..df5877b 100644
 --- a/toonz/sources/common/tipc/tipc.cpp
@@ -266,6 +279,32 @@ index a6ecdf8..4362b97 100644
 
 typedef GLvoid (*GluCallback)();
 
+diff --git a/toonz/sources/image/3gp/tiio_3gp_proxy.cpp b/toonz/sources/image/3gp/tiio_3gp_proxy.cpp
+index fca4c3e..fa0a2eb 100644
+--- a/toonz/sources/image/3gp/tiio_3gp_proxy.cpp
+++ b/toonz/sources/image/3gp/tiio_3gp_proxy.cpp
+@@ -1,7 +1,7 @@
+ 
+ 
+ #if defined(x64) || defined(__LP64__) || defined(LINUX) || defined(FREEBSD) || \
+-    (defined(_WIN32) && defined(__GNUC__))
+    defined(HAIKU) || (defined(_WIN32) && defined(__GNUC__))
+ 
+ // Toonz includes
+ #include "tfilepath.h"
+diff --git a/toonz/sources/image/3gp/tiio_3gp_proxy.h b/toonz/sources/image/3gp/tiio_3gp_proxy.h
+index d777839..810f3bd 100644
+--- a/toonz/sources/image/3gp/tiio_3gp_proxy.h
+++ b/toonz/sources/image/3gp/tiio_3gp_proxy.h
+@@ -3,7 +3,7 @@
+ #ifndef TIIO_3GP_PROXY_H
+ #define TIIO_3GP_PROXY_H
+ 
+-#if defined(x64) || defined(__LP64__) || defined(LINUX) || defined(FREEBSD) || (defined(_WIN32) && defined(__GNUC__))
+#if defined(x64) || defined(__LP64__) || defined(LINUX) || defined(FREEBSD) || defined(HAIKU) || (defined(_WIN32) && defined(__GNUC__))
+ 
+ // Qt includes
+ #include <QString>
 diff --git a/toonz/sources/image/compatibility/tfile_io.c b/toonz/sources/image/compatibility/tfile_io.c
 index 83c3ac1..bef8892 100644
 --- a/toonz/sources/image/compatibility/tfile_io.c
@@ -314,6 +353,32 @@ index e903fad..50eddbe 100644
   unsigned short r, g, b, m;
 #elif defined(MACOSX)
   unsigned char m, r, g, b;
+diff --git a/toonz/sources/image/mov/tiio_mov_proxy.cpp b/toonz/sources/image/mov/tiio_mov_proxy.cpp
+index 8718ed2..93b0dc2 100644
+--- a/toonz/sources/image/mov/tiio_mov_proxy.cpp
+++ b/toonz/sources/image/mov/tiio_mov_proxy.cpp
+@@ -1,7 +1,7 @@
+ 
+ 
+ #if defined(x64) || defined(__LP64__) || defined(LINUX) || defined(FREEBSD) || \
+-    (defined(_WIN32) && defined(__GNUC__))
+    defined(HAIKU) || (defined(_WIN32) && defined(__GNUC__))
+ 
+ // Toonz includes
+ #include "tfilepath.h"
+diff --git a/toonz/sources/image/mov/tiio_mov_proxy.h b/toonz/sources/image/mov/tiio_mov_proxy.h
+index fbd8213..3fdbe70 100644
+--- a/toonz/sources/image/mov/tiio_mov_proxy.h
+++ b/toonz/sources/image/mov/tiio_mov_proxy.h
+@@ -3,7 +3,7 @@
+ #ifndef TIIO_MOV_PROXY_H
+ #define TIIO_MOV_PROXY_H
+ 
+-#if defined(x64) || defined(__LP64__) || defined(LINUX) || defined(FREEBSD) || (defined(_WIN32) && defined(__GNUC__))
+#if defined(x64) || defined(__LP64__) || defined(LINUX) || defined(FREEBSD)  || defined(HAIKU) || (defined(_WIN32) && defined(__GNUC__))
+ 
+ // Qt includes
+ #include <QString>
 diff --git a/toonz/sources/image/pli/pli_io.cpp b/toonz/sources/image/pli/pli_io.cpp
 index df4d586..d003e5e 100644
 --- a/toonz/sources/image/pli/pli_io.cpp
@@ -340,6 +405,19 @@ index 0bfd43f..97d766e 100644
 // #include "./mov/tiio_movL.h"
 #include "./mov/tiio_mov_proxy.h"
 #include "./3gp/tiio_3gp_proxy.h"
+diff --git a/toonz/sources/include/movsettings.h b/toonz/sources/include/movsettings.h
+index 9008f7d..ad64de9 100644
+--- a/toonz/sources/include/movsettings.h
+++ b/toonz/sources/include/movsettings.h
+@@ -13,7 +13,7 @@
+ #define DVVAR DV_IMPORT_VAR
+ #endif
+ 
+-#if !defined(x64) && !defined(__LP64__) && !(defined(LINUX) || defined(FREEBSD)) && !(defined(__GNUC__) && defined(_WIN32))
+#if !defined(x64) && !defined(__LP64__) && !(defined(LINUX) || defined(FREEBSD) || defined(HAIKU)) && !(defined(__GNUC__) && defined(_WIN32))
+ 
+ #ifdef _WIN32
+ 
 diff --git a/toonz/sources/include/tcg/hpp/triangulate.hpp b/toonz/sources/include/tcg/hpp/triangulate.hpp
 index 3b5e5b3..499d13b 100644
 --- a/toonz/sources/include/tcg/hpp/triangulate.hpp
@@ -432,6 +510,42 @@ index 45a67a1..2b01366 100644
 
 #ifdef powerpc
 
+diff --git a/toonz/sources/t32bitsrv/main.cpp b/toonz/sources/t32bitsrv/main.cpp
+index 806904f..44830cf 100644
+--- a/toonz/sources/t32bitsrv/main.cpp
+++ b/toonz/sources/t32bitsrv/main.cpp
+@@ -1,6 +1,6 @@
+ 
+ 
+-#if (!(defined(x64) || defined(__LP64__) || defined(LINUX) || defined(FREEBSD)))
+#if (!(defined(x64) || defined(__LP64__) || defined(LINUX) || defined(FREEBSD) || defined(HAIKU)))
+ 
+ // Toonz includes
+ #include "tiio_std.h"
+diff --git a/toonz/sources/t32bitsrv/t323gpmsg.cpp b/toonz/sources/t32bitsrv/t323gpmsg.cpp
+index 84ead44..14dc606 100644
+--- a/toonz/sources/t32bitsrv/t323gpmsg.cpp
+++ b/toonz/sources/t32bitsrv/t323gpmsg.cpp
+@@ -1,6 +1,6 @@
+ 
+ 
+-#if (!(defined(x64) || defined(__LP64__) || defined(LINUX) || defined(FREEBSD)))
+#if (!(defined(x64) || defined(__LP64__) || defined(LINUX) || defined(FREEBSD) || defined(HAIKU)))
+ 
+ // Toonz stuff
+ #include "tiio.h"
+diff --git a/toonz/sources/t32bitsrv/t32movmsg.cpp b/toonz/sources/t32bitsrv/t32movmsg.cpp
+index 9c8d49d..a3b2bbf 100644
+--- a/toonz/sources/t32bitsrv/t32movmsg.cpp
+++ b/toonz/sources/t32bitsrv/t32movmsg.cpp
+@@ -1,6 +1,6 @@
+ 
+ 
+-#if (!(defined(x64) || defined(__LP64__) || defined(LINUX) || defined(FREEBSD)))
+#if (!(defined(x64) || defined(__LP64__) || defined(LINUX) || defined(FREEBSD) || defined(HAIKU)))
+ 
+ // Toonz stuff
+ #include "tiio.h"
 diff --git a/toonz/sources/toonz/CMakeLists.txt b/toonz/sources/toonz/CMakeLists.txt
 index 770d6b7..d3aee49 100644
 --- a/toonz/sources/toonz/CMakeLists.txt