rpms/muse/F-12 muse-destdir.patch, NONE, 1.1 muse-x86_64-sse.patch, NONE, 1.1 sse_functions_64bit.s, NONE, 1.1 muse.spec, 1.7, 1.8 sources, 1.6, 1.7 muse-glibc210.patch, 1.1, NONE

Orcan Ogetbil oget at fedoraproject.org
Thu Dec 24 11:54:27 UTC 2009 

Author: oget

Update of /cvs/pkgs/rpms/muse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17103

Modified Files:
	muse.spec sources 
Added Files:
	muse-destdir.patch muse-x86_64-sse.patch sse_functions_64bit.s 
Removed Files:
	muse-glibc210.patch 
Log Message:
* Thu Dec 24 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1:1.0-1
- Update to 1.0


muse-destdir.patch:
 share/scripts/Makefile.am |    6 +++---
 share/scripts/Makefile.in |    6 +++---
 utils/Makefile.am         |    4 ++--
 utils/Makefile.in         |    4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE muse-destdir.patch ---
diff -rupN muse-1.0.old/share/scripts/Makefile.am muse-1.0/share/scripts/Makefile.am
--- muse-1.0.old/share/scripts/Makefile.am	2009-12-21 10:37:20.000000000 -0500
+++ muse-1.0/share/scripts/Makefile.am	2009-12-24 04:19:27.000000000 -0500
@@ -5,7 +5,7 @@ EXTRA_DIST = DoNothing RemoveShortEvents
 #musemidiscriptspkgdatadir = $(pkgdatadir)/scripts
 
 install-data-local: 
-	mkdir -p $(pkgdatadir)/scripts/
-	cp $(EXTRA_DIST) $(pkgdatadir)/scripts/
-	chmod a+x $(pkgdatadir)/scripts/*
+	mkdir -p $(DESTDIR)/$(pkgdatadir)/scripts/
+	cp $(EXTRA_DIST) $(DESTDIR)/$(pkgdatadir)/scripts/
+	chmod a+x $(DESTDIR)/$(pkgdatadir)/scripts/*
 
diff -rupN muse-1.0.old/share/scripts/Makefile.in muse-1.0/share/scripts/Makefile.in
--- muse-1.0.old/share/scripts/Makefile.in	2009-12-21 10:37:44.000000000 -0500
+++ muse-1.0/share/scripts/Makefile.in	2009-12-24 04:19:43.000000000 -0500
@@ -389,9 +389,9 @@ uninstall-am: uninstall-info-am
 #musemidiscriptspkgdatadir = $(pkgdatadir)/scripts
 
 install-data-local: 
-	mkdir -p $(pkgdatadir)/scripts/
-	cp $(EXTRA_DIST) $(pkgdatadir)/scripts/
-	chmod a+x $(pkgdatadir)/scripts/*
+	mkdir -p $(DESTDIR)/$(pkgdatadir)/scripts/
+	cp $(EXTRA_DIST) $(DESTDIR)/$(pkgdatadir)/scripts/
+	chmod a+x $(DESTDIR)/$(pkgdatadir)/scripts/*
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -rupN muse-1.0.old/utils/Makefile.am muse-1.0/utils/Makefile.am
--- muse-1.0.old/utils/Makefile.am	2009-12-21 10:37:20.000000000 -0500
+++ muse-1.0/utils/Makefile.am	2009-12-24 04:26:15.000000000 -0500
@@ -1,6 +1,6 @@
 EXTRA_DIST = muse-find-unused-wavs
 
 install-data-local:
-	cp $(EXTRA_DIST) $(bindir)/
-	chmod a+x $(bindir)/$(EXTRA_DIST) 
+	cp $(EXTRA_DIST) $(DESTDIR)/$(bindir)/
+	chmod a+x $(DESTDIR)/$(bindir)/$(EXTRA_DIST) 
 
diff -rupN muse-1.0.old/utils/Makefile.in muse-1.0/utils/Makefile.in
--- muse-1.0.old/utils/Makefile.in	2009-12-21 10:37:45.000000000 -0500
+++ muse-1.0/utils/Makefile.in	2009-12-24 04:26:39.000000000 -0500
@@ -385,8 +385,8 @@ uninstall-am: uninstall-info-am
 
 
 install-data-local:
-	cp $(EXTRA_DIST) $(bindir)/
-	chmod a+x $(bindir)/$(EXTRA_DIST) 
+	cp $(EXTRA_DIST) $(DESTDIR)/$(bindir)/
+	chmod a+x $(DESTDIR)/$(bindir)/$(EXTRA_DIST) 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

muse-x86_64-sse.patch:
 dsp.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE muse-x86_64-sse.patch ---
--- muse-1.0.old/al/dsp.cpp	2009-12-21 10:37:17.000000000 -0500
+++ muse-1.0/al/dsp.cpp	2009-12-24 05:52:14.000000000 -0500
@@ -28,7 +28,7 @@ namespace AL {
 
 Dsp* dsp = 0;
 
-#ifdef __i386__
+#if defined(__i386__) || defined(__x86_64__)
 
 //---------------------------------------------------------
 //   DspSSE86
@@ -100,7 +100,7 @@ void initDsp()
         printf("Muse: __i386__ or __x86_64__ not defined. Using non-optimized memcpy for float buffer copying.\n");
 #endif
 
-#if defined(__i386__) && defined(USE_SSE)
+#if (defined(__i386__) || defined(__x86_64__)) && defined(USE_SSE)
       unsigned long useSSE = 0;
       if(debugMsg)
         printf("initDsp: __i386__ and USE_SSE defined\n");


***** Error reading new file: [Errno 2] No such file or directory: 'sse_functions_64bit.s'

Index: muse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/muse/F-12/muse.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- muse.spec	25 Jul 2009 15:25:37 -0000	1.7
+++ muse.spec	24 Dec 2009 11:54:27 -0000	1.8
@@ -1,41 +1,48 @@
-%global prerelease rc3
-
 Name:          muse
 Summary:       Midi/Audio Music Sequencer
 # Epoch is set to 1 for PlanetCCRMA compatibility.
 # See: https://fedoraproject.org/wiki/AudioCreation
 Epoch:         1
 Version:       1.0
-Release:       %{?prerelease:0.}7%{?prerelease:.%prerelease}%{?dist}.1
+Release:       1%{?dist}
 # synti/vam is GPLv2+
 # original freeverb plugin was public domain
 # some of the widgets are GPLv2
 # ladspa.h is LGPLv2+
 # givertcap (not built) is GPLv2
 # The rest, including the core of muse is distributed under GPL+
+# Source1 is GPLv2+
 License:       GPL+ and GPLv2 and GPLv2+ and LGPLv2+
 Group:         Applications/Multimedia
 URL:           http://www.muse-sequencer.org/
-Source0:       http://downloads.sourceforge.net/lmuse/%{name}-%{version}%{?prerelease}.tar.gz
-# Fix: muse doesn't start on systems using glibc-2.10
-# https://sourceforge.net/tracker/?func=detail&aid=2819312&group_id=93414&atid=604222
-Patch0:        muse-glibc210.patch
+Source0:       http://downloads.sourceforge.net/project/lmuse/%{name}-%{version}/%{name}-%{version}/%{name}-%{version}.tar.gz
+# The following file and patches are sent upstream on Dec 24 2009:
+# http://sourceforge.net/mailarchive/forum.php?forum_name=lmuse-developer
+# Compilation of sse bits fail on x86_64. This file fixes the problem
+Source1:       sse_functions_64bit.s
+# Install utils and scripts into the destdir, or mock will fail
+Patch0:        muse-destdir.patch
+# Add missing condition on an #if to make the sse optimization effective
+Patch1:        muse-x86_64-sse.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel
 BuildRequires: desktop-file-utils
 BuildRequires: docbook-style-dsssl
 BuildRequires: doxygen
+BuildRequires: dssi-devel
 BuildRequires: fluidsynth-devel
 BuildRequires: graphviz
 BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: lash-devel
 BuildRequires: libcap-devel
+BuildRequires: liblo-devel
 BuildRequires: libsamplerate-devel
 BuildRequires: libsndfile-devel
 BuildRequires: libtool
 BuildRequires: openjade
 BuildRequires: pkgconfig
+BuildRequires: python-devel
 BuildRequires: qt3-devel
 BuildRequires: readline-devel
 
@@ -48,8 +55,9 @@ Jack and ALSA interfaces. MusE aims to b
 for Linux.
 
 %prep
-%setup -q -n %{name}-%{version}%{?prerelease}
-%patch0 -p1 -b .glibc210
+%setup -q
+%patch0 -p1
+%patch1 -p1
 
 # Fix encoding issues (upstream is informed):
 for f in README.de README.softsynth SECURITY synti/vam/README; do
@@ -58,13 +66,30 @@ for f in README.de README.softsynth SECU
    mv -f $f.tmp $f
 done
 
+# Detect python properly
+sed -i 's|locate \$ax_python_bin|echo %{_includedir}/python2.6|' configure
+
+# Fix compilaton of the sse bits
+%ifarch x86_64
+cp %{SOURCE1} al/dspSSE.cpp
+%endif
+
 %build
+# Work around the gcc bug RHBZ#531218
+%if 0%{?fedora} >= 12
+export CXX="g++ -fno-var-tracking-assignments"
+%endif
 %configure --disable-suid-build \
            --disable-suid-install \
            --with-docbook-stylesheets=%{_datadir}/sgml/docbook/dsssl-stylesheets \
            --disable-qttest \
            --with-qt-prefix=${QTDIR} \
            --enable-lash \
+%ifarch x86_64
+           --enable-sse \
+%endif
+           --enable-python \
+           --enable-dssi \
            --enable-static=no 
 
 make %{?_smp_mflags}
@@ -141,12 +166,16 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc README* ReleaseNotes* SECURITY TODO* de
 %{_bindir}/%{name}
 %{_bindir}/grepmidi
+%{_bindir}/%{name}-find-unused-wavs
 %{_libdir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/*/*
 
-%changelog
+%changelog 
+* Thu Dec 24 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1:1.0-1
+- Update to 1.0
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0-0.7.rc3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/muse/F-12/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	21 Jun 2009 01:10:20 -0000	1.6
+++ sources	24 Dec 2009 11:54:27 -0000	1.7
@@ -1 +1 @@
-533a638539a85318034a2764740d11d9  muse-1.0rc3.tar.gz
+177ce7bcad2dc93e733f0ace7cd99b2d  muse-1.0.tar.gz


--- muse-glibc210.patch DELETED ---

More information about the scm-commits mailing list