Krypton wayland

.gitignore

@@ -511,6 +511,10 @@ lib/cpluff/stamp-h1
 # /xbmc/windowing/
 /xbmc/windowing/Makefile
 /xbmc/windowing/egl/Makefile
+/xbmc/windowing/tests/wayland/xbmc_wayland_test_client_protocol.h
+/xbmc/windowing/tests/wayland/xbmc_wayland_test_protocol.c
+/xbmc/windowing/tests/wayland/xbmc_wayland_test_server_protocol.h
+/xbmc/windowing/tests/wayland/Makefile
 
 # /lib/libdvd/
 /lib/libdvd/bin

lib/gtest/Makefile.am

@@ -273,20 +273,20 @@ test_fused_gtest_test_CPPFLAGS = -I"$(srcdir)/fused-src"
 # Build rules for putting fused Google Test files into the distribution
 # package. The user can also create those files by manually running
 # scripts/fuse_gtest_files.py.
-$(test_fused_gtest_test_SOURCES): fused-gtest
+$(FUSED_GTEST_SRC): fused-gtest
 
 fused-gtest: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) \
              $(GTEST_SRC) src/gtest-all.cc src/gtest_main.cc \
              scripts/fuse_gtest_files.py
-	mkdir -p "$(srcdir)/fused-src"
-	chmod -R u+w "$(srcdir)/fused-src"
-	rm -f "$(srcdir)/fused-src/gtest/gtest-all.cc"
-	rm -f "$(srcdir)/fused-src/gtest/gtest.h"
-	"$(srcdir)/scripts/fuse_gtest_files.py" "$(srcdir)/fused-src"
-	cp -f "$(srcdir)/src/gtest_main.cc" "$(srcdir)/fused-src/gtest/"
+	mkdir -p "$(builddir)/fused-src"
+	chmod -R u+w "$(builddir)/fused-src"
+	rm -f "$(builddir)/fused-src/gtest/gtest-all.cc"
+	rm -f "$(builddir)/fused-src/gtest/gtest.h"
+	"$(srcdir)/scripts/fuse_gtest_files.py" "$(builddir)/fused-src"
+	cp -f "$(srcdir)/src/gtest_main.cc" "$(builddir)/fused-src/gtest/"
 
 maintainer-clean-local:
-	rm -rf "$(srcdir)/fused-src"
+	rm -rf "$(builddir)/fused-src"
 endif
 
 # Death tests may produce core dumps in the build directory. In case

project/cmake/CMakeLists.txt

@@ -52,6 +52,7 @@ if(UNIX)
   option(ENABLE_INTERNAL_CROSSGUID "Enable internal crossguid?" ON)
   option(ENABLE_OPENSSL     "Enable OpenSSL?" ON)
   option(ENABLE_SDL         "Enable SDL?" OFF)
+  option(ENABLE_WAYLAND     "Enable Wayland?" OFF)
   if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL freebsd)
     option(ENABLE_X11         "Enable X11 support?" ON)
     option(ENABLE_AML         "Enable AML?" OFF)
@@ -206,8 +207,13 @@ if(NOT WIN32)
   else()
     core_optional_dep(OpenGLES)
     if(OPENGLES_FOUND)
-      core_optional_dep(X ENABLE_X11)
-      core_optional_dep(LibDRM ENABLE_X11)
+      if (ENABLE_WAYLAND)
+        core_require_dep(Wayland ENABLE_WAYLAND)
+        core_optional_dep(LibDRM ENABLE_WAYLAND)
+      else()
+        core_optional_dep(X ENABLE_X11)
+        core_optional_dep(LibDRM ENABLE_X11)
+      endif()
     endif()
   endif()
   if(NOT APPLE)

project/cmake/modules/FindWayland.cmake

@@ -0,0 +1,44 @@
+#.rst:
+# FindWayland
+# -----------
+# Finds the Wayland library
+#
+# This will will define the following variables::
+#
+# WAYLAND_FOUND        - the system has Wayland
+# WAYLAND_INCLUDE_DIRS - the Wayland include directory
+# WAYLAND_LIBRARIES    - the Wayland libraries
+# WAYLAND_DEFINITIONS  - the Wayland definitions
+
+
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules (PC_WAYLAND wayland-client wayland-egl xkbcommon QUIET)
+endif()
+
+find_path(WAYLAND_INCLUDE_DIR NAMES wayland-client.h
+                          PATHS ${PC_WAYLAND_INCLUDE_DIRS})
+
+find_library(WAYLAND_CLIENT_LIBRARY NAMES wayland-client
+                         PATHS ${PC_WAYLAND_LIBRARIES} ${PC_WAYLAND_LIBRARY_DIRS})
+
+find_library(WAYLAND_EGL_LIBRARY NAMES wayland-egl
+                         PATHS ${PC_WAYLAND_LIBRARIES} ${PC_WAYLAND_LIBRARY_DIRS})
+
+find_library(XKBCOMMON_LIBRARY NAMES xkbcommon
+                         PATHS ${PC_WAYLAND_LIBRARIES} ${PC_WAYLAND_LIBRARY_DIRS})
+
+include (FindPackageHandleStandardArgs)
+find_package_handle_standard_args (WAYLAND
+  REQUIRED_VARS
+  WAYLAND_INCLUDE_DIR
+  WAYLAND_CLIENT_LIBRARY
+  WAYLAND_EGL_LIBRARY
+  XKBCOMMON_LIBRARY)
+
+if (WAYLAND_FOUND)
+  set(WAYLAND_LIBRARIES ${WAYLAND_CLIENT_LIBRARY} ${WAYLAND_EGL_LIBRARY} ${XKBCOMMON_LIBRARY})
+  set(WAYLAND_INCLUDE_DIRS ${PC_WAYLAND_INCLUDE_DIRS})
+  set(WAYLAND_DEFINITIONS -DHAVE_WAYLAND=1)
+endif()
+
+mark_as_advanced (WAYLAND_LIBRARY WAYLAND_INCLUDE_DIR)

project/cmake/treedata/optional/common/wayland.txt

@@ -0,0 +1 @@
+xbmc/windowing/wayland windowing/wayland # WAYLAND

system/shaders/yuv2rgb_basic_gles.glsl

@@ -32,10 +32,17 @@ uniform mat4      m_yuvmat;
 void main()
 {
   vec4 yuv, rgb;
+#if defined(XBMC_NV12_RRG)
+  yuv.rgba = vec4( texture2D(m_sampY, m_cordY).r
+                 , texture2D(m_sampU, m_cordU).r
+                 , texture2D(m_sampV, m_cordV).g
+                 , 1.0);
+#else
   yuv.rgba = vec4( texture2D(m_sampY, m_cordY).r
                  , texture2D(m_sampU, m_cordU).g
                  , texture2D(m_sampV, m_cordV).a
                  , 1.0);
+#endif
 
   rgb   = m_yuvmat * yuv;
   rgb.a = m_alpha;

tools/depends/native/JsonSchemaBuilder/.gitignore

@@ -0,0 +1,5 @@
+/src/Makefile.in
+/src/aclocal.m4
+/src/*.cache
+/src/config/
+/src/configure

tools/depends/native/JsonSchemaBuilder/Makefile

@@ -15,30 +15,28 @@ endif
 
 SOURCE=$(ROOT_DIR)/src
 
-CONFIGURE=./configure --prefix=$(PREFIX)
-APP=$(SOURCE)/JsonSchemaBuilder
-APPBIN=$(PREFIX)/bin/JsonSchemaBuilder
+CONFIGURE=$(SOURCE)/configure --prefix=$(PREFIX)
+APP=$(PREFIX)/bin/JsonSchemaBuilder
 
-all: .installed-$(PLATFORM)
+all: $(APP)
 
-$(PLATFORM):
-	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
-	cd $(PLATFORM); cp -a $(SOURCE)/* .
-	cd $(PLATFORM); ./autogen.sh
-	cd $(PLATFORM); $(CONFIGURE)
+$(SOURCE)/configure: $(SOURCE)/configure.ac
+	cd $(SOURCE) && ./autogen.sh
 
+$(PLATFORM)/config.log: $(SOURCE)/configure
+	rm -rf $(PLATFORM)
+	mkdir -p $(PLATFORM)
+	cd $(PLATFORM) && $(CONFIGURE)
 
-$(APP): $(PLATFORM)
+$(PLATFORM)/JsonSchemaBuilder: $(PLATFORM)/config.log
 	$(MAKE) -C $(PLATFORM)
 
-
-.installed-$(PLATFORM): $(APP)
+$(APP): $(PLATFORM)/JsonSchemaBuilder
 	$(MAKE) -C $(PLATFORM) install
-	touch $@
 
 clean:
 	$(MAKE) -C $(PLATFORM) clean
 
 distclean::
-	rm -rf $(PLATFORM) .installed-$(PLATFORM)
+	rm -rf $(PLATFORM)
 	-rm -rf bin

tools/depends/target/Makefile

@@ -133,6 +133,7 @@ linux-system-libs-egl:
 	[ -f $(PREFIX)/lib/pkgconfig/egl.pc ] || ln -sf /usr/lib/$(HOST)/pkgconfig/egl.pc $(PREFIX)/lib/pkgconfig/egl.pc
 	[ -f $(PREFIX)/lib/pkgconfig/damageproto.pc ] || ln -sf  /usr/share/pkgconfig/damageproto.pc $(PREFIX)/lib/pkgconfig/damageproto.pc
 	[ -f $(PREFIX)/lib/pkgconfig/fixesproto.pc ] || ln -sf  /usr/share/pkgconfig/fixesproto.pc $(PREFIX)/lib/pkgconfig/fixesproto.pc
+	[ -f $(PREFIX)/lib/pkgconfig/wayland-egl.pc ] || ln -sf  /usr/share/pkgconfig/wayland-egl.pc $(PREFIX)/lib/pkgconfig/wayland-egl.pc
 	[ -f $(PREFIX)/lib/pkgconfig/x11-xcb.pc ] || ln -sf  /usr/lib/$(HOST)/pkgconfig/x11-xcb.pc $(PREFIX)/lib/pkgconfig/x11-xcb.pc
 	[ -f $(PREFIX)/lib/pkgconfig/xcb-dri2.pc ] || ln -sf  /usr/lib/$(HOST)/pkgconfig/xcb-dri2.pc $(PREFIX)/lib/pkgconfig/xcb-dri2.pc
 	[ -f $(PREFIX)/lib/pkgconfig/xcb-dri3.pc ] || ln -sf  /usr/lib/$(HOST)/pkgconfig/xcb-dri3.pc $(PREFIX)/lib/pkgconfig/xcb-dri3.pc

tools/depends/target/libdvdcss/Makefile

@@ -44,6 +44,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	cd $(PLATFORM); $(AUTORECONF) -vif && ac_cv_path_GIT= ./configure $(config)
 
 $(PLATFORM)/.libs/$(LIBNAME).a: $(PLATFORM)
+	[ -f $(PLATFORM)/ChangeLog ] || touch $(PLATFORM)/ChangeLog
 	[ -d $(PLATFORM)/.libs ] && [ ! -f $@ ] && $(MAKE) -C $(PLATFORM) clean || :
 	$(MAKE) -C $(PLATFORM)
 

xbmc/ContextMenuManager.cpp

@@ -211,6 +211,7 @@ bool CONTEXTMENU::ShowFor(const CFileItemPtr& fileItem, const CContextMenuItem&
     return true;
 
   CContextButtons buttons;
+  buttons.reserve(menuItems.size());
   for (size_t i = 0; i < menuItems.size(); ++i)
     buttons.Add(i, menuItems[i]->GetLabel(*fileItem));
 

xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.cpp

@@ -22,6 +22,7 @@
 #include "DVDClock.h"
 #include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
 #include "utils/log.h"
+#include "utils/fastmemcpy.h"
 #include "cores/FFmpeg.h"
 #include "Util.h"
 
@@ -91,7 +92,7 @@ bool CDVDCodecUtils::CopyPicture(DVDVideoPicture* pDst, DVDVideoPicture* pSrc)
 
   for (int y = 0; y < h; y++)
   {
-    memcpy(d, s, w);
+    fast_memcpy(d, s, w);
     s += pSrc->iLineSize[0];
     d += pDst->iLineSize[0];
   }
@@ -103,7 +104,7 @@ bool CDVDCodecUtils::CopyPicture(DVDVideoPicture* pDst, DVDVideoPicture* pSrc)
   d = pDst->data[1];
   for (int y = 0; y < h; y++)
   {
-    memcpy(d, s, w);
+    fast_memcpy(d, s, w);
     s += pSrc->iLineSize[1];
     d += pDst->iLineSize[1];
   }
@@ -112,7 +113,7 @@ bool CDVDCodecUtils::CopyPicture(DVDVideoPicture* pDst, DVDVideoPicture* pSrc)
   d = pDst->data[2];
   for (int y = 0; y < h; y++)
   {
-    memcpy(d, s, w);
+    fast_memcpy(d, s, w);
     s += pSrc->iLineSize[2];
     d += pDst->iLineSize[2];
   }
@@ -127,13 +128,13 @@ bool CDVDCodecUtils::CopyPicture(YV12Image* pImage, DVDVideoPicture *pSrc)
   int h = pImage->height;
   if ((w == pSrc->iLineSize[0]) && ((unsigned int) pSrc->iLineSize[0] == pImage->stride[0]))
   {
-    memcpy(d, s, w*h);
+    fast_memcpy(d, s, w*h);
   }
   else
   {
     for (int y = 0; y < h; y++)
     {
-      memcpy(d, s, w);
+      fast_memcpy(d, s, w);
       s += pSrc->iLineSize[0];
       d += pImage->stride[0];
     }
@@ -144,13 +145,13 @@ bool CDVDCodecUtils::CopyPicture(YV12Image* pImage, DVDVideoPicture *pSrc)
   h =(pImage->height >> pImage->cshift_y);
   if ((w==pSrc->iLineSize[1]) && ((unsigned int) pSrc->iLineSize[1]==pImage->stride[1]))
   {
-    memcpy(d, s, w*h);
+    fast_memcpy(d, s, w*h);
   }
   else
   {
     for (int y = 0; y < h; y++)
     {
-      memcpy(d, s, w);
+      fast_memcpy(d, s, w);
       s += pSrc->iLineSize[1];
       d += pImage->stride[1];
     }
@@ -159,13 +160,13 @@ bool CDVDCodecUtils::CopyPicture(YV12Image* pImage, DVDVideoPicture *pSrc)
   d = pImage->plane[2];
   if ((w==pSrc->iLineSize[2]) && ((unsigned int) pSrc->iLineSize[2]==pImage->stride[2]))
   {
-    memcpy(d, s, w*h);
+    fast_memcpy(d, s, w*h);
   }
   else
   {
     for (int y = 0; y < h; y++)
     {
-      memcpy(d, s, w);
+      fast_memcpy(d, s, w);
       s += pSrc->iLineSize[2];
       d += pImage->stride[2];
     }
@@ -203,7 +204,7 @@ DVDVideoPicture* CDVDCodecUtils::ConvertToNV12Picture(DVDVideoPicture *pSrc)
       uint8_t *d = pPicture->data[0];
       for (int y = 0; y < (int)pSrc->iHeight; y++)
       {
-        memcpy(d, s, pSrc->iWidth);
+        fast_memcpy(d, s, pSrc->iWidth);
         s += pSrc->iLineSize[0];
         d += pPicture->iLineSize[0];
       }
@@ -294,13 +295,13 @@ bool CDVDCodecUtils::CopyNV12Picture(YV12Image* pImage, DVDVideoPicture *pSrc)
   // Copy Y
   if ((w == pSrc->iLineSize[0]) && ((unsigned int) pSrc->iLineSize[0] == pImage->stride[0]))
   {
-    memcpy(d, s, w*h);
+    fast_memcpy(d, s, w*h);
   }
   else
   {
     for (int y = 0; y < h; y++)
     {
-      memcpy(d, s, w);
+      fast_memcpy(d, s, w);
       s += pSrc->iLineSize[0];
       d += pImage->stride[0];
     }
@@ -313,13 +314,13 @@ bool CDVDCodecUtils::CopyNV12Picture(YV12Image* pImage, DVDVideoPicture *pSrc)
   // Copy packed UV (width is same as for Y as it's both U and V components)
   if ((w==pSrc->iLineSize[1]) && ((unsigned int) pSrc->iLineSize[1]==pImage->stride[1]))
   {
-    memcpy(d, s, w*h);
+    fast_memcpy(d, s, w*h);
   }
   else
   {
     for (int y = 0; y < h; y++)
     {
-      memcpy(d, s, w);
+      fast_memcpy(d, s, w);
       s += pSrc->iLineSize[1];
       d += pImage->stride[1];
     }
@@ -338,13 +339,13 @@ bool CDVDCodecUtils::CopyYUV422PackedPicture(YV12Image* pImage, DVDVideoPicture
   // Copy YUYV
   if ((w * 2 == pSrc->iLineSize[0]) && ((unsigned int) pSrc->iLineSize[0] == pImage->stride[0]))
   {
-    memcpy(d, s, w*h*2);
+    fast_memcpy(d, s, w*h*2);
   }
   else
   {
     for (int y = 0; y < h; y++)
     {
-      memcpy(d, s, w*2);
+      fast_memcpy(d, s, w*2);
       s += pSrc->iLineSize[0];
       d += pImage->stride[0];
     }

xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecMFC.cpp

@@ -17,6 +17,7 @@
 #endif
 
 #include "DVDVideoCodecMFC.h"
+#include "utils/fastmemcpy.h"
 
 #include <sys/mman.h>
 #include <sys/ioctl.h>
@@ -304,7 +305,7 @@ bool CDVDVideoCodecMFC::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) {
     return false;
   // Fill it with the header
   sinkBuffer.iBytesUsed[0] = extraSize;
-  memcpy(sinkBuffer.cPlane[0], extraData, extraSize);
+  fast_memcpy(sinkBuffer.cPlane[0], extraData, extraSize);
   // Enqueue buffer
   if (!m_MFCOutput->PushBuffer(&sinkBuffer))
     return false;
@@ -484,7 +485,7 @@ int CDVDVideoCodecMFC::Decode(BYTE* pData, int iSize, double dts, double pts) {
     if (m_MFCOutput->GetBuffer(m_Buffer)) {
       debug_log(LOGDEBUG, "%s::%s - Got empty buffer %d from MFC Output, filling", CLASSNAME, __func__, m_Buffer->iIndex);
       m_Buffer->iBytesUsed[0] = demuxer_bytes;
-      memcpy((uint8_t *)m_Buffer->cPlane[0], demuxer_content, m_Buffer->iBytesUsed[0]);
+      fast_memcpy((uint8_t *)m_Buffer->cPlane[0], demuxer_content, m_Buffer->iBytesUsed[0]);
       long* longPts = (long*)&pts;
       m_Buffer->timeStamp.tv_sec = longPts[0];
       m_Buffer->timeStamp.tv_usec = longPts[1];

xbmc/cores/VideoPlayer/DVDCodecs/Video/OpenMaxVideo.h

@@ -24,7 +24,7 @@
 #include <vector>
 
 #include "OpenMax.h"
-#include <EGL/egl.h>
+#include "system_egl.h"
 #include <EGL/eglext.h>
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>