Hello community,
here is the log from the commit of package muse
checked in at Mon May 5 01:00:04 CEST 2008.
--------
--- muse/muse.changes 2008-01-14 18:18:54.000000000 +0100
+++ /mounts/work_src_done/STABLE/muse/muse.changes 2008-05-03 08:20:43.000000000 +0200
@@ -1,0 +2,5 @@
+Sat May 3 08:20:33 CEST 2008 - dmueller@suse.de
+
+- fix build against qt4.4
+
+-------------------------------------------------------------------
New:
----
qatomic-qt-4.4.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ muse.spec ++++++
--- /var/tmp/diff_new_pack.SR1204/_old 2008-05-05 00:57:48.000000000 +0200
+++ /var/tmp/diff_new_pack.SR1204/_new 2008-05-05 00:57:48.000000000 +0200
@@ -10,10 +10,11 @@
# norootforbuild
+
Name: muse
Summary: MIDI Music Editor
Version: 1.0pre1
-Release: 7
+Release: 11
License: GPL v2 or later
Group: Productivity/Multimedia/Sound/Midi
Url: http://muse-sequencer.org
@@ -28,6 +29,7 @@
Source3: dspSSE.cpp.amd64
Patch0: muse-1.0pre1-svn331.diff.bz2
Patch2: muse-gcc43fix
+Patch3: qatomic-qt-4.4.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
%define my_provides /tmp/my-provides
@@ -71,6 +73,7 @@
%ifarch x86_64
cp -p %{SOURCE3} al/dspSSE.cpp
%endif
+%patch3
%build
(cd obj && cmake -DCMAKE_INSTALL_PREFIX=/usr .. && make)
@@ -105,202 +108,204 @@
%{_libdir}/qt4/plugins/designer/libawlplugin.so
%changelog
-* Mon Jan 14 2008 - duwe@suse.de
+* Sat May 03 2008 dmueller@suse.de
+- fix build against qt4.4
+* Mon Jan 14 2008 duwe@suse.de
- require fftw3-devel (for zynaddsubfx)
-* Fri Jan 11 2008 - lrupp@suse.de
+* Fri Jan 11 2008 lrupp@suse.de
- require qjackctl (as mentioned in README)
- build only on ix86 and amd64
-* Fri Jan 04 2008 - duwe@suse.de
+* 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
+* Wed Jun 13 2007 ro@suse.de
- use texlive instead of tetex
-* Thu Jan 18 2007 - duwe@suse.de
+* Thu Jan 18 2007 duwe@suse.de
- internal DSSI synth "zynaddsubfx" GUI program needs fltk
-* Tue Jan 16 2007 - duwe@suse.de
+* 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
+* 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
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Fri Dec 23 2005 - duwe@suse.de
+* Fri Dec 23 2005 duwe@suse.de
- update to 0.7.2pre4
- fix int 0 termination in execlp with NULL.
-* Thu Oct 13 2005 - duwe@suse.de
+* Thu Oct 13 2005 duwe@suse.de
- gcc-4.1 found deicsonce envelope func returning garbage in
case of error. Fixed.
-* Wed Oct 12 2005 - stbinner@suse.de
+* Wed Oct 12 2005 stbinner@suse.de
- fix wrong include hints to make it compile with Qt 3.3.5
-* Thu Oct 06 2005 - duwe@suse.de
+* Thu Oct 06 2005 duwe@suse.de
- update to latest version (0.7.2pre2)
- add flac requirements for libsndfile
- one more gcc4 fix
-* Thu Apr 14 2005 - yxu@suse.de
+* Thu Apr 14 2005 yxu@suse.de
- fixed for GCC4
-* Thu Jan 27 2005 - tiwai@suse.de
+* Thu Jan 27 2005 tiwai@suse.de
- fixed encoding of README.de (bug #50106)
-* Fri Jan 21 2005 - tiwai@suse.de
+* Fri Jan 21 2005 tiwai@suse.de
- updated to version 0.7.1.
-* Wed Oct 06 2004 - tiwai@suse.de
+* Wed Oct 06 2004 tiwai@suse.de
- fixed segfault when opening a project with -d option (#46814)
-* Fri Sep 17 2004 - tiwai@suse.de
+* Fri Sep 17 2004 tiwai@suse.de
- removed ladcca support, which seems problematic with debug mode.
-* Tue Aug 31 2004 - tiwai@suse.de
+* Tue Aug 31 2004 tiwai@suse.de
- updated to version 0.7.0.
use the icon file included in the package.
-* Wed Apr 14 2004 - tiwai@suse.de
+* Wed Apr 14 2004 tiwai@suse.de
- fixed segfault with 64bit architecture (bug #38786)
-* Thu Jan 15 2004 - tiwai@suse.de
+* Thu Jan 15 2004 tiwai@suse.de
- updated to version 0.6.3.
-* Mon Sep 15 2003 - tiwai@suse.de
+* Mon Sep 15 2003 tiwai@suse.de
- added desktop icon.
-* Thu Sep 04 2003 - tiwai@suse.de
+* Thu Sep 04 2003 tiwai@suse.de
- fixed hang-up with softsynth (bug #29681).
- fixed the installation path and segfault on 64bit archs.
- fixed neededforbuild for ladcca support.
-* Fri Aug 29 2003 - ro@suse.de
+* Fri Aug 29 2003 ro@suse.de
- fix build with recent jack
-* Sat Aug 16 2003 - adrian@suse.de
+* Sat Aug 16 2003 adrian@suse.de
- add desktop file
-* Tue Jul 22 2003 - tiwai@suse.de
+* Tue Jul 22 2003 tiwai@suse.de
- updated to 0.6.1.
-* Thu Jun 05 2003 - ro@suse.de
+* Thu Jun 05 2003 ro@suse.de
- update to 0.6.0 final
- hack to build with current libtool
-* Tue Apr 01 2003 - tiwai@suse.de
+* Tue Apr 01 2003 tiwai@suse.de
- updated to version 0.6.0pre7.
- removed iiwusynth temporarily for moving to fluidsynth.
-* Tue Feb 25 2003 - aj@suse.de
+* Tue Feb 25 2003 aj@suse.de
- Add missing assert includes.
-* Mon Jan 27 2003 - tiwai@suse.de
+* Mon Jan 27 2003 tiwai@suse.de
- fixed the build on x86-64 and ia64 with gcc3.3.
-* Tue Jan 21 2003 - tiwai@suse.de
+* Tue Jan 21 2003 tiwai@suse.de
- fixed the jack driver for the newer version.
-* Thu Jan 16 2003 - tiwai@suse.de
+* Thu Jan 16 2003 tiwai@suse.de
- updated to version 0.6.0pre5.
rpm version is numbered as 0.6.0 w/o preX-suffix.
- added iiwusynth to neededforbuild.
-* Fri Nov 22 2002 - ro@suse.de
+* Fri Nov 22 2002 ro@suse.de
- update to 0.6.0pre3
-* Mon Nov 11 2002 - ro@suse.de
+* Tue Nov 12 2002 ro@suse.de
- changed neededforbuild <xshared> to <x-devel-packages>
- changed neededforbuild <xdevel> to <>
-* Mon Aug 05 2002 - tiwai@suse.de
+* Mon Aug 05 2002 tiwai@suse.de
- updated to the new cvs snapshot.
-* Wed Jul 24 2002 - tiwai@suse.de
+* Wed Jul 24 2002 tiwai@suse.de
- disalbed stk plugins.
-* Thu Jun 27 2002 - tiwai@suse.de
+* Thu Jun 27 2002 tiwai@suse.de
- updated to 0.6.3 from cvs 2002.06.27.
- merged and fixed patches.
-* Thu Jun 27 2002 - ro@suse.de
+* Thu Jun 27 2002 ro@suse.de
- use -fPIC for shared objects
-* Fri May 24 2002 - meissner@suse.de
+* Fri May 24 2002 meissner@suse.de
- %%_lib fixes
-* Fri May 10 2002 - schwab@suse.de
+* Fri May 10 2002 schwab@suse.de
- Fix PIC linking.
-* Thu Apr 11 2002 - tiwai@suse.de
+* Thu Apr 11 2002 tiwai@suse.de
- fixed compile with gcc-3.1.
-* Tue Apr 09 2002 - tiwai@suse.de
+* Tue Apr 09 2002 tiwai@suse.de
- updated to muse-0.5.2 (sync'ed with cvs 2002.04.09)
- using autoreconf instead of given autogen.sh script.
-* Tue Mar 12 2002 - tiwai@suse.de
+* Tue Mar 12 2002 tiwai@suse.de
- added README.SuSE.
-* Thu Mar 07 2002 - tiwai@suse.de
+* Thu Mar 07 2002 tiwai@suse.de
- fixed a bug in opening the help-toc file with unsupported
locales (bug #14647).
-* Fri Feb 08 2002 - tiwai@suse.de
+* Fri Feb 08 2002 tiwai@suse.de
- updated to ver.0.5.1. sync with cvs 2002.02.08.
the package is autotoolized now.
- fixed font loading bugs in bigtimer window.
- removed qt-designer plugin from filelist.
-* Sun Feb 03 2002 - ro@suse.de
+* Sun Feb 03 2002 ro@suse.de
- use readlink for real qt3 dir
-* Wed Jan 16 2002 - tiwai@suse.de
+* Wed Jan 16 2002 tiwai@suse.de
- added rawwaves files from stk.
stk plugin should work now.
- creating obj directory more cleverly.
-* Wed Jan 16 2002 - ro@suse.de
+* Wed Jan 16 2002 ro@suse.de
- use the directory not the link in the filelist
-* Thu Jan 03 2002 - tiwai@suse.de
+* Thu Jan 03 2002 tiwai@suse.de
- updated to muse 0.5.0.
changed from qt-devel-packages to qt3-devel-packages.
-* Fri Nov 09 2001 - ro@suse.de
+* Fri Nov 09 2001 ro@suse.de
- use qt-devel-packages in neededforbuild
-* Mon Oct 15 2001 - sf@suse.de
+* Mon Oct 15 2001 sf@suse.de
- added some missing includes to build with gcc > 2.95
- corrected parameter types declared as size_t, used unsigned int.
I changed them to size_t everywhere, as size_t != unsigned int on any
non 32-bit architecture
-* Wed Oct 10 2001 - tiwai@suse.de
+* Wed Oct 10 2001 tiwai@suse.de
- updated to muse-0.4.13.
-* Mon Aug 20 2001 - tiwai@suse.de
+* Mon Aug 20 2001 tiwai@suse.de
- updated to muse-0.4.8.
-* Thu Aug 16 2001 - tiwai@suse.de
+* Thu Aug 16 2001 tiwai@suse.de
- updated to muse-0.4.7.
-* Fri Jul 13 2001 - tiwai@suse.de
+* Fri Jul 13 2001 tiwai@suse.de
- updated to muse-0.4.4.
-* Mon Jul 09 2001 - tiwai@suse.de
+* Mon Jul 09 2001 tiwai@suse.de
- fixed neededforbuild.
-* Thu Jul 05 2001 - tiwai@suse.de
+* Thu Jul 05 2001 tiwai@suse.de
- updated to muse-0.4.2.
-* Thu Jun 07 2001 - tiwai@suse.de
+* Thu Jun 07 2001 tiwai@suse.de
- updated to muse-0.3.20.
-* Fri May 11 2001 - tiwai@suse.de
+* Fri May 11 2001 tiwai@suse.de
- fixed build.
-* Wed May 09 2001 - tiwai@suse.de
+* Wed May 09 2001 tiwai@suse.de
- updated to muse-0.3.19.
-* Wed Apr 11 2001 - tiwai@suse.de
+* Wed Apr 11 2001 tiwai@suse.de
- updated to muse-0.3.16.
-* Wed Apr 04 2001 - tiwai@suse.de
+* Wed Apr 04 2001 tiwai@suse.de
- updated to muse-0.3.15.
-* Tue Mar 20 2001 - tiwai@suse.de
+* Tue Mar 20 2001 tiwai@suse.de
- fixed neededforbuild.
-* Fri Mar 16 2001 - tiwai@suse.de
+* Fri Mar 16 2001 tiwai@suse.de
- updated to muse-0.3.12.
-* Mon Mar 12 2001 - tiwai@suse.de
+* Mon Mar 12 2001 tiwai@suse.de
- updated to muse-0.3.11.
-* Wed Mar 07 2001 - ro@suse.de
+* Wed Mar 07 2001 ro@suse.de
- changed neededforbuild <mesadev> to <mesa-devel>
-* Wed Mar 07 2001 - tiwai@suse.de
+* Wed Mar 07 2001 tiwai@suse.de
- Updated to muse-0.3.10.
-* Mon Feb 26 2001 - tiwai@suse.de
+* Mon Feb 26 2001 tiwai@suse.de
- Updated to muse-0.3.9.
-* Mon Feb 12 2001 - tiwai@suse.de
+* Mon Feb 12 2001 tiwai@suse.de
- Updated to muse-0.3.7.
-* Fri Feb 09 2001 - tiwai@suse.de
+* Fri Feb 09 2001 tiwai@suse.de
- Updated to muse-0.3.6.
-* Tue Jan 30 2001 - tiwai@suse.de
+* Tue Jan 30 2001 tiwai@suse.de
- Updated to muse-0.3.5.
-* Fri Dec 01 2000 - ro@suse.de
+* Fri Dec 01 2000 ro@suse.de
- added liblcms to neededforbuild
-* Thu Nov 23 2000 - tiwai@suse.de
+* Thu Nov 23 2000 tiwai@suse.de
- Updated to muse-0.2.12.
-* Fri Nov 17 2000 - tiwai@suse.de
+* Fri Nov 17 2000 tiwai@suse.de
- Updated to muse-0.2.10.
-* Fri Nov 17 2000 - ro@suse.de
+* Fri Nov 17 2000 ro@suse.de
- fixed neededforbuild: += libmng-devel
-* Wed Nov 08 2000 - tiwai@suse.de
+* Wed Nov 08 2000 tiwai@suse.de
- Updated to muse-0.2.7.
- Fixed to compile.
-* Mon Nov 06 2000 - ro@suse.de
+* Mon Nov 06 2000 ro@suse.de
- fixed to compile (include spinlock before mc146818rtc)
-* Fri Nov 03 2000 - tiwai@suse.de
+* Fri Nov 03 2000 tiwai@suse.de
- Updated to muse-0.2.6.
- Fixed spec file for long package-name support.
- Excluded plug-ins from provide list.
-* Mon Oct 09 2000 - tiwai@suse.de
+* Mon Oct 09 2000 tiwai@suse.de
- Added libmng to neededforbuild
-* Fri Oct 06 2000 - tiwai@suse.de
+* Fri Oct 06 2000 tiwai@suse.de
- Updated to muse-0.2.4
-* Wed Sep 27 2000 - tiwai@suse.de
+* Wed Sep 27 2000 tiwai@suse.de
- Fixed compile for alpha and ppc.
-* Tue Sep 26 2000 - tiwai@suse.de
+* Tue Sep 26 2000 tiwai@suse.de
- Update to 0.2.3
-* Mon Aug 28 2000 - tiwai@suse.de
+* Mon Aug 28 2000 tiwai@suse.de
- Update to 0.2.1.
- Disable translations (due to change of qt-2.2).
-* Wed Aug 02 2000 - tiwai@suse.de
+* Wed Aug 02 2000 tiwai@suse.de
- Initial version: 0.1.10. No manual document is included.
++++++ qatomic-qt-4.4.diff ++++++
--- muse/driver/alsamidi.cpp
+++ muse/driver/alsamidi.cpp
@@ -43,7 +43,7 @@ bool PortRouteFifo::put(const PortRoute& event)
if (size < PORT_ROUTE_FIFO_SIZE) {
fifo[wIndex] = event;
wIndex = (wIndex + 1) % PORT_ROUTE_FIFO_SIZE;
- q_atomic_increment(&size);
+ size.ref();
return false;
}
return true;
@@ -57,7 +57,7 @@ PortRoute PortRouteFifo::get()
{
PortRoute event(fifo[rIndex]);
rIndex = (rIndex + 1) % PORT_ROUTE_FIFO_SIZE;
- q_atomic_decrement(&size);
+ size.deref();
return event;
}
--- muse/driver/alsamidi.h
+++ muse/driver/alsamidi.h
@@ -24,6 +24,8 @@
#include
participants (1)
-
root@Hilbert.suse.de