From a388dabbcd734ecb6926c79c2a418613b9fff1dd Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 24 Jan 2012 12:50:57 +0100 Subject: xbmc: enable libusb and fix zeroconf Signed-off-by: Koen Kooi --- ...orcefully-disable-avahi-configure-has-che.patch | 31 ++++++++++++++++++++++ meta-oe/recipes-multimedia/xbmc/xbmc_git.bb | 7 +++-- 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-multimedia/xbmc/xbmc/0004-ARM-Don-t-forcefully-disable-avahi-configure-has-che.patch (limited to 'meta-oe') 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 new file mode 100644 index 0000000000..303f382df9 --- /dev/null +++ b/meta-oe/recipes-multimedia/xbmc/xbmc/0004-ARM-Don-t-forcefully-disable-avahi-configure-has-che.patch @@ -0,0 +1,31 @@ +From e8112cd4bafdbbfd88f3cc9a10b7b8e08fbbea01 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +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 +--- + +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 092f1fe0a9..4e8c9b04ff 100644 --- a/meta-oe/recipes-multimedia/xbmc/xbmc_git.bb +++ b/meta-oe/recipes-multimedia/xbmc/xbmc_git.bb @@ -3,18 +3,19 @@ DESCRIPTION = "XBMC Media Center" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=6eb631b6da7fdb01508a80213ffc35ff" -DEPENDS = "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" +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 = "f119e6aa5ff44d8bf8e670d5d7c21e2fc4832a7c" PV = "11.0" -PR = "r4" +PR = "r5" 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 \ " inherit autotools gettext python-dir @@ -24,6 +25,8 @@ S = "${WORKDIR}/git" EXTRA_OECONF = " \ --disable-rpath \ --enable-gles \ + --enable-libusb \ + --enable-airplay \ --disable-optical-drive \ --enable-external-libraries \ " -- cgit 1.2.3-korg