xbmc: build a slightly more standard version

 * performance tweaks from the summer of code project will be applied later

1 files changed, 17 insertions, 5 deletions

diff --git a/recipes/xbmc/xbmc_svn.bb b/recipes/xbmc/xbmc_svn.bb
index 0ba75dacf4..4085e58527 100644
--- a/recipes/xbmc/xbmc_svn.bb
+++ b/recipes/xbmc/xbmc_svn.bb
@@ -3,14 +3,26 @@ LICENSE = "xbmc"
 
 DEPENDS = "libmodplug libmicrohttpd wavpack libmms cmake-native libsdl-image libsdl-mixer virtual/egl mysql5 sqlite3 libmms faad2 libcdio libpcre boost lzo2 enca avahi libsamplerate0 libxrandr bzip2 virtual/libsdl"
 
-SRC_URI = "git://xbmc.git.sourceforge.net/gitroot/xbmc/xbmc;protocol=git;branch=gsoc-2010-beagleboard"
-
-SRCREV = "c494f76d87ed98838e9890319554d02814bef10e"
+SRCREV = "21029056aa4c26c6ce3aa7d09703ca8b458df201"
 
 PV = "0.0"
-PR = "r1"
+PR = "r2"
 PR_append = "+gitr${SRCPV}"
 
+SRC_URI = "git://xbmc.git.sourceforge.net/gitroot/xbmc/xbmc;protocol=git;branch=master \
+file://0001-Only-check-for-nasm-on-i686-it-is-bogus-on-ARM-which.patch \
+file://0002-Exclude-gnu-configize-for-ngstr-m-Thanks-koen.patch \
+file://0003-Workaround-to-compile-python-on-ngstr-m-with-Python-.patch \
+file://0004-Don-t-use-sudo-in-install-of-xbmc.bin-not-all-distri.patch \
+file://0005-Hardcode-arm7-for-now.patch \
+file://0006-Hardcode-python2.6-for-now.patch \
+file://0007-No-need-for-FEH-on-embedded-need-a-better-way-to-not.patch \
+file://0008-configure.in-also-pass-down-target-when-using-host-a.patch \
+file://0009-Added-a-configure-option-disable-optical-drive.patch \
+file://0010-Fixed-so-compile-worked-when-disabling-optical.patch \
+file://0011-reverted-so-normal-bootstrap-doesn-t-exclude-gnu-con.patch \
+"
+
 inherit autotools gettext
 
 S = "${WORKDIR}/git"
@@ -22,7 +34,7 @@ EXTRA_OECONF = " \
 "
 
 do_configure() {
-	./bootstrap.angstrom
+	sh bootstrap.angstrom
 	oe_runconf
 }