- added opt patch

- removed BR ladspa-devel (ardour contains its own ladspa.h)

Changed files:
    ardour-opt.patch -> 1.1
    ardour.spec -> 1.4

diff --git a/ardour-opt.patch b/ardour-opt.patch
new file mode 100644 (file)
index 0000000..517ded9
--- /dev/null
+++ b/ardour-opt.patch
@@ -0,0 +1,94 @@
+--- ardour-0.9beta2/gtk_ardour/configure.ac.orig       2003-06-24 05:11:35.000000000 +0200
++++ ardour-0.9beta2/gtk_ardour/configure.ac    2003-07-15 01:30:51.000000000 +0200
+@@ -37,8 +37,8 @@
+    AC_MSG_ERROR([*** Ardour is written in C++. You don't appear to have a C++ compiler])
+ fi
+ 
+-CXXFLAGS="-g -D_REENTRANT"
+-OPT_CXXFLAGS="-D_REENTRANT -O6 -fomit-frame-pointer -ffast-math -fstrength-reduce -funroll-loops -fmove-all-movables"
++CXXFLAGS="$CXXFLAGS -D_REENTRANT"
++OPT_CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
+ if test x"$GXX" = xyes ; then
+    CXXFLAGS="$CXXFLAGS -Wall"
+ fi
+--- ardour-0.9beta2/ksi_ardour/configure.ac.orig       2003-06-24 05:11:36.000000000 +0200
++++ ardour-0.9beta2/ksi_ardour/configure.ac    2003-07-15 01:30:39.000000000 +0200
+@@ -32,8 +32,7 @@
+    AC_MSG_ERROR([*** aes is written in C++. You don't appear to have a C++ compiler])
+ fi
+ 
+-CXXFLAGS="-g"
+-OPT_CXXFLAGS="-O6 -fomit-frame-pointer -ffast-math -fstrength-reduce -funroll-loops -fmove-all-movables"
++OPT_CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
+ if test x"$GXX" = xyes ; then
+    CXXFLAGS="$CXXFLAGS -Wall"
+ fi
+--- ardour-0.9beta2/libs/ardour/configure.ac.orig      2003-06-27 03:21:32.000000000 +0200
++++ ardour-0.9beta2/libs/ardour/configure.ac   2003-07-15 01:31:29.000000000 +0200
+@@ -37,8 +37,8 @@
+    AC_MSG_ERROR([*** Ardour is written in C++. You don't appear to have a C++ compiler])
+ fi
+ 
+-CXXFLAGS="-g -D_REENTRANT"
+-OPT_CXXFLAGS="-D_REENTRANT -O6 -mcpu=i686 -march=i686 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
++CXXFLAGS="$CXXFLAGS -D_REENTRANT"
++OPT_CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
+ if test x"$GXX" = xyes ; then
+    CXXFLAGS="$CXXFLAGS -Wall"
+ fi
+--- ardour-0.9beta2/libs/gtkmmext/configure.ac.orig    2003-06-24 05:11:38.000000000 +0200
++++ ardour-0.9beta2/libs/gtkmmext/configure.ac 2003-07-15 01:33:24.000000000 +0200
+@@ -37,10 +37,10 @@
+    AC_MSG_ERROR([*** libmidi is C++. You don't appear to have a C++ compiler])
+ fi
+ 
+-CXXFLAGS="-g -D_REENTRANT"
+-OPT_CXXFLAGS="-D_REENTRANT -O6 -fomit-frame-pointer -ffast-math -fstrength-reduce -funroll-loops -fmove-all-movables"
+-CFLAGS="-g -D_REENTRANT"
+-OPT_CFLAGS="-D_REENTRANT -O6 -fomit-frame-pointer -ffast-math -fstrength-reduce -funroll-loops -fmove-all-movables"
++CXXFLAGS="$CXXFLAGS -D_REENTRANT"
++OPT_CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
++CFLAGS="$CLFAGS -D_REENTRANT"
++OPT_CFLAGS="$CFLAGS -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
+ if test x"$GXX" = xyes ; then
+    CXXFLAGS="$CXXFLAGS -Wall"
+ fi
+--- ardour-0.9beta2/libs/midi++/configure.ac.orig      2003-06-24 05:11:39.000000000 +0200
++++ ardour-0.9beta2/libs/midi++/configure.ac   2003-07-15 01:33:48.000000000 +0200
+@@ -48,8 +48,8 @@
+    AC_MSG_ERROR([*** libmidi is C++. You don't appear to have a C++ compiler])
+ fi
+ 
+-CXXFLAGS="-g -D_REENTRANT"
+-OPT_CXXFLAGS="-D_REENTRANT -O6 -fomit-frame-pointer -ffast-math -fstrength-reduce -funroll-loops -fmove-all-movables"
++CXXFLAGS="$CXXFLAGS -D_REENTRANT"
++OPT_CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
+ if test x"$GXX" = xyes ; then
+    CXXFLAGS="$CXXFLAGS -Wall"
+ fi
+--- ardour-0.9beta2/libs/pbd/configure.ac.orig 2003-06-24 05:11:39.000000000 +0200
++++ ardour-0.9beta2/libs/pbd/configure.ac      2003-07-15 01:34:11.000000000 +0200
+@@ -32,8 +32,8 @@
+    AC_MSG_ERROR([*** libpbd is C++. You don't appear to have a C++ compiler])
+ fi
+ 
+-CXXFLAGS="-g -D_REENTRANT"
+-OPT_CXXFLAGS="-D_REENTRANT -O6 -fomit-frame-pointer -ffast-math -fstrength-reduce -funroll-loops -fmove-all-movables"
++CXXFLAGS="$CXXFLAGS -D_REENTRANT"
++OPT_CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
+ if test x"$GXX" = xyes ; then
+    CXXFLAGS="$CXXFLAGS -Wall"
+ fi
+--- ardour-0.9beta2/libs/soundtouch/configure.ac.orig  2003-03-01 03:53:20.000000000 +0100
++++ ardour-0.9beta2/libs/soundtouch/configure.ac       2003-07-15 01:34:34.000000000 +0200
+@@ -35,8 +35,8 @@
+    AC_MSG_ERROR([*** libpbd is C++. You don't appear to have a C++ compiler])
+ fi
+ 
+-CXXFLAGS="-g -D_REENTRANT"
+-OPT_CXXFLAGS="-D_REENTRANT -O6 -fomit-frame-pointer -ffast-math -fstrength-reduce -funroll-loops -fmove-all-movables"
++CXXFLAGS="$CXXFLAGS -D_REENTRANT"
++OPT_CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
+ if test x"$GXX" = xyes ; then
+    CXXFLAGS="$CXXFLAGS -Wall"
+ fi

diff --git a/ardour.spec b/ardour.spec
index 0230896be4b44fa0a5582831ed2d4175fdf40ba3..4c5e8b800b8086e47d5a76d9e4026ea43e9738ef 100644 (file)
--- a/ardour.spec
+++ b/ardour.spec
@@ -1,8 +1,5 @@
 # TODO:
-# - use external libraries if possible (sigc++1 and gtkmm1)
 # - .desktop
-# - check BR (ladspa - is it really needed at compile time?)
-# - optflags (in gtk_ardour, libs/{ardour,gtkmmext,midi++,pbd,soundtouch}
 #
 %define                _beta beta2
 Summary:       Multitrack hard disk recorder
@@ -15,6 +12,7 @@ Group:                X11/Applications/Sound
 Source0:       http://dl.sourceforge.net/ardour/%{name}-%{version}%{_beta}.tar.bz2
 # Source0-md5: 91db0b724e5183e7c92408a986aa17ea
 Patch0:                %{name}-system-libs.patch
+Patch1:                %{name}-opt.patch
 URL:           http://ardour.sourceforge.net/
 BuildRequires: XFree86-devel
 BuildRequires: autoconf >= 2.50
@@ -23,8 +21,8 @@ BuildRequires:        alsa-lib-devel >= 0.9.0
 BuildRequires: gtk+-devel >= 1.0.0
 BuildRequires: gtkmm1-devel >= 1.2.6
 BuildRequires: jack-audio-connection-kit-devel >= 0.66.0
-BuildRequires: ladspa-devel
 BuildRequires: libart_lgpl >= 2.3
+BuildRequires: libpng-devel
 BuildRequires: liblrdf-devel >= 0.3.0
 BuildRequires: libsamplerate-devel >= 0.0.13
 BuildRequires: libsigc++1-devel >= 0.8.8
@@ -49,7 +47,8 @@ MMC, niedestruktywny, nieliniowy edytor oraz wtyczki LADSPA.
 
 %prep
 %setup -q -n %{name}-%{version}%{_beta}
-%patch -p1
+%patch0 -p1
+%patch1 -p1
 
 install -d m4
 # extract AM_BUILD_ENVIRONMENT (patched!)
@@ -100,7 +99,8 @@ cd ../soundtouch
 cd ../..
 # ksi doesn't build for a moment
 %configure \
-       --disable-ksi
+       --disable-ksi \
+       %{!?debug:--enable-optimize}
 
 %{__make}
 
@@ -119,9 +119,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc ChangeLog README ReleaseNotes* TODO
 %attr(755,root,root) %{_bindir}/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/pixmaps
-%{_datadir}/%{name}/splash.ppm
+%{_datadir}/%{name}
 %{_mandir}/man1/*
 %dir %{_sysconfdir}/ardour
-%{_sysconfdir}/ardour/*.rc
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/ardour/*.rc