[oe-commits] Koen Kooi : xbmc: update to Eden RC1 and remove patches that have been applied upstream

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: d173003034859eccf80ca4770a48d499172f6012
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=d173003034859eccf80ca4770a48d499172f6012

Author: Koen Kooi <koen at dominion.thruhere.net>
Date:   Tue Feb 28 15:47:18 2012 +0100

xbmc: update to Eden RC1 and remove patches that have been applied upstream

Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 ...orcefully-disable-avahi-configure-has-che.patch |   31 --------------------
 meta-oe/recipes-multimedia/xbmc/xbmc_git.bb        |    5 +--
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/meta-oe/recipes-multimedia/xbmc/xbmc/0004-ARM-Don-t-forcefully-disable-avahi-configure-has-che.patch b/meta-oe/recipes-multimedia/xbmc/xbmc/0004-ARM-Don-t-forcefully-disable-avahi-configure-has-che.patch
deleted file mode 100644
index 303f382..0000000
--- a/meta-oe/recipes-multimedia/xbmc/xbmc/0004-ARM-Don-t-forcefully-disable-avahi-configure-has-che.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e8112cd4bafdbbfd88f3cc9a10b7b8e08fbbea01 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen at dominion.thruhere.net>
-Date: Tue, 24 Jan 2012 12:40:29 +0100
-Subject: [PATCH 4/4] [ARM] Don't forcefully disable avahi, configure has checks for it already
-
-This fixes zeroconf on ARM platforms that do support avahi like Beagleboard/Angstrom
-
-Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
----
-
-Upstream-status: Pending
-
- xbmc/system.h |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/xbmc/system.h b/xbmc/system.h
-index c838dc8..b10ebae 100644
---- a/xbmc/system.h
-+++ b/xbmc/system.h
-@@ -222,8 +222,6 @@
- 
- // ARM does not support certain features... disable them here!
- #ifdef _ARMEL
--#undef HAS_AVAHI
--#undef HAS_ZEROCONF
- #undef HAS_VISUALISATION
- #undef HAS_FILESYSTEM_HTSP
- #endif
--- 
-1.7.2.5
-
diff --git a/meta-oe/recipes-multimedia/xbmc/xbmc_git.bb b/meta-oe/recipes-multimedia/xbmc/xbmc_git.bb
index 0d3079b..c458c4c 100644
--- a/meta-oe/recipes-multimedia/xbmc/xbmc_git.bb
+++ b/meta-oe/recipes-multimedia/xbmc/xbmc_git.bb
@@ -6,16 +6,15 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=6eb631b6da7fdb01508a80213ffc35ff"
 DEPENDS = "libusb1 libcec libplist expat yajl gperf-native libxmu fribidi mpeg2dec ffmpeg samba fontconfig curl python libass libmodplug libmicrohttpd wavpack libmms cmake-native libsdl-image libsdl-mixer virtual/egl mysql5 sqlite3 libmms faad2 libcdio libpcre boost lzo enca avahi libsamplerate0 libxinerama libxrandr libxtst bzip2 virtual/libsdl jasper zip-native zlib"
 #require recipes/egl/egl.inc
 
-SRCREV = "1fef727af39c0c6e5264ee14fe4c78f8567f035e"
+SRCREV = "4246dffa9896d0c66dc79a97c2d3c8a3d4c4a183"
 
 PV = "11.0"
-PR = "r8"
+PR = "r9"
 PR_append = "+gitr${SRCPV}"
 SRC_URI = "git://github.com/xbmc/xbmc.git;branch=eden;protocol=git \
            file://0001-configure-don-t-run-python-distutils-to-find-STAGING.patch \
            file://0002-Revert-fixed-ios-Add-memory-barriers-to-atomic-Add-S.patch \
            file://0003-Revert-fixed-ios-Add-memory-barriers-to-cas-assembly.patch \
-           file://0004-ARM-Don-t-forcefully-disable-avahi-configure-has-che.patch \
            file://0005-Revert-build-fixed-build-issue-in-certain-cases.patch \
           "