diff --git a/recipes-musicians/supercollider/supercollider.bb b/recipes-musicians/supercollider/supercollider.bb index 8beae08..489536f 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-Fix-build-with-Qt-5.15.patch \ - file://0002-Fix-boost-1.73.0-support-4983.patch \ -" -SRCREV = "e341b4957c304823faca063448792358ce62b077" -PV = "3.11.0" +SRC_URI = "gitsm://github.com/supercollider/supercollider.git" +SRCREV = "206f24d865efa37264a0b42594f536ed834c1493" +PV = "3.11.1" S = "${WORKDIR}/git/" inherit cmake_qt5 features_check mime mime-xdg diff --git a/recipes-musicians/supercollider/supercollider/0001-Fix-build-with-Qt-5.15.patch b/recipes-musicians/supercollider/supercollider/0001-Fix-build-with-Qt-5.15.patch deleted file mode 100644 index 47696ac..0000000 --- a/recipes-musicians/supercollider/supercollider/0001-Fix-build-with-Qt-5.15.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 244e55632cef86ecd363eb8df3f2352569f804f4 Mon Sep 17 00:00:00 2001 -From: Hector Martin -Date: Sun, 31 May 2020 21:24:52 +0900 -Subject: [PATCH] Fix build with Qt 5.15 - ---- - QtCollider/primitives/prim_QPen.cpp | 1 + - QtCollider/widgets/QcGraph.cpp | 1 + - QtCollider/widgets/QcLevelIndicator.cpp | 1 + - QtCollider/widgets/QcMultiSlider.cpp | 1 + - QtCollider/widgets/QcScopeShm.cpp | 1 + - QtCollider/widgets/soundfileview/view.cpp | 1 + - 6 files changed, 6 insertions(+) - -diff --git a/QtCollider/primitives/prim_QPen.cpp b/QtCollider/primitives/prim_QPen.cpp -index 8d531214d..4ba24519d 100644 ---- a/QtCollider/primitives/prim_QPen.cpp -+++ b/QtCollider/primitives/prim_QPen.cpp -@@ -27,6 +27,7 @@ - #include "PyrKernel.h" - - #include -+#include - #include - #include - #include -diff --git a/QtCollider/widgets/QcGraph.cpp b/QtCollider/widgets/QcGraph.cpp -index 70215ae94..79e71d1ad 100644 ---- a/QtCollider/widgets/QcGraph.cpp -+++ b/QtCollider/widgets/QcGraph.cpp -@@ -24,6 +24,7 @@ - #include "../style/routines.hpp" - - #include -+#include - #include - #include - #include -diff --git a/QtCollider/widgets/QcLevelIndicator.cpp b/QtCollider/widgets/QcLevelIndicator.cpp -index 19c7d4874..8a60f354a 100644 ---- a/QtCollider/widgets/QcLevelIndicator.cpp -+++ b/QtCollider/widgets/QcLevelIndicator.cpp -@@ -23,6 +23,7 @@ - #include "../QcWidgetFactory.h" - - #include -+#include - - QC_DECLARE_QWIDGET_FACTORY(QcLevelIndicator); - -diff --git a/QtCollider/widgets/QcMultiSlider.cpp b/QtCollider/widgets/QcMultiSlider.cpp -index 046b18739..381ddd404 100644 ---- a/QtCollider/widgets/QcMultiSlider.cpp -+++ b/QtCollider/widgets/QcMultiSlider.cpp -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #include - -diff --git a/QtCollider/widgets/QcScopeShm.cpp b/QtCollider/widgets/QcScopeShm.cpp -index bb44623f4..edd38ef57 100644 ---- a/QtCollider/widgets/QcScopeShm.cpp -+++ b/QtCollider/widgets/QcScopeShm.cpp -@@ -25,6 +25,7 @@ - #include "../debug.h" - - #include -+#include - #include - #include - #include -diff --git a/QtCollider/widgets/soundfileview/view.cpp b/QtCollider/widgets/soundfileview/view.cpp -index a3eca811f..baba0b245 100644 ---- a/QtCollider/widgets/soundfileview/view.cpp -+++ b/QtCollider/widgets/soundfileview/view.cpp -@@ -24,6 +24,7 @@ - - #include - #include -+#include - #include - #include - #include --- -2.21.3 - diff --git a/recipes-musicians/supercollider/supercollider/0002-Fix-boost-1.73.0-support-4983.patch b/recipes-musicians/supercollider/supercollider/0002-Fix-boost-1.73.0-support-4983.patch deleted file mode 100644 index 0d0f3da..0000000 --- a/recipes-musicians/supercollider/supercollider/0002-Fix-boost-1.73.0-support-4983.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 56cdef47103ec39727c735d371a861e6d308f851 Mon Sep 17 00:00:00 2001 -From: Tristan de Cacqueray -Date: Mon, 1 Jun 2020 02:52:44 +0000 -Subject: [PATCH 2/2] Fix boost 1.73.0 support (#4983) - -fix boost 1.73.0 support by including the appropriate header and using up-to-date endianness macros ---- - external_libraries/oscpack_build.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/external_libraries/oscpack_build.cpp b/external_libraries/oscpack_build.cpp -index 3a658f3d3..de7e78fef 100644 ---- a/external_libraries/oscpack_build.cpp -+++ b/external_libraries/oscpack_build.cpp -@@ -1,8 +1,8 @@ --#include -+#include - --#ifdef BOOST_LITTLE_ENDIAN -+#if BOOST_ENDIAN_LITTLE_BYTE - #define OSC_HOST_LITTLE_ENDIAN --#elif defined(BOOST_BIG_ENDIAN) -+#elif BOOST_ENDIAN_BIG_BYTE - #define OSC_HOST_BIG_ENDIAN - #else - #error please define endianness --- -2.21.3 -