summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-08-27 09:51:05 +0000
committerMike Frysinger <vapier@gentoo.org>2009-08-27 09:51:05 +0000
commita2431c1588a54797a527a14b83235975a87a64f3 (patch)
tree2f4fa12a71a46b47b77dc58b6884ff07d9f640b9 /media-tv/xbmc
parentAdd ~amd64 keyword (diff)
downloadhistorical-a2431c1588a54797a527a14b83235975a87a64f3.tar.gz
historical-a2431c1588a54797a527a14b83235975a87a64f3.tar.bz2
historical-a2431c1588a54797a527a14b83235975a87a64f3.zip
Force internal faad2 for now #278400. Pull in more deps #279062 #281078.
Package-Manager: portage-2.2_rc40/cvs/Linux x86_64
Diffstat (limited to 'media-tv/xbmc')
-rw-r--r--media-tv/xbmc/ChangeLog5
-rw-r--r--media-tv/xbmc/Manifest10
-rw-r--r--media-tv/xbmc/xbmc-9999.ebuild16
3 files changed, 24 insertions, 7 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/Manifest b/media-tv/xbmc/Manifest
index 920bd6bd4bde..fd2856276e54 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
AUX xbmc-9.04-gcc.patch 2966 RMD160 cada277b78b85c8ddf6b539c3e8941b41c82ef35 SHA1 ff3eef31033a23385607c78436094958ab71457d SHA256 b7cf032b4208013a8935429c84c7597e4ec8be01599da0cfbf923ef4124305c5
DIST XBMC_9.04_Babylon-linux-osx-win32.tar.bz2 111993901 RMD160 7b108c0d22ca31895008d056e3f681e3c98386e2 SHA1 097db32fa4ae4ced0c8d101195d040a81a6ca105 SHA256 2a477b51578e345112859ea06d20abea03a7e6d079ac4012670b1b1b82b3faed
EBUILD xbmc-9.04.ebuild 3531 RMD160 9862845d51a8f5b8dad31a3c208474d747725fef SHA1 2a48bc90e92e38ec4bc8f598c45c2b16492717c6 SHA256 d50766ac452d97e74c5737bdafe6a8f79bc13dda142e0b8c39a8a9011134e66f
-EBUILD xbmc-9999.ebuild 3284 RMD160 e6b8b7755c73b34d4ce3f98aec989ee6a88bdaa0 SHA1 8b71cda6562ffee00fcee6eadc10e55fa6f0fe6f SHA256 5801c033610ba02f067a5acb7491635d148e7ca03e2558cb960380a965a2ee17
-MISC ChangeLog 3698 RMD160 83dc2bc881040d017e2dc98548b7015cf21e9851 SHA1 a39913fba7478556f52c14a7a8302c58ce3c9f6c SHA256 54f8a7cc36d35bf415e25d041664eba4a6284b6902e3e4888aaf65824ed2a73f
+EBUILD xbmc-9999.ebuild 3638 RMD160 2b00966e8c5954536055365180399025583d0894 SHA1 a171e8276096cfc5c3bbede63245dbf46b300a6a SHA256 eabd6766397c1068415f7cebe6f0032f53af1aaed65453b73b0c6395af36884b
+MISC ChangeLog 3842 RMD160 7e36a9576c8b7b9dfe51907a95c24ee866d194a4 SHA1 ff8465c9064cd66f01aea2a2f669fe5ee2185cb3 SHA256 a372757aa8baf576df67b7ed39592e8b166519d625f04cd01149950df27a6e79
MISC metadata.xml 259 RMD160 1451e37fea39b948f3e6f0c0eb20c8d9e41801f0 SHA1 73240b8832bc707628304061d6980bdf7d6baa28 SHA256 31764ed43ab7fbf241987d089733cd337e410b53f3135ff020a13ed24793af64
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkqV8QsACgkQlPl3HsVfCDq4ngCfWQPOPN3ODJh8SJ5ZxEJzfAhx
-KSIAn1x4cPZzB8fabbdwdGlDNR58bB0W
-=AOg6
+iEUEARECAAYFAkqWVw8ACgkQlPl3HsVfCDrwTQCeP1JfeCTulEXN/OVxJTmK6cMR
+yOQAmN1l8+PPw8iXqmRg+PwRN/xezNc=
+=SweY
-----END PGP SIGNATURE-----
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}