Hello community, here is the log from the commit of package muse checked in at Sat Jan 12 03:02:02 CET 2008. -------- --- muse/muse.changes 2006-03-31 15:32:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/muse/muse.changes 2008-01-11 16:24:53.000000000 +0100 @@ -1,0 +2,30 @@ +Fri Jan 11 16:24:25 CET 2008 - lrupp@suse.de + +- require qjackctl (as mentioned in README) +- build only on ix86, amd64 and ppc64 + +------------------------------------------------------------------- +Fri Jan 4 17:36:42 CET 2008 - duwe@suse.de + +- update to svn revision 331, +- hacked to build on amd64 +- fixed for gcc-4.3 compilation + +------------------------------------------------------------------- +Wed Jun 13 01:40:24 CEST 2007 - ro@suse.de + +- use texlive instead of tetex + +------------------------------------------------------------------- +Thu Jan 18 14:57:38 CET 2007 - duwe@suse.de + +- internal DSSI synth "zynaddsubfx" GUI program needs fltk + +------------------------------------------------------------------- +Tue Jan 16 12:11:03 CET 2007 - duwe@suse.de + +- update to 1.0pre1: + + Qt4-based, now building with cmake + + DSSI supported(!) + +------------------------------------------------------------------- Old: ---- deicsonze-envelope-retvalfix muse-0.8.1a.tar.gz vamgui-init-popenFlag zeroint-to-nullptr New: ---- dspSSE.cpp.amd64 muse-1.0pre1-svn331.diff.bz2 muse-1.0pre1.tar.bz2 muse-gcc43fix ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ muse.spec ++++++ --- /var/tmp/diff_new_pack.p15016/_old 2008-01-12 03:00:08.000000000 +0100 +++ /var/tmp/diff_new_pack.p15016/_new 2008-01-12 03:00:08.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package muse (Version 0.8.1) +# spec file for package muse (Version 1.0pre1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,26 +11,46 @@ # norootforbuild Name: muse -BuildRequires: alsa-devel e2fsprogs-devel flac-devel fluidsynth-devel glib-devel jack-devel libdrm-devel libjpeg-devel libsamplerate-devel libsndfile-devel qt3-devel readline-devel update-desktop-files -%define my_provides /tmp/my-provides -%define qtlink %(/usr/bin/linkto /usr/lib/qt3) Summary: MIDI Music Editor -Version: 0.8.1 -Release: 2 -License: GPL +Version: 1.0pre1 +Release: 5 +License: GPL v2 or later Group: Productivity/Multimedia/Sound/Midi -BuildRoot: %{_tmppath}/%{name}-%{version}-build -URL: http://muse-sequencer.org -Source: muse-%{version}a.tar.gz +Url: http://muse-sequencer.org +Requires: qjackctl +BuildRequires: alsa-devel cmake doxygen dssi flac-devel fltk-devel fluidsynth-devel +BuildRequires: glib-devel jack-devel libdrm-devel libjpeg-devel liblo-devel libqt4-devel +BuildRequires: libsamplerate-devel libsndfile-devel mxml-devel readline-devel texlive update-desktop-files +Source: muse-%{version}.tar.bz2 Source1: README.SuSE Source2: %name.desktop -Patch: deicsonze-envelope-retvalfix -Patch2: zeroint-to-nullptr -Patch3: vamgui-init-popenFlag +# from ardour-2.1 +Source3: dspSSE.cpp.amd64 +Patch0: muse-1.0pre1-svn331.diff.bz2 +Patch2: muse-gcc43fix +BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExclusiveArch: %ix86 x86_64 +%define my_provides /tmp/my-provides +%define _use_internal_dependency_generator 0 %description -MusE is a MIDI sequencer with recording and editing capabilities. It is -fully multithreaded with a Qt GUI. +MusE aims to be a complete multitrack virtual studio for Linux. MusE +contains a MIDI sequencer with recording and editing capabilities. It +is fully multithreaded with a Qt GUI. + +MusE has among other things support for: + +* Midi sequencing (Record/Playback/Import) + +* Audio sequencing (AudioGroups; Record/Playback several mono/stereo + inputs/outputs) + +* LASH (Perform audio effects like chorus/flanger in realtime) + +* Jack - jack-audio-connection-kit (for midi/audio routing; Internal + Audio Routing Interface) + +* ALSA - based on the Advanced Linux Sound Architecture @@ -40,33 +60,23 @@ %prep %setup -q +mkdir obj %patch -p1 %patch2 -p1 -%patch3 -p1 -# rename docs -cp plugins/freeverb/readme.txt README.freeverb -cp synti/vam/README README.vam -cp synti/vam/TODO TODO.vam +## rename docs +#cp plugins/freeverb/readme.txt README.freeverb +#cp synti/vam/README README.vam +#cp synti/vam/TODO TODO.vam cp %{SOURCE1} . +%ifarch x86_64 +cp -p %{SOURCE3} al/dspSSE.cpp +%endif %build -# export QTDIR=/usr/lib/qt3 -# sh ./autogen.sh -# autoreconf --force --install -CFLAGS="$RPM_OPT_FLAGS" \ -CXXFLAGS="$RPM_OPT_FLAGS" \ -./configure \ - --prefix=%{_prefix} \ - --libdir=%{_prefix}/%_lib \ - --disable-suid-install \ - --disable-qttest \ - --with-qt-dir=/usr/lib/qt3 \ - --with-qt-libraries=/usr/lib/qt3/%_lib -make +(cd obj && cmake -DCMAKE_INSTALL_PREFIX=/usr .. && make) %install -[ "$RPM_BUILD_ROOT" != "/" -a -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT -make DESTDIR="$RPM_BUILD_ROOT" SUIDINSTALL=no install +make -C obj DESTDIR="$RPM_BUILD_ROOT" install # exclude plugins from the provide-list cat << EOF > %{my_provides} grep -v $RPM_BUILD_ROOT%{_libdir}/muse | %{__find_provides} @@ -77,8 +87,8 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps install -c -m 644 packaging/muse_icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/muse.png # convert to UTF-8 -iconv -fiso8859-1 -tutf-8 README.de > README.de.UTF-8 -mv -f README.de.UTF-8 README.de +# iconv -fiso8859-1 -tutf-8 README.de > README.de.UTF-8 +# mv -f README.de.UTF-8 README.de %clean [ "$RPM_BUILD_ROOT" != "/" -a -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT @@ -86,18 +96,30 @@ %files %defattr(-, root, root) +%doc COPYING ChangeLog NEWS README README.* SECURITY %{_bindir}/* -%{_libdir}/muse -%{_datadir}/muse -%if %suse_version > 820 -/usr/share/applications/*.desktop -%endif +%{_prefix}/lib/%{name}-%{version} +%{_datadir}/%{name}-%{version} +%{_datadir}/applications/*.desktop %{_datadir}/pixmaps/*.png -%doc AUTHORS COPYING ChangeLog NEWS README README.* SECURITY -%doc demos/*.med -# /usr/lib/%{qtlink}/plugins/designer/* +%{_libdir}/qt4/plugins/designer/libawlplugin.so -%changelog -n muse +%changelog +* Fri Jan 11 2008 - lrupp@suse.de +- require qjackctl (as mentioned in README) +- build only on ix86, amd64 and ppc64 +* Fri Jan 04 2008 - duwe@suse.de +- update to svn revision 331, +- hacked to build on amd64 +- fixed for gcc-4.3 compilation +* Wed Jun 13 2007 - ro@suse.de +- use texlive instead of tetex +* Thu Jan 18 2007 - duwe@suse.de +- internal DSSI synth "zynaddsubfx" GUI program needs fltk +* Tue Jan 16 2007 - duwe@suse.de +- update to 1.0pre1: + + Qt4-based, now building with cmake + + DSSI supported(!) * Fri Mar 31 2006 - duwe@suse.de - update to 0.8.1, fixing a newly introduced uninitialized var * Wed Jan 25 2006 - mls@suse.de ++++++ muse-1.0pre1-svn331.diff.bz2 ++++++ ++++ 68568 lines (skipped) ++++++ muse.desktop ++++++ --- muse/muse.desktop 2006-03-31 15:32:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/muse/muse.desktop 2008-01-11 16:09:16.000000000 +0100 @@ -1,6 +1,9 @@ [Desktop Entry] +Encoding=UTF-8 Type=Application Exec=muse Comment=MusE MIDI/Audio sequencer Name=Muse Icon=muse +StartupNotify=true +Terminal=false ++++++ muse-gcc43fix ++++++ --- muse-1.0pre1/muse/midiedit/ecanvas.cpp.orig 2008-01-04 12:34:02.000000000 +0100 +++ muse-1.0pre1/muse/midiedit/ecanvas.cpp 2008-01-04 12:41:26.000000000 +0100 @@ -28,6 +28,7 @@ #include "part.h" #include "audio.h" #include "midi.h" +#include <cstdlib> //--------------------------------------------------------- // EventCanvas --- muse-1.0pre1/plugins/pandelay/pandelaymodel.h.orig 2008-01-04 14:27:42.000000000 +0100 +++ muse-1.0pre1/plugins/pandelay/pandelaymodel.h 2008-01-04 15:53:03.000000000 +0100 @@ -42,8 +42,6 @@ #define MINDELAYTIME 0.01 //in second #define MAXDELAYTIME 2.0 //in second -#define NBRPARAM 5 - class PanDelayModel { private: int _samplerate; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org