diff --git a/packages/mediacenter/xbmc-theme-Confluence/package.mk b/packages/mediacenter/xbmc-theme-Confluence/package.mk index 10379529c1..751d86269d 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/package.mk +++ b/packages/mediacenter/xbmc-theme-Confluence/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="14-fa8281b" +PKG_VERSION="14-021933e" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index 2937d7fbfd..1218bbba61 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="14-fa8281b" +PKG_VERSION="14-021933e" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-999.95-fix-build.patch b/packages/mediacenter/xbmc/patches/xbmc-999.95-fix-build.patch new file mode 100644 index 0000000000..eaa9cfa134 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-999.95-fix-build.patch @@ -0,0 +1,43 @@ +commit 3f472ab8a09d2dfc724fa667646ce47159d8c166 +Author: wolfgar +Date: Thu Sep 25 02:50:27 2014 +0200 + + Undef EGL_KHR_reusable_sync when imx support is enabled as + egl*SyncKHR declarations will conflict + +diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp +index 1300a7f..c747118 100644 +--- a/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp ++++ b/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp +@@ -79,23 +79,25 @@ static PFNEGLDESTROYIMAGEKHRPROC eglDestroyImageKHR; + static PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES; + #endif + +-#if defined(EGL_KHR_reusable_sync) +-static PFNEGLCREATESYNCKHRPROC eglCreateSyncKHR; +-static PFNEGLDESTROYSYNCKHRPROC eglDestroySyncKHR; +-static PFNEGLCLIENTWAITSYNCKHRPROC eglClientWaitSyncKHR; +-#endif +- + #ifdef HAS_IMXVPU + #include "windowing/egl/EGLWrapper.h" + #include "DVDCodecs/Video/DVDVideoCodecIMX.h" + + #define GL_VIV_NV12 0x8FC1 ++#undef EGL_KHR_reusable_sync + typedef void (GL_APIENTRYP PFNGLTEXDIRECTVIVMAPPROC) (GLenum Target, GLsizei Width, GLsizei Height, GLenum Format, GLvoid ** Logical, const GLuint * Physical); + typedef void (GL_APIENTRYP PFNGLTEXDIRECTINVALIDATEVIVPROC) (GLenum Target); + static PFNGLTEXDIRECTVIVMAPPROC glTexDirectVIVMap; + static PFNGLTEXDIRECTINVALIDATEVIVPROC glTexDirectInvalidateVIV; + #endif + ++#if defined(EGL_KHR_reusable_sync) ++static PFNEGLCREATESYNCKHRPROC eglCreateSyncKHR; ++static PFNEGLDESTROYSYNCKHRPROC eglDestroySyncKHR; ++static PFNEGLCLIENTWAITSYNCKHRPROC eglClientWaitSyncKHR; ++#endif ++ ++ + #if defined(TARGET_ANDROID) + #include "DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h" + #endif