[arch-commits] Commit in opentoonz/trunk (PKGBUILD fix-build.patch fix-build2.patch)
Antonio Rojas
arojas at archlinux.org
Sat Apr 17 09:09:50 UTC 2021
Date: Saturday, April 17, 2021 @ 09:09:49
Author: arojas
Revision: 919703
Update to 1.5.0
Modified:
opentoonz/trunk/PKGBUILD
Deleted:
opentoonz/trunk/fix-build.patch
opentoonz/trunk/fix-build2.patch
------------------+
PKGBUILD | 18 +++----------
fix-build.patch | 60 ---------------------------------------------
fix-build2.patch | 70 -----------------------------------------------------
3 files changed, 5 insertions(+), 143 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-04-17 09:03:10 UTC (rev 919702)
+++ PKGBUILD 2021-04-17 09:09:49 UTC (rev 919703)
@@ -2,28 +2,20 @@
# Contributor: cyrant <cyrant at tuta dot io>
pkgname=opentoonz
-pkgver=1.4.0
-pkgrel=3
+pkgver=1.5.0
+pkgrel=1
pkgdesc='Software for producing a 2D animation'
arch=(x86_64)
url='https://opentoonz.github.io/e/'
license=(BSD)
-depends=(cblas ffmpeg freeglut glew hicolor-icon-theme libmypaint qt5-multimedia qt5-script qt5-svg superlu)
+depends=(cblas ffmpeg freeglut glew hicolor-icon-theme libmypaint qt5-multimedia qt5-script qt5-serialport qt5-svg superlu opencv)
makedepends=(boost cmake qt5-tools)
-source=(https://github.com/opentoonz/$pkgname/archive/v${pkgver}/$pkgname-$pkgver.tar.gz
- fix-build.patch
- fix-build2.patch)
-sha256sums=('176caca191bf2747964ecaf8cbb6be6a738fd04b464a2ba182b5aaf96ccaefa9'
- '14c5ad66485bbbc7665068f0ee623a2cf87bb2b20a24a636753997acd708b43e'
- '9124f2899be6e40f71a25beaf382214682df68148b443f2c5ebd630aba486b0a')
+source=(https://github.com/opentoonz/$pkgname/archive/v${pkgver}/$pkgname-$pkgver.tar.gz)
+sha256sums=('fba0f381fb71ffda89e6423b4d461450d4851f93830342e69e36313070af5990')
prepare() {
cd $pkgname-$pkgver
- # Fix build
- patch -Np1 -i ../fix-build.patch
- patch -Np1 -i ../fix-build2.patch
-
# Specify path for ffmpeg
sed -i 's|"ffmpegPath", QMetaType::QString, ""|"ffmpegPath", QMetaType::QString, "/usr/bin"|' toonz/sources/toonzlib/preferences.cpp
}
Deleted: fix-build.patch
===================================================================
--- fix-build.patch 2021-04-17 09:03:10 UTC (rev 919702)
+++ fix-build.patch 2021-04-17 09:09:49 UTC (rev 919703)
@@ -1,60 +0,0 @@
-From 05ead497ad4d95cf5c37154b780724d67da93f55 Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe at krop.fr>
-Date: Tue, 9 Jun 2020 08:51:28 +0200
-Subject: [PATCH 1/2] Fix build with GCC 10.
-
-The default option was fixed in the latest Twain releases
-but Opentoonz includes Twain 2.1.
----
- toonz/sources/common/twain/twain.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/toonz/sources/common/twain/twain.h b/toonz/sources/common/twain/twain.h
-index c7dee179c1..1bfe9d5001 100644
---- a/toonz/sources/common/twain/twain.h
-+++ b/toonz/sources/common/twain/twain.h
-@@ -2209,7 +2209,7 @@ typedef struct {
- #elif defined(TWH_CMP_GNU)
- #pragma pack(pop, before_twain)
- #elif defined(TWH_CMP_BORLAND)
--#pragma option –a.
-+#pragma option -a.
- #elif defined(TWH_CMP_XCODE)
- #if PRAGMA_STRUCT_ALIGN
- #pragma options align = reset
-
-From 3ccd50532913049804bd7569fb7f88415cd45ee9 Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe at krop.fr>
-Date: Tue, 9 Jun 2020 09:47:56 +0200
-Subject: [PATCH 2/2] 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
---- a/toonz/sources/tnztools/toolutils.cpp
-+++ b/toonz/sources/tnztools/toolutils.cpp
-@@ -42,6 +42,7 @@
- #include "tools/strokeselection.h"
-
- #include <QPainter>
-+#include <QPainterPath>
- #include <QGLWidget> // for QGLWidget::convertToGLFormat
- #include <QFont>
- #include <QFontMetrics>
-diff --git a/toonz/sources/toonzqt/functionpanel.cpp b/toonz/sources/toonzqt/functionpanel.cpp
-index 4cc6612634..b6a0c09239 100644
---- a/toonz/sources/toonzqt/functionpanel.cpp
-+++ b/toonz/sources/toonzqt/functionpanel.cpp
-@@ -24,6 +24,7 @@
-
- // Qt includes
- #include <QPainter>
-+#include <QPainterPath>
- #include <QMouseEvent>
- #include <QWheelEvent>
- #include <QMenu>
Deleted: fix-build2.patch
===================================================================
--- fix-build2.patch 2021-04-17 09:03:10 UTC (rev 919702)
+++ fix-build2.patch 2021-04-17 09:09:49 UTC (rev 919703)
@@ -1,70 +0,0 @@
-From 26d905d84b7a9f3385a8116fa8065916e9ca945c Mon Sep 17 00:00:00 2001
-From: Rozhuk Ivan <rozhuk.im at gmail.com>
-Date: Fri, 22 May 2020 16:54:16 +0300
-Subject: [PATCH] System depend code deduplication
-
----
- .../toonzfarm/tfarmserver/tfarmserver.cpp | 39 +++----------------
- 1 file changed, 6 insertions(+), 33 deletions(-)
-
-diff --git a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
-index 6b2cacc3b6..4142d717b4 100644
---- a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
-+++ b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
-@@ -46,14 +46,6 @@ using namespace TVER;
- #define NO_ERROR 0
- #endif
-
--#ifdef MACOSX
--#include <sys/sysctl.h> //To retrieve MAC HW infos
--#endif
--
--#ifdef LINUX
--#include <sys/sysctl.h>
--#endif
--
- // forward declaration
- class FarmServer;
-
-@@ -660,35 +652,16 @@ void FarmServer::queryHwInfo(HwInfo &hwInfo) {
- hwInfo.m_cpuCount = TSystem::getProcessorCount();
- hwInfo.m_type = Windows;
- #else
--#ifdef __sgi
-- hwInfo.m_cpuCount = sysconf(_SC_NPROC_CONF);
-- hwInfo.m_type = Irix;
--#else
--
--#ifdef MACOSX
-- int mib[2];
-- TINT64 physMemSize;
-- size_t len;
--
-- mib[0] = CTL_HW;
-- mib[1] = HW_MEMSIZE;
-- len = sizeof(physMemSize);
-- sysctl(mib, 2, &physMemSize, &len, NULL, 0);
--#endif
--
--#ifdef LINUX
-- TINT64 physMemSize =
-- (TINT64)sysconf(_SC_PHYS_PAGES) * (TINT64)sysconf(_SC_PAGE_SIZE);
--#endif
--
-- hwInfo.m_cpuCount = TSystem::getProcessorCount();
--
- // We can just retrieve the overall physical memory - the rest is defaulted to
- // 500 MB
-- hwInfo.m_totPhysMem = physMemSize;
-- hwInfo.m_availPhysMem = 500000000;
-+ hwInfo.m_totPhysMem = TSystem::getMemorySize(true);
-+ hwInfo.m_availPhysMem = TSystem::getFreeMemorySize(true);
- hwInfo.m_totVirtMem = 500000000;
- hwInfo.m_availVirtMem = 500000000;
-+ hwInfo.m_cpuCount = TSystem::getProcessorCount();
-+#ifdef __sgi
-+ hwInfo.m_type = Irix;
-+#else
- hwInfo.m_type = Linux;
- #endif
- #endif
More information about the arch-commits
mailing list