Date: Sunday, March 14, 2021 @ 18:59:17 Author: bgyorgy Revision: 891283
upgpkg: opentoonz 1.4.0-3: Fix build (FS#68327) Added: opentoonz/trunk/fix-build2.patch Modified: opentoonz/trunk/PKGBUILD ------------------+ PKGBUILD | 23 ++++++++--------- fix-build2.patch | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 12 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-03-14 18:40:08 UTC (rev 891282) +++ PKGBUILD 2021-03-14 18:59:17 UTC (rev 891283) @@ -3,7 +3,7 @@ pkgname=opentoonz pkgver=1.4.0 -pkgrel=2 +pkgrel=3 pkgdesc='Software for producing a 2D animation' arch=(x86_64) url='https://opentoonz.github.io/e/' @@ -10,18 +10,19 @@ license=(BSD) depends=(cblas ffmpeg freeglut glew hicolor-icon-theme libmypaint qt5-multimedia qt5-script qt5-svg superlu) makedepends=(boost cmake qt5-tools) -source=("$pkgname-$pkgver.tar.gz::https://github.com/opentoonz/$pkgname/archive/v${pkgver}.tar.gz"; - fix-build.patch) +source=(https://github.com/opentoonz/$pkgname/archive/v${pkgver}/$pkgname-$pkgver.tar.gz + fix-build.patch + fix-build2.patch) sha256sums=('176caca191bf2747964ecaf8cbb6be6a738fd04b464a2ba182b5aaf96ccaefa9' - '14c5ad66485bbbc7665068f0ee623a2cf87bb2b20a24a636753997acd708b43e') + '14c5ad66485bbbc7665068f0ee623a2cf87bb2b20a24a636753997acd708b43e' + '9124f2899be6e40f71a25beaf382214682df68148b443f2c5ebd630aba486b0a') prepare() { - [[ -d build ]] || mkdir build - 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 @@ -33,15 +34,13 @@ make popd - cd build - cmake -G "Unix Makefiles" ../$pkgname-$pkgver/toonz/sources \ + cmake -B build -S $pkgname-$pkgver/toonz/sources \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_SKIP_RPATH=YES - make + cmake --build build } package() { - cd build - make DESTDIR="$pkgdir" install - install -Dm644 ../$pkgname-$pkgver/LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt" + DESTDIR="$pkgdir" cmake --install build + install -Dm644 $pkgname-$pkgver/LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt" } Added: fix-build2.patch =================================================================== --- fix-build2.patch (rev 0) +++ fix-build2.patch 2021-03-14 18:59:17 UTC (rev 891283) @@ -0,0 +1,70 @@ +From 26d905d84b7a9f3385a8116fa8065916e9ca945c Mon Sep 17 00:00:00 2001 +From: Rozhuk Ivan <[email protected]> +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
