fix sparc build without vis, by Friedrich Oslage

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 38 insertions, 4 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index b077cbe6ff17..a54ddec8495a 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.559 2008/08/16 07:48:32 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.560 2008/08/16 11:37:45 aballier Exp $
+
+  16 Aug 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/xine-lib-1.1.15-libmpeg2-vis.patch, xine-lib-1.1.15.ebuild:
+  fix sparc build without vis, by Friedrich Oslage
 
   16 Aug 2008; Markus Rothe <corsair@gentoo.org> xine-lib-1.1.15.ebuild:
   Stable on ppc64; bug #234777
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index c45223116462..891df50224d0 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xine-lib-1.1.14-metadata-bugfix.patch 580 RMD160 540a5fef4f449c4510368ae2c1379bf619dccbad SHA1 0a9ded68eac8773ae3b008d733ae93d60996363f SHA256 d8dbb93a6f4d4cc99896fd0c945189b897928c999efb5efa6d7ba0ad7e6f708a
+AUX xine-lib-1.1.15-libmpeg2-vis.patch 405 RMD160 896298250884a9e3a1b168fe7140835a7112bc53 SHA1 3a3212a629c630e52327f25b3df3c5ecef5b5bbb SHA256 90af2c9a50db6dc358df59c9ab3e4aaed4bc8a8686f2b512e1dffa97b64825fe
 AUX xine-lib-1.1.8-dxr3.patch 543 RMD160 4fc1c9ae238c416f097e85b47a8ba4e04fb1c14f SHA1 d5d1ad4ad4a88dda30207d67f3e5e2b6b174fabd SHA256 d6cd3a848de564ccaa82f92e32983ce3a444db357c56b9312be226eac7a81aff
 DIST xine-lib-1.1.13.tar.bz2 7444294 RMD160 a2ffcb43890ec525115e62f796dec6e835ceb4d5 SHA1 d1f4cf0511067a554dbe243468311ebeb3bbdce4 SHA256 ad8c5ba0715c023676a8bff9355865949a63a8505e356e6f21fbff099968991a
 DIST xine-lib-1.1.14.tar.bz2 7455590 RMD160 518b4e90d55971154d78af71f6987f0930ed937c SHA1 8dfe071865ebdb0cfe2f5ce287485bb5ed7c6978 SHA256 40a89065eb8f189d3788b42ad2d5f35ea0b9230372a76f96c9a4c40e71608bfc
@@ -6,7 +10,14 @@ DIST xine-lib-1.1.15.tar.bz2 7478750 RMD160 5c64dd51c05a6e17cb6dfcbb8a9009ba8571
 DIST xine-lib-1.1.8.tar.bz2 7284933 RMD160 b926caa13d5b3f3c74eee681aa6c47c6083c1349 SHA1 48c7402ee2ada28e4b271d9dfb2bcb4d812e7daf SHA256 6c9f11bdec714f8df36b5140a7c8cc6ec81dd8a7673f4756e940cee4f4833c0e
 EBUILD xine-lib-1.1.13.ebuild 5580 RMD160 51ae99e239c308482d9f68e233f42d40189e0fa0 SHA1 9fdceca9596ac5631bb8721b5ec384e6d2b4d94a SHA256 e1e3afa8060266ae151defd3fcc5cc3b23ad0ebb7011a09ba5ed2ba70281d596
 EBUILD xine-lib-1.1.14-r1.ebuild 5678 RMD160 7d7baf747b56bcd6c472751a91f532016c95768a SHA1 74f0e97f181aeb3f0a899167dbf1f487de3f1886 SHA256 aca6c8a415b2f6dc28a17ab26b891ccbd5c0b849d6c3483a9513f1cca84f62a4
-EBUILD xine-lib-1.1.15.ebuild 5351 RMD160 f7b465b8f595df347dfcfac08b8f0dab09123570 SHA1 70b3522899f9858c135581b02899e8ea22c3afb9 SHA256 59d6691a5c05a4dbef603eb2b0b269063c7322b4f8e272e6e3dc7672471d7f1f
+EBUILD xine-lib-1.1.15.ebuild 5438 RMD160 aa7c28b8ae6fe5b950a82c4da06a6723201834de SHA1 80109abdc3eff83f430929401b054069c21a0fb9 SHA256 cc249b67aa5b64048c35b87bcaf47b57139ae76f47f3e725b7c79d65a227e4cb
 EBUILD xine-lib-1.1.8.ebuild 5632 RMD160 81524b906917dda749ffdfdf9c0247169671a4d0 SHA1 7887cca7aaca9bb011a218e824082c26f00e9c0e SHA256 383ddc76254be422550559fe8b5495ba9768e188e1bddcba55806edf0756989e
-MISC ChangeLog 63245 RMD160 f58ad8340fd56f9c72af3539f93bcda8442a98a6 SHA1 3494ca0c172ee58e7449aa17dbd27e221603a43d SHA256 04972ae5230d23d219b1209303b3f1fbb3e1acef4956ae1565f0fef56018781d
+MISC ChangeLog 63419 RMD160 873d03fcc3e626085928f8542e5b7483ee855e24 SHA1 b42b41f0ffac8725bb8b2fdf39f8bc0f43e47893 SHA256 c1cb0af906122b8342c6c348ae14660dcb6b811f5763cb0168a813bab5cf3ae7
 MISC metadata.xml 2914 RMD160 bed4bab81a32b49e4923ddfcc02e8338a45ef7ef SHA1 fe3faf7dba7f929241acfe5eaa17b2f66bfb2722 SHA256 efe3b879c59c9971e1ffcd732c2bdbd8f60f2b173fde675a371202ceeb96b0fe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkimvA8ACgkQvFcC4BYPU0ookACeLk1UEB4ogGKoktUT55mMBRz3
+oC8An21KUGvvm21JOetr3CKYzv2IhQyz
+=IOzD
+-----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.15-libmpeg2-vis.patch b/media-libs/xine-lib/files/xine-lib-1.1.15-libmpeg2-vis.patch
new file mode 100644
index 000000000000..c85fa6086d1f
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.1.15-libmpeg2-vis.patch
@@ -0,0 +1,13 @@
+src/libmpeg2/motion_comp_vis.c checks for ENABLE_VIS therefore we also need to check for it.
+
+--- src/libmpeg2/motion_comp.c
++++ src/libmpeg2/motion_comp.c
+@@ -68,7 +68,7 @@
+ 	mpeg2_mc = mpeg2_mc_altivec;
+     } else
+ #endif
+-#ifdef ARCH_SPARC
++#if defined(ARCH_SPARC) && defined(ENABLE_VIS)
+     if (mm_accel & MM_ACCEL_SPARC_VIS) {
+ #ifdef LOG
+ 	fprintf (stderr, "Using VIS for motion compensation\n");
diff --git a/media-libs/xine-lib/xine-lib-1.1.15.ebuild b/media-libs/xine-lib/xine-lib-1.1.15.ebuild
index 41a5132f95e8..37ef8e1a89a5 100644
--- a/media-libs/xine-lib/xine-lib-1.1.15.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.15.ebuild,v 1.8 2008/08/16 07:48:32 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.15.ebuild,v 1.9 2008/08/16 11:37:45 aballier Exp $
 
 EAPI=1
 
@@ -85,6 +85,12 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 	nls? ( sys-devel/gettext )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "$FILESDIR"/${P}-libmpeg2-vis.patch
+}
+
 src_compile() {
 	#prevent quicktime crashing
 	append-flags -frename-registers -ffunction-sections