From d526b0597c6626c2f5abf8f4ca093bc85603cb50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 19 Sep 2020 12:32:42 +0200 Subject: [PATCH] bjumblr: upgrade 1.2.2 -> 1.4.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-musicians/sjaehn/bjumblr.bb | 9 +-- ...001-BJumblr.cpp-Fix-build-with-gcc10.patch | 56 ------------------- 2 files changed, 3 insertions(+), 62 deletions(-) delete mode 100644 recipes-musicians/sjaehn/bjumblr/0001-BJumblr.cpp-Fix-build-with-gcc10.patch diff --git a/recipes-musicians/sjaehn/bjumblr.bb b/recipes-musicians/sjaehn/bjumblr.bb index e678ff0..6194404 100644 --- a/recipes-musicians/sjaehn/bjumblr.bb +++ b/recipes-musicians/sjaehn/bjumblr.bb @@ -14,13 +14,10 @@ DEPENDS += " \ lv2 \ " -SRC_URI = " \ - git://github.com/sjaehn/BJumblr.git \ - file://0001-BJumblr.cpp-Fix-build-with-gcc10.patch \ -" -SRCREV = "4f906ea47467637a6e115435784dc34f6bf63ca7" +SRC_URI = "git://github.com/sjaehn/BJumblr.git" +SRCREV = "fd90faed2dc511fdacdf2dd61952dbda5d87dc2a" S = "${WORKDIR}/git" -PV = "1.2.2" +PV = "1.4.2" do_install() { DESTDIR=${D} PREFIX=${prefix} oe_runmake install diff --git a/recipes-musicians/sjaehn/bjumblr/0001-BJumblr.cpp-Fix-build-with-gcc10.patch b/recipes-musicians/sjaehn/bjumblr/0001-BJumblr.cpp-Fix-build-with-gcc10.patch deleted file mode 100644 index b92014f..0000000 --- a/recipes-musicians/sjaehn/bjumblr/0001-BJumblr.cpp-Fix-build-with-gcc10.patch +++ /dev/null @@ -1,56 +0,0 @@ -From aceb6d17c6ef7abb6780606df780fd6288ff4e71 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 9 Jun 2020 22:30:48 +0200 -Subject: [PATCH] BJumblr.cpp: Fix build with gcc10 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Error message: -| src/BJumblr.cpp:70:21: error: 'invalid_argument' is not a member of 'std' -| 70 | if (!m) throw std::invalid_argument ("BJumblr.lv2: Host does not support urid:map."); -| | ^~~~~~~~~~~~~~~~ -| src/BJumblr.cpp:71:34: error: 'invalid_argument' is not a member of 'std' -| 71 | if (!workerSchedule) throw std::invalid_argument ("BJumblr.lv2: Host does not support work:schedule."); -| | ^~~~~~~~~~~~~~~~ -| src/BJumblr.cpp: In constructor 'BJumblr::Sample::Sample(const char*)': -| src/BJumblr.cpp:104:50: error: 'invalid_argument' is not a member of 'std' -| 104 | if (!sndfile || !info.frames) throw std::invalid_argument("BJumblr.lv2: Can't open " + std::string(samplepath) + "."); -| | ^~~~~~~~~~~~~~~~ -| src/BJumblr.cpp: In member function 'LV2_State_Status BJumblr::state_restore(LV2_State_Retrieve_Function, LV2_State_Handle, uint32_t, const LV2_Feature* const*)': -| src/BJumblr.cpp:701:15: error: 'invalid_argument' in namespace 'std' does not name a type -| 701 | catch (std::invalid_argument &ia) -| | ^~~~~~~~~~~~~~~~ -| src/BJumblr.cpp:703:29: error: 'ia' was not declared in this scope -| 703 | fprintf (stderr, "%s\n", ia.what()); -| | ^~ -| src/BJumblr.cpp: In member function 'LV2_Worker_Status BJumblr::work(LV2_Worker_Respond_Function, LV2_Worker_Respond_Handle, uint32_t, const void*)': -| src/BJumblr.cpp:842:17: error: 'invalid_argument' in namespace 'std' does not name a type -| 842 | catch (std::invalid_argument &ia) -| | ^~~~~~~~~~~~~~~~ -| src/BJumblr.cpp:844:31: error: 'ia' was not declared in this scope -| 844 | fprintf (stderr, "%s\n", ia.what()); -| | ^~ - -Upstream-Status: Submitted[https://github.com/sjaehn/BJumblr/pull/9] - -Signed-off-by: Andreas Müller ---- - src/BJumblr.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/BJumblr.cpp b/src/BJumblr.cpp -index 5f89e41..3e97e6a 100644 ---- a/src/BJumblr.cpp -+++ b/src/BJumblr.cpp -@@ -19,6 +19,7 @@ - */ - - #include "BJumblr.hpp" -+#include - - inline double floorfrac (const double value) {return value - floor (value);} - inline double floormod (const double numer, const double denom) {return numer - floor(numer / denom) * denom;} --- -2.26.2 -