Grab patch from upstream to fix compilation with stricter linkers, such as Darwin's

(Portage version: 2.2.01.17133-prefix/cvs/Darwin powerpc)

3 files changed, 51 insertions, 2 deletions

diff --git a/media-libs/schroedinger/ChangeLog b/media-libs/schroedinger/ChangeLog
index 444ff6ea36c0..db34bb56df24 100644
--- a/media-libs/schroedinger/ChangeLog
+++ b/media-libs/schroedinger/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/schroedinger
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/ChangeLog,v 1.51 2010/10/08 20:55:13 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/ChangeLog,v 1.52 2010/10/28 19:33:24 grobian Exp $
+
+  28 Oct 2010; Fabian Groffen <grobian@gentoo.org>
+  schroedinger-1.0.10.ebuild, +files/schroedinger-1.0.10-orc-symbols.patch:
+  Grab patch from upstream to fix compilation with stricter linkers, such as
+  Darwin's
 
 *schroedinger-1.0.10 (08 Oct 2010)
 
diff --git a/media-libs/schroedinger/files/schroedinger-1.0.10-orc-symbols.patch b/media-libs/schroedinger/files/schroedinger-1.0.10-orc-symbols.patch
new file mode 100644
index 000000000000..6e236ab1698c
--- /dev/null
+++ b/media-libs/schroedinger/files/schroedinger-1.0.10-orc-symbols.patch
@@ -0,0 +1,43 @@
+From: David Schleef <ds@schleef.org>
+Date: Fri, 8 Oct 2010 20:32:11 +0000 (-0700)
+Subject: Don't export orc_ symbols and fix related bugs
+X-Git-Url: http://diracvideo.schleef.org/git?p=schroedinger.git;a=commitdiff_plain;h=9c4e8a89af9f8ce408e50a0ffab79348e9703df2
+
+Don't export orc_ symbols and fix related bugs
+---
+
+diff --git a/schroedinger/Makefile.am b/schroedinger/Makefile.am
+index b9b10c6..aa5e41c 100644
+--- a/schroedinger/Makefile.am
++++ b/schroedinger/Makefile.am
+@@ -157,7 +157,7 @@ libschroedinger_@SCHRO_MAJORMINOR@_la_LIBADD = \
+ libschroedinger_@SCHRO_MAJORMINOR@_la_LDFLAGS = \
+ 	-no-undefined \
+ 	-version-info $(SCHRO_LIBVERSION) \
+-	-export-symbols-regex '^(schro|orc)_'
++	-export-symbols-regex '^schro_'
+ 
+ %.c.gcov: .libs/libschroedinger_@SCHRO_MAJORMINOR@_la-%.gcda %.c
+ 	$(GCOV) -b -f -o $^ > $@.out
+diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
+index fac2e21..92d74fd 100644
+--- a/testsuite/Makefile.am
++++ b/testsuite/Makefile.am
+@@ -95,7 +95,7 @@ wavelet_gain_curve_SOURCES = wavelet_gain_curve.c
+ 
+ #wavelet_2d_CFLAGS = $(SCHRO_CFLAGS)
+ #wavelet_2d_LDADD = $(SCHRO_LIBS)
+-wavelet_2d_SOURCES = wavelet_2d.c
++wavelet_2d_SOURCES = wavelet_2d.c $(top_srcdir)/schroedinger/tmp-orc.c
+ 
+ wavelet_noise_2d_SOURCES = wavelet_noise_2d.c
+ 
+@@ -113,7 +113,7 @@ motion2_SOURCES = motion2.c
+ 
+ #quant_CFLAGS = 
+ #quant_LDADD = -lm
+-quant_SOURCES = quant.c
++quant_SOURCES = quant.c $(top_srcdir)/schroedinger/tmp-orc.c
+ 
+ #sort_CFLAGS = $(SCHRO_CFLAGS)
+ #sort_LDADD = $(SCHRO_LIBS)
diff --git a/media-libs/schroedinger/schroedinger-1.0.10.ebuild b/media-libs/schroedinger/schroedinger-1.0.10.ebuild
index 81614f0f25aa..f58e9e5f5137 100644
--- a/media-libs/schroedinger/schroedinger-1.0.10.ebuild
+++ b/media-libs/schroedinger/schroedinger-1.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/schroedinger-1.0.10.ebuild,v 1.1 2010/10/08 20:55:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/schroedinger-1.0.10.ebuild,v 1.2 2010/10/28 19:33:24 grobian Exp $
 
 EAPI=3
 inherit autotools eutils
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-orc-symbols.patch
 	sed -i \
 		-e '/AS_COMPILER_FLAG(-O3/d' \
 		configure.ac || die