summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-tv/xbmc')
-rw-r--r--media-tv/xbmc/ChangeLog6
-rw-r--r--media-tv/xbmc/xbmc-9999.ebuild11
2 files changed, 11 insertions, 6 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index b111d3350e5b..59eb700e203f 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,10 @@
# 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.69 2010/11/19 08:46:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.70 2010/12/22 18:20:27 vapier Exp $
+
+ 22 Dec 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+ Only delay for 3 seconds when dbus services are missing #348580 by James
+ Bowlin.
19 Nov 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
Drop USE=aac like upstream has #345939 by BT.
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 37d2c396f70e..b5a673cdf9fa 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
# 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-9999.ebuild,v 1.65 2010/11/19 08:46:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.66 2010/12/22 18:20:27 vapier Exp $
EAPI="2"
@@ -114,10 +114,6 @@ src_unpack() {
}
src_prepare() {
- sed -i \
- -e '1i#include <stdlib.h>\n#include <string.h>\n' \
- xbmc/lib/libid3tag/libid3tag/metadata.c || die
-
# some dirs ship generated autotools, some dont
local d
for d in . xbmc/cores/dvdplayer/Codecs/{libdts,libdvd/lib*/} lib/cpluff ; do
@@ -149,6 +145,11 @@ src_prepare() {
# Do not use termcap #262822
sed -i 's:-ltermcap::' xbmc/lib/libPython/Python/configure
+ # avoid long delays when powerkit isn't running #348580
+ sed -i \
+ -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+ xbmc/linux/*.cpp || die
+
epatch_user #293109
# Tweak autotool timestamps to avoid regeneration