From d3ad7e6629d192c6adeb7c92b267b552fdcaf6f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 28 Apr 2021 21:53:56 +0200 Subject: [PATCH] muse: upgrade 3.1.1 -> 4.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-musicians/muse/{muse_git.bb => muse.bb} | 16 ++++++++-------- ...-find-aeffectx.h-it-is-not-found-for-un.patch | 8 ++++---- ...se-find-unused-wavs-convert-to-pythomn3.patch | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) rename recipes-musicians/muse/{muse_git.bb => muse.bb} (79%) diff --git a/recipes-musicians/muse/muse_git.bb b/recipes-musicians/muse/muse.bb similarity index 79% rename from recipes-musicians/muse/muse_git.bb rename to recipes-musicians/muse/muse.bb index b9bcd57..7fbf7ba 100644 --- a/recipes-musicians/muse/muse_git.bb +++ b/recipes-musicians/muse/muse.bb @@ -1,7 +1,7 @@ SUMMARY = "MusE is a digital audio workstation" HOMEPAGE = "http://muse-sequencer.org/" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://muse3/COPYING;md5=328283dc167a7b37ffdc59f524a7fc4d" +LIC_FILES_CHKSUM = "file://src/COPYING;md5=328283dc167a7b37ffdc59f524a7fc4d" DEPENDS += " \ qtbase \ @@ -28,17 +28,17 @@ SRC_URI = " \ file://0001-Do-not-try-to-find-aeffectx.h-it-is-not-found-for-un.patch \ file://0002-muse-find-unused-wavs-convert-to-pythomn3.patch \ " -SRCREV = "2b479fecc447871c10b08dcd8aabb1ac9b0bdfc7" -PV = "3.1.1" +SRCREV = "3e79cbcbea4480a43dc6052fb0fc118c356fb404" +PV = "4.0.0" S = "${WORKDIR}/git" -OECMAKE_SOURCEPATH = "${S}/muse3" +OECMAKE_SOURCEPATH = "${S}/src" EXTRA_OECMAKE += " \ -DLIB_INSTALL_DIR=${libdir} \ -DMODULES_BUILD_STATIC=1 \ -DCMAKE_SHARED_LINKER_FLAGS='${LDFLAGS} -Wl,--no-undefined' \ - -DVST_HEADER_PATH=${S}/muse3/vestige \ + -DVST_HEADER_PATH=${S}/src/vestige \ -DENABLE_VST_VESTIGE=1 \ \ -DENABLE_LV2=1 \ @@ -52,7 +52,7 @@ EXTRA_OECMAKE += " \ do_install_append() { # remove python script to convert songs from very old muse to avoid # python rdeps - rm -f ${D}${datadir}/muse-3.1/utils/muse-song-convert.py + rm -f ${D}${datadir}/muse-4.0/utils/muse-song-convert.py } QT_TRANSLATION_FILES = "${datadir}/*/locale/*.qm" @@ -61,8 +61,8 @@ FILES_${PN}-locale = "${datadir}/muse-3.0/locale" FILES_${PN} += " \ ${datadir}/mime \ ${datadir}/metainfo \ - ${datadir}/muse-3.1 \ - ${libdir}/muse-3.1 \ + ${datadir}/muse-4.0 \ + ${libdir}/muse-4.0 \ " RDEPENDS_${PN} += "python3-core" diff --git a/recipes-musicians/muse/muse/0001-Do-not-try-to-find-aeffectx.h-it-is-not-found-for-un.patch b/recipes-musicians/muse/muse/0001-Do-not-try-to-find-aeffectx.h-it-is-not-found-for-un.patch index 0157ae7..ff35e38 100644 --- a/recipes-musicians/muse/muse/0001-Do-not-try-to-find-aeffectx.h-it-is-not-found-for-un.patch +++ b/recipes-musicians/muse/muse/0001-Do-not-try-to-find-aeffectx.h-it-is-not-found-for-un.patch @@ -11,13 +11,13 @@ Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Andreas Müller --- - muse3/CMakeLists.txt | 1 - + src/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) -diff --git a/muse3/CMakeLists.txt b/muse3/CMakeLists.txt +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2746a50f..ebf97d10 100644 ---- a/muse3/CMakeLists.txt -+++ b/muse3/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt @@ -451,7 +451,6 @@ SET (AEFFECT_H_FOUND FALSE) SET (VST_NATIVE_SUPPORT FALSE) diff --git a/recipes-musicians/muse/muse/0002-muse-find-unused-wavs-convert-to-pythomn3.patch b/recipes-musicians/muse/muse/0002-muse-find-unused-wavs-convert-to-pythomn3.patch index f460fe1..3e2be9d 100644 --- a/recipes-musicians/muse/muse/0002-muse-find-unused-wavs-convert-to-pythomn3.patch +++ b/recipes-musicians/muse/muse/0002-muse-find-unused-wavs-convert-to-pythomn3.patch @@ -10,13 +10,13 @@ Upstream-Status: Pending Signed-off-by: Andreas Müller --- - muse3/utils/muse-find-unused-wavs | 46 +++++++++++++++---------------- + src/utils/muse-find-unused-wavs | 46 +++++++++++++++---------------- 1 file changed, 23 insertions(+), 23 deletions(-) -diff --git a/muse3/utils/muse-find-unused-wavs b/muse3/utils/muse-find-unused-wavs +diff --git a/src/utils/muse-find-unused-wavs b/src/utils/muse-find-unused-wavs index 5aaf2707..3bc4e009 100755 ---- a/muse3/utils/muse-find-unused-wavs -+++ b/muse3/utils/muse-find-unused-wavs +--- a/src/utils/muse-find-unused-wavs ++++ b/src/utils/muse-find-unused-wavs @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3