aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 de832f6cf..000000000
--- 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 @@
-From 8bb5efe64ecf56e096cfa7bd721ed0e61175e839 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Sun, 22 Jan 2012 10:59:53 +0100
-Subject: [PATCH 4/4] [gles] GL_BGRA does not exist for every GLES implementation
-
-The GLES implementation that TI supports for the catalog chips lacks GL_BGRA
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
-Upstream-status: Accepted
-
- xbmc/cores/VideoRenderers/OverlayRendererGL.cpp | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/xbmc/cores/VideoRenderers/OverlayRendererGL.cpp b/xbmc/cores/VideoRenderers/OverlayRendererGL.cpp
-index b5d00a7..a1a37d0 100644
---- a/xbmc/cores/VideoRenderers/OverlayRendererGL.cpp
-+++ b/xbmc/cores/VideoRenderers/OverlayRendererGL.cpp
-@@ -65,7 +65,9 @@ static void LoadTexture(GLenum target
- int bytesPerPixel;
- switch (externalFormat)
- {
-+#ifndef HAS_GLES
- case GL_BGRA:
-+#endif
- case GL_RGBA:
- bytesPerPixel = 4;
- break;
---
-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 fb632a63a..092f1fe0a 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"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=6eb631b6da7fdb01508a80213ffc35ff"
-DEPENDS = "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 = "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 = "fd08f6d3f3d0de9fbdbc1db20ee5e5ffa26d7a83"
+SRCREV = "f119e6aa5ff44d8bf8e670d5d7c21e2fc4832a7c"
PV = "11.0"
-PR = "r3"
+PR = "r4"
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-gles-GL_BGRA-does-not-exist-for-every-GLES-implement.patch \
"
inherit autotools gettext python-dir