summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-03-29 16:20:09 +0000
committerMike Frysinger <vapier@gentoo.org>2012-03-29 16:20:09 +0000
commit96f57f72def1574852699e389ff9383384e71514 (patch)
treec5d10a2e7a516f76c461c4ae981f4064ccfb8db9
parentDrop patch merged into upstream git. (diff)
downloadgentoo-2-96f57f72def1574852699e389ff9383384e71514.tar.gz
gentoo-2-96f57f72def1574852699e389ff9383384e71514.tar.bz2
gentoo-2-96f57f72def1574852699e389ff9383384e71514.zip
Disable internal vdpau/ffmpeg checks since we handle this ourselves #408395 by Tomáš Chvátal.
-rw-r--r--media-tv/xbmc/ChangeLog10
-rw-r--r--media-tv/xbmc/xbmc-9999.ebuild6
2 files changed, 14 insertions, 2 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 8997e719038f..cd5eafddc475 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,14 @@
# 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.123 2012/03/27 18:37:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.124 2012/03/29 16:20:09 vapier Exp $
+
+ 29 Mar 2012; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+ Disable internal vdpau/ffmpeg checks since we handle this ourselves
+ #408395 by Tomáš Chvátal.
+
+ 29 Mar 2012; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
+ -files/xbmc-9999-no-exec-stack.patch:
+ Drop patch merged into upstream git.
27 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> xbmc-10.1.ebuild,
xbmc-11.0_rc2.ebuild, xbmc-9999.ebuild:
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 2bf91188406d..ff3e6aae5be6 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.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-9999.ebuild,v 1.106 2012/03/29 16:18:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.107 2012/03/29 16:20:09 vapier Exp $
EAPI="4"
@@ -138,6 +138,10 @@ src_prepare() {
popd >/dev/null
done
+ # Disable internal func checks as our USE/DEPEND
+ # stuff handles this just fine already #408395
+ export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes
+
local squish #290564
use altivec && squish="-DSQUISH_USE_ALTIVEC=1 -maltivec"
use sse && squish="-DSQUISH_USE_SSE=1 -msse"