summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-06-21 20:01:32 +0000
committerMike Frysinger <vapier@gentoo.org>2010-06-21 20:01:32 +0000
commit67a4b71c80b484f72381b9fe57ddd1e36e206578 (patch)
tree3b2c817ba1d43209e2e614c925995ec5b177b098 /media-tv
parentalpha/arm/ia64/m68k/s390/sh/sparc stable (diff)
downloadgentoo-2-67a4b71c80b484f72381b9fe57ddd1e36e206578.tar.gz
gentoo-2-67a4b71c80b484f72381b9fe57ddd1e36e206578.tar.bz2
gentoo-2-67a4b71c80b484f72381b9fe57ddd1e36e206578.zip
Fix building with ffmpeg-0.6 #324293 by Alexis Ballier.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-tv')
-rw-r--r--media-tv/xbmc/ChangeLog5
-rw-r--r--media-tv/xbmc/xbmc-9.11-r4.ebuild9
2 files changed, 11 insertions, 3 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/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"