Fix build on Darwin with upstream patches, bug #404231

(Portage version: 2.2.01.20271-prefix/cvs/Darwin i386)

3 files changed, 42 insertions, 3 deletions

diff --git a/media-libs/schroedinger/ChangeLog b/media-libs/schroedinger/ChangeLog
index f01fecf00042..9ed174488347 100644
--- a/media-libs/schroedinger/ChangeLog
+++ b/media-libs/schroedinger/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/schroedinger
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/ChangeLog,v 1.57 2012/02/15 10:09:58 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/ChangeLog,v 1.58 2012/03/15 17:43:16 grobian Exp $
+
+  15 Mar 2012; Fabian Groffen <grobian@gentoo.org>
+  +files/schroedinger-1.0.11-darwin-compile.patch, schroedinger-1.0.11.ebuild:
+  Fix build on Darwin with upstream patches, bug #404231
 
 *schroedinger-1.0.11 (15 Feb 2012)
 
diff --git a/media-libs/schroedinger/files/schroedinger-1.0.11-darwin-compile.patch b/media-libs/schroedinger/files/schroedinger-1.0.11-darwin-compile.patch
new file mode 100644
index 000000000000..853d5da736f3
--- /dev/null
+++ b/media-libs/schroedinger/files/schroedinger-1.0.11-darwin-compile.patch
@@ -0,0 +1,32 @@
+From 46f48277ce8109541ef1d0608bd2532e433124ea Mon Sep 17 00:00:00 2001
+From: David Schleef <ds@schleef.org>
+Date: Thu, 23 Feb 2012 20:45:57 -0800
+Subject: [PATCH] testsuite: fix out-of-dir builds
+
+From ee011f33f80c9691a6cfd5116101fdcf8c3cd6f7 Mon Sep 17 00:00:00 2001
+From: David Schleef <ds@schleef.org>
+Date: Mon, 27 Feb 2012 16:11:52 -0800
+Subject: [PATCH] tests: fix build on os/x
+
+
+--- a/testsuite/Makefile.am
++++ b/testsuite/Makefile.am
+@@ -97,7 +97,8 @@ wavelet_gain_curve_SOURCES = wavelet_gain_curve.c
+ #wavelet_2d_CFLAGS = $(SCHRO_CFLAGS)
+ #wavelet_2d_LDADD = $(SCHRO_LIBS)
+ wavelet_2d_SOURCES = wavelet_2d.c
+-nodist_wavelet_2d_SOURCES = $(top_srcdir)/schroedinger/tmp-orc.c
++nodist_wavelet_2d_SOURCES = $(top_builddir)/schroedinger/tmp-orc.c
+ 
+ wavelet_max_gain_SOURCES = wavelet_max_gain.c
++nodist_wavelet_max_gain_SOURCES = $(top_builddir)/schroedinger/tmp-orc.c
+ 
+@@ -118,7 +118,7 @@ motion2_SOURCES = motion2.c
+ #quant_CFLAGS = 
+ #quant_LDADD = -lm
+ quant_SOURCES = quant.c
+-nodist_quant_SOURCES = $(top_srcdir)/schroedinger/tmp-orc.c
++nodist_quant_SOURCES = $(top_builddir)/schroedinger/tmp-orc.c
+ 
+ #sort_CFLAGS = $(SCHRO_CFLAGS)
+ #sort_LDADD = $(SCHRO_LIBS)
diff --git a/media-libs/schroedinger/schroedinger-1.0.11.ebuild b/media-libs/schroedinger/schroedinger-1.0.11.ebuild
index 09dd0309be17..b5a2fa10cb54 100644
--- a/media-libs/schroedinger/schroedinger-1.0.11.ebuild
+++ b/media-libs/schroedinger/schroedinger-1.0.11.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/schroedinger-1.0.11.ebuild,v 1.1 2012/02/15 10:09:58 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/schroedinger-1.0.11.ebuild,v 1.2 2012/03/15 17:43:16 grobian Exp $
 
 EAPI=4
-inherit autotools
+inherit eutils autotools
 
 DESCRIPTION="C-based libraries for the Dirac video codec"
 HOMEPAGE="http://www.diracvideo.org/"
@@ -20,6 +20,9 @@ DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am"
 
 src_prepare() {
+	# from upstream, drop at next release
+	epatch "${FILESDIR}"/${P}-darwin-compile.patch 
+
 	sed -i \
 		-e '/AS_COMPILER_FLAG(-O3/d' \
 		configure.ac || die