From af23d5015607dc6fcbd43d699f75f9560c3a2e22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 13 Apr 2020 14:11:06 +0200 Subject: [PATCH] supercollider: upgrade 3.10.2 -> 3.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../supercollider/supercollider.bb | 10 ++--- ...-utilities-time_tag.hpp-Adding-stati.patch | 30 ------------- ...Workaround-build-errors-on-musl-libc.patch | 43 ------------------- 3 files changed, 3 insertions(+), 80 deletions(-) delete mode 100644 recipes-musicians/supercollider/supercollider/0001-server-supernova-utilities-time_tag.hpp-Adding-stati.patch delete mode 100644 recipes-musicians/supercollider/supercollider/0002-Workaround-build-errors-on-musl-libc.patch diff --git a/recipes-musicians/supercollider/supercollider.bb b/recipes-musicians/supercollider/supercollider.bb index 4f9ca4c..af02975 100644 --- a/recipes-musicians/supercollider/supercollider.bb +++ b/recipes-musicians/supercollider/supercollider.bb @@ -3,13 +3,9 @@ HOMEPAGE = "http://supercollider.github.io/" LICENSE = "GPL-3.0" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = " \ - gitsm://github.com/supercollider/supercollider.git \ - file://0001-server-supernova-utilities-time_tag.hpp-Adding-stati.patch \ - file://0002-Workaround-build-errors-on-musl-libc.patch \ -" -SRCREV = "834c036d3519337d409277d13f15f321759c5756" -PV = "3.10.2" +SRC_URI = "gitsm://github.com/supercollider/supercollider.git" +SRCREV = "e341b4957c304823faca063448792358ce62b077" +PV = "3.11.0" S = "${WORKDIR}/git/" inherit cmake_qt5 features_check mime mime-xdg diff --git a/recipes-musicians/supercollider/supercollider/0001-server-supernova-utilities-time_tag.hpp-Adding-stati.patch b/recipes-musicians/supercollider/supercollider/0001-server-supernova-utilities-time_tag.hpp-Adding-stati.patch deleted file mode 100644 index 965391e..0000000 --- a/recipes-musicians/supercollider/supercollider/0001-server-supernova-utilities-time_tag.hpp-Adding-stati.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bbcd068659ced596402dedc78f49fabfab6470bd Mon Sep 17 00:00:00 2001 -From: David Runge -Date: Sat, 29 Sep 2018 17:14:18 +0200 -Subject: [PATCH] server/supernova/utilities/time_tag.hpp: Adding static_cast - to long for time_duration offset in microseconds to satisfy boost >= 1.67.0. - -Upstream-Status: Applied [1] - -[1] https://github.com/supercollider/supercollider/commit/bbcd068659ced596402dedc78f49fabfab6470bd - ---- - server/supernova/utilities/time_tag.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/server/supernova/utilities/time_tag.hpp b/server/supernova/utilities/time_tag.hpp -index 33b1effd8..3d0f21dba 100644 ---- a/server/supernova/utilities/time_tag.hpp -+++ b/server/supernova/utilities/time_tag.hpp -@@ -229,7 +229,7 @@ public: - #ifdef BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG - time_duration offset = seconds(get_secs() - ntp_offset) + nanoseconds(get_nanoseconds()); - #else -- time_duration offset = seconds(get_secs() - ntp_offset) + microseconds(get_nanoseconds()/1000); -+ time_duration offset = seconds(get_secs() - ntp_offset) + microseconds(static_cast(get_nanoseconds()/1000)); - #endif - return ptime(base, offset); - } --- -2.14.4 - diff --git a/recipes-musicians/supercollider/supercollider/0002-Workaround-build-errors-on-musl-libc.patch b/recipes-musicians/supercollider/supercollider/0002-Workaround-build-errors-on-musl-libc.patch deleted file mode 100644 index 90b7f32..0000000 --- a/recipes-musicians/supercollider/supercollider/0002-Workaround-build-errors-on-musl-libc.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d5f48157a5a0e061f09efca87f4c420bbfe0f09f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 19 Apr 2019 19:40:06 +0200 -Subject: [PATCH] Workaround build errors on musl libc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Currently musl does not support GLOB_TILDE but it is on their roadmap [1]. This -patch is no fix and changes functionality for musl. A slightly changed -functionality seems better than being unable to build. - -For glibc and future versions of musl this change is a noop. - -Upstream-Status: Submitted [2] - -[1] https://wiki.musl-libc.org/roadmap.html -[2] https://github.com/supercollider/supercollider/pull/4391 - -Signed-off-by: Andreas Müller ---- - common/SC_Filesystem_unix.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/common/SC_Filesystem_unix.cpp b/common/SC_Filesystem_unix.cpp -index f15774b46..40334e435 100644 ---- a/common/SC_Filesystem_unix.cpp -+++ b/common/SC_Filesystem_unix.cpp -@@ -32,6 +32,11 @@ - // system - #include // ::glob, glob_t - -+// workaround for musl not yet supporting GLOB_TILDE -+#ifndef GLOB_TILDE -+#define GLOB_TILDE 0 -+#endif -+ - using Path = SC_Filesystem::Path; - using DirName = SC_Filesystem::DirName; - using DirMap = SC_Filesystem::DirMap; --- -2.20.1 -