diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-08-27 09:51:05 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-08-27 09:51:05 +0000 |
| commit | ea5b983301482b33745d859009fe7f7069a4e70a (patch) | |
| tree | 2651f33c0dca74d1040e8d66830883af2227c519 /media-tv/xbmc | |
| parent | Add ~amd64 keyword (diff) | |
| download | gentoo-2-ea5b983301482b33745d859009fe7f7069a4e70a.tar.gz gentoo-2-ea5b983301482b33745d859009fe7f7069a4e70a.tar.bz2 gentoo-2-ea5b983301482b33745d859009fe7f7069a4e70a.zip | |
Force internal faad2 for now #278400. Pull in more deps #279062 #281078.
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Diffstat (limited to 'media-tv/xbmc')
| -rw-r--r-- | media-tv/xbmc/ChangeLog | 5 | ||||
| -rw-r--r-- | media-tv/xbmc/xbmc-9999.ebuild | 16 |
2 files changed, 19 insertions, 2 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog index f44c8b4539e4..da43aa6c0c0d 100644 --- a/media-tv/xbmc/ChangeLog +++ b/media-tv/xbmc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-tv/xbmc # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.23 2009/08/27 02:35:49 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.24 2009/08/27 09:51:05 vapier Exp $ + + 27 Aug 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild: + Force internal faad2 for now #278400. Pull in more deps #279062 #281078. 27 Aug 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild: Drop unzip step since upstream has integrated it #282739 by Jan diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild index bb269bb8de5e..a38108c568d6 100644 --- a/media-tv/xbmc/xbmc-9999.ebuild +++ b/media-tv/xbmc/xbmc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 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.28 2009/08/27 02:35:49 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.29 2009/08/27 09:51:05 vapier Exp $ # XXX: be nice to split out packages that come bundled and use the # system libraries ... @@ -41,15 +41,20 @@ RDEPEND="opengl? ( virtual/opengl ) dev-libs/libpcre dev-libs/lzo >=dev-python/pysqlite-2 + media-libs/a52dec media-libs/alsa-lib media-libs/faac + media-libs/flac media-libs/fontconfig media-libs/freetype media-libs/glew media-libs/jasper media-libs/libass + media-libs/libdca media-libs/libmad media-libs/libmms + media-libs/libmpcdec + media-libs/libmpeg2 media-libs/libogg media-libs/libsamplerate media-libs/libsdl[alsa,audio,video,X] @@ -59,7 +64,9 @@ RDEPEND="opengl? ( virtual/opengl ) media-libs/sdl-mixer media-libs/sdl-sound media-sound/wavpack + media-video/ffmpeg net-misc/curl + net-fs/samba sys-apps/dbus sys-apps/hal sys-apps/pmount @@ -69,6 +76,7 @@ RDEPEND="opengl? ( virtual/opengl ) x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender" +# media-libs/faad2 we use internal one for now DEPEND="${RDEPEND} x11-proto/xineramaproto dev-util/cmake @@ -91,6 +99,12 @@ src_prepare() { # Tweak autotool timestamps to avoid regeneration find . -type f -print0 | xargs -0 touch -r configure + # use internal faad2 as mp4ff is dead and xbmc hasnt + # switched to libmp4v2 yet + sed -i \ + -e '/use_external_libfaad/s:use_external_libraries:FOOOO:' \ + configure || die + # Fix XBMC's final version string showing as "exported" # instead of the SVN revision number. export SVN_REV=${ESVN_WC_REVISION:-exported} |