Hello community,
here is the log from the commit of package lmms for openSUSE:Factory checked in
at 2014-05-10 08:02:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lmms (Old)
and /work/SRC/openSUSE:Factory/.lmms.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lmms"
Changes:
--------
--- /work/SRC/openSUSE:Factory/lmms/lmms.changes 2013-08-12
14:25:48.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.lmms.new/lmms.changes 2014-05-10
08:02:55.000000000 +0200
@@ -1,0 +2,22 @@
+Fri May 9 05:12:09 UTC 2014 - stephan.ba...@suse.com
+
+- update to version 1.0.2 which is bugfix release
+
+-------------------------------------------------------------------
+Fri May 2 06:02:58 UTC 2014 - stephan.ba...@suse.com
+
+- update to version 1.0.0
+- Added BuildRequires for wine to be still able to build the VST plugin
+- Added explicit Requires for %{_bindir}/wineserver which is needed for full
+ VST support
+- removed patches:
+ - lmms-0.4.14-system_fltk.patch
+ lmms now uses system fltk by itself
+- redone patches:
+ - lmms-1.0.0-crippled_stk.patch
+ - lmms-1.0.0-return.patch
+- added Requires for portaudio-devel and pkgconfig(sdl)
+- updated precheckin_cripple_tarball.sh since the tarball name slightly
+ changed
+
+-------------------------------------------------------------------
Old:
----
lmms-0.4.12-return.patch
lmms-0.4.13-crippled_stk.patch
lmms-0.4.14-system_fltk.patch
lmms-0.4.15-crippled.tar.bz2
lmms-0.4.15.tar.bz2
releasenotes-0.4.15.txt
New:
----
lmms-1.0.0-crippled_stk.patch
lmms-1.0.0-return.patch
lmms-1.0.2-src-crippled.tar.bz2
lmms-1.0.2-src.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lmms.spec ++++++
--- /var/tmp/diff_new_pack.S6KN7a/_old 2014-05-10 08:02:56.000000000 +0200
+++ /var/tmp/diff_new_pack.S6KN7a/_new 2014-05-10 08:02:56.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package lmms
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,34 +16,35 @@
#
+# NOTE: Some parts of the upstream tarball have to removed. This can be done
+# by simply running "sh precheckin_cripple_tarball.sh"
+
%bcond_without distributable
%bcond_without crippled_stk
Name: lmms
-Version: 0.4.15
+Version: 1.0.2
Release: 0
Summary: Linux MultiMedia Studio
License: GPL-2.0+
Group: Productivity/Multimedia/Sound/Midi
Url: http://lmms.sourceforge.net/
-%if %{with distributable}
-Source0: lmms-%{version}-crippled.tar.bz2
-%else
-Source0: http://downloads.sourceforge.net/lmms/lmms-%{version}.tar.bz2
-%endif
-Source1: releasenotes-%{version}.txt
+Source0: lmms-%{version}-src-crippled.tar.bz2
+# Used for removing files that are not allowed to be distributed by us
Source99: precheckin_cripple_tarball.sh
-Patch0: lmms-0.4.14-system_fltk.patch
# PATCH-FIX-OPENSUSE Patch for providing proper return code in a function
-Patch2: lmms-0.4.12-return.patch
+Patch2: lmms-1.0.0-return.patch
# PATCH-FIX-OPENSUSE Some parts cannot be build because stk misses some files
due to legal issues (bnc#761147)
-Patch4: lmms-0.4.13-crippled_stk.patch
+Patch4: lmms-1.0.0-crippled_stk.patch
BuildRequires: cmake
BuildRequires: desktop-file-utils
+BuildRequires: fdupes
BuildRequires: fltk-devel
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
BuildRequires: libstk-devel
+BuildRequires: portaudio-devel
+BuildRequires: wine
BuildRequires: pkgconfig(QtCore)
BuildRequires: pkgconfig(QtGui)
BuildRequires: pkgconfig(QtXml)
@@ -54,6 +55,7 @@
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(ogg)
BuildRequires: pkgconfig(samplerate)
+BuildRequires: pkgconfig(sdl)
BuildRequires: pkgconfig(shared-mime-info)
BuildRequires: pkgconfig(sndfile)
BuildRequires: pkgconfig(vorbis)
@@ -73,6 +75,8 @@
%endif
%endif
Recommends: %{_bindir}/wine
+# VeSTige needs wineserver for using VST plugins
+Requires: %{_bindir}/wineserver
%description
LMMS is a free cross-platform music studio which allows you to produce music
@@ -89,13 +93,10 @@
%prep
%setup -q
-%patch0
-%patch2
+%patch2 -p1
%if %{with crippled_stk}
-%patch4
+%patch4 -p1
%endif
-# Ensure we use system fltk
-rm -r plugins/zynaddsubfx/fltk
%build
mkdir build
@@ -116,9 +117,8 @@
cd ..
# Debian menu system
rm -r '%{buildroot}%{_datadir}/menu'
-
mkdir -p '%{buildroot}%{_defaultdocdir}/lmms/'
-cp %{S:1} '%{buildroot}%{_defaultdocdir}/lmms/'
+%fdupes -s %buildroot/%{_datadir}
%post
%icon_theme_cache_post
@@ -137,7 +137,6 @@
%{_mandir}/man1/lmms.1*
%{_libdir}/lmms/
%{_datadir}/lmms/
-%{_defaultdocdir}/lmms/releasenotes-%{version}.txt
%{_datadir}/applications/lmms.desktop
%{_datadir}/pixmaps/lmms.png
%{_datadir}/mime/packages/lmms.xml
++++++ lmms-0.4.13-crippled_stk.patch -> lmms-1.0.0-crippled_stk.patch ++++++
--- /work/SRC/openSUSE:Factory/lmms/lmms-0.4.13-crippled_stk.patch
2012-05-23 08:53:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.lmms.new/lmms-1.0.0-crippled_stk.patch
2014-05-10 08:02:52.000000000 +0200
@@ -1,7 +1,6 @@
-Index: plugins/stk/mallets/mallets.cpp
-===================================================================
---- plugins/stk/mallets/mallets.cpp.orig
-+++ plugins/stk/mallets/mallets.cpp
+diff -urN lmms-1.0.0.old/plugins/stk/mallets/mallets.cpp
lmms-1.0.0/plugins/stk/mallets/mallets.cpp
+--- lmms-1.0.0.old/plugins/stk/mallets/mallets.cpp 2014-03-24
00:00:39.000000000 +0100
++++ lmms-1.0.0/plugins/stk/mallets/mallets.cpp 2014-03-24 08:28:45.557483536
+0100
@@ -30,7 +30,6 @@
#include "BandedWG.h"
@@ -10,7 +9,7 @@
#include "engine.h"
#include "gui_templates.h"
-@@ -111,10 +110,6 @@ malletsInstrument::malletsInstrument( In
+@@ -111,10 +110,6 @@
m_presetsModel.addItem( tr( "Clump" ) );
m_scalers.append( 4.0 );
@@ -21,7 +20,7 @@
// BandedWG
m_presetsModel.addItem( tr( "Uniform Bar" ) );
m_scalers.append( 25.0 );
-@@ -145,13 +140,6 @@ void malletsInstrument::saveSettings( QD
+@@ -145,13 +140,6 @@
m_vibratoFreqModel.saveSettings( _doc, _this, "vib_freq" );
m_stickModel.saveSettings( _doc, _this, "stick_mix" );
@@ -35,7 +34,7 @@
// BandedWG
m_pressureModel.saveSettings( _doc, _this, "pressure" );
m_motionModel.saveSettings( _doc, _this, "motion" );
-@@ -175,13 +163,6 @@ void malletsInstrument::loadSettings( co
+@@ -175,13 +163,6 @@
m_vibratoFreqModel.loadSettings( _this, "vib_freq" );
m_stickModel.loadSettings( _this, "stick_mix" );
@@ -49,9 +48,9 @@
// BandedWG
m_pressureModel.loadSettings( _this, "pressure" );
m_motionModel.loadSettings( _this, "motion" );
-@@ -235,19 +216,6 @@ void malletsInstrument::playNote( notePl
- (Uint8) m_spreadModel.value(),
- engine::getMixer()->processingSampleRate() );
+@@ -235,19 +216,6 @@
+ (uint8_t) m_spreadModel.value(),
+ engine::mixer()->processingSampleRate() );
}
- else if( p == 9 )
- {
@@ -63,68 +62,66 @@
- m_crossfadeModel.value(),
- m_lfoSpeedModel.value(),
- m_adsrModel.value(),
-- (Uint8) m_spreadModel.value(),
-- engine::getMixer()->processingSampleRate() );
+- (uint8_t) m_spreadModel.value(),
+- engine::mixer()->processingSampleRate() );
- }
else
{
_n->m_pluginData = new malletsSynth( freq,
-@@ -311,10 +279,6 @@ malletsInstrumentView::malletsInstrument
- m_modalBarWidget = setupModalBarControls( this );
- setWidgetBackground( m_modalBarWidget, "artwork" );
+@@ -313,11 +281,6 @@
+ m_modalBarWidget->show();
+ m_modalBarWidget->move( 0,0 );
- m_tubeBellWidget = setupTubeBellControls( this );
- setWidgetBackground( m_tubeBellWidget, "artwork" );
- m_tubeBellWidget->hide();
+- m_tubeBellWidget->move( 0,0 );
-
m_bandedWGWidget = setupBandedWGControls( this );
setWidgetBackground( m_bandedWGWidget, "artwork" );
m_bandedWGWidget->hide();
-@@ -388,43 +352,6 @@ QWidget * malletsInstrumentView::setupMo
+@@ -393,40 +356,6 @@
--
-QWidget * malletsInstrumentView::setupTubeBellControls( QWidget * _parent )
-{
- QWidget * widget = new QWidget( _parent );
- widget->setFixedSize( 250, 250 );
-
-- m_modulatorKnob = new knob( knobBright_26, widget );
+- m_modulatorKnob = new knob( knobVintage_32, widget );
- m_modulatorKnob->setLabel( tr( "Modulator" ) );
-- m_modulatorKnob->move( 145, 24 );
+- m_modulatorKnob->move( 30, 90 );
- m_modulatorKnob->setHintText( tr( "Modulator:" ) + " ", "" );
-
-- m_crossfadeKnob = new knob( knobBright_26, widget );
+- m_crossfadeKnob = new knob( knobVintage_32, widget );
- m_crossfadeKnob->setLabel( tr( "Crossfade" ) );
-- m_crossfadeKnob->move( 195, 24 );
+- m_crossfadeKnob->move( 110, 90 );
- m_crossfadeKnob->setHintText( tr( "Crossfade:" ) + " ", "" );
-
-- m_lfoSpeedKnob = new knob( knobBright_26, widget );
+- m_lfoSpeedKnob = new knob( knobVintage_32, widget );
- m_lfoSpeedKnob->setLabel( tr( "LFO Speed" ) );
-- m_lfoSpeedKnob->move( 56, 86 );
+- m_lfoSpeedKnob->move( 30, 140 );
- m_lfoSpeedKnob->setHintText( tr( "LFO Speed:" ) + " ", "" );
-
-- m_lfoDepthKnob = new knob( knobBright_26, widget );
+- m_lfoDepthKnob = new knob( knobVintage_32, widget );
- m_lfoDepthKnob->setLabel( tr( "LFO Depth" ) );
-- m_lfoDepthKnob->move( 117, 86 );
+- m_lfoDepthKnob->move( 110, 140 );
- m_lfoDepthKnob->setHintText( tr( "LFO Depth:" ) + " ", "" );
-
-- m_adsrKnob = new knob( knobBright_26, widget );
+- m_adsrKnob = new knob( knobVintage_32, widget );
- m_adsrKnob->setLabel( tr( "ADSR" ) );
-- m_adsrKnob->move( 178, 86 );
+- m_adsrKnob->move( 190, 90 );
- m_adsrKnob->setHintText( tr( "ADSR:" ) + " ", "" );
-
- return( widget );
-}
-
-
--
--
+
+
QWidget * malletsInstrumentView::setupBandedWGControls( QWidget * _parent )
- {
- // BandedWG
-@@ -468,11 +395,6 @@ void malletsInstrumentView::modelChanged
+@@ -472,11 +401,6 @@
m_vibratoGainKnob->setModel( &inst->m_vibratoGainModel );
m_vibratoFreqKnob->setModel( &inst->m_vibratoFreqModel );
m_stickKnob->setModel( &inst->m_stickModel );
@@ -136,7 +133,7 @@
m_pressureKnob->setModel( &inst->m_pressureModel );
m_motionKnob->setModel( &inst->m_motionModel );
m_vibratoKnob->setModel( &inst->m_vibratoModel );
-@@ -493,7 +415,6 @@ void malletsInstrumentView::changePreset
+@@ -497,7 +421,6 @@
printf("malletsInstrumentView %d\n", _preset);
if( _preset < 9 )
{
@@ -144,7 +141,7 @@
m_bandedWGWidget->hide();
m_modalBarWidget->show();
}
-@@ -501,12 +422,10 @@ void malletsInstrumentView::changePreset
+@@ -505,12 +428,10 @@
{
m_modalBarWidget->hide();
m_bandedWGWidget->hide();
@@ -157,11 +154,10 @@
m_bandedWGWidget->show();
}
}
-@@ -559,52 +478,6 @@ malletsSynth::malletsSynth( const StkFlo
+@@ -564,50 +485,6 @@
--
-// TubeBell
-malletsSynth::malletsSynth( const StkFloat _pitch,
- const StkFloat _velocity,
@@ -171,7 +167,7 @@
- const StkFloat _control4,
- const StkFloat _control11,
- const StkFloat _control128,
-- const Uint8 _delay,
+- const uint8_t _delay,
- const sample_rate_t _sample_rate )
-{
- try
@@ -198,7 +194,7 @@
- m_delay = new StkFloat[256];
- m_delayRead = 0;
- m_delayWrite = _delay;
-- for( Uint16 i = 0; i < 256; i++ )
+- for( int i = 0; i < 256; i++ )
- {
- m_delay[i] = 0.0;
- }
@@ -206,16 +202,14 @@
-
-
-
--
+
// BandedWG
malletsSynth::malletsSynth( const StkFloat _pitch,
- const StkFloat _velocity,
-Index: plugins/stk/mallets/mallets.h
-===================================================================
---- plugins/stk/mallets/mallets.h.orig
-+++ plugins/stk/mallets/mallets.h
-@@ -58,18 +58,6 @@ public:
- const Uint8 _delay,
+diff -urN lmms-1.0.0.old/plugins/stk/mallets/mallets.h
lmms-1.0.0/plugins/stk/mallets/mallets.h
+--- lmms-1.0.0.old/plugins/stk/mallets/mallets.h 2014-03-24
00:00:39.000000000 +0100
++++ lmms-1.0.0/plugins/stk/mallets/mallets.h 2014-03-24 08:29:33.317983335
+0100
+@@ -58,18 +58,6 @@
+ const uint8_t _delay,
const sample_rate_t _sample_rate );
- // TubeBell
@@ -227,13 +221,13 @@
- const StkFloat _control4,
- const StkFloat _control11,
- const StkFloat _control128,
-- const Uint8 _delay,
+- const uint8_t _delay,
- const sample_rate_t _sample_rate );
-
// BandedWG
malletsSynth( const StkFloat _pitch,
const StkFloat _velocity,
-@@ -199,7 +187,6 @@ private:
+@@ -199,7 +187,6 @@
void setWidgetBackground( QWidget * _widget, const QString & _pic );
QWidget * setupModalBarControls( QWidget * _parent );
@@ -241,7 +235,7 @@
QWidget * setupBandedWGControls( QWidget * _parent );
QWidget * m_modalBarWidget;
-@@ -209,13 +196,6 @@ private:
+@@ -209,13 +196,6 @@
knob * m_vibratoFreqKnob;
knob * m_stickKnob;
++++++ lmms-0.4.12-return.patch -> lmms-1.0.0-return.patch ++++++
--- /work/SRC/openSUSE:Factory/lmms/lmms-0.4.12-return.patch 2012-05-23
08:53:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.lmms.new/lmms-1.0.0-return.patch
2014-05-10 08:02:52.000000000 +0200
@@ -1,12 +1,11 @@
-Index: plugins/midi_import/portsmf/allegro.cpp
-===================================================================
---- plugins/midi_import/portsmf/allegro.cpp.orig
-+++ plugins/midi_import/portsmf/allegro.cpp
-@@ -2297,6 +2297,7 @@ Alg_event_ptr &Alg_seq::operator[](int i
+diff -urN lmms-1.0.0.old/plugins/midi_import/portsmf/allegro.cpp
lmms-1.0.0/plugins/midi_import/portsmf/allegro.cpp
+--- lmms-1.0.0.old/plugins/midi_import/portsmf/allegro.cpp 2014-03-24
00:00:39.000000000 +0100
++++ lmms-1.0.0/plugins/midi_import/portsmf/allegro.cpp 2014-03-24
07:57:08.376352912 +0100
+@@ -2298,6 +2298,7 @@
tr++;
}
- assert(false); // out of bounds
-+ exit(EXIT_FAILURE);
+ assert(false); // out of bounds
++ exit(EXIT_FAILURE);
}
++++++ precheckin_cripple_tarball.sh ++++++
--- /var/tmp/diff_new_pack.S6KN7a/_old 2014-05-10 08:02:56.000000000 +0200
+++ /var/tmp/diff_new_pack.S6KN7a/_new 2014-05-10 08:02:56.000000000 +0200
@@ -5,7 +5,7 @@
# Find source tarball + unpack
tmp="$(mktemp)"
trap 'rm -f $tmp; echo 1>&2 "$0 failed"' EXIT
-tarsource="$(echo lmms-*[0-9].tar.bz2)"
+tarsource="$(echo lmms-*[0-9]-src.tar.bz2)"
if [ ! -s "$tarsource" ] ; then
echo "Error: cannot find source tarball"
exit 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
