Hello community,
here is the log from the commit of package opentoonz for openSUSE:Factory
checked in at 2020-10-15 13:50:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opentoonz (Old)
and /work/SRC/openSUSE:Factory/.opentoonz.new.3486 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opentoonz"
Thu Oct 15 13:50:59 2020 rev:10 rq:841809 version:1.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/opentoonz/opentoonz.changes 2020-06-10
00:50:10.003219760 +0200
+++ /work/SRC/openSUSE:Factory/.opentoonz.new.3486/opentoonz.changes
2020-10-15 13:51:07.781317673 +0200
@@ -1,0 +2,6 @@
+Wed Oct 14 17:01:46 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Add patch to fix the factory build:
+ * 0001-System-depend-code-deduplication.patch
+
+-------------------------------------------------------------------
New:
----
0001-System-depend-code-deduplication.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opentoonz.spec ++++++
--- /var/tmp/diff_new_pack.QlCrKR/_old 2020-10-15 13:51:08.641318033 +0200
+++ /var/tmp/diff_new_pack.QlCrKR/_new 2020-10-15 13:51:08.645318034 +0200
@@ -35,6 +35,8 @@
Patch3: 0001-Fix-build-with-GCC-10.patch
# PATCH-FIX-UPSTREAM
Patch4: 0001-Fix-build-with-Qt-5.15.patch
+# PATCH-FIX-UPSTREAM
+Patch5: 0001-System-depend-code-deduplication.patch
BuildRequires: boost-devel >= 1.55
BuildRequires: cmake
BuildRequires: freeglut-devel
++++++ 0001-System-depend-code-deduplication.patch ++++++
>From 26d905d84b7a9f3385a8116fa8065916e9ca945c Mon Sep 17 00:00:00 2001
From: Rozhuk Ivan <rozhuk...@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 6b2cacc3..4142d717 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
--
2.28.0
