summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-04-29 16:01:28 +0000
committerMike Frysinger <vapier@gentoo.org>2012-04-29 16:01:28 +0000
commit80871a742f3351fbe9c89c078e787a940a9ea424 (patch)
treec22f1a056cb91e01f000773e1f1cceb51d298dd6 /media-tv
parentx86 stable, bug #410611 (diff)
downloadgentoo-2-80871a742f3351fbe9c89c078e787a940a9ea424.tar.gz
gentoo-2-80871a742f3351fbe9c89c078e787a940a9ea424.tar.bz2
gentoo-2-80871a742f3351fbe9c89c078e787a940a9ea424.zip
Add dedciated arm flags patch for 11.0 #413715 by Lech Perczak.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'media-tv')
-rw-r--r--media-tv/xbmc/ChangeLog6
-rw-r--r--media-tv/xbmc/files/xbmc-11.0-no-arm-flags.patch16
-rw-r--r--media-tv/xbmc/xbmc-11.0.ebuild4
3 files changed, 23 insertions, 3 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/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