rpms/ardour/F-11 ardour-SConstruct.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 ardour.spec, 1.25, 1.26 sources, 1.12, 1.13 ardour-2.8-SConstruct.patch, 1.1, NONE ardour-2.8-gcc44.patch, 1.1, NONE

Thu Jul 9 23:50:21 UTC 2009

Author: oget

Update of /cvs/pkgs/rpms/ardour/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12247

Modified Files:
	.cvsignore ardour.spec sources 
Added Files:
	ardour-SConstruct.patch 
Removed Files:
	ardour-2.8-SConstruct.patch ardour-2.8-gcc44.patch 
Log Message:
* Thu Jul 09 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 2.8.1-1
- New upstream release 2.8.1.


ardour-SConstruct.patch:

--- NEW FILE ardour-SConstruct.patch ---
diff -rupN ardour-2.8.1.old/SConstruct ardour-2.8.1/SConstruct
--- ardour-2.8.1.old/SConstruct	2009-07-03 18:01:15.000000000 -0400
+++ ardour-2.8.1/SConstruct	2009-07-09 15:20:01.000000000 -0400
@@ -49,6 +49,7 @@ opts.AddOptions(
     BoolOption('LIBLO', 'Compile with support for liblo library', 1),
     BoolOption('NLS', 'Set to turn on i18n support', 1),
     PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'),
+    ('LIBDIR', 'Set librarydir (lib/lib64)', 'lib'),
     BoolOption('SURFACES', 'Build support for control surfaces', 1),
     BoolOption('WIIMOTE', 'Build the wiimote control surface', 0),
     BoolOption('SYSLIBS', 'USE AT YOUR OWN RISK: CANCELS ALL SUPPORT FROM ARDOUR AUTHORS: Use existing system versions of various libraries instead of internal ones', 0),
@@ -741,10 +742,10 @@ if env['FPU_OPTIMIZATION']:
 
 # handle x86/x86_64 libdir properly
 
-if env['DIST_TARGET'] == 'x86_64':
-    env['LIBDIR']='lib64'
-else:
-    env['LIBDIR']='lib'
+#if env['DIST_TARGET'] == 'x86_64':
+#    env['LIBDIR']='lib64'
+#else:
+#    env['LIBDIR']='lib'
 
 #
 # no VST on x86_64
@@ -794,11 +795,11 @@ if env['ARCH'] != '':
 #
 
 opt_flags[:0] = [
-    "-O3",
+#    "-O3",
     "-fomit-frame-pointer",
     "-ffast-math",
     "-fstrength-reduce",
-    "-pipe"
+#    "-pipe"
     ]
 
 if env['DEBUG'] == 1:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	30 Mar 2009 22:07:42 -0000	1.12
+++ .cvsignore	9 Jul 2009 23:49:50 -0000	1.13
@@ -1 +1 @@
-ardour-2.8.tar.bz2
+ardour-2.8.1.tar.bz2


Index: ardour.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/F-11/ardour.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ardour.spec	30 Mar 2009 22:07:43 -0000	1.25
+++ ardour.spec	9 Jul 2009 23:49:50 -0000	1.26
@@ -1,12 +1,13 @@
 Summary:       Multichannel Digital Audio Workstation
 Name:          ardour
-Version:       2.8
+Version:       2.8.1
 Release:       1%{?dist}
-Source:        http://ardour.org/files/releases/ardour-%{version}.tar.bz2
+# No more direct links. Download from
+# http://ardour.org/download
+Source:        ardour-%{version}.tar.bz2
 Source2:       ardour.script
-Patch0:        ardour-2.8-SConstruct.patch
+Patch0:        ardour-SConstruct.patch
 Patch1:        ardour-2.8-session.cc-no_stomp.patch
-Patch2:        ardour-2.8-gcc44.patch
 Patch3:        ardour-2.5-HOST_NOT_FOUND.patch
 URL:           http://ardour.org
 License:       GPLv2+
@@ -14,46 +15,53 @@ Group:         Applications/Multimedia
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: scons, pkgconfig, libtool
-BuildRequires: libxslt-devel, libgnomecanvas-devel, boost-devel
-BuildRequires: alsa-lib-devel, jack-audio-connection-kit-devel
-BuildRequires: liblo-devel, libusb-devel
-BuildRequires: gettext >= 0.11.5
-BuildRequires: libsamplerate-devel >= 0.0.13
-BuildRequires: liblrdf-devel >= 0.3.1
+BuildRequires: alsa-lib-devel
+BuildRequires: aubio-devel
+BuildRequires: boost-devel
+BuildRequires: cwiid-devel
+BuildRequires: desktop-file-utils
 BuildRequires: fftw-devel
+BuildRequires: gettext >= 0.11.5
 BuildRequires: gtkmm24-devel >= 2.8
-BuildRequires: libgnomecanvasmm26-devel >= 2.12
-BuildRequires: aubio-devel
+BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: libcurl-devel
+BuildRequires: libgnomecanvas-devel
+BuildRequires: libgnomecanvasmm26-devel >= 2.12
+BuildRequires: liblo-devel
+BuildRequires: liblrdf-devel >= 0.3.1
+BuildRequires: libsamplerate-devel >= 0.0.13
+BuildRequires: libtool
+BuildRequires: libusb-devel
+BuildRequires: libxslt-devel
+BuildRequires: pkgconfig
+BuildRequires: scons
 BuildRequires: slv2-devel
+BuildRequires: soundtouch-devel
+
 Requires: hicolor-icon-theme
 
-BuildRequires:    desktop-file-utils
 
 # for upgrade path from CCRMA ardour2 packages:
 Provides: ardour2 = %{version}-%{release}
 Obsoletes: ardour2 < %{version}-%{release}
 
 %description
-Ardour is a multichannel hard disk recorder (HDR) and digital audio
-workstation (DAW). It is capable of simultaneous recording 24 or more
-channels of 32 bit audio at 48kHz. Ardour is intended to function as a
-"professional" HDR system, replacing dedicated hardware solutions such
-as the Mackie HDR, the Tascam 2424 and more traditional tape systems
-like the Alesis ADAT series. It is also intended to provide the same
-or better functionality as software systems such as ProTools,
-Samplitude, Logic Audio, Nuendo and Cubase VST (we acknowledge these
-and all other names as trademarks of their respective owners). It
+Ardour is a multichannel hard disk recorder (HDR) and digital audio workstation
+(DAW). It is capable of simultaneous recording 24 or more channels of 32 bit
+audio at 48kHz. Ardour is intended to function as a "professional" HDR system,
+replacing dedicated hardware solutions such as the Mackie HDR, the Tascam 2424
+and more traditional tape systems like the Alesis ADAT series. It is also
+intended to provide the same or better functionality as software systems such
+as ProTools, Samplitude, Logic Audio, Nuendo and Cubase VST (we acknowledge
+these and all other names as trademarks of their respective owners). It
 supports MIDI Machine Control, and so can be controlled from any MMC
-controller, such as the Mackie Digital 8 Bus mixer and many other
-modern digital mixers.
+controller, such as the Mackie Digital 8 Bus mixer and many other modern
+digital mixers.
 
 %prep
 %setup -q
 %patch0 -p1 -b .SConstruct
 %patch1 -p1 -b .no_stomp
-%patch2 -p1 -b .gcc44
 %patch3 -p0 -b .host.not.found
 
 # Fix encodings:
@@ -72,19 +80,20 @@ echo "GenericName=Digital Audio Workstat
 TARGETCPU="none"
 
 %ifarch %{ix86}
-ARCH_FLAGS="-DARCH_X86 -DBUILD_SSE_OPTIMIZATIONS"
+ARCH_FLAGS="-DARCH_X86 -DBUILD_SSE_OPTIMIZATIONS -msse -mfpmath=sse -DUSE_XMMINTRIN"
 TARGETCPU="i386"
 %endif
 %ifarch x86_64
-ARCH_FLAGS="-DARCH_X86 -DBUILD_SSE_OPTIMIZATIONS -DUSE_X86_64_ASM"
+ARCH_FLAGS="-DARCH_X86 -DBUILD_SSE_OPTIMIZATIONS -DUSE_X86_64_ASM -msse -mfpmath=sse -DUSE_XMMINTRIN"
 TARGETCPU="x86_64"
 %endif
 
 scons %{?_smp_mflags} PREFIX=%{_prefix} LIBDIR=%{_lib} SYSLIBS=1 \
       FREESOUND=1 \
       DIST_TARGET="${TARGETCPU}" \
-      ARCH="$RPM_OPT_FLAGS $ARCH_FLAGS -ffast-math" \
-      AUSTATE=1
+      ARCH="$RPM_OPT_FLAGS $ARCH_FLAGS" \
+      AUSTATE=1 \
+      WIIMOTE=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -99,7 +108,7 @@ install -pm 755 %{SOURCE2} $RPM_BUILD_RO
 # copy icons to freedesktop locations
 for s in 16 22 32 48 ; do
     mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps
-    cp $RPM_BUILD_ROOT%{_datadir}/ardour2/icons/ardour_icon_${s}px.png \
+    cp -p $RPM_BUILD_ROOT%{_datadir}/ardour2/icons/ardour_icon_${s}px.png \
        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/ardour2.png
 done
 
@@ -166,6 +175,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_mandir}/ru/man1/ardour.1*
 
 %changelog
+* Thu Jul 09 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 2.8.1-1
+- New upstream release 2.8.1.
+
+* Sun May 10 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 2.8-2
+- Rebuild against new boost
+
 * Mon Mar 30 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 2.8-1
 - New upstream release 2.8.
 - Update scriptlets according to the new guidelines


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	30 Mar 2009 22:07:43 -0000	1.12
+++ sources	9 Jul 2009 23:49:50 -0000	1.13
@@ -1 +1 @@
-24bd768dbe08f1f2724dc97704ee0518  ardour-2.8.tar.bz2
+80b38c6381e9b285734978478079dbfe  ardour-2.8.1.tar.bz2


--- ardour-2.8-SConstruct.patch DELETED ---


--- ardour-2.8-gcc44.patch DELETED ---


