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

Package-Manager: portage-2.2.01.17133-prefix/cvs/Darwin powerpc

4 files changed, 54 insertions, 14 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/Manifest b/media-libs/schroedinger/Manifest
index 9475f2d92305..203fe6f12bf1 100644
--- a/media-libs/schroedinger/Manifest
+++ b/media-libs/schroedinger/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX schroedinger-1.0.10-orc-symbols.patch 1507 RMD160 299b34e5fb04384b2c32d21c6b97ebd9c15f88b0 SHA1 2d3ed0be9ff11b8fc56c225538c8b553a6e463f5 SHA256 1d8728f1d1545bbdc0514ff278dc53864d984c60d5424e8120962f746b5958e2
 AUX schroedinger-1.0.9-asneeded.patch 389 RMD160 9b2e12b6554a99c0a45a1060ad062152c0a4230b SHA1 7eaaee31b4a63c0e025746b9a33d19ecc53cb81d SHA256 74d97e408a70889bf28318c94f4e1563c7ff067b1bf66e3abdd8b5acf48d9067
 DIST schroedinger-1.0.10.tar.gz 996489 RMD160 07373e40e62067fd2a38a41c55ef6cdce40c75fb SHA1 c8af4cb2bc54b7783ac20d7f4a39db4e31c1cac0 SHA256 9a45c4f8d6197a641a9b06ab9b59ec02ad9986723fd855528a00ec3477a71964
 DIST schroedinger-1.0.8.tar.gz 863436 RMD160 77b029fd2f0f8d7c687f9a4eb30e02e4499be53d SHA1 7abfdc8dae7185b70315b0c91757337b40b31610 SHA256 2a3cac3d561af744d1f7b0f2d00540153beb6ce5293de7f822cfc7e86c380d29
 DIST schroedinger-1.0.9.tar.gz 937748 RMD160 bf3abf83909a6d9f074c00a45ca65fcd124c07c8 SHA1 b4121e10cc474c97676e03ae49c5a91c11956ba0 SHA256 345abcaa72ff0f2e9c1075e22f7141475ee4e6eea23a7f568b69ffc13cc1c723
-EBUILD schroedinger-1.0.10.ebuild 1037 RMD160 3393be13464df0270f7d11af8cb104151d0b1107 SHA1 173fa79add868e3a48e7cdfab2b9419d5ae3486b SHA256 0bf9810e824766c439360c4b5a6690115f723cbc5e973d3ed2d76c62f2fb7e01
+EBUILD schroedinger-1.0.10.ebuild 1081 RMD160 3a2e3a1fdf1bb7ee3dbe26f2851252f84b34c8f3 SHA1 e3f05e6d6fb6deb0b6f5b2729c2171f040f853d9 SHA256 f13d0fd1bb1aac6fc3b291db9f5258df8031128e991e379c4f8359f2ffdf938f
 EBUILD schroedinger-1.0.8.ebuild 927 RMD160 592e9f41229832eae61c5ed8f404ebf281d53a31 SHA1 a4c43b0fce37b1f4695ae1657e23de350ecf97b1 SHA256 ebaa967ff29c948f679f6da2e1f38b1e7f06f920bb7a8a3d06afc7430d21abc1
 EBUILD schroedinger-1.0.9.ebuild 1104 RMD160 6dd55cd13c40d65d5afd46e1764b1708eef03350 SHA1 66469d4408b985fb44eac073851569407303239a SHA256 1fdb20e4710c117f0d337b65748398149a87966070cdb24972c1b7ef15b22daa
-MISC ChangeLog 7253 RMD160 d365f0691f562220cd288b78724adc8961763aa2 SHA1 4dc8720ac53c7de20b2148a5efb58a96443aad99 SHA256 5f5b82cb8cf7f7b37605af2f0c0c866c236777789fe76b6c82e9c9d3af50585e
+MISC ChangeLog 7468 RMD160 42a56d685831ad5017e8ded4ebba71e6740e514f SHA1 ec2f8a43c2ead9b78835d4892963fbca42a3b635 SHA256 c7066e11c54e3cb12c4f869d0bcfcf37e73ecc716673fcf2161b7a1c8dc919f3
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyvhTgACgkQvFcC4BYPU0oo7QCfaUQY/ptrU/kcuUPWHI4U20BB
-PjoAmwfUyzQCgJyI0FlE/gzXo7NCNLiI
-=y9lz
------END PGP SIGNATURE-----
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