Fix build on Darwin with upstream patches, bug #404231

Package-Manager: portage-2.2.01.20271-prefix/cvs/Darwin i386

4 files changed, 50 insertions, 14 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/Manifest b/media-libs/schroedinger/Manifest
index c517ff34b4b3..678445595bff 100644
--- a/media-libs/schroedinger/Manifest
+++ b/media-libs/schroedinger/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX schroedinger-1.0.10-orc-symbols.patch 1507 RMD160 299b34e5fb04384b2c32d21c6b97ebd9c15f88b0 SHA1 2d3ed0be9ff11b8fc56c225538c8b553a6e463f5 SHA256 1d8728f1d1545bbdc0514ff278dc53864d984c60d5424e8120962f746b5958e2
+AUX schroedinger-1.0.11-darwin-compile.patch 1176 RMD160 88714016367661bca86edb229e5ab573e6e39a88 SHA1 3519bd97b2bc6bdca90318e8b72bf2d8b5e49c40 SHA256 064baef8753361b6a7494416b867fe6df8897b4c50a250879085baae94dc9f47
 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.11.tar.gz 1019247 RMD160 2246f07d2a7310d7a4fa8b79f62b28f65c780322 SHA1 c01ee0bed6c1bd7608763927f719f94ebc6aaa41 SHA256 1e572a0735b92aca5746c4528f9bebd35aa0ccf8619b22fa2756137a8cc9f912
@@ -9,19 +10,15 @@ DIST schroedinger-1.0.8.tar.gz 863436 RMD160 77b029fd2f0f8d7c687f9a4eb30e02e4499
 DIST schroedinger-1.0.9.tar.gz 937748 RMD160 bf3abf83909a6d9f074c00a45ca65fcd124c07c8 SHA1 b4121e10cc474c97676e03ae49c5a91c11956ba0 SHA256 345abcaa72ff0f2e9c1075e22f7141475ee4e6eea23a7f568b69ffc13cc1c723
 EBUILD schroedinger-1.0.10-r1.ebuild 1084 RMD160 8a7207d75220613e9f3bc876f317fb23b78436bd SHA1 a78dd3a4fb7b77c1be958c160e4cea271de77266 SHA256 a89f92e221959c2e39969f7ee2a662a3b4cea8d6cd1343328683a7134a20d8bb
 EBUILD schroedinger-1.0.10.ebuild 1082 RMD160 d2f10b45bede125857de6e27aa26fbea7b51f878 SHA1 d4cd4fbb88993a5cd20ea6549cfcd282e6f4c7fe SHA256 3fac011daed865d186d98a11d5a9b7acc165536d13b8a4865fbf53bcc68dc776
-EBUILD schroedinger-1.0.11.ebuild 1027 RMD160 c9fabbc79f9e07b975152005ce43b26192d7713b SHA1 9551fd26de38e5be418a90262c8ba7c752e2f31f SHA256 c1d2404f1e3906adb66f3a86bc34abdda1e88ac7239adfb43648bf67c4ac3daf
+EBUILD schroedinger-1.0.11.ebuild 1121 RMD160 f87211a6c456dca23d2ab00e0c5b91ffe17ab7a5 SHA1 fd24558ff5373d946dbbb93e16f4cfaf160ea751 SHA256 d691060198be665e43167238f845c524b5d3db4d196c6776aabc70795a1a03c0
 EBUILD schroedinger-1.0.8.ebuild 928 RMD160 fc020dccd8947ac190e5cab92a46abbc1fbe34bb SHA1 2512a9163a97be219e4d9d67ff8fbbf4099735c9 SHA256 480225ebbf680a834eeda0d0acb66c37186c86e79cc72e64c2d76a83603f67e0
 EBUILD schroedinger-1.0.9.ebuild 1104 RMD160 6dd55cd13c40d65d5afd46e1764b1708eef03350 SHA1 66469d4408b985fb44eac073851569407303239a SHA256 1fdb20e4710c117f0d337b65748398149a87966070cdb24972c1b7ef15b22daa
-MISC ChangeLog 8155 RMD160 f6668e3ed770fe6f6b03642114b19c54434dab8e SHA1 ed4be6ce7b9d1f565db07a017ea8ea2295f4c423 SHA256 a8393731621120ddb392448579ccb984ccc08bce3e8278104b6786860f4c0f83
+MISC ChangeLog 8341 RMD160 ac479d349ef45cddff3b0712247868158a50cabb SHA1 953945dbbc589251af4d88f250e30aba9e48d457 SHA256 349d06adf80b7da0ac9931a21bb84c92d114f21a45654aa137542673faacc522
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iQEcBAEBCgAGBQJPO4R8AAoJEEqz6FtPBkyjBOUH/3wlaa5hxcZCqH09gaEoNx10
-sLnOPTx3V7d//xXqyNzOasKGvODmD9fqlmhPyGT4/GQ2wXOXAQ+cqbIBK8zxzBdE
-MKTzHiZYXWZc1Jj8lMJ8UUGqd5/U7UPCTM86pfVuxlFatmo4NVtD7HN28CYvlBJp
-tjZFgfHtuefqQalPX3Ekzi8qWJHXBK0XAzHK8ouJmPw4Z55N7enRt5QbHUuksj/s
-SqvsizzMfaGZgxlFw9Ayn/+rHwbng3HWPnuV84kCGR1W5NvluX+ghRO6qZFpXHeQ
-LKW4XXPEenWjziKtfS7z18Q/Ay+S3FbU8tZp/2tzj3hj2RApztUFDLCwbry1B1c=
-=5M1p
+iEYEARECAAYFAk9iKk8ACgkQX3X2B8XHTonWUwCeKWaZiZqKh/ftkBzWsxhjW60V
+JfEAn1Elph68WVIzLWtTBpkYFKha/c4V
+=ccN2
 -----END PGP SIGNATURE-----
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