3 files changed, 22 insertions, 19 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 2ec896036f57..1a97c003dad6 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.140 2012/06/08 04:49:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.141 2012/07/02 22:13:55 vapier Exp $
+
+  02 Jul 2012; Mike Frysinger <vapier@gentoo.org>
+  files/xbmc-9999-no-arm-flags.patch:
+  Update patch to latest git #424485 by tsubus.
 
   08 Jun 2012; Mike Frysinger <vapier@gentoo.org> xbmc-11.0.ebuild,
   xbmc-9999.ebuild:
@@ -575,4 +579,3 @@
   +xbmc-9999.ebuild:
   Initial ebuild by many people at #198849 (Peter Fern, Rick Harris, etc...)
   cleaned up by me.
-
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index f0a9e0ca8cd6..f5cdacabb643 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -6,27 +6,27 @@ AUX xbmc-11.0-ffmpeg.patch 1566 RMD160 f6b966309a67a1ab4fc6917a9310c15921ced5a4
 AUX xbmc-11.0-libav.patch 3636 RMD160 2324951f7f04b22b7afd6b2e12b15ddba38a8cea SHA1 7ba00ad27670691aec13436bba6a77a488dd88af SHA256 b30f3c16595f9d79fe4f091504ae9d1f7b01042c988394e89ec467583d1e371d
 AUX xbmc-11.0-no-arm-flags.patch 542 RMD160 108586f2956cc27cc9f3c582565bd4e2f22fede0 SHA1 e6dc2f2b63e208fccb0c1ecb50322d6a9c9fda88 SHA256 72164a8b91f3209cff06ea1a103580f827135951a7a798eefabc04ee1a6d3e84
 AUX xbmc-11.0-no-exec-stack.patch 807 RMD160 c42590cf3dd2fb3407e6dd518ba706ea8919d586 SHA1 c50207ff50cb1cedc97a7de1484a98fdebf51c5e SHA256 e36c83746838dd362512a046dc066c0f3fdc1252289b2761be381f84262cab78
-AUX xbmc-9999-no-arm-flags.patch 486 RMD160 73c83fcc6475693808011c6fdacc1d731768d311 SHA1 4576f7c21e205358fda80b0acc97ffa796ac5134 SHA256 91c683e779a9c6c0c04c839d858d245ce76f8bb78ea5988d60f03fbc762b5ff7
+AUX xbmc-9999-no-arm-flags.patch 457 RMD160 ab47f717071c13cee29f815342d869d2cfdd14d9 SHA1 16e6d79a4fb08ab2ca0c30abc6fa01972bde5fe0 SHA256 db13f604ac5901e84dd96b65e9a1318956b60d73c7b5918e0040eb14321aab92
 AUX xbmc-9999-nomythtv.patch 6190 RMD160 829dff4b58098ee0935aed6fcda345e06abdb7b3 SHA1 d34afef9342b1d5781729433795cb23240fa5d6b SHA256 ffb1eb49f94b4ae41e5d79172499671915122a58af248b0585ee276e4aa2c87e
 DIST xbmc-11.0.tar.gz 63012044 RMD160 23cf4d7fa11d2996cc45c44ba5ca0022ff2acc1d SHA1 d836a0a1e8ed239a339ec7e0c19f893e29df741d SHA256 1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19
 EBUILD xbmc-11.0.ebuild 6264 RMD160 26ab681ea8a8ac1aefe4101b69dcf5da72d40d0b SHA1 3c5b43fe460ea717bfbb945b10cdaf959371989a SHA256 61e105ec501d39999a5194bba7c3b5dfdcf988a1fe31499c947bdf9a37136705
 EBUILD xbmc-9999.ebuild 5935 RMD160 5a096624f39abe8b3590bbd11c43c4f07a4cf0f1 SHA1 e87ded188a23123a17c976509cd008ab88517361 SHA256 b8b1b1f426669a0366dc0e4c285d14c021fd103bd6a4b0a35762711645f4cdfb
-MISC ChangeLog 22493 RMD160 9ec0936c2338011a4ad69ee137e1adbe08652a12 SHA1 9b43123f3be9a14c0a25667ce3ebb64d3f573c28 SHA256 dcb809c1749d97ce93d7a303c5a375369baf81fbbe6b6480f110c99401b4c585
+MISC ChangeLog 22629 RMD160 a450d5d4f9cd8f9f95c0337a3eace754d0c5154b SHA1 9b8eba1b65e12c22357ce7b93a6bd9abc9eabe8e SHA256 81b7b918493dc2be0930451531ebe941e0a0f73706650c51abb277cb546ec96e
 MISC metadata.xml 1004 RMD160 f75e76041c2cbb1356ba9cb93b73cdbf48930632 SHA1 1ffacab45603382e48ef148c0aeb703a2303ab2c SHA256 e0fe06415e25d223ea299f1eecf4de6a8e8609d5ec038cc295f61002cd7d7a5e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP0YR7AAoJELEHsLL7fEFWpKgP/03jqV6c3pMpGeka9utrmLav
-iRVZohY1p4SRk03hACcnW+LyT9Im99k6u35Cp9k1PCmpr9c+vqVWPI4mdjpm7Y7C
-/2hfd5bCPr7Nl5mjMi3ogWMTsod/iPaXK/QA+/rS6VjMKagT1BymXuZyA7yB0ESb
-HKoDqL6xtoSQPnzHt/2bNsXdMyLUy3aoNv4R7q/M+rF+mmT1yGeP4pKqOJJfpmJz
-RbQvciXkXazWlgZhJdhtfUHwSPcP3vb2DR6EdHTECXZs9Ve79/rCV4qpbMWOUN1M
-Dh9wc2C6j1pBnLghIJdk0QqklHoz253+/Utonjj7bkMvMuusV0EbfnP2us8L6H6L
-U0R3hNQtS9/uvZgM2lvpny1snB9Qi893/ehb0EmFXwXfcLrGw7K5Y+6mdlJK9Kw8
-5W4HGwv7EtJXV68cw6LUhmF5pIkiOklULroYXMp7F2eELEgw0vh/NY1Dg2aWwUXy
-3RuZHY8S1N7fbwUo/SQ4m3/1FTepcAEKL5c0MvuWwgf4kZ/RE0LpxQN1wNw+4M5p
-w/JTE8eBPyU25RF6hp33WlOyDmHmauZmShL2dAeZR/ieWmzXy66G/ZNFPzpbyGSW
-6/comJO9euahQt4hBlxVQGUwPuVPJlFNKvEfa8qUJ0Ofq/56FMt3jjoymNz5Ikm1
-5oCslOQmdC1MtBf7xtxz
-=1+se
+iQIcBAEBAgAGBQJP8h0qAAoJELEHsLL7fEFWMH8P/R2JBNgpuL+3R34megvwhfeg
+jYo/WOuAdtCqPfCHyHwGrwhRrGquFjYMMGRijRS5jfV0mJ4hDP/Vu0+euq+9rGKT
+HBU7sINDV1mRBxP517U1m1gIzisaLBg2L1o++gFl2EiqllOEH5wb71Qyyh6yDAst
+p0b6EKg1ZvggHM81MlDClgMWo9qmjo8diGBU1P22shRwFfSzA3sJEVO7txvf1syg
+fjJuzM1OC0GuFhovgYq97HDtdQxj5EqkcPu+1M4VY58/I6wa+6q+8MopAQ4hWWYP
+emc3AIwU5pAcxRysMuQjIc2dqbByXR1PI2FKHQ90MeWYRSwEvRV0D4sV5qzdwcfh
+0bmv36w9N929RhCBFT02gj4wnFxjuYdhplFbtzYItNPYSWhIupnXPSyk2qMgHpo/
+E/pIebxBVQQQ4nzFp67pSslA18uOjR81HpUc0ZbOh2rhxFx8ofhnAORhF9N+w+Ov
+E5On61BS1rdp59hd0aHqt1xnLaRqCClKKJP8/UyG2Ga9Rp/kfBVRm2CQg8rEidGf
+DiWwN7VB9JPhopctY541VnFisH3x7/IYZykw95/iz6VBSymwATdwRFq+OlRdJKXb
+wuF5lI1TZ5zaCP6TgoANHfci+QXhBlRuw6jD77WA3Gtuq8PlzTdhU01RW/VUfcSc
+qpNFjrSpaMDApz9/Vt1c
+=4+HB
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/files/xbmc-9999-no-arm-flags.patch b/media-tv/xbmc/files/xbmc-9999-no-arm-flags.patch
index 7d9e494b6443..2d430e047529 100644
--- a/media-tv/xbmc/files/xbmc-9999-no-arm-flags.patch
+++ b/media-tv/xbmc/files/xbmc-9999-no-arm-flags.patch
@@ -6,9 +6,9 @@ targets.  let the toolchain and user CFLAGS control that.
 --- a/configure.in
 +++ b/configure.in
 @@ -571,7 +571,7 @@
-     LIBS="$LIBS -framework DiskArbitration"
-     LIBS="$LIBS -framework ApplicationServices"
+     LIBS="$LIBS -framework QuartzCore"
    fi
+   USE_EXTERNAL_FFMPEG=1
 -elif test "$use_arch" = "arm"; then
 +elif false; then
    CFLAGS="$CFLAGS -mno-apcs-stack-check"