muse: upgrade 3.1.0 -> 3.1.1

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2020-07-22 02:44:11 +02:00
parent 891cf2138c
commit 7483108dfb
3 changed files with 2 additions and 191 deletions

View File

@@ -23,82 +23,5 @@ index 5aaf2707..3bc4e009 100755
# -*- coding: utf-8 -*-
#=============================================================================
# MusE
@@ -31,29 +31,29 @@ dirlist = os.listdir(".")
wavs=[]
-print "muse-find-unused-wavs - check wav file usage in all *.med files in current dir."
-print ""
-print "This utility scans all med files in the current dir, maps their"
-print "wave file usage to what is currently available in current dir."
-print "The output is printed."
-print "Files no longer used are moved to the subdir 'unused'"
-print "Press enter to continue."
-print ""
-raw_input()
+print("muse-find-unused-wavs - check wav file usage in all *.med files in current dir.")
+print("")
+print("This utility scans all med files in the current dir, maps their")
+print("wave file usage to what is currently available in current dir.")
+print("The output is printed.")
+print("Files no longer used are moved to the subdir 'unused'")
+print("Press enter to continue.")
+print("")
+input()
for line in dirlist:
if (line.endswith( ".wav")):
#print "HA!", line
wavs.append(line)
-print "===================================================="
-print "===================================================="
-print " These wave files were found in current directory:\n"
+print("====================================================")
+print("====================================================")
+print(" These wave files were found in current directory:\n")
if wavs == []:
- print "No files were found."
+ print("No files were found.")
sys.exit(0)
else:
for f in wavs:
- print f
+ print(f)
for line in dirlist:
if (line.endswith( ".med") ):
@@ -65,16 +65,16 @@ for line in dirlist:
#print "found %s removing %s"%(line, wav)
wavs.remove(wav)
-print "===================================================="
-print " These wave files were unused:\n"
+print("====================================================")
+print(" These wave files were unused:\n")
if wavs == []:
- print "None"
+ print("None")
else:
for f in wavs:
- print f
+ print(f)
- print "moving to new subdir unused, press Enter to continue"
- raw_input()
+ print("moving to new subdir unused, press Enter to continue")
+ input()
try:
os.mkdir('unused')
@@ -82,6 +82,6 @@ else:
pass
for f in wavs:
shutil.move(f,'unused')
-print "===================================================="
-print "===================================================="
+print("====================================================")
+print("====================================================")
--
2.21.0

View File

@@ -1,111 +0,0 @@
From 4f7fa72afee94dc14d16b71c15f992907b4cc6b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Mon, 8 Jun 2020 14:09:28 +0200
Subject: [PATCH] Fix buid with Qt >= 5.15
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
There were several errors as
| error: aggregate 'QPainterPath path' has incomplete type and cannot be defined
Upstream-Status: Submitted [https://github.com/muse-sequencer/muse/pull/818]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
muse3/awl/knob.cpp | 1 +
muse3/awl/slider.cpp | 1 +
muse3/muse/components/slider.cpp | 1 +
muse3/muse/components/utils.cpp | 1 +
muse3/muse/midiedit/scoreedit.cpp | 1 +
muse3/muse/mixer/routedialog.cpp | 1 +
muse3/muse/widgets/meter.cpp | 1 +
7 files changed, 7 insertions(+)
diff --git a/muse3/awl/knob.cpp b/muse3/awl/knob.cpp
index be8bc85d..b9f1e3e2 100644
--- a/muse3/awl/knob.cpp
+++ b/muse3/awl/knob.cpp
@@ -25,6 +25,7 @@
#include <QMouseEvent>
#include <QPainter>
+#include <QPainterPath>
namespace Awl {
diff --git a/muse3/awl/slider.cpp b/muse3/awl/slider.cpp
index 7d82fde3..e33be869 100644
--- a/muse3/awl/slider.cpp
+++ b/muse3/awl/slider.cpp
@@ -24,6 +24,7 @@
#include <QMouseEvent>
#include <QPainter>
+#include <QPainterPath>
namespace Awl {
diff --git a/muse3/muse/components/slider.cpp b/muse3/muse/components/slider.cpp
index 5a0e85c0..831ba89c 100644
--- a/muse3/muse/components/slider.cpp
+++ b/muse3/muse/components/slider.cpp
@@ -26,6 +26,7 @@
#include "mmath.h"
#include <QPainter>
+#include <QPainterPath>
#include <QResizeEvent>
#include "utils.h"
diff --git a/muse3/muse/components/utils.cpp b/muse3/muse/components/utils.cpp
index e40d5e14..b0d348ae 100644
--- a/muse3/muse/components/utils.cpp
+++ b/muse3/muse/components/utils.cpp
@@ -34,6 +34,7 @@
#include <QLinearGradient>
#include <QMimeData>
#include <QPainter>
+#include <QPainterPath>
#include <QPointF>
#include <QFileInfo>
#include <QFont>
diff --git a/muse3/muse/midiedit/scoreedit.cpp b/muse3/muse/midiedit/scoreedit.cpp
index b963f3ad..788e43c3 100644
--- a/muse3/muse/midiedit/scoreedit.cpp
+++ b/muse3/muse/midiedit/scoreedit.cpp
@@ -44,6 +44,7 @@
#include <QImage>
#include <QInputDialog>
#include <QMessageBox>
+#include <QPainterPath>
#include <stdio.h>
#include "muse_math.h"
diff --git a/muse3/muse/mixer/routedialog.cpp b/muse3/muse/mixer/routedialog.cpp
index 2e6cf0f0..92285b19 100644
--- a/muse3/muse/mixer/routedialog.cpp
+++ b/muse3/muse/mixer/routedialog.cpp
@@ -35,6 +35,7 @@
#include <QLayout>
#include <QFlags>
#include <QVariant>
+#include <QPainterPath>
#include "routedialog.h"
#include "globaldefs.h"
diff --git a/muse3/muse/widgets/meter.cpp b/muse3/muse/widgets/meter.cpp
index 3920e6f6..85d4953a 100644
--- a/muse3/muse/widgets/meter.cpp
+++ b/muse3/muse/widgets/meter.cpp
@@ -28,6 +28,7 @@
#include <QMouseEvent>
#include <QPainter>
+#include <QPainterPath>
#include <QResizeEvent>
#include <QVector>
#include <QLocale>
--
2.21.3

View File

@@ -27,10 +27,9 @@ SRC_URI = " \
git://github.com/muse-sequencer/muse.git \
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 \
file://0003-Fix-buid-with-Qt-5.15.patch \
"
SRCREV = "50f4b71eab801aa49f35b66fdfdca9ab02e08238"
PV = "3.1.0"
SRCREV = "2b479fecc447871c10b08dcd8aabb1ac9b0bdfc7"
PV = "3.1.1"
S = "${WORKDIR}/git"
OECMAKE_SOURCEPATH = "${S}/muse3"