diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2012-02-28 15:47:18 +0100 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-02-28 15:49:59 +0100 |
commit | d173003034859eccf80ca4770a48d499172f6012 (patch) | |
tree | ab77fc40a6cff91af9c07e29ca39efca4259369e | |
parent | f1ffd1299273a92151a4fc766ab2ca3391f59cb0 (diff) | |
download | meta-openembedded-d173003034859eccf80ca4770a48d499172f6012.tar.gz |
xbmc: update to Eden RC1 and remove patches that have been applied upstream
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r-- | meta-oe/recipes-multimedia/xbmc/xbmc/0004-ARM-Don-t-forcefully-disable-avahi-configure-has-che.patch | 31 | ||||
-rw-r--r-- | 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 303f382df..000000000 --- a/meta-oe/recipes-multimedia/xbmc/xbmc/0004-ARM-Don-t-forcefully-disable-avahi-configure-has-che.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From e8112cd4bafdbbfd88f3cc9a10b7b8e08fbbea01 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Tue, 24 Jan 2012 12:40:29 +0100 | ||
4 | Subject: [PATCH 4/4] [ARM] Don't forcefully disable avahi, configure has checks for it already | ||
5 | |||
6 | This fixes zeroconf on ARM platforms that do support avahi like Beagleboard/Angstrom | ||
7 | |||
8 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
9 | --- | ||
10 | |||
11 | Upstream-status: Pending | ||
12 | |||
13 | xbmc/system.h | 2 -- | ||
14 | 1 files changed, 0 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/xbmc/system.h b/xbmc/system.h | ||
17 | index c838dc8..b10ebae 100644 | ||
18 | --- a/xbmc/system.h | ||
19 | +++ b/xbmc/system.h | ||
20 | @@ -222,8 +222,6 @@ | ||
21 | |||
22 | // ARM does not support certain features... disable them here! | ||
23 | #ifdef _ARMEL | ||
24 | -#undef HAS_AVAHI | ||
25 | -#undef HAS_ZEROCONF | ||
26 | #undef HAS_VISUALISATION | ||
27 | #undef HAS_FILESYSTEM_HTSP | ||
28 | #endif | ||
29 | -- | ||
30 | 1.7.2.5 | ||
31 | |||
diff --git a/meta-oe/recipes-multimedia/xbmc/xbmc_git.bb b/meta-oe/recipes-multimedia/xbmc/xbmc_git.bb index 0d3079baf..c458c4c22 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" | |||
6 | 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" | 6 | 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" |
7 | #require recipes/egl/egl.inc | 7 | #require recipes/egl/egl.inc |
8 | 8 | ||
9 | SRCREV = "1fef727af39c0c6e5264ee14fe4c78f8567f035e" | 9 | SRCREV = "4246dffa9896d0c66dc79a97c2d3c8a3d4c4a183" |
10 | 10 | ||
11 | PV = "11.0" | 11 | PV = "11.0" |
12 | PR = "r8" | 12 | PR = "r9" |
13 | PR_append = "+gitr${SRCPV}" | 13 | PR_append = "+gitr${SRCPV}" |
14 | SRC_URI = "git://github.com/xbmc/xbmc.git;branch=eden;protocol=git \ | 14 | SRC_URI = "git://github.com/xbmc/xbmc.git;branch=eden;protocol=git \ |
15 | file://0001-configure-don-t-run-python-distutils-to-find-STAGING.patch \ | 15 | file://0001-configure-don-t-run-python-distutils-to-find-STAGING.patch \ |
16 | file://0002-Revert-fixed-ios-Add-memory-barriers-to-atomic-Add-S.patch \ | 16 | file://0002-Revert-fixed-ios-Add-memory-barriers-to-atomic-Add-S.patch \ |
17 | file://0003-Revert-fixed-ios-Add-memory-barriers-to-cas-assembly.patch \ | 17 | file://0003-Revert-fixed-ios-Add-memory-barriers-to-cas-assembly.patch \ |
18 | file://0004-ARM-Don-t-forcefully-disable-avahi-configure-has-che.patch \ | ||
19 | file://0005-Revert-build-fixed-build-issue-in-certain-cases.patch \ | 18 | file://0005-Revert-build-fixed-build-issue-in-certain-cases.patch \ |
20 | " | 19 | " |
21 | 20 | ||