Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/erlang/PKGBUILD
	community/lshw/PKGBUILD
	extra/ardour/PKGBUILD

1 files changed, 6 insertions, 4 deletions

diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD
index 3dbefac8a..f7f0561a6 100644
--- a/extra/ardour/PKGBUILD
+++ b/extra/ardour/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165179 2012-08-12 12:56:20Z schiv $
+# $Id: PKGBUILD 172504 2012-12-04 11:26:49Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -8,9 +8,10 @@
 # for fixed dependencies speaking in terms of versions -- tobias
 
 # SYSLIBS enabled, support still valid; see ardour 2.8.13 rel notes
+# http://ardour.org/node/5263
 
 pkgname=ardour
-pkgver=2.8.14
+pkgver=2.8.16
 pkgrel=1
 pkgdesc="A multichannel hard disk recorder and digital audio workstation"
 arch=('i686' 'x86_64' 'mips64el')
@@ -25,12 +26,13 @@ makedepends=('scons' 'boost')
 changelog=$pkgname.changelog
 source=("ftp://ftp.archlinux.org/other/ardour/$pkgname-$pkgver.tar.bz2"
         "$pkgname.desktop")
-md5sums=('c79219ba10735d0b061d53a84ae611a4'
+md5sums=('5bafe41df00d25e7a357baaa1038f16d'
          '8aeaf433ebf781733db48e5a16b0c4da')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # ardour defaults to -O3; use this in CFLAGS below
   sed -i '/-O3/d' SConstruct
 
   # work around boost linking error (see ardour3 svn r13081)
@@ -42,7 +44,7 @@ build() {
   # All unknown arches are considered i686 with SSE.
   [ "$CARCH" == "mips64el" ] && extra="DIST_TARGET=none"
 
-  scons $MAKEFLAGS ARCH="$CFLAGS -O3" \
+  scons $MAKEFLAGS ARCH="${CFLAGS/-O[0-9]/-O3}" \
                    PREFIX="/usr" \
                    DIST_LIBDIR="lib" \
                    FREEDESKTOP=0 \