From 8ff89fe0db67ce1a17673678ca2c911fc9bcb209 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 22 Jan 2012 12:27:57 +0100 Subject: xbmc: update to Eden beta 2 Signed-off-by: Koen Kooi --- ...on-t-run-python-distutils-to-find-STAGING.patch | 2 +- ...d-ios-Add-memory-barriers-to-atomic-Add-S.patch | 2 +- ...d-ios-Add-memory-barriers-to-cas-assembly.patch | 2 +- ...A-does-not-exist-for-every-GLES-implement.patch | 31 ++++++++++++++++++++++ meta-oe/recipes-multimedia/xbmc/xbmc_git.bb | 5 ++-- 5 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 meta-oe/recipes-multimedia/xbmc/xbmc/0004-gles-GL_BGRA-does-not-exist-for-every-GLES-implement.patch diff --git a/meta-oe/recipes-multimedia/xbmc/xbmc/0001-configure-don-t-run-python-distutils-to-find-STAGING.patch b/meta-oe/recipes-multimedia/xbmc/xbmc/0001-configure-don-t-run-python-distutils-to-find-STAGING.patch index 04712e26b6..dfc3959a1f 100644 --- a/meta-oe/recipes-multimedia/xbmc/xbmc/0001-configure-don-t-run-python-distutils-to-find-STAGING.patch +++ b/meta-oe/recipes-multimedia/xbmc/xbmc/0001-configure-don-t-run-python-distutils-to-find-STAGING.patch @@ -1,4 +1,4 @@ -From 46d747f48a5e099644c37cc5e345960d714ff5d5 Mon Sep 17 00:00:00 2001 +From 0dce5a2abd9f42876616c35772a4d71c5399543c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 17 Dec 2011 11:38:15 +0100 Subject: [PATCH 1/4] configure: don't run python distutils to find STAGING_INCDIR/python, it is not safe for per-machine sysroots diff --git a/meta-oe/recipes-multimedia/xbmc/xbmc/0002-Revert-fixed-ios-Add-memory-barriers-to-atomic-Add-S.patch b/meta-oe/recipes-multimedia/xbmc/xbmc/0002-Revert-fixed-ios-Add-memory-barriers-to-atomic-Add-S.patch index 8fd89b8a67..e0a4037bc5 100644 --- a/meta-oe/recipes-multimedia/xbmc/xbmc/0002-Revert-fixed-ios-Add-memory-barriers-to-atomic-Add-S.patch +++ b/meta-oe/recipes-multimedia/xbmc/xbmc/0002-Revert-fixed-ios-Add-memory-barriers-to-atomic-Add-S.patch @@ -1,4 +1,4 @@ -From 84494a538fe3b2aad64ef82673a3a2b576acb7f4 Mon Sep 17 00:00:00 2001 +From 7b2a8a7869d257cba35f53f6d877877c29cdac27 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sun, 14 Aug 2011 21:53:47 +0200 Subject: [PATCH 2/4] Revert "fixed:[ios] Add memory barriers to atomic Add/Subtract and Increment/Decrement functions to ensure synchronized accesses." diff --git a/meta-oe/recipes-multimedia/xbmc/xbmc/0003-Revert-fixed-ios-Add-memory-barriers-to-cas-assembly.patch b/meta-oe/recipes-multimedia/xbmc/xbmc/0003-Revert-fixed-ios-Add-memory-barriers-to-cas-assembly.patch index 894fa7aa5e..629017b7b4 100644 --- a/meta-oe/recipes-multimedia/xbmc/xbmc/0003-Revert-fixed-ios-Add-memory-barriers-to-cas-assembly.patch +++ b/meta-oe/recipes-multimedia/xbmc/xbmc/0003-Revert-fixed-ios-Add-memory-barriers-to-cas-assembly.patch @@ -1,4 +1,4 @@ -From 7ed1e824d92b014aeb3c8855f807af022cd21475 Mon Sep 17 00:00:00 2001 +From aaae1616a09d359b52e929f944ca0ceb4bb7f831 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sun, 14 Aug 2011 21:55:09 +0200 Subject: [PATCH 3/4] Revert "fixed:[ios] Add memory barriers to cas() assembly to ensure alignment of memory accesses." 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 new file mode 100644 index 0000000000..de832f6cfd --- /dev/null +++ b/meta-oe/recipes-multimedia/xbmc/xbmc/0004-gles-GL_BGRA-does-not-exist-for-every-GLES-implement.patch @@ -0,0 +1,31 @@ +From 8bb5efe64ecf56e096cfa7bd721ed0e61175e839 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +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 +--- +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 7985dbd888..fb632a63a4 100644 --- a/meta-oe/recipes-multimedia/xbmc/xbmc_git.bb +++ b/meta-oe/recipes-multimedia/xbmc/xbmc_git.bb @@ -6,15 +6,16 @@ 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" #require recipes/egl/egl.inc -SRCREV = "22ad8e4ddf844bb82fa2c467818d2d797ca36707" +SRCREV = "fd08f6d3f3d0de9fbdbc1db20ee5e5ffa26d7a83" PV = "11.0" -PR = "r2" +PR = "r3" 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 -- cgit 1.2.3-korg