summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-tv/xbmc/ChangeLog6
-rw-r--r--media-tv/xbmc/Manifest31
-rw-r--r--media-tv/xbmc/files/xbmc-11.0-no-arm-flags.patch16
-rw-r--r--media-tv/xbmc/xbmc-11.0.ebuild4
4 files changed, 39 insertions, 18 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index f8d19d77ed2b..684648946931 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.133 2012/04/26 02:08:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.134 2012/04/29 16:01:28 vapier Exp $
+
+ 29 Apr 2012; Mike Frysinger <vapier@gentoo.org>
+ +files/xbmc-11.0-no-arm-flags.patch, xbmc-11.0.ebuild:
+ Add dedciated arm flags patch for 11.0 #413715 by Lech Perczak.
26 Apr 2012; Mike Frysinger <vapier@gentoo.org>
files/xbmc-9999-no-arm-flags.patch:
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index db0ce021bd3c..caa14e54d84c 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -4,28 +4,29 @@ Hash: SHA1
AUX xbmc-11.0-ffmpeg-0.10.2.patch 1197 RMD160 58baba2480df84e9cc5e768c3bc95f03077cc78f SHA1 255abd76ebf718f23b621e0c119b494af5a9f328 SHA256 84e2a842c81c1bc6a346c946301f38e47862051f4e3f56ffe468852542ba9b90
AUX xbmc-11.0-ffmpeg.patch 1566 RMD160 f6b966309a67a1ab4fc6917a9310c15921ced5a4 SHA1 0a34899915ce61a28bfe869be75625cd1344da77 SHA256 5515321c4cb46b0ac1c959b9e8752c370344352d9f7de1be3991760fa6ffc70f
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-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 6171 RMD160 1b260b709e953c81d48eced5c2923be9cdc60e0f SHA1 bb3256f4b5ba769cf8695cbdcfdee7c56597f1fb SHA256 521e3c96ec4ca41ad59fe2ce618101a1ee2a36bc04690caa4a54c6cac6c56b3e
+EBUILD xbmc-11.0.ebuild 6171 RMD160 471ebf5098811fd8ae7f27e20a434236ef617e94 SHA1 84437339f7f58d8c249e1417895c7c165e09ec7f SHA256 3c567a79f45a8bfb93c0a60e7b7f50faac8162ebc205ca19b421d5e4f7621d57
EBUILD xbmc-9999.ebuild 5823 RMD160 630444b378222dfa850a8b88359738360f701f8e SHA1 12269e2daccfb3d86400beaeac73173027367392 SHA256 b9bd2000b23a5ff2f6d7b9bff36b6388b64a8e09259aafaef57e56e084fc4878
-MISC ChangeLog 21580 RMD160 88f59e1d85070326cf10bd609650288cbdc9c74e SHA1 0dcffd724c87578d61db4ec20b22d006df9243dd SHA256 fe6877be8fdc24f71b24253747f4430ebd9640ea03ae06e34ac89258f05dbc75
+MISC ChangeLog 21754 RMD160 66b98bdea680274863dbfa767384829bdb0ebf17 SHA1 f6c08980027d6d879fb98dd275d1c3bfdf93abaf SHA256 a7d0caa5c22bd4b903c3c7a3aa5ec93dd01a312f6798c7a056e9597085229fac
MISC metadata.xml 1004 RMD160 f75e76041c2cbb1356ba9cb93b73cdbf48930632 SHA1 1ffacab45603382e48ef148c0aeb703a2303ab2c SHA256 e0fe06415e25d223ea299f1eecf4de6a8e8609d5ec038cc295f61002cd7d7a5e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBAgAGBQJPmK6jAAoJELEHsLL7fEFWLLsQAJQrnwidPcyuvXnHJ3IQhmuC
-bl7dsuVeK0W4X/mpM/rsojDzth8ZOdL15IQJn0ZFZaU+IsJVGigoqN3Eq4BhNjvq
-woLmdqkci/NJ24Xm/9pDgxhAFLou4dl+boUDWTRaYMO1tEGV/6bdppChprzK/F4e
-vzZzX8iVm2gRFRbxBZWSK/VconVtdY7BgXsjgG88lQMgJn5rkXsrjeEEoEYFKCKq
-0qMymtgo1v4iyXfkRuRY4zCJd/xLj8Jy3/tSra4UTax6AlpLsQDXneFvjSCUnl6p
-xuz6oCnksPCK0svhXts5uvpkWTMezH9m7PZBCENZZ2wS/3+wivvYJwJCiuaoFG4h
-hUyRrHn3dA+u+CNvVxvzvYUL6helk6E/vUAfKkXHt9C7fe9vUGCdewSRhHQJ1Sd/
-OOu9ZTMIv5yITNdCrMI2Xytenu3OnYuy1oc+yswnYaMuV8CY5zxELb8p6kwjg/UG
-sBuc0wJQetXGqu7ZU0fJtknxq3EfExKjyy7eTZKQ31vPl/Q5vs6xwgPVTkPhmk/D
-qH/SX+aWGs6QrKCLzSzPMoppCBZ09IyfIU2hKrgp0Ku1l9QaPLf6XVFouWsGUFwp
-c3TBD1KCrAtsIkrQfq8PF/rCLNLs1tIR5+fDhN47c4tDAKB7IlmfZEif4lt8X/8J
-hDmabHTyMu2tVqRDiMVI
-=V+s6
+iQIcBAEBAgAGBQJPnWZfAAoJELEHsLL7fEFWQuoQAKkhXIUPAUiHYG8N1E/0SQTM
+NYtaYTKOB2vQXacehQ8pAV4WRznCdJFS1F4XUCWkmdGTmuFreT44suYZhokK7OJA
+waqjSZu6RDjoEltr8kome5AFJUUweTDOv5ldjEmFd3nw1GQVFB86k3Np3Jif8VME
+XhCBdxK89TOA/3KJvpRKlKzAEutMBOcrLLwusVSjaXpagjnK2bQHPLDLQT3ND+zJ
+0n3lQh6ZfrT6zdvNp+GHUNSPImHmwiRMsx2E93UNH96PVMZ3s7afv8m0dpEd9PuV
+YrcrihuTSvxUueOojZlBuPUqwK5y1xhcvRdNK+0Cm+xjI3bYaVWZnyU9D1fiPezV
+0CEFUJlt3zYXpYLjD6kM/Zyf1Z9A8COzfIKhtHEwSR1uWQ3gcvgt33zp7O5nFM7S
+DhYt7sNRt2Atz/2zTG7xC5uM8UvvyjLkm8lVoMxgvgcQsJqVGbWjAkCJIyKZ/C99
+Pjl59GUydNu4kpRfemMpvYixLOFpxftmIFt8/jD8JOvIpg4In2K2HUWCyZRSgFoH
+fhZM2YFvvpR2q5d2n/pgz4vXxJMZQwEC422KnVLDqC1nbf1LrTuPL4QKQia1BQIO
+YFsDAzoJQofp4fK1xwDs31t8mpPqOCCD2e2OhsUMi220b4CR3NoZCiz5fUDJZQ5r
+kMyWAw93FZa4ydoFbfvP
+=l0YJ
-----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/files/xbmc-11.0-no-arm-flags.patch b/media-tv/xbmc/files/xbmc-11.0-no-arm-flags.patch
new file mode 100644
index 000000000000..179697a8f5ce
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-11.0-no-arm-flags.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/400617
+
+do not force any particular ABI or FPU or SIMD compiler flags for arm
+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"
+ fi
+-elif test "$use_arch" = "arm"; then
++elif false; then
+ CFLAGS="$CFLAGS -mfloat-abi=softfp -mno-apcs-stack-check"
+ CXXFLAGS="$CXXFLAGS -mfloat-abi=softfp -mno-apcs-stack-check"
+ FFMPEG_EXTRACFLAGS="-mfloat-abi=softfp"
diff --git a/media-tv/xbmc/xbmc-11.0.ebuild b/media-tv/xbmc/xbmc-11.0.ebuild
index d83fb1dd4c06..69bf1954bab8 100644
--- a/media-tv/xbmc/xbmc-11.0.ebuild
+++ b/media-tv/xbmc/xbmc-11.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-11.0.ebuild,v 1.6 2012/04/05 00:26:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-11.0.ebuild,v 1.7 2012/04/29 16:01:28 vapier Exp $
EAPI="4"
@@ -123,7 +123,7 @@ src_unpack() {
src_prepare() {
epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
- epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
+ epatch "${FILESDIR}"/${PN}-11.0-no-arm-flags.patch #400617
epatch "${FILESDIR}"/${PN}-11.0-no-exec-stack.patch
epatch "${FILESDIR}"/${PN}-11.0-ffmpeg-0.10.2.patch #406215
epatch "${FILESDIR}"/${PN}-11.0-libav.patch #406215