summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2012-01-24 08:47:59 +0100
committerKoen Kooi <koen@dominion.thruhere.net>2012-01-24 13:20:51 +0100
commit926b8427285306545df5e46a3dfe30b92d66afb3 (patch)
tree0e6b8f2ae11a60ea97292aca243e25994a4f36ea
parent0abc68a6318d9fcf6a94aac84909bddca302b396 (diff)
downloadmeta-openembedded-926b8427285306545df5e46a3dfe30b92d66afb3.tar.gz
xbmc: update SRCREV, add CEC and Airplay support
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r--meta-oe/recipes-multimedia/xbmc/xbmc/0004-gles-GL_BGRA-does-not-exist-for-every-GLES-implement.patch31
-rw-r--r--meta-oe/recipes-multimedia/xbmc/xbmc_git.bb7
2 files changed, 3 insertions, 35 deletions
diff --git a/meta-oe/recipes-multimedia/xbmc/xbmc/0004-gles-GL_BGRA-does-not-exist-for-every-GLES-implement.patch b/meta-oe/recipes-multimedia/xbmc/xbmc/0004-gles-GL_BGRA-does-not-exist-for-every-GLES-implement.patch
deleted file mode 100644
index de832f6cfd..0000000000
--- a/meta-oe/recipes-multimedia/xbmc/xbmc/0004-gles-GL_BGRA-does-not-exist-for-every-GLES-implement.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 8bb5efe64ecf56e096cfa7bd721ed0e61175e839 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sun, 22 Jan 2012 10:59:53 +0100
4Subject: [PATCH 4/4] [gles] GL_BGRA does not exist for every GLES implementation
5
6The GLES implementation that TI supports for the catalog chips lacks GL_BGRA
7
8Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
9---
10Upstream-status: Accepted
11
12 xbmc/cores/VideoRenderers/OverlayRendererGL.cpp | 2 ++
13 1 files changed, 2 insertions(+), 0 deletions(-)
14
15diff --git a/xbmc/cores/VideoRenderers/OverlayRendererGL.cpp b/xbmc/cores/VideoRenderers/OverlayRendererGL.cpp
16index b5d00a7..a1a37d0 100644
17--- a/xbmc/cores/VideoRenderers/OverlayRendererGL.cpp
18+++ b/xbmc/cores/VideoRenderers/OverlayRendererGL.cpp
19@@ -65,7 +65,9 @@ static void LoadTexture(GLenum target
20 int bytesPerPixel;
21 switch (externalFormat)
22 {
23+#ifndef HAS_GLES
24 case GL_BGRA:
25+#endif
26 case GL_RGBA:
27 bytesPerPixel = 4;
28 break;
29--
301.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 fb632a63a4..092f1fe0a9 100644
--- a/meta-oe/recipes-multimedia/xbmc/xbmc_git.bb
+++ b/meta-oe/recipes-multimedia/xbmc/xbmc_git.bb
@@ -3,19 +3,18 @@ DESCRIPTION = "XBMC Media Center"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=6eb631b6da7fdb01508a80213ffc35ff" 4LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=6eb631b6da7fdb01508a80213ffc35ff"
5 5
6DEPENDS = "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" 6DEPENDS = "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
9SRCREV = "fd08f6d3f3d0de9fbdbc1db20ee5e5ffa26d7a83" 9SRCREV = "f119e6aa5ff44d8bf8e670d5d7c21e2fc4832a7c"
10 10
11PV = "11.0" 11PV = "11.0"
12PR = "r3" 12PR = "r4"
13PR_append = "+gitr${SRCPV}" 13PR_append = "+gitr${SRCPV}"
14SRC_URI = "git://github.com/xbmc/xbmc.git;branch=eden;protocol=git \ 14SRC_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-gles-GL_BGRA-does-not-exist-for-every-GLES-implement.patch \
19 " 18 "
20 19
21inherit autotools gettext python-dir 20inherit autotools gettext python-dir