From 8d67777bb5e8c385976db57c0b2272edf68777e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 21 Jun 2020 17:32:58 +0200 Subject: [PATCH] lmms upgrade to latest stable to fix build with Qt 5.15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-musicians/lmms/lmms.bb | 3 +- recipes-musicians/lmms/lmms.inc | 2 +- ...y-Do-not-overwrite-CMAKE_C-XX-_FLAGS.patch | 44 ------------------- ...abase-Do-not-add-RPATH-to-carlabase.patch} | 10 +++-- 4 files changed, 8 insertions(+), 51 deletions(-) delete mode 100644 recipes-musicians/lmms/lmms/0003-CMake-3rdparty-Do-not-overwrite-CMAKE_C-XX-_FLAGS.patch rename recipes-musicians/lmms/lmms/{0004-carlabase-Do-not-add-RPATH-to-carlabase.patch => 0003-carlabase-Do-not-add-RPATH-to-carlabase.patch} (83%) diff --git a/recipes-musicians/lmms/lmms.bb b/recipes-musicians/lmms/lmms.bb index 7f7bc15..51d277a 100644 --- a/recipes-musicians/lmms/lmms.bb +++ b/recipes-musicians/lmms/lmms.bb @@ -7,8 +7,7 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += " \ file://0001-Find-native-bin2res.patch \ file://0002-zynaddsubfx-link-agains-X11.patch \ - file://0003-CMake-3rdparty-Do-not-overwrite-CMAKE_C-XX-_FLAGS.patch \ - file://0004-carlabase-Do-not-add-RPATH-to-carlabase.patch \ + file://0003-carlabase-Do-not-add-RPATH-to-carlabase.patch \ " DEPENDS += " \ diff --git a/recipes-musicians/lmms/lmms.inc b/recipes-musicians/lmms/lmms.inc index 9fc646f..e9ef9ab 100644 --- a/recipes-musicians/lmms/lmms.inc +++ b/recipes-musicians/lmms/lmms.inc @@ -4,6 +4,6 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = "gitsm://github.com/LMMS/${BPN}.git;branch=stable-1.2" -SRCREV = "dbf5f47149fbb7584bf48ce9e767b9e90ee2df7e" +SRCREV = "f56b4963c141b91bc6e78947814f2f0cb92c26a1" S = "${WORKDIR}/git" PV = "1.2.1+git${SRCPV}" diff --git a/recipes-musicians/lmms/lmms/0003-CMake-3rdparty-Do-not-overwrite-CMAKE_C-XX-_FLAGS.patch b/recipes-musicians/lmms/lmms/0003-CMake-3rdparty-Do-not-overwrite-CMAKE_C-XX-_FLAGS.patch deleted file mode 100644 index cb09a70..0000000 --- a/recipes-musicians/lmms/lmms/0003-CMake-3rdparty-Do-not-overwrite-CMAKE_C-XX-_FLAGS.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0546835950cc057490b01c85bcf7088369137934 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 11 Jun 2019 09:06:20 +0200 -Subject: [PATCH] CMake 3rdparty: Do not overwrite CMAKE_C(XX)_FLAGS -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It causes at least problems when cross-building with openembedded - -Upstream-Status: Submitted [1] - -[1] https://github.com/LMMS/lmms/pull/4080 - -Signed-off-by: Andreas Müller ---- - src/3rdparty/CMakeLists.txt | 3 --- - src/3rdparty/rpmalloc/CMakeLists.txt | 2 +- - 2 files changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt -index d546fd06e..3939a58ad 100644 ---- a/src/3rdparty/CMakeLists.txt -+++ b/src/3rdparty/CMakeLists.txt -@@ -1,6 +1,3 @@ --set(CMAKE_C_FLAGS "") --set(CMAKE_CXX_FLAGS "") -- - IF(QT5 AND LMMS_BUILD_LINUX AND WANT_VST) - set(BUILD_SHARED_LIBS OFF) - add_subdirectory(qt5-x11embed) -diff --git a/src/3rdparty/rpmalloc/CMakeLists.txt b/src/3rdparty/rpmalloc/CMakeLists.txt -index 23d1551c2..f4a8dcd22 100644 ---- a/src/3rdparty/rpmalloc/CMakeLists.txt -+++ b/src/3rdparty/rpmalloc/CMakeLists.txt -@@ -1,4 +1,4 @@ --set(CMAKE_C_FLAGS "-std=c11") -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11") - - add_library(rpmalloc STATIC - rpmalloc/rpmalloc/rpmalloc.c --- -2.20.1 - diff --git a/recipes-musicians/lmms/lmms/0004-carlabase-Do-not-add-RPATH-to-carlabase.patch b/recipes-musicians/lmms/lmms/0003-carlabase-Do-not-add-RPATH-to-carlabase.patch similarity index 83% rename from recipes-musicians/lmms/lmms/0004-carlabase-Do-not-add-RPATH-to-carlabase.patch rename to recipes-musicians/lmms/lmms/0003-carlabase-Do-not-add-RPATH-to-carlabase.patch index 9a3f0ee..22377f2 100644 --- a/recipes-musicians/lmms/lmms/0004-carlabase-Do-not-add-RPATH-to-carlabase.patch +++ b/recipes-musicians/lmms/lmms/0003-carlabase-Do-not-add-RPATH-to-carlabase.patch @@ -14,10 +14,10 @@ Signed-off-by: Andreas Müller 1 file changed, 5 deletions(-) diff --git a/plugins/carlabase/CMakeLists.txt b/plugins/carlabase/CMakeLists.txt -index 4fa81a491..4375e95f1 100644 +index 5e024da40..802ee55c0 100644 --- a/plugins/carlabase/CMakeLists.txt +++ b/plugins/carlabase/CMakeLists.txt -@@ -12,9 +12,4 @@ if(LMMS_HAVE_CARLA) +@@ -35,11 +35,6 @@ if(LMMS_HAVE_CARLA OR LMMS_HAVE_WEAKCARLA) LINK_DIRECTORIES(${CARLA_LIBRARY_DIRS}) LINK_LIBRARIES(${CARLA_LIBRARIES}) BUILD_PLUGIN(carlabase carla.cpp carla.h MOCFILES carla.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png" LINK SHARED) @@ -26,7 +26,9 @@ index 4fa81a491..4375e95f1 100644 - BUILD_WITH_INSTALL_RPATH TRUE - INSTALL_RPATH_USE_LINK_PATH TRUE - INSTALL_RPATH "${CARLA_RPATH}") - endif(LMMS_HAVE_CARLA) + IF(LMMS_HAVE_WEAKCARLA) + ADD_DEPENDENCIES(carlabase carla_native-plugin) + ENDIF() -- -2.14.5 +2.26.2