Add a patch for sse and another src_pretend. See bug 526608

(Portage version: 2.2.8-r2/cvs/Linux i686, signed Manifest commit with key C1DE54B2)

3 files changed, 43 insertions, 12 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index 823f61e6d3f6..8dc5299a5410 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/ardour
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.133 2014/10/23 18:15:30 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.134 2014/10/24 19:07:19 nativemad Exp $
+
+  24 Oct 2014; Andreas Schuerch <nativemad@gentoo.org> ardour-3.5.403.ebuild,
+  +files/ardour-3.5.403-sse.patch:
+  add a patch for sse and another src_pretend. See bug 526608
 
   23 Oct 2014; Andreas Schuerch <nativemad@gentoo.org> ChangeLog:
   forgot to sign..
diff --git a/media-sound/ardour/ardour-3.5.403.ebuild b/media-sound/ardour/ardour-3.5.403.ebuild
index ef24e142996c..1e82c20a127c 100644
--- a/media-sound/ardour/ardour-3.5.403.ebuild
+++ b/media-sound/ardour/ardour-3.5.403.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.403.ebuild,v 1.1 2014/10/23 18:13:02 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.403.ebuild,v 1.2 2014/10/24 19:07:19 nativemad Exp $
 
-EAPI=4
+EAPI=5
 inherit eutils toolchain-funcs flag-o-matic waf-utils
 
 DESCRIPTION="Digital Audio Workstation"
@@ -68,13 +68,6 @@ DEPEND="${RDEPEND}
 		DEPEND="${DEPEND}"
 	fi
 
-pkg_pretend() {
-	MARCH=$(get-flag march)
-	if ! gcc -march=${MARCH} -Q --help=target | grep "msse" | grep "enabled" >/dev/null; then
-		die "Ardour fails to build with an march that is not sse capable!"
-	fi
-}
-
 src_unpack() {
 	if [ ${PV} = 9999 ]; then
 		git-2_src_unpack
@@ -83,17 +76,27 @@ src_unpack() {
 	fi
 }
 
+pkg_pretend() {
+	if use sse; then
+		MARCH=$(get-flag march)
+		for ARCHWOSSE in i686 i486; do
+			if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
+				is-flag -msse || is-flag -msse2 || die "Ardour fails to build with USE=sse and an march that is not sse capable, unless the -msse or -msse2 cflag are set also!"
+			fi
+		done
+	fi
+}
+
 src_prepare(){
 	if ! [ ${PV} = 9999 ]; then
 		PVTEMP=$(echo "${PV}" | sed "s/\./-/2")
 		sed -e '/cmd = "git describe HEAD/,/utf-8/{s:cmd = \"git describe HEAD\":rev = \"'${PVTEMP}-gentoo'\":p;d}' -i "${S}"/wscript
 		sed -e 's/'os.getcwd\(\),\ \'.git'/'os.getcwd\(\),\ \'libs/'' -i "${S}"/wscript
 		sed -e 's/'os.path.exists\(\'.git'/'os.path.exists\(\'wscript/'' -i "${S}"/wscript
-
 	fi
 	epatch "${FILESDIR}"/${PN}-3.5.7-syslibs.patch
+	epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
 	sed 's/python/python2/' -i waf
-#	sed 's/'FLAGS\'\,\ optimization_flags'/'FLAGS\'\,\ \'\''/g' -i "${S}"/wscript
 	sed 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ \'\''/g' -i "${S}"/wscript
 	append-flags "-lboost_system"
 }
diff --git a/media-sound/ardour/files/ardour-3.5.403-sse.patch b/media-sound/ardour/files/ardour-3.5.403-sse.patch
new file mode 100644
index 000000000000..194da5f08059
--- /dev/null
+++ b/media-sound/ardour/files/ardour-3.5.403-sse.patch
@@ -0,0 +1,24 @@
+diff -rupN ardouroriginal/libs/ardour/wscript ardour-3.5.403/libs/ardour/wscript
+--- ardouroriginal/libs/ardour/wscript	2014-10-24 19:18:10.981000000 +0200
++++ ardour-3.5.403/libs/ardour/wscript	2014-10-24 19:19:36.115000000 +0200
+@@ -385,7 +385,7 @@ def build(bld):
+     if bld.is_defined('AUDIOUNIT_SUPPORT'):
+         obj.source += [ 'audio_unit.cc' ]
+ 
+-    if Options.options.fpu_optimization:
++    if bld.env['FPU_OPTIMIZATION']:
+         if (bld.env['build_target'] == 'i386' or bld.env['build_target'] == 'i686'):
+             obj.source += [ 'sse_functions_xmm.cc', 'sse_functions.s' ]
+         elif bld.env['build_target'] == 'x86_64':
+diff -rupN ardouroriginal/wscript ardour-3.5.403/wscript
+--- ardouroriginal/wscript	2014-10-24 19:18:10.989000000 +0200
++++ ardour-3.5.403/wscript	2014-10-24 19:20:20.160000000 +0200
+@@ -675,6 +675,8 @@ def configure(conf):
+         conf.env['PHONE_HOME'] = True
+     if opts.fpu_optimization:
+         conf.env['FPU_OPTIMIZATION'] = True
++    else:
++	conf.env['FPU_OPTIMIZATION'] = False
+     if opts.nls:
+         conf.define('ENABLE_NLS', 1)
+         conf.env['ENABLE_NLS'] = True