Version bump and optimisation fix

5 files changed, 296 insertions, 12 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index d41e9ea142ec..6d92c8dab02f 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/ardour
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.29 2004/07/21 12:44:50 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.30 2004/07/24 13:48:02 tigger Exp $
+
+*ardour-0.9_beta18-r1 (24 Jul 2004)
+
+  24 Jul 2004; Rob Holland <tigger@gentoo.org> +ardour-0.9_beta18-r1.ebuild:
+  Version bump and optimisation improvements.
 
 *ardour-0.9_beta18 (21 Jul 2004)
 
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index ceb96e13aaaa..5b97e654f533 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,23 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7d3441226b962d038a5e288ada67058e ardour-0.9_beta16.ebuild 1175
 MD5 f197fc6c26a82d2b0f105f775c74dc46 ardour-0.9_beta11-r1.ebuild 1177
 MD5 4aaae0ab832bc48fdf38131e0146a537 ardour-0.9_beta18.ebuild 1281
+MD5 100fac7edba8740a1f01a597f487fb19 ardour-0.9_beta18-r1.ebuild 1336
 MD5 85ae7ef7d14a7eee5260cac5e52a82be ardour-0.9_beta17.ebuild 1267
 MD5 ae6da285ffd7cfde5c24ce3f4d585fae ardour-0.9_beta14.ebuild 1175
-MD5 0d2b9b7cb8e300c9f8a2aff455de7b38 ChangeLog 4453
+MD5 c09a650b52fd9d2630c3ab698827d887 ChangeLog 4615
 MD5 28188f1657f0547a15f682ed3626a397 metadata.xml 330
+MD5 11e862600d9c027d453d23dc2bf8763d files/ardour.aclocal.patch 8594
 MD5 70693c54e8c510859384503ff9ed10cc files/digest-ardour-0.9_beta14 72
 MD5 3e39c45e572cf4ec921e0554fd226f11 files/digest-ardour-0.9_beta16 72
 MD5 df7a09804b9e2413a2e3163cd6ee9c63 files/digest-ardour-0.9_beta17 72
 MD5 deaa03228c326df68ddb39830f3549d0 files/digest-ardour-0.9_beta18 72
 MD5 e016dfbfc8e85547954395c455b04e61 files/ardour-gcc34.patch 9562
 MD5 d20e0aaa416ef820fd3c6767245288e8 files/digest-ardour-0.9_beta11-r1 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFA/qDtT+MN7JbqCpMRAnRZAJ0X4drKqev7vtNqPBL8MWxnPgBi4gCfWxZo
-VaCxSOGhOoHrN1DO/njTtw8=
-=6i6v
------END PGP SIGNATURE-----
+MD5 7a141a91be1ab2fa37751bff2697f71f files/digest-ardour-0.9_beta18-r1 72
diff --git a/media-sound/ardour/ardour-0.9_beta18-r1.ebuild b/media-sound/ardour/ardour-0.9_beta18-r1.ebuild
new file mode 100644
index 000000000000..4b0123826013
--- /dev/null
+++ b/media-sound/ardour/ardour-0.9_beta18-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-0.9_beta18-r1.ebuild,v 1.1 2004/07/24 13:48:02 tigger Exp $
+
+inherit eutils
+
+MY_P="${P}.3"
+MY_PV="${PV}.3"
+
+DESCRIPTION="multi-track hard disk recording software"
+HOMEPAGE="http://ardour.org/"
+SRC_URI="http://ardour.org/releases/${MY_P/_/}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="nls"
+
+RDEPEND="dev-util/pkgconfig
+	>=media-libs/liblrdf-0.3.6
+	>=media-sound/jack-audio-connection-kit-0.98.1
+	=dev-libs/glib-1.2*
+	=x11-libs/gtk+-1.2*
+	>=media-libs/libsndfile-1.0.4
+	sys-libs/gdbm
+	>=media-libs/ladspa-sdk-1.12
+	>=media-libs/libsamplerate-0.0.14
+	>=media-libs/liblrdf-0.3.1
+	>=dev-libs/libxml2-2.5.7
+	=media-libs/libart_lgpl-2.3*"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P/_/}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/ardour-gcc34.patch
+	epatch ${FILESDIR}/ardour.aclocal.patch
+}
+
+src_compile() {
+	autoconf
+	local myconf="--disable-dependency-tracking --enable-optimize --disable-ksi"
+
+	use nls || myconf="${myconf} --disable-nls"
+	econf ${myconf} || die "configure failed"
+
+	emake || die "parallel make failed"
+}
+
+src_install() {
+	einstall || die "make install failed"
+	dodoc DOCUMENTATION/*
+}
diff --git a/media-sound/ardour/files/ardour.aclocal.patch b/media-sound/ardour/files/ardour.aclocal.patch
new file mode 100644
index 000000000000..72f7864b2860
--- /dev/null
+++ b/media-sound/ardour/files/ardour.aclocal.patch
@@ -0,0 +1,228 @@
+diff -ru ardour-0.9beta18.3.orig/gtk_ardour/aclocal.m4 ardour-0.9beta18.3/gtk_ardour/aclocal.m4
+--- ardour-0.9beta18.3.orig/gtk_ardour/aclocal.m4	2004-07-22 11:15:43.000000000 +0000
++++ ardour-0.9beta18.3/gtk_ardour/aclocal.m4	2004-07-23 18:44:28.878403696 +0000
+@@ -2756,6 +2756,8 @@
+ dnl figure out how best to optimize
+ dnl 
+ 
++gcc_major_version=$($CC -dumpversion | sed -e 's/\..*//')
++
+ if test "$target_cpu" = "powerpc"; then
+   AC_DEFINE(POWERPC, 1, "Are we running a ppc CPU?")
+   altivecLinux=
+@@ -2770,7 +2772,7 @@
+   else
+     OPT_FLAGS="-D_REENTRANT -O3 -mcpu=750 -mmultiple"
+   fi
+-  OPT_FLAGS="$OPTIM_FLAGS -mhard-float -mpowerpc-gfxopt"
++  OPT_FLAGS="$OPT_FLAGS -mhard-float -mpowerpc-gfxopt"
+ elif echo $target_cpu | grep "i*86" >/dev/null; then
+   cat /proc/cpuinfo | grep mmx >/dev/null
+   if test $? = 0; then
+@@ -2790,13 +2792,15 @@
+   elif test "$target_cpu" = "i686"; then
+     OPT_FLAGS="-D_REENTRANT -O3 -march=i686 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
+     if test "$gcc_major_version" = "3"; then
+-      OPT_FLAGS="$OPTIM_FLAGS $mmx $sse $dreidnow"
++      OPT_FLAGS="$OPT_FLAGS $mmx $sse $dreidnow"
+     fi
+   else
+     OPT_FLAGS="-D_REENTRANT -O3 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
+   fi
+ fi
+ 
++OPT_FLAGS="$OPT_FLAGS -pipe"
++
+ # LARGEFILE_FLAGS="`getconf LFS_CFLAGS`"
+ LARGEFILE_FLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+ 
+diff -ru ardour-0.9beta18.3.orig/libs/ardour/aclocal.m4 ardour-0.9beta18.3/libs/ardour/aclocal.m4
+--- ardour-0.9beta18.3.orig/libs/ardour/aclocal.m4	2004-07-22 11:15:18.000000000 +0000
++++ ardour-0.9beta18.3/libs/ardour/aclocal.m4	2004-07-23 18:59:16.276498680 +0000
+@@ -2756,6 +2756,8 @@
+ dnl figure out how best to optimize
+ dnl 
+ 
++gcc_major_version=$($CC -dumpversion | sed -e 's/\..*//')
++
+ if test "$target_cpu" = "powerpc"; then
+   AC_DEFINE(POWERPC, 1, "Are we running a ppc CPU?")
+   altivecLinux=
+@@ -2770,7 +2772,7 @@
+   else
+     OPT_FLAGS="-D_REENTRANT -O3 -mcpu=750 -mmultiple"
+   fi
+-  OPT_FLAGS="$OPTIM_FLAGS -mhard-float -mpowerpc-gfxopt"
++  OPT_FLAGS="$OPT_FLAGS -mhard-float -mpowerpc-gfxopt"
+ elif echo $target_cpu | grep "i*86" >/dev/null; then
+   cat /proc/cpuinfo | grep mmx >/dev/null
+   if test $? = 0; then
+@@ -2790,13 +2792,15 @@
+   elif test "$target_cpu" = "i686"; then
+     OPT_FLAGS="-D_REENTRANT -O3 -march=i686 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
+     if test "$gcc_major_version" = "3"; then
+-      OPT_FLAGS="$OPTIM_FLAGS $mmx $sse $dreidnow"
++      OPT_FLAGS="$OPT_FLAGS $mmx $sse $dreidnow"
+     fi
+   else
+     OPT_FLAGS="-D_REENTRANT -O3 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
+   fi
+ fi
+ 
++OPT_FLAGS="$OPT_FLAGS -pipe"
++
+ # LARGEFILE_FLAGS="`getconf LFS_CFLAGS`"
+ LARGEFILE_FLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+ 
+diff -ru ardour-0.9beta18.3.orig/libs/gtkmmext/aclocal.m4 ardour-0.9beta18.3/libs/gtkmmext/aclocal.m4
+--- ardour-0.9beta18.3.orig/libs/gtkmmext/aclocal.m4	2004-07-22 11:15:32.000000000 +0000
++++ ardour-0.9beta18.3/libs/gtkmmext/aclocal.m4	2004-07-23 18:59:35.627556872 +0000
+@@ -2756,6 +2756,8 @@
+ dnl figure out how best to optimize
+ dnl 
+ 
++gcc_major_version=$($CC -dumpversion | sed -e 's/\..*//')
++
+ if test "$target_cpu" = "powerpc"; then
+   AC_DEFINE(POWERPC, 1, "Are we running a ppc CPU?")
+   altivecLinux=
+@@ -2770,7 +2772,7 @@
+   else
+     OPT_FLAGS="-D_REENTRANT -O3 -mcpu=750 -mmultiple"
+   fi
+-  OPT_FLAGS="$OPTIM_FLAGS -mhard-float -mpowerpc-gfxopt"
++  OPT_FLAGS="$OPT_FLAGS -mhard-float -mpowerpc-gfxopt"
+ elif echo $target_cpu | grep "i*86" >/dev/null; then
+   cat /proc/cpuinfo | grep mmx >/dev/null
+   if test $? = 0; then
+@@ -2790,13 +2792,15 @@
+   elif test "$target_cpu" = "i686"; then
+     OPT_FLAGS="-D_REENTRANT -O3 -march=i686 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
+     if test "$gcc_major_version" = "3"; then
+-      OPT_FLAGS="$OPTIM_FLAGS $mmx $sse $dreidnow"
++      OPT_FLAGS="$OPT_FLAGS $mmx $sse $dreidnow"
+     fi
+   else
+     OPT_FLAGS="-D_REENTRANT -O3 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
+   fi
+ fi
+ 
++OPT_FLAGS="$OPT_FLAGS -pipe"
++
+ # LARGEFILE_FLAGS="`getconf LFS_CFLAGS`"
+ LARGEFILE_FLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+ 
+diff -ru ardour-0.9beta18.3.orig/libs/midi++/aclocal.m4 ardour-0.9beta18.3/libs/midi++/aclocal.m4
+--- ardour-0.9beta18.3.orig/libs/midi++/aclocal.m4	2004-07-22 11:15:13.000000000 +0000
++++ ardour-0.9beta18.3/libs/midi++/aclocal.m4	2004-07-23 18:59:49.517445288 +0000
+@@ -951,6 +951,8 @@
+ dnl figure out how best to optimize
+ dnl 
+ 
++gcc_major_version=$($CC -dumpversion | sed -e 's/\..*//')
++
+ if test "$target_cpu" = "powerpc"; then
+   AC_DEFINE(POWERPC, 1, "Are we running a ppc CPU?")
+   altivecLinux=
+@@ -965,7 +967,7 @@
+   else
+     OPT_FLAGS="-D_REENTRANT -O3 -mcpu=750 -mmultiple"
+   fi
+-  OPT_FLAGS="$OPTIM_FLAGS -mhard-float -mpowerpc-gfxopt"
++  OPT_FLAGS="$OPT_FLAGS -mhard-float -mpowerpc-gfxopt"
+ elif echo $target_cpu | grep "i*86" >/dev/null; then
+   cat /proc/cpuinfo | grep mmx >/dev/null
+   if test $? = 0; then
+@@ -985,13 +987,15 @@
+   elif test "$target_cpu" = "i686"; then
+     OPT_FLAGS="-D_REENTRANT -O3 -march=i686 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
+     if test "$gcc_major_version" = "3"; then
+-      OPT_FLAGS="$OPTIM_FLAGS $mmx $sse $dreidnow"
++      OPT_FLAGS="$OPT_FLAGS $mmx $sse $dreidnow"
+     fi
+   else
+     OPT_FLAGS="-D_REENTRANT -O3 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
+   fi
+ fi
+ 
++OPT_FLAGS="$OPT_FLAGS -pipe"
++
+ # LARGEFILE_FLAGS="`getconf LFS_CFLAGS`"
+ LARGEFILE_FLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+ 
+diff -ru ardour-0.9beta18.3.orig/libs/pbd/aclocal.m4 ardour-0.9beta18.3/libs/pbd/aclocal.m4
+--- ardour-0.9beta18.3.orig/libs/pbd/aclocal.m4	2004-07-22 11:15:06.000000000 +0000
++++ ardour-0.9beta18.3/libs/pbd/aclocal.m4	2004-07-23 18:21:14.026453424 +0000
+@@ -839,6 +839,8 @@
+ dnl figure out how best to optimize
+ dnl 
+ 
++gcc_major_version=$($CC -dumpversion | sed -e 's/\..*//')
++
+ if test "$target_cpu" = "powerpc"; then
+   AC_DEFINE(POWERPC, 1, "Are we running a ppc CPU?")
+   altivecLinux=
+@@ -853,7 +855,7 @@
+   else
+     OPT_FLAGS="-D_REENTRANT -O3 -mcpu=750 -mmultiple"
+   fi
+-  OPT_FLAGS="$OPTIM_FLAGS -mhard-float -mpowerpc-gfxopt"
++  OPT_FLAGS="$OPT_FLAGS -mhard-float -mpowerpc-gfxopt"
+ elif echo $target_cpu | grep "i*86" >/dev/null; then
+   cat /proc/cpuinfo | grep mmx >/dev/null
+   if test $? = 0; then
+@@ -873,13 +875,15 @@
+   elif test "$target_cpu" = "i686"; then
+     OPT_FLAGS="-D_REENTRANT -O3 -march=i686 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
+     if test "$gcc_major_version" = "3"; then
+-      OPT_FLAGS="$OPTIM_FLAGS $mmx $sse $dreidnow"
++      OPT_FLAGS="$OPT_FLAGS $mmx $sse $dreidnow"
+     fi
+   else
+     OPT_FLAGS="-D_REENTRANT -O3 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
+   fi
+ fi
+ 
++OPT_FLAGS="$OPT_FLAGS -pipe"
++
+ # LARGEFILE_FLAGS="`getconf LFS_CFLAGS`"
+ LARGEFILE_FLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+ 
+diff -ru ardour-0.9beta18.3.orig/libs/soundtouch/aclocal.m4 ardour-0.9beta18.3/libs/soundtouch/aclocal.m4
+--- ardour-0.9beta18.3.orig/libs/soundtouch/aclocal.m4	2004-07-22 11:15:10.000000000 +0000
++++ ardour-0.9beta18.3/libs/soundtouch/aclocal.m4	2004-07-23 19:00:52.502870048 +0000
+@@ -839,6 +839,8 @@
+ dnl figure out how best to optimize
+ dnl 
+ 
++gcc_major_version=$($CC -dumpversion | sed -e 's/\..*//')
++
+ if test "$target_cpu" = "powerpc"; then
+   AC_DEFINE(POWERPC, 1, "Are we running a ppc CPU?")
+   altivecLinux=
+@@ -853,7 +855,7 @@
+   else
+     OPT_FLAGS="-D_REENTRANT -O3 -mcpu=750 -mmultiple"
+   fi
+-  OPT_FLAGS="$OPTIM_FLAGS -mhard-float -mpowerpc-gfxopt"
++  OPT_FLAGS="$OPT_FLAGS -mhard-float -mpowerpc-gfxopt"
+ elif echo $target_cpu | grep "i*86" >/dev/null; then
+   cat /proc/cpuinfo | grep mmx >/dev/null
+   if test $? = 0; then
+@@ -873,13 +875,15 @@
+   elif test "$target_cpu" = "i686"; then
+     OPT_FLAGS="-D_REENTRANT -O3 -march=i686 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
+     if test "$gcc_major_version" = "3"; then
+-      OPT_FLAGS="$OPTIM_FLAGS $mmx $sse $dreidnow"
++      OPT_FLAGS="$OPT_FLAGS $mmx $sse $dreidnow"
+     fi
+   else
+     OPT_FLAGS="-D_REENTRANT -O3 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
+   fi
+ fi
+ 
++OPT_FLAGS="$OPT_FLAGS -pipe"
++
+ # LARGEFILE_FLAGS="`getconf LFS_CFLAGS`"
+ LARGEFILE_FLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+ 
diff --git a/media-sound/ardour/files/digest-ardour-0.9_beta18-r1 b/media-sound/ardour/files/digest-ardour-0.9_beta18-r1
new file mode 100644
index 000000000000..a67c19ba2541
--- /dev/null
+++ b/media-sound/ardour/files/digest-ardour-0.9_beta18-r1
@@ -0,0 +1 @@
+MD5 755924ccaaf4c4490b842a0ddc801db5 ardour-0.9beta18.3.tar.bz2 2597213