diff --git a/recipes-musicians/yoshimi/yoshimi/0001-Keep-build-system-CXXFLAGS-when-not-selecting-a-spec.patch b/recipes-musicians/yoshimi/yoshimi/0001-Keep-build-system-CXXFLAGS-when-not-selecting-a-spec.patch deleted file mode 100644 index 73789783..00000000 --- a/recipes-musicians/yoshimi/yoshimi/0001-Keep-build-system-CXXFLAGS-when-not-selecting-a-spec.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 29b79b335f7b2d42e9dbc3fc1c990199325bd1e5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 11 Jan 2019 22:37:05 +0100 -Subject: [PATCH] Keep build system CXXFLAGS when not selecting a specialized - build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Cross/sysrooted build environments as Openembedded/Yocto set a lot flags to -tailor builds and usually do a good job selecting the correct flags for the -target machine. -So don't ignore them because it causes nasty build failures. - -Upstream-Status: Submitted [1] - -[1] https://github.com/Yoshimi/yoshimi/pull/46 - -Signed-off-by: Andreas Müller ---- - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 3448d5a7..ba65d9b1 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -317,7 +317,7 @@ else (BuildFor0ld_X86) - if (BuildForThisCPU) - set (CMAKE_CXX_FLAGS ${BuildOptionsThisCPU}) - else (BuildForThisCPU) -- set (CMAKE_CXX_FLAGS ${BuildOptionsBasic}) -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${BuildOptionsBasic}") - endif (BuildForThisCPU) - endif (BuildForNEON) - endif (BuildForCore2_X86_64) --- -2.20.1 - diff --git a/recipes-musicians/yoshimi/yoshimi_1.5.10.bb b/recipes-musicians/yoshimi/yoshimi_1.5.10.2.bb similarity index 72% rename from recipes-musicians/yoshimi/yoshimi_1.5.10.bb rename to recipes-musicians/yoshimi/yoshimi_1.5.10.2.bb index 0cb0a17c..7faa774c 100644 --- a/recipes-musicians/yoshimi/yoshimi_1.5.10.bb +++ b/recipes-musicians/yoshimi/yoshimi_1.5.10.2.bb @@ -23,15 +23,12 @@ DEPENDS += " \ SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/1.5/${BPN}-${PV}.tar.bz2 \ - file://0001-Keep-build-system-CXXFLAGS-when-not-selecting-a-spec.patch \ " -SRC_URI[md5sum] = "1c3b2eb1e85c9ecd07729b43746da288" -SRC_URI[sha256sum] = "5445edf05157960303564cd7f9719faf009aba763e783f2293b613768bfd5f55" +SRC_URI[md5sum] = "953662f7552f4f55851554ee76215bfd" +SRC_URI[sha256sum] = "0128bff8926e19344058499756772ba11e6055678cf4b1a3a0480384274e29e7" OECMAKE_SOURCEPATH = "${S}/src" -LDFLAGS += "-lpng16 -ljpeg -lXrender -lXft" - FILES_${PN} += " \ ${datadir}/metainfo \ ${libdir}/lv2 \