From 88b79db47f8e6c236fa724535d4f4f3b063fed6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 11 Jun 2019 09:22:00 +0200 Subject: [PATCH] lmms: upgrade 1.2.0~rc8 -> 1.2.0 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 | 2 +- recipes-musicians/lmms/lmms.inc | 4 ++-- ...-3rdparty-Do-not-overwrite-CMAKE_C-XX-_FLAGS.patch} | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) rename recipes-musicians/lmms/lmms/{0003-CMake-rpmalloc-Do-not-overwrite-CMAKE_C_FLAGS.patch => 0003-CMake-3rdparty-Do-not-overwrite-CMAKE_C-XX-_FLAGS.patch} (86%) diff --git a/recipes-musicians/lmms/lmms.bb b/recipes-musicians/lmms/lmms.bb index 13dbb8f..a666972 100644 --- a/recipes-musicians/lmms/lmms.bb +++ b/recipes-musicians/lmms/lmms.bb @@ -7,7 +7,7 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += " \ file://0001-Find-native-bin2res.patch \ file://0002-zynaddsubfx-link-agains-X11.patch \ - file://0003-CMake-rpmalloc-Do-not-overwrite-CMAKE_C_FLAGS.patch \ + file://0003-CMake-3rdparty-Do-not-overwrite-CMAKE_C-XX-_FLAGS.patch \ file://0004-carlabase-Do-not-add-RPATH-to-carlabase.patch \ " diff --git a/recipes-musicians/lmms/lmms.inc b/recipes-musicians/lmms/lmms.inc index f4b4c94..d3280ee 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 = "55eb831507250b236de80e63d376083dde0b3ae1" +SRCREV = "0fbaca40bd6ea1a3fa664e12beaec5803d0d9662" S = "${WORKDIR}/git" -PV = "1.2.0~rc8+git${SRCPV}" +PV = "1.2.0" diff --git a/recipes-musicians/lmms/lmms/0003-CMake-rpmalloc-Do-not-overwrite-CMAKE_C_FLAGS.patch b/recipes-musicians/lmms/lmms/0003-CMake-3rdparty-Do-not-overwrite-CMAKE_C-XX-_FLAGS.patch similarity index 86% rename from recipes-musicians/lmms/lmms/0003-CMake-rpmalloc-Do-not-overwrite-CMAKE_C_FLAGS.patch rename to recipes-musicians/lmms/lmms/0003-CMake-3rdparty-Do-not-overwrite-CMAKE_C-XX-_FLAGS.patch index ad401bb..cb09a70 100644 --- a/recipes-musicians/lmms/lmms/0003-CMake-rpmalloc-Do-not-overwrite-CMAKE_C_FLAGS.patch +++ b/recipes-musicians/lmms/lmms/0003-CMake-3rdparty-Do-not-overwrite-CMAKE_C-XX-_FLAGS.patch @@ -1,6 +1,6 @@ -From 9fe454637103ab2307f59495b938e9fcff5d39a3 Mon Sep 17 00:00:00 2001 +From 0546835950cc057490b01c85bcf7088369137934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 29 Dec 2017 21:43:52 +0100 +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 @@ -19,14 +19,14 @@ Signed-off-by: Andreas Müller 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt -index 5dec2890c..75b28e988 100644 +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) + 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 @@ -40,5 +40,5 @@ index 23d1551c2..f4a8dcd22 100644 add_library(rpmalloc STATIC rpmalloc/rpmalloc/rpmalloc.c -- -2.14.3 +2.20.1