lmms: update to 1.2.2.

Patch is upstream now
Disable Carla weak linking
This commit is contained in:
tibequadorian 2021-03-12 23:45:35 +01:00 committed by Andrew J. Hesford
parent e271e112e3
commit 548a4daa9d
2 changed files with 5 additions and 58 deletions

View file

@ -1,54 +0,0 @@
Source: @pullmoll
Upstream: no
Reason: qt5-5.15.0 requires explicit include for QPainterPath
--- src/gui/AutomationPatternView.cpp 2018-11-03 02:43:42.000000000 +0100
+++ src/gui/AutomationPatternView.cpp 2020-06-30 20:54:11.520449601 +0200
@@ -25,6 +25,7 @@
#include <QMouseEvent>
#include <QPainter>
+#include <QPainterPath>
#include <QMenu>
#include "AutomationEditor.h"
--- src/gui/LmmsStyle.cpp 2018-11-03 02:43:42.000000000 +0100
+++ src/gui/LmmsStyle.cpp 2020-06-30 22:59:34.411837701 +0200
@@ -28,6 +28,7 @@
#include <QApplication>
#include <QFrame>
#include <QPainter>
+#include <QPainterPath>
#include <QStyleFactory>
#include <QStyleOption>
--- src/gui/editors/AutomationEditor.cpp 2018-11-03 02:43:42.000000000 +0100
+++ src/gui/editors/AutomationEditor.cpp 2020-06-30 23:03:53.262851055 +0200
@@ -35,6 +35,7 @@
#include <QLayout>
#include <QMdiArea>
#include <QPainter>
+#include <QPainterPath>
#include <QScrollBar>
#include <QStyleOption>
#include <QToolTip>
--- plugins/Eq/EqSpectrumView.h 2018-11-03 02:43:42.000000000 +0100
+++ plugins/Eq/EqSpectrumView.h 2020-06-30 23:07:48.389863185 +0200
@@ -24,6 +24,7 @@
#define EQSPECTRUMVIEW_H
#include <QPainter>
+#include <QPainterPath>
#include <QWidget>
#include "fft_helpers.h"
--- plugins/Eq/EqCurve.h 2018-11-03 02:43:42.000000000 +0100
+++ plugins/Eq/EqCurve.h 2020-06-30 23:08:21.792864908 +0200
@@ -27,6 +27,7 @@
#include <QGraphicsItem>
#include <QPainter>
+#include <QPainterPath>
#include <QGraphicsSceneWheelEvent>
#include "lmms_math.h"
#include "AutomatableModelView.h"

View file

@ -1,10 +1,11 @@
# Template file for 'lmms'
pkgname=lmms
version=1.2.1
revision=5
version=1.2.2
revision=1
archs="~armv6*"
wrksrc=${pkgname}
build_style=cmake
configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF"
configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF -DWANT_CARLA=OFF"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake extra-cmake-modules
fltk"
makedepends="SDL_sound-devel fltk-devel fluidsynth-devel jack-devel ladspa-sdk
@ -17,7 +18,7 @@ maintainer="Logen K. <logen@sudotask.com>"
license="GPL-2.0-or-later"
homepage="https://lmms.io/"
distfiles="https://github.com/LMMS/lmms/releases/download/v${version}/lmms_${version}.tar.xz"
checksum=5a6d1e82b00a7f54ffb8cf52eff2e0b3ff87cadbe5691917edebe51f64c26ae8
checksum=b185507fb64ecfd8e31145135b58ab244b637f9efc09c4176caf70aa3cbaae1e
build_options="sndio"
build_options_default="sndio"