diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-06-21 20:01:32 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-06-21 20:01:32 +0000 |
| commit | 3308b9967704003e7443f2014d35961d5e3c9f3d (patch) | |
| tree | 6eb08555db5b44e94ee57a0e77472f41dee142d1 /media-tv/xbmc | |
| parent | alpha/arm/ia64/m68k/s390/sh/sparc stable (diff) | |
| download | historical-3308b9967704003e7443f2014d35961d5e3c9f3d.tar.gz historical-3308b9967704003e7443f2014d35961d5e3c9f3d.tar.bz2 historical-3308b9967704003e7443f2014d35961d5e3c9f3d.zip | |
Fix building with ffmpeg-0.6 #324293 by Alexis Ballier.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'media-tv/xbmc')
| -rw-r--r-- | media-tv/xbmc/ChangeLog | 5 | ||||
| -rw-r--r-- | media-tv/xbmc/Manifest | 20 | ||||
| -rw-r--r-- | media-tv/xbmc/xbmc-9.11-r4.ebuild | 9 |
3 files changed, 16 insertions, 18 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog index 69445304977e..caf19f7cd2db 100644 --- a/media-tv/xbmc/ChangeLog +++ b/media-tv/xbmc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-tv/xbmc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.59 2010/06/19 00:57:39 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.60 2010/06/21 20:01:32 vapier Exp $ + + 21 Jun 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9.11-r4.ebuild: + Fix building with ffmpeg-0.6 #324293 by Alexis Ballier. 19 Jun 2010; Jonathan Callen <abcd@gentoo.org> xbmc-9999.ebuild: Moving dev-util/cvs* to dev-vcs/cvs* diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest index c3a4c5e98d96..781f1388bba3 100644 --- a/media-tv/xbmc/Manifest +++ b/media-tv/xbmc/Manifest @@ -9,24 +9,14 @@ AUX xbmc-9.11-use-cdio-system-headers-on-non-win32.patch 3623 RMD160 d8b6d48a072 AUX xbmc-9.11-wavpack.patch 2637 RMD160 35a7f5446aaef27ff563da4a8200616fffb66e00 SHA1 0f9a2845a5b9d0b554569f1379af0557b071ef69 SHA256 b09e9072f0a2d4451588c40b0b300611944ba7d4cefbae0c400389ed9f8485dc DIST xbmc-9.11.tar.gz 141420517 RMD160 0d0890ba373e05af95a66360aed8871b384849f2 SHA1 71956ed8630d46662e49de9d96304308078f10b5 SHA256 e810aaaf1c380bbe923d9e30e2e472577081b7b893e12a7ef4bb70a911c3db87 EBUILD xbmc-9.11-r3.ebuild 5062 RMD160 bd1d51bf0637833c8ea1e6a79a00bc0a5dbbeaa1 SHA1 bd451c1b37c11d800496d40a5657b2ac21d65ed8 SHA256 0f34e65defa5b970eb91e69d42ac1e37ab032797e2d98fc8b7386d736ab983ad -EBUILD xbmc-9.11-r4.ebuild 5464 RMD160 c2befb2c16954b4ed92d3b89bb58562a7f96029c SHA1 15b61d3e369157c4b506cd229c175a4090087d5d SHA256 83f0885bc85a2203b5882382c4c7ea4a96006b8f630ff1042e55448e28f12fe4 +EBUILD xbmc-9.11-r4.ebuild 5674 RMD160 fd995e1a4e36b191e719e62dda71c1247481fad0 SHA1 e9bf1a2f733f70d31e2d369fa6e2974c54862e3d SHA256 20021dabb346da065e8d17e6dc13b7a1ca131492b5741b0ea7f8f08c8f9a0f19 EBUILD xbmc-9999.ebuild 4953 RMD160 ad9b8355fba361da8f4121669bd882d60396164b SHA1 62401f964e5643260513c0ff4bca02d33c2f0d9c SHA256 359b4d5954506f32342bd514c83b42e2fb3b5002ce299368ad378a946b6cee00 -MISC ChangeLog 9891 RMD160 3b9366bd4d3d9235fae010492a6a17b98bad6690 SHA1 6db03597870d5db72200d43a1b45ad197177669a SHA256 5636d8d973e2e417f23a1b215428f18c104932c5f0107a8cdb1ae319bee51fbc +MISC ChangeLog 10023 RMD160 d30e1ad5bc2e8c6a1e63ff4bd27816cb3103b473 SHA1 f25c578528cf27d80e971d286df43e0f18cbf05b SHA256 80ef76774b60be04a2a2f6f27584240273ad5e6f8857b7d0734de84e8f8169a3 MISC metadata.xml 446 RMD160 8784194c0d5667ad0a7a662e090aaf2006a2dc9a SHA1 28161d5a31a40fb383431a1b069b45270938bcc2 SHA256 ef0d7c7d3311d8a7b2b534d8e0e5ae8216dbbc91bb1a808d7d427f828be5bad8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iQIcBAEBCAAGBQJMHBYJAAoJELHSF2kinlg4ErkQAJHD2EXvPA7G0geZZS0GReak -klVMSv7D21cAgJhAeluNq1uGNNGBjLQwfrkgA69l0VUXJDmsZzx2Z7n8XdTXBTc5 -dwVmCtkYn0Q4pGtwdlTJDq3b9wLPIwMQeFX4AGsa9hAtW3NvCJEDfxhHiFeKYarJ -rDGtlUjAKg94ag0G88zJSdTifQkeCHGwwp0nEtmWxzvxJzkAMEAw+dOfcOv0U3zV -tBqvA8yXBJO4K+anjrmWt19v+vBrmmW60pdjHMOahJ8GpEAkK0QecoCxgVIWYZsN -MLpBIRGCC59sFcT19YHhnzXVCKf8uGcZeU437FYfXQcOzICW07p95bgsFHabnK0y -tFPpNSaGqmv93e29ULP9Vj8YG8XczW/mHsiayzFgPyS3deBOO2w4YkvZPbFu6afT -a/Wftva7FXRz4XPmkWfUwTPCkiRG4ZR3q/rj7AL9EBQTN1YOxcLrQEoLuxio/AeI -IqM3pwPDkDqsSTvdfpxaixHrlGgN9RN127TzJk8D55a6PLMcobBcDq3iycD1P3i7 -hZAIiKQp2psBNbDFrlGz/m0RlsjnY32cXy2tmmVYTQduQUXI4ezkSSmCzWLZaYhF -aY238brvYx2VdQflRo+EGZ78UWiWRgEFwW2XROPAq3Sk4cU1Y3Sd+TFZ0gFVCEG1 -ggBWZhbIGHqrMFfeIl4n -=6p28 +iF4EAREIAAYFAkwfxRoACgkQTwhj9JtAlp4OOgEAtUxfJXX14qrPagb3s+Q/cqe+ +HPo2qdoz+xJt1HziitcBAKEb18F6qBFzWqZ7rTxkb3xrvyu73RhbJrmqpnRcvacC +=v1F+ -----END PGP SIGNATURE----- diff --git a/media-tv/xbmc/xbmc-9.11-r4.ebuild b/media-tv/xbmc/xbmc-9.11-r4.ebuild index 81401fd93874..d0b6d0367ff5 100644 --- a/media-tv/xbmc/xbmc-9.11-r4.ebuild +++ b/media-tv/xbmc/xbmc-9.11-r4.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9.11-r4.ebuild,v 1.2 2010/05/23 20:47:48 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9.11-r4.ebuild,v 1.3 2010/06/21 20:01:32 vapier Exp $ EAPI="2" -inherit eutils python +inherit eutils python flag-o-matic # Use XBMC_ESVN_REPO_URI to track a different branch ESVN_REPO_URI=${XBMC_ESVN_REPO_URI:-http://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk} @@ -134,6 +134,11 @@ src_prepare() { popd >/dev/null done + # fix building with ffmpeg-0.6+ #324293 + # latest svn solves this in a more specific way, but we'll just + # kludge the whole system for the last release + append-cxxflags -D__STDC_CONSTANT_MACROS + local squish #290564 use altivec && squish="-DSQUISH_USE_ALTIVEC=1 -maltivec" use sse && squish="-DSQUISH_USE_SSE=1 -msse" |