Hello community,
here is the log from the commit of package lmms for openSUSE:Factory checked in
at 2020-04-02 17:43:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lmms (Old)
and /work/SRC/openSUSE:Factory/.lmms.new.3248 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lmms"
Thu Apr 2 17:43:03 2020 rev:31 rq:790875 version:1.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/lmms/lmms.changes 2019-09-11
10:40:32.475218473 +0200
+++ /work/SRC/openSUSE:Factory/.lmms.new.3248/lmms.changes 2020-04-02
17:43:05.977384143 +0200
@@ -1,0 +2,34 @@
+Sun Mar 29 09:34:51 UTC 2020 - Dave Plater <davejpla...@gmail.com>
+
+- Update to version 1.2.1 and enable wine dependent vst plugins in
+ a seperate subpackage, see boo#1167345.
+- Added tarballs for two VST specific 3rd party tarballs:
+ rpmalloc b5bdc18051bb74a22f0bde4bcc90b01cf590b496.tar.gz
+ and qt5-x11embed 022b39a1d496d72eb3e5b5188e5559f66afca957.tar.gz
+- Added lmms-rpmalloc-fpic.patch
+- Removed incorporated patches:
+ 0001-Better-French-translations-in-the-menu-item-file-471.patch
+ 0001-Fix-invalid-MIDI-Program-Change-decoding-5154.patch
+ 0001-show-BBEditor-on-clicking-the-TrackLabelButton-5060.patch
+ 0001-Make-splash-screen-text-white-5149.patch
+ 0001-Update-.mailmap-5037.patch
+- Upstream changes:
+ *Respect OS case sensitivity when check for existing files #4768
+ *Remove MIDI connections from factory .mmpz files (#5163)
+ *Make splash screen text white (#5149)
+ *Show Beat/Bassline Editor on clicking track labels of B/B tracks
+ (#5060)
+ *Fix building RemoteVstPlugin with Wine >= 4.14 (#5210)
+ *Fix stuck keys when dragging on the piano view (#5127)
+ *Fix crash on unmarking octave semitones (#5184)
+ *Fix invalid MIDI Program Change decoding (#5154)
+ *Rubberband fix for selecting a large area in the song editor
+ (#5003)
+ *VeSTige: show icon on 'Turn off all notes' button (#5237)
+ *RemoteVstPlugin: fix crashes when failed to open a file (#5235)
+ *Organic: fix glitch at the beginning of a note (#5252)
+ *Fix broken audio sample exporting on high sampling rate (#5226)
+ *Better French translations in the menu item file (#4711)
+ *Fix too long translations to fix the UI misalignment (#5185)
+
+-------------------------------------------------------------------
Old:
----
0001-Better-French-translations-in-the-menu-item-file-471.patch
0001-Fix-invalid-MIDI-Program-Change-decoding-5154.patch
0001-Make-splash-screen-text-white-5149.patch
0001-Update-.mailmap-5037.patch
0001-show-BBEditor-on-clicking-the-TrackLabelButton-5060.patch
_service
_servicedata
lmms-1.2.0.obscpio
lmms-1.2.0.tar.xz
lmms.obsinfo
New:
----
022b39a1d496d72eb3e5b5188e5559f66afca957.tar.gz
b5bdc18051bb74a22f0bde4bcc90b01cf590b496.tar.gz
lmms-1.2.1.tar.gz
lmms-rpmalloc-fpic.patch
lmms-warning
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lmms.spec ++++++
--- /var/tmp/diff_new_pack.YXvNHi/_old 2020-04-02 17:43:08.005385713 +0200
+++ /var/tmp/diff_new_pack.YXvNHi/_new 2020-04-02 17:43:08.005385713 +0200
@@ -1,7 +1,7 @@
#
# spec file for package lmms
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,20 +18,26 @@
# Since 42.2 RPM creates a hard requirement on a build time library
(libvstbase), the requirement is unnecessary and bad
%global __requires_exclude_from ^%{_libdir}/lmms/.*\\.so$
+# The revision numbers for rpmalloc and qt5-x11embed come from accessing them
via
+# https://github.com/LMMS/lmms/tree/v%%{version}/src/3rdparty/qt5-x11embed and
+# https://github.com/LMMS/lmms/tree/v1.2.1/src/3rdparty/rpmalloc/rpmalloc (two
directories not a mistake)
+%define rpmallocrev b5bdc18051bb74a22f0bde4bcc90b01cf590b496
+%define qt5x11embedrev 022b39a1d496d72eb3e5b5188e5559f66afca957
+
%bcond_without carla
%bcond_without crippled_stk
-#Vst plugins need wine but this causes build failure.
-%bcond_with wine
-#This is only needed because 1.2.0rc was used. Remove with next sane update
(See also prep)
-%define rversion 1.2.0
+%bcond_without wine
Name: lmms
-Version: 1.2.0.9
+Version: 1.2.1
Release: 0
Summary: Linux MultiMedia Studio
License: GPL-2.0-or-later
Group: Productivity/Multimedia/Sound/Midi
URL: https://lmms.io/
-Source0: %{name}-%{rversion}.tar.xz
+Source0:
https://github.com/LMMS/lmms/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source1:
https://github.com/mjansson/rpmalloc/archive/%{rpmallocrev}.tar.gz
+Source2:
https://github.com/lukas-w/qt5-x11embed/archive/%{qt5x11embedrev}.tar.gz
+Source3: lmms-warning
# PATCH-FIX-OPENSUSE Patch for providing proper return code in a function
Patch0: lmms-1.2.0-return.patch
%if %{with crippled_stk}
@@ -39,18 +45,14 @@
Patch1: lmms-1.2.0-crippled_stk.patch
%endif
# PATCH-FIX-UPSTREAM Fix plugin library search path, testing an upstream
proposal
-Patch3: lmms-1.2.0-libdir.patch
-#Patches From git fixes after 1.2.0 release
-Patch4: 0001-Update-.mailmap-5037.patch
-Patch5: 0001-Better-French-translations-in-the-menu-item-file-471.patch
-Patch6: 0001-Fix-invalid-MIDI-Program-Change-decoding-5154.patch
-Patch7: 0001-Make-splash-screen-text-white-5149.patch
-Patch8: 0001-show-BBEditor-on-clicking-the-TrackLabelButton-5060.patch
+Patch2: lmms-1.2.0-libdir.patch
+Patch3: lmms-rpmalloc-fpic.patch
BuildRequires: bash-completion
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: fdupes
+BuildRequires: filesystem
BuildRequires: fltk-devel
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
@@ -83,11 +85,30 @@
BuildRequires: pkgconfig(xcb-util)
BuildRequires: pkgconfig(zlib)
%if %{with wine}
+#Extra packages
+BuildRequires: extra-cmake-modules
BuildRequires: gcc-c++-32bit
+BuildRequires: libQt5DBus-private-headers-devel
+BuildRequires: libQt5KmsSupport-devel-static
+BuildRequires: libQt5KmsSupport-private-headers-devel
+BuildRequires: libQt5Network-private-headers-devel
+BuildRequires: libQt5OpenGL-private-headers-devel
+BuildRequires: libQt5PlatformSupport-devel-static
+BuildRequires: libQt5PlatformSupport-private-headers-devel
+BuildRequires: libQt5PrintSupport-private-headers-devel
+BuildRequires: libQt5Sql-private-headers-devel
+BuildRequires: libqt5-qtbase-private-headers-devel
+BuildRequires: libstdc++-devel-32bit
+BuildRequires: libxkbcommon-x11-devel
+BuildRequires: mtdev-devel
+BuildRequires: tslib
+BuildRequires: tslib-devel
+BuildRequires: tslib-plugins
+#!BuildIgnore: sane-backends-32bit
BuildRequires: wine
BuildRequires: wine-devel
BuildRequires: wine-devel-32bit
-Suggests: wine
+Suggests: %{name}-vst = %{version}
%endif
ExclusiveArch: x86_64
%if %{with carla}
@@ -101,6 +122,22 @@
LMMS is a free cross-platform music studio which allows you to produce music
with your computer. This includes the creation of melodies and beats, the
synthesis and mixing of sounds, and arranging of samples.
+%if %{with wine}
+You need to install lmms-vst for VST plugins
+
+%package vst
+Summary: Wine dependent VST plugins
+Group: Productivity/Multimedia/Sound/Midi
+Requires: %{name} = %{version}
+Obsoletes: %{name} < 1.2.1
+Requires: wine
+
+%description vst
+LMMS is a free cross-platform music studio which allows you to produce music
+with your computer. This includes the creation of melodies and beats, the
+synthesis and mixing of sounds, and arranging of samples.
+This package contains the wine dependent VST plugins
+%endif
%package devel
Summary: Headers to create LMMS plugins
@@ -111,10 +148,27 @@
create a LMMS plugin.
%prep
-%setup -q -n %{name}-%{rversion}
+%setup -q -n %{name}-%{version}
%autopatch -p1
+pushd src/3rdparty
+rm -rf qt5-x11embed
+tar -xf %{S:2} && mv qt5-x11embed-%{qt5x11embedrev} qt5-x11embed
+pushd qt5-x11embed
+rm -rf 3rdparty/ECM
+ln -s /usr/share/ECM 3rdparty/ECM
+popd
+cd rpmalloc && rm -rf rpmalloc && tar -xf %{S:1} && mv rpmalloc-%{rpmallocrev}
rpmalloc
+popd
+# This doesn't do anything but cause trouble
+rm plugins/LadspaEffect/swh/ladspa-util.c
%build
+%if %{with wine}
+#Remove -m64 from CFLAGS, it causes VST build failure.
+export CFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector
-funwind-tables -fasynchronous-unwind-tables"
+%define optflags $CFLAGS
+%endif
+export CFLAGS="$CFLAGS -fPIC"
%cmake \
%if %{with wine}
-DCMAKE_CXX_FLAGS:STRING="%{optflags}
-D__WIDL_objidl_generated_name_0000000C=""" \
@@ -126,7 +180,8 @@
-DCMAKE_EXE_LINKER_FLAGS:STRING="$LDFLAGS -pie" \
-DCMAKE_SKIP_RPATH=OFF \
-Wno-dev
-%make_jobs || make
+
+%make_jobs
%install
%cmake_install
@@ -135,9 +190,12 @@
rm %{buildroot}%{_libdir}/libqx11embedcontainer.a
# workaround: copy bash completion manually into install dir because it fails
during cmake install
mkdir -p %{buildroot}/%{_datadir}/bash-completion/completions
-cp %{_builddir}/lmms*/doc/bash-completion/lmms
%{buildroot}/%{_datadir}/bash-completion/completions/lmms
+cp %{_builddir}/lmms*/doc/bash-completion/lmms
%{buildroot}%{_datadir}/bash-completion/completions/lmms
%fdupes -s %{buildroot}/%{_datadir}
+mkdir -p %{buildroot}%{_localstatedir}/adm/update-messages/
+#%%{name}-warning
+cp %{S:3} %{buildroot}%{_localstatedir}/adm/update-messages/
%files
%doc doc/AUTHORS README.md INSTALL.txt
@@ -151,6 +209,21 @@
%{_datadir}/mime/packages/lmms.xml
%{_datadir}/bash-completion/completions/lmms
+%if %{with wine}
+%{_localstatedir}/adm/update-messages/%{name}-warning
+%exclude %{_libdir}/lmms/RemoteVstPlugin
+%exclude %{_libdir}/lmms/RemoteVstPlugin.exe.so
+%exclude %{_libdir}/lmms/libvsteffect.so
+
+%post
+cat %{_localstatedir}/adm/update-messages/%{name}-warning
+
+%files vst
+%{_libdir}/lmms/RemoteVstPlugin
+%{_libdir}/lmms/RemoteVstPlugin.exe.so
+%{_libdir}/lmms/libvsteffect.so
+%endif
+
%files devel
%defattr(0644,root,root,0755)
%{_includedir}/lmms/
++++++ lmms-1.2.0-libdir.patch ++++++
--- /var/tmp/diff_new_pack.YXvNHi/_old 2020-04-02 17:43:08.029385732 +0200
+++ /var/tmp/diff_new_pack.YXvNHi/_new 2020-04-02 17:43:08.029385732 +0200
@@ -1,7 +1,8 @@
-diff -up lmms/cmake/modules/DetectMachine.cmake.orig
lmms/cmake/modules/DetectMachine.cmake
---- lmms/cmake/modules/DetectMachine.cmake.orig 2018-08-06
08:43:43.000000000 +0200
-+++ lmms/cmake/modules/DetectMachine.cmake 2018-10-30 17:32:32.385021508
+0100
-@@ -42,6 +42,13 @@ ENDIF(IS_X86)
+Index: lmms-1.2.1/cmake/modules/DetectMachine.cmake
+===================================================================
+--- lmms-1.2.1.orig/cmake/modules/DetectMachine.cmake 2020-03-28
13:53:04.556153597 +0200
++++ lmms-1.2.1/cmake/modules/DetectMachine.cmake 2020-03-28
13:55:13.925217058 +0200
+@@ -44,6 +44,13 @@ ENDIF(IS_X86)
IF(CMAKE_INSTALL_LIBDIR)
SET(LIB_DIR "${CMAKE_INSTALL_LIBDIR}")
++++++ lmms-1.2.0-return.patch ++++++
--- /var/tmp/diff_new_pack.YXvNHi/_old 2020-04-02 17:43:08.037385738 +0200
+++ /var/tmp/diff_new_pack.YXvNHi/_new 2020-04-02 17:43:08.041385742 +0200
@@ -1,7 +1,8 @@
-diff -urN lmms-1.1.0.old/plugins/midi_import/portsmf/allegro.cpp
lmms-1.1.0/plugins/midi_import/portsmf/allegro.cpp
---- lmms-1.2.0.old/plugins/MidiImport/portsmf/allegro.cpp 2019-06-18
00:00:39.000000000 +0100
-+++ lmms-1.1.0/plugins/MidiImport/portsmf/allegro.cpp 2019-06-18
11:44:25.376352912 +0100
-@@ -2302,6 +2302,7 @@
+Index: lmms-1.2.1/plugins/MidiImport/portsmf/allegro.cpp
+===================================================================
+--- lmms-1.2.1.orig/plugins/MidiImport/portsmf/allegro.cpp 2020-03-28
13:53:04.668157976 +0200
++++ lmms-1.2.1/plugins/MidiImport/portsmf/allegro.cpp 2020-03-28
13:55:02.828782278 +0200
+@@ -2300,6 +2300,7 @@ Alg_event_ptr &Alg_seq::operator[](int i
tr++;
}
assert(false); // out of bounds
++++++ lmms-rpmalloc-fpic.patch ++++++
From: Plater <davejpla...@gmail.com>
Date: Sat 28 Mar 13:58:16 SAST 2020
Subject: rpmalloc needs to build with -fPIC
Add -fPIC to rpmalloc's CMakeLists.txt CFLAGS
Index: lmms-1.2.1/src/3rdparty/rpmalloc/CMakeLists.txt
===================================================================
--- lmms-1.2.1.orig/src/3rdparty/rpmalloc/CMakeLists.txt 2019-10-21
02:27:12.000000000 +0200
+++ lmms-1.2.1/src/3rdparty/rpmalloc/CMakeLists.txt 2020-03-28
14:04:13.314446543 +0200
@@ -1,4 +1,4 @@
-set(CMAKE_C_FLAGS "-std=c11")
+set(CMAKE_C_FLAGS "-std=c11 -fPIC")
add_library(rpmalloc STATIC
rpmalloc/rpmalloc/rpmalloc.c
++++++ lmms-warning ++++++
WARNING: This version of lmms has VST support but if
you wish to use it you will need to install lmms-vst.
This is to prevent an unnecessary dependency on wine.
