diff options
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-multimedia/xbmc/xbmc/0005-Revert-build-fixed-build-issue-in-certain-cases.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/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 5919175cc..000000000 --- a/meta-oe/recipes-multimedia/xbmc/xbmc/0005-Revert-build-fixed-build-issue-in-certain-cases.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From d1fb013bf055e3522fdd3e67c355e606a08d7611 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Fri, 24 Feb 2012 23:19:49 +0100 | ||
4 | Subject: [PATCH 5/5] Revert "build: fixed build issue in certain cases" | ||
5 | |||
6 | The double include breaks all kinds of undefs, on ARM HAS_GL gets enabled | ||
7 | |||
8 | This reverts commit bf9dd471187f56eeb35a6f5ce4a3c39faaa7e72e. | ||
9 | --- | ||
10 | xbmc/cores/DllLoader/LibraryLoader.h | 5 +++-- | ||
11 | 1 files changed, 3 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/xbmc/cores/DllLoader/LibraryLoader.h b/xbmc/cores/DllLoader/LibraryLoader.h | ||
14 | index 7f5129f..a3f6c5d 100644 | ||
15 | --- a/xbmc/cores/DllLoader/LibraryLoader.h | ||
16 | +++ b/xbmc/cores/DllLoader/LibraryLoader.h | ||
17 | @@ -22,8 +22,9 @@ | ||
18 | #ifndef LIBRARY_LOADER | ||
19 | #define LIBRARY_LOADER | ||
20 | |||
21 | -#include "system.h" | ||
22 | -#ifdef _LINUX | ||
23 | +#ifndef _LINUX | ||
24 | +#include "system.h" // WIN32INCLUDES - needed for HMODULE | ||
25 | +#else | ||
26 | #include "PlatformDefs.h" | ||
27 | #endif | ||
28 | |||
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 c458c4c22..2c922e733 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 = "4246dffa9896d0c66dc79a97c2d3c8a3d4c4a183" | 9 | SRCREV = "f38655f1b565926846c1e17e0e7801c811037b1f" |
10 | 10 | ||
11 | PV = "11.0" | 11 | PV = "11.0" |
12 | PR = "r9" | 12 | PR = "r10" |
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://0005-Revert-build-fixed-build-issue-in-certain-cases.patch \ | ||
19 | " | 18 | " |
20 | 19 | ||
21 | inherit autotools gettext python-dir | 20 | inherit autotools gettext python-dir |