From 9921cd13fc596dae2fe3033177a1c2ee4197b544 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 2 Mar 2012 09:49:02 +0100 Subject: xbmc: update to Eden RC2 and remove patches that have been fixed upstream Signed-off-by: Koen Kooi --- ...-build-fixed-build-issue-in-certain-cases.patch | 31 ---------------------- meta-oe/recipes-multimedia/xbmc/xbmc_git.bb | 5 ++-- 2 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/xbmc/xbmc/0005-Revert-build-fixed-build-issue-in-certain-cases.patch (limited to 'meta-oe') diff --git a/meta-oe/recipes-multimedia/xbmc/xbmc/0005-Revert-build-fixed-build-issue-in-certain-cases.patch b/meta-oe/recipes-multimedia/xbmc/xbmc/0005-Revert-build-fixed-build-issue-in-certain-cases.patch deleted file mode 100644 index 5919175cc0..0000000000 --- a/meta-oe/recipes-multimedia/xbmc/xbmc/0005-Revert-build-fixed-build-issue-in-certain-cases.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d1fb013bf055e3522fdd3e67c355e606a08d7611 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Fri, 24 Feb 2012 23:19:49 +0100 -Subject: [PATCH 5/5] Revert "build: fixed build issue in certain cases" - -The double include breaks all kinds of undefs, on ARM HAS_GL gets enabled - -This reverts commit bf9dd471187f56eeb35a6f5ce4a3c39faaa7e72e. ---- - xbmc/cores/DllLoader/LibraryLoader.h | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/xbmc/cores/DllLoader/LibraryLoader.h b/xbmc/cores/DllLoader/LibraryLoader.h -index 7f5129f..a3f6c5d 100644 ---- a/xbmc/cores/DllLoader/LibraryLoader.h -+++ b/xbmc/cores/DllLoader/LibraryLoader.h -@@ -22,8 +22,9 @@ - #ifndef LIBRARY_LOADER - #define LIBRARY_LOADER - --#include "system.h" --#ifdef _LINUX -+#ifndef _LINUX -+#include "system.h" // WIN32INCLUDES - needed for HMODULE -+#else - #include "PlatformDefs.h" - #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 c458c4c22a..2c922e733b 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 = "4246dffa9896d0c66dc79a97c2d3c8a3d4c4a183" +SRCREV = "f38655f1b565926846c1e17e0e7801c811037b1f" PV = "11.0" -PR = "r9" +PR = "r10" 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://0005-Revert-build-fixed-build-issue-in-certain-cases.patch \ " inherit autotools gettext python-dir -- cgit 1.2.3-korg