[Buildroot] [PATCH 00/16] XBMC Gotham Beta3

[Buildroot] [PATCH 00/16] XBMC Gotham Beta3

[Bernd Kuhls]

Hi,

this patch series replaces yesterdays patch series 1-8/8.

patches 1-5: unrelated version bumps
patch 6: Kconfig comment for libdrm
patch 7: v4 of xdriver_xf86-video-intel version bump
patches 8-13: new packages needed for xbmc, especially for intel support
patch 14: first try to create an opengl virtual package
patch 15: WIP - xbmc version bump to Gotham Beta3 with uClibc support
                http://xbmc.org/xbmc-13-0-gotham-beta-3-returns/
          this patch includes the host-gawk patch:
          http://patchwork.ozlabs.org/patch/334971/
patch 16: WIP - Add xbmc-send script to send commands to xbmc

I consider patches 1-13 git-ready, for the rest I am waiting for feedback ;)

Regards, Bernd


Bernd Kuhls (16):
  pixman: Version bump 0.32.4
  xlib_xtrans: Version bump 1.3.4
  file: Version bump 5.18
  flex: Version bump 2.5.39
  sqlite: Version bump 3.8.4.2
  libdrm: Explain dependency on xorg in Kconfig
  xdriver_xf86-video-intel: Bump version to 2.99.911
  libva: new package
  libva-intel-driver: new package
  ffmpeg: Add libva support
  libglu: new package
  libglew: new package
  sdl: Add new dependency libglu for opengl support
  opengl: New virtual package
  xbmc: Bump version to Gotham_beta3
  xbmc: Add xbmc-send script to send commands to xbmc service

 package/Config.in                                  |    4 +
 package/ffmpeg/ffmpeg.mk                           |    8 +-
 package/file/file.mk                               |    2 +-
 package/flex/flex-prog-ar.patch                    |   11 ---
 package/flex/flex.mk                               |    2 +-
 package/libdrm/Config.in                           |    3 +
 package/libglew/Config.in                          |   19 +++++
 package/libglew/libglew-0001-lib64.patch           |   14 ++++
 package/libglew/libglew.mk                         |   40 ++++++++++
 package/libglu/Config.in                           |   10 +++
 package/libglu/libglu.mk                           |   19 +++++
 package/libva-intel-driver/Config.in               |   13 ++++
 package/libva-intel-driver/libva-intel-driver.mk   |   13 ++++
 package/libva/Config.in                            |   12 +++
 package/libva/libva.mk                             |   59 +++++++++++++++
 package/mesa3d/Config.in                           |    4 +
 package/opengl/Config.in                           |    1 +
 package/opengl/libgl/Config.in                     |    6 ++
 package/opengl/libgl/libgl.mk                      |   16 ++++
 package/pixman/pixman-01-loongson-cflags.patch     |   38 ----------
 package/pixman/pixman.mk                           |    2 +-
 package/sdl/sdl.mk                                 |    6 +-
 package/sqlite/sqlite.mk                           |    2 +-
 package/x11r7/xdriver_xf86-video-intel/Config.in   |   13 ++--
 .../xdriver_xf86-video-intel.mk                    |   31 ++++++--
 package/x11r7/xlib_xtrans/xlib_xtrans.mk           |    2 +-
 package/xbmc/Config.in                             |   26 ++++---
 package/xbmc/xbmc.mk                               |   79 +++++++++++++++++---
 28 files changed, 364 insertions(+), 91 deletions(-)
 delete mode 100644 package/flex/flex-prog-ar.patch
 create mode 100644 package/libglew/Config.in
 create mode 100644 package/libglew/libglew-0001-lib64.patch
 create mode 100644 package/libglew/libglew.mk
 create mode 100644 package/libglu/Config.in
 create mode 100644 package/libglu/libglu.mk
 create mode 100644 package/libva-intel-driver/Config.in
 create mode 100644 package/libva-intel-driver/libva-intel-driver.mk
 create mode 100644 package/libva/Config.in
 create mode 100644 package/libva/libva.mk
 create mode 100644 package/opengl/libgl/Config.in
 create mode 100644 package/opengl/libgl/libgl.mk
 delete mode 100644 package/pixman/pixman-01-loongson-cflags.patch

-- 
1.7.10.4

[Buildroot] [PATCH 01/16] pixman: Version bump 0.32.4

[Bernd Kuhls]

- removed pixman-01-loongson-cflags.patch, applied upstream

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/pixman/pixman-01-loongson-cflags.patch |   38 ------------------------
 package/pixman/pixman.mk                       |    2 +-
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 package/pixman/pixman-01-loongson-cflags.patch

diff --git a/package/pixman/pixman-01-loongson-cflags.patch b/package/pixman/pixman-01-loongson-cflags.patch
deleted file mode 100644
index fc53be2..0000000
--- a/package/pixman/pixman-01-loongson-cflags.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-configure.ac: Verify that the Loongson MMI code can link
-
-The Loongson MMI code modifies -march and as a result it breaks linking
-when the rest of the code is built with a different -match/-mtune.
-This patch fixes the problem by trying to link the code instead of just
-compiling it. This patch is already committed upstream.
-
-Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
-
-From d77d75cc6e5de14d027d22b70389a4d0c71048b9 Mon Sep 17 00:00:00 2001
-From: Markos Chandras <markos.chandras@imgtec.com>
-Date: Wed, 15 May 2013 16:51:20 +0000
-Subject: Use AC_LINK_IFELSE to check if the Loongson MMI code can link
-
-The Loongson code is compiled with -march=loongson2f to enable the MMI
-instructions, but binutils refuses to link object code compiled with
-different -march settings, leading to link failures later in the
-compile. This avoids that problem by checking if we can link code
-compiled for Loongson.
-
-Reviewed-by: Matt Turner <mattst88@gmail.com>
-Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
----
-diff --git a/configure.ac b/configure.ac
-index c43a0d2..221179f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -279,7 +279,7 @@ AC_MSG_CHECKING(whether to use Loongson MMI assembler)
- 
- xserver_save_CFLAGS=$CFLAGS
- CFLAGS=" $LS_CFLAGS $CFLAGS -I$srcdir"
--AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-+AC_LINK_IFELSE([AC_LANG_SOURCE([[
- #ifndef __mips_loongson_vector_rev
- #error "Loongson Multimedia Instructions are only available on Loongson"
- #endif
---
-cgit v0.9.0.2-2-gbebe
diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
index 4f70ce5..91f3332 100644
--- a/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PIXMAN_VERSION = 0.30.0
+PIXMAN_VERSION = 0.32.4
 PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib
 PIXMAN_LICENSE = MIT
 PIXMAN_LICENSE_FILES = COPYING
-- 
1.7.10.4

[Buildroot] [PATCH 02/16] xlib_xtrans: Version bump 1.3.4

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/x11r7/xlib_xtrans/xlib_xtrans.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
index 8c5fd42..bc84dfb 100644
--- a/package/x11r7/xlib_xtrans/xlib_xtrans.mk
+++ b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_XTRANS_VERSION = 1.3.2
+XLIB_XTRANS_VERSION = 1.3.4
 XLIB_XTRANS_SOURCE = xtrans-$(XLIB_XTRANS_VERSION).tar.bz2
 XLIB_XTRANS_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_XTRANS_LICENSE = MIT
-- 
1.7.10.4

[Buildroot] [PATCH 03/16] file: Version bump 5.18

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/file/file.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/file/file.mk b/package/file/file.mk
index ac9cf55..846d56a 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FILE_VERSION = 5.17
+FILE_VERSION = 5.18
 FILE_SITE = ftp://ftp.astron.com/pub/file
 FILE_DEPENDENCIES = host-file zlib
 FILE_INSTALL_STAGING = YES
-- 
1.7.10.4

[Buildroot] [PATCH 04/16] flex: Version bump 2.5.39

[Bernd Kuhls]

- upstream fixed Makefile.in, flex-prog-ar.patch is unneeded now

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/flex/flex-prog-ar.patch |   11 -----------
 package/flex/flex.mk            |    2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 package/flex/flex-prog-ar.patch

diff --git a/package/flex/flex-prog-ar.patch b/package/flex/flex-prog-ar.patch
deleted file mode 100644
index e0626ff..0000000
--- a/package/flex/flex-prog-ar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rup flex-2.5.33.orig/Makefile.in flex-2.5.33/Makefile.in
---- flex-2.5.33.orig/Makefile.in	2007-01-18 17:29:25.000000000 +0100
-+++ flex-2.5.33/Makefile.in	2007-01-18 18:28:22.000000000 +0100
-@@ -105,7 +105,6 @@ am__installdirs = "$(DESTDIR)$(libdir)"
- 	"$(DESTDIR)$(includedir)"
- libLIBRARIES_INSTALL = $(INSTALL_DATA)
- LIBRARIES = $(lib_LIBRARIES)
--AR = ar
- ARFLAGS = cru
- libfl_a_AR = $(AR) $(ARFLAGS)
- libfl_a_LIBADD =
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index 17f651b..2373d04 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FLEX_VERSION = 2.5.37
+FLEX_VERSION = 2.5.39
 FLEX_SITE = http://download.sourceforge.net/project/flex
 FLEX_INSTALL_STAGING = YES
 FLEX_LICENSE = FLEX
-- 
1.7.10.4

[Buildroot] [PATCH 05/16] sqlite: Version bump 3.8.4.2

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/sqlite/sqlite.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 7893e6b..af59479 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SQLITE_VERSION = 3080401
+SQLITE_VERSION = 3080402
 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE = http://www.sqlite.org/2014
 SQLITE_LICENSE = Public domain
-- 
1.7.10.4

[Buildroot] [PATCH 06/16] libdrm: Explain dependency on xorg in Kconfig

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/libdrm/Config.in |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
index 7192e94..0a8c681 100644
--- a/package/libdrm/Config.in
+++ b/package/libdrm/Config.in
@@ -20,6 +20,9 @@ config BR2_PACKAGE_LIBDRM_INTEL
 	help
 	  installs intel graphics driver
 
+comment "libdrm intel driver depends on X.org"
+	depends on !BR2_PACKAGE_XORG7
+
 config BR2_PACKAGE_LIBDRM_RADEON
 	bool "radeon"
 	depends on BR2_i386 || BR2_x86_64
-- 
1.7.10.4

[Buildroot] [PATCH v4 07/16] xdriver_xf86-video-intel: Bump version to 2.99.911

[Bernd Kuhls]

From: Bernd Kuhls <berndkuhls@hotmail.com>

- add necessary dependencies
- add -D_GNU_SOURCE to avoid getline compilation error

Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v4: no changes
v3: - add optional dependency BR2_PACKAGE_XPROTO_XF86DRIPROTO (Thomas)
v2: - depend on mesa3d only when the i965 DRI driver is selected (Thomas)
    - allow both kms and ums support (Thomas):
  Support for Kernel Mode Setting? yes
  Support for legacy User Mode Setting (for i810)? yes

 package/x11r7/xdriver_xf86-video-intel/Config.in   |   13 ++++----
 .../xdriver_xf86-video-intel.mk                    |   31 ++++++++++++++++----
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/package/x11r7/xdriver_xf86-video-intel/Config.in b/package/x11r7/xdriver_xf86-video-intel/Config.in
index 83b714a..1917319 100644
--- a/package/x11r7/xdriver_xf86-video-intel/Config.in
+++ b/package/x11r7/xdriver_xf86-video-intel/Config.in
@@ -1,13 +1,14 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL
 	bool "xf86-video-intel"
-	select BR2_PACKAGE_XPROTO_FONTSPROTO
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_RENDERPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
-	select BR2_PACKAGE_XLIB_LIBPCIACCESS
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_LIBDRM_INTEL
-	select BR2_PACKAGE_MESA3D
+	select BR2_PACKAGE_XLIB_LIBXCOMPOSITE
+	select BR2_PACKAGE_XLIB_LIBPCIACCESS
+	select BR2_PACKAGE_XLIB_LIBXRANDR
+	select BR2_PACKAGE_XLIB_LIBXTST
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_MESA3D_DRI_DRIVER_I965
+	select BR2_PACKAGE_XPROTO_XPROTO
 	depends on (BR2_i386 || BR2_x86_64)
 	help
 	  Intel video driver
diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
index 332de54..e9d3871 100644
--- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
+++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
@@ -4,18 +4,18 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.99.907
+XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.99.911
 XDRIVER_XF86_VIDEO_INTEL_SOURCE = xf86-video-intel-$(XDRIVER_XF86_VIDEO_INTEL_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_INTEL_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_INTEL_LICENSE = MIT
 XDRIVER_XF86_VIDEO_INTEL_LICENSE_FILES = COPYING
-XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES
+
+# this fixes a getline-related compilation in src/sna/kgem.c
+XDRIVER_XF86_VIDEO_INTEL_CONF_ENV = \
+	CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
 
 XDRIVER_XF86_VIDEO_INTEL_CONF_OPT = \
-	--enable-dri \
-	--enable-kms-only \
 	--disable-xvmc \
-	--disable-ums-only \
 	--enable-sna \
 	--disable-uxa \
 	--disable-glamor \
@@ -23,6 +23,25 @@ XDRIVER_XF86_VIDEO_INTEL_CONF_OPT = \
 	--disable-dga \
 	--disable-async-swap
 
-XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto libdrm xlib_libpciaccess
+XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = \
+	libdrm \
+	xlib_libXcomposite \
+	xlib_libXrandr \
+	xlib_libXtst \
+	xlib_libpciaccess \
+	xproto_fontsproto \
+	xproto_xproto \
+	xserver_xorg-server
+
+ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965),y)
+XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += \
+	--enable-dri
+XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES += \
+	mesa3d \
+	xproto_xf86driproto
+else
+XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += \
+	--disable-dri
+endif
 
 $(eval $(autotools-package))
-- 
1.7.10.4

[Buildroot] [PATCH 08/16] libva: new package

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/Config.in       |    1 +
 package/libva/Config.in |   12 ++++++++++
 package/libva/libva.mk  |   59 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+)
 create mode 100644 package/libva/Config.in
 create mode 100644 package/libva/libva.mk

diff --git a/package/Config.in b/package/Config.in
index e816603..b45c6e9 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -593,6 +593,7 @@ source "package/libsvg/Config.in"
 source "package/libsvg-cairo/Config.in"
 source "package/libsvgtiny/Config.in"
 source "package/libungif/Config.in"
+source "package/libva/Config.in"
 source "package/opencv/Config.in"
 source "package/opengl/Config.in"
 source "package/pango/Config.in"
diff --git a/package/libva/Config.in b/package/libva/Config.in
new file mode 100644
index 0000000..98a5ee8
--- /dev/null
+++ b/package/libva/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LIBVA
+	bool "libva"
+	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XSERVER_XORG_SERVER
+	help
+	  The main motivation for VA-API (Video Acceleration API) is to enable
+	  hardware accelerated video decode/encode at various entry-points (VLD,
+	  IDCT, Motion Compensation etc.) for the prevailing coding standards
+	  today (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).
+
+	  http://www.freedesktop.org/wiki/Software/vaapi/
diff --git a/package/libva/libva.mk b/package/libva/libva.mk
new file mode 100644
index 0000000..1c7e6e0
--- /dev/null
+++ b/package/libva/libva.mk
@@ -0,0 +1,59 @@
+################################################################################
+#
+# libva
+#
+################################################################################
+
+LIBVA_VERSION = 1.3.0
+LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2
+LIBVA_SITE = http://www.freedesktop.org/software/vaapi/releases/libva
+LIBVA_LICENSE = MIT
+LIBVA_INSTALL_STAGING = YES
+
+LIBVA_DEPENDENCIES = \
+	host-pkgconf \
+	libdrm
+
+LIBVA_CONF_OPT = \
+	--enable-drm \
+	--disable-dummy-driver \
+	--with-drivers-path="/usr/lib/va"
+
+ifeq ($(BR2_PACKAGE_MESA3D),y)
+LIBVA_DEPENDENCIES += \
+	mesa3d
+LIBVA_CONF_OPT += \
+	--enable-glx
+endif
+
+ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER),y)
+LIBVA_DEPENDENCIES += \
+	xlib_libX11 \
+	xlib_libXext \
+	xlib_libXfixes
+LIBVA_CONF_OPT += \
+	--enable-x11
+else
+LIBVA_CONF_OPT += \
+	--disable-x11
+endif
+
+ifeq ($(BR2_PACKAGE_WAYLAND),y)
+LIBVA_DEPENDENCIES += \
+	wayland
+LIBVA_CONF_OPT += \
+	--enable-wayland
+else
+LIBVA_CONF_OPT += \
+	--disable-wayland
+endif
+
+ifeq ($(BR2_PACKAGE_HAS_OPENGL_EGL),y)
+LIBVA_CONF_OPT += \
+	--enable-egl
+else
+LIBVA_CONF_OPT += \
+	--disable-egl
+endif
+
+$(eval $(autotools-package))
-- 
1.7.10.4

[Buildroot] [PATCH 09/16] libva-intel-driver: new package

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/Config.in                                |    1 +
 package/libva-intel-driver/Config.in             |   13 +++++++++++++
 package/libva-intel-driver/libva-intel-driver.mk |   13 +++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 package/libva-intel-driver/Config.in
 create mode 100644 package/libva-intel-driver/libva-intel-driver.mk

diff --git a/package/Config.in b/package/Config.in
index b45c6e9..3550935 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -594,6 +594,7 @@ source "package/libsvg-cairo/Config.in"
 source "package/libsvgtiny/Config.in"
 source "package/libungif/Config.in"
 source "package/libva/Config.in"
+source "package/libva-intel-driver/Config.in"
 source "package/opencv/Config.in"
 source "package/opengl/Config.in"
 source "package/pango/Config.in"
diff --git a/package/libva-intel-driver/Config.in b/package/libva-intel-driver/Config.in
new file mode 100644
index 0000000..343f45f
--- /dev/null
+++ b/package/libva-intel-driver/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_LIBVA_INTEL_DRIVER
+	bool "libva-intel-driver"
+	depends on BR2_i386 || BR2_x86_64
+	depends on BR2_PACKAGE_LIBVA
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_LIBDRM_INTEL
+	help
+	  VA-API back-end driver for Intel graphics chips
+
+	  https://01.org/linuxgraphics/community/vaapi
+
+comment "libva intel driver depends on libva & X.org"
+	depends on !BR2_PACKAGE_LIBVA || !BR2_PACKAGE_XORG7
diff --git a/package/libva-intel-driver/libva-intel-driver.mk b/package/libva-intel-driver/libva-intel-driver.mk
new file mode 100644
index 0000000..86d2dcc
--- /dev/null
+++ b/package/libva-intel-driver/libva-intel-driver.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# libva-intel-driver
+#
+################################################################################
+
+LIBVA_INTEL_DRIVER_VERSION = 1.3.0
+LIBVA_INTEL_DRIVER_SOURCE = libva-intel-driver-$(LIBVA_INTEL_DRIVER_VERSION).tar.bz2
+LIBVA_INTEL_DRIVER_SITE = http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver
+LIBVA_INTEL_DRIVER_LICENSE = MIT
+LIBVA_INTEL_DRIVER_DEPENDENCIES = libva
+
+$(eval $(autotools-package))
-- 
1.7.10.4

[Buildroot] [PATCH 10/16] ffmpeg: Add libva support

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/ffmpeg/ffmpeg.mk |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index a067fe6..0084a53 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -41,7 +41,6 @@ FFMPEG_CONF_OPT = \
 	--enable-mdct \
 	--enable-rdft \
 	--disable-crystalhd \
-	--disable-vaapi \
 	--disable-vdpau \
 	--disable-dxva2 \
 	--enable-runtime-cpudetect \
@@ -217,6 +216,13 @@ FFMPEG_CONF_OPT += \
 	--enable-encoder=libvorbis
 endif
 
+ifeq ($(BR2_PACKAGE_LIBVA),y)
+FFMPEG_CONF_OPT += --enable-vaapi
+FFMPEG_DEPENDENCIES += libva
+else
+FFMPEG_CONF_OPT += --disable-vaapi
+endif
+
 ifeq ($(BR2_X86_CPU_HAS_MMX),y)
 FFMPEG_CONF_OPT += --enable-yasm
 FFMPEG_DEPENDENCIES += host-yasm
-- 
1.7.10.4

[Buildroot] [PATCH 11/16] libglu: new package

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/Config.in        |    1 +
 package/libglu/Config.in |   10 ++++++++++
 package/libglu/libglu.mk |   19 +++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 package/libglu/Config.in
 create mode 100644 package/libglu/libglu.mk

diff --git a/package/Config.in b/package/Config.in
index 3550935..3240188 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -584,6 +584,7 @@ source "package/libexif/Config.in"
 source "package/libgail/Config.in"
 source "package/libgeotiff/Config.in"
 source "package/libglade/Config.in"
+source "package/libglu/Config.in"
 source "package/libgtk2/Config.in"
 source "package/libpng/Config.in"
 source "package/libqrencode/Config.in"
diff --git a/package/libglu/Config.in b/package/libglu/Config.in
new file mode 100644
index 0000000..042a0c3
--- /dev/null
+++ b/package/libglu/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_LIBGLU
+	bool "libglu"
+	depends on BR2_PACKAGE_MESA3D
+	help
+	  Mesa OpenGL Utility library
+
+	  http://cgit.freedesktop.org/mesa/glu/
+
+comment "libglu depends on mesa3d"
+	depends on !BR2_PACKAGE_MESA3D
diff --git a/package/libglu/libglu.mk b/package/libglu/libglu.mk
new file mode 100644
index 0000000..3e5aafa
--- /dev/null
+++ b/package/libglu/libglu.mk
@@ -0,0 +1,19 @@
+################################################################################
+#
+# libglu
+#
+################################################################################
+
+LIBGLU_VERSION = 9.0.0
+LIBGLU_SITE = http://cgit.freedesktop.org/mesa/glu/snapshot
+LIBGLU_SOURCE = glu-$(LIBGLU_VERSION).tar.gz
+LIBGLU_LICENSE = SGI-B-2.0
+LIBGLU_LICENSE_FILES = include/GL/glu.h
+LIBGLU_INSTALL_STAGING = YES
+LIBGLU_AUTORECONF = YES
+LIBGLU_DEPENDENCIES = mesa3d
+
+LIBGLU_CONF_OPT = \
+	--disable-osmesa
+
+$(eval $(autotools-package))
-- 
1.7.10.4

[Buildroot] [PATCH 12/16] libglew: new package

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/Config.in                        |    1 +
 package/libglew/Config.in                |   19 ++++++++++++++
 package/libglew/libglew-0001-lib64.patch |   14 +++++++++++
 package/libglew/libglew.mk               |   40 ++++++++++++++++++++++++++++++
 4 files changed, 74 insertions(+)
 create mode 100644 package/libglew/Config.in
 create mode 100644 package/libglew/libglew-0001-lib64.patch
 create mode 100644 package/libglew/libglew.mk

diff --git a/package/Config.in b/package/Config.in
index 3240188..8433020 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -584,6 +584,7 @@ source "package/libexif/Config.in"
 source "package/libgail/Config.in"
 source "package/libgeotiff/Config.in"
 source "package/libglade/Config.in"
+source "package/libglew/Config.in"
 source "package/libglu/Config.in"
 source "package/libgtk2/Config.in"
 source "package/libpng/Config.in"
diff --git a/package/libglew/Config.in b/package/libglew/Config.in
new file mode 100644
index 0000000..fdb2b91
--- /dev/null
+++ b/package/libglew/Config.in
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_LIBGLEW
+	bool "libglew"
+	depends on BR2_PACKAGE_XSERVER_XORG_SERVER
+	depends on BR2_PACKAGE_MESA3D_DRIVER
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBXI
+	select BR2_PACKAGE_XLIB_LIBXMU
+	help
+	  The OpenGL Extension Wrangler Library (GLEW) is a cross-platform C/C++
+	  extension loading library. GLEW provides efficient run-time mechanisms
+	  for determining which OpenGL extensions are supported on the target
+	  platform. OpenGL core and extension functionality is exposed in a
+	  single header file.
+
+	  http://glew.sourceforge.net
+
+comment "libglew depends on X.org server and an activated mesa3d driver"
+	depends on !BR2_PACKAGE_XSERVER_XORG_SERVER || !BR2_PACKAGE_MESA3D_DRIVER
diff --git a/package/libglew/libglew-0001-lib64.patch b/package/libglew/libglew-0001-lib64.patch
new file mode 100644
index 0000000..b961aec
--- /dev/null
+++ b/package/libglew/libglew-0001-lib64.patch
@@ -0,0 +1,14 @@
+diff -uNr glew-1.10.0.org/config/Makefile.linux glew-1.10.0/config/Makefile.linux
+--- glew-1.10.0.org/config/Makefile.linux	2013-07-22 16:11:22.000000000 +0200
++++ glew-1.10.0/config/Makefile.linux	2014-03-30 22:01:04.403574030 +0200
+@@ -10,8 +10,8 @@
+   ARCH64 = true
+ endif
+ ifeq (${ARCH64},true)
+-  LDFLAGS.EXTRA = -L/usr/X11R6/lib64 -L/usr/lib64
+-  LIBDIR = $(GLEW_DEST)/lib64
++  LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib
++  LIBDIR = $(GLEW_DEST)/lib
+ else
+   LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib
+   LIBDIR = $(GLEW_DEST)/lib
diff --git a/package/libglew/libglew.mk b/package/libglew/libglew.mk
new file mode 100644
index 0000000..e9c08d7
--- /dev/null
+++ b/package/libglew/libglew.mk
@@ -0,0 +1,40 @@
+################################################################################
+#
+# libglew
+#
+################################################################################
+
+LIBGLEW_VERSION = 1.10.0
+LIBGLEW_SOURCE = glew-$(LIBGLEW_VERSION).tgz
+LIBGLEW_SITE = http://sourceforge.net/projects/glew/files/glew/$(LIBGLEW_VERSION)
+LIBGLEW_LICENSE = MIT
+LIBGLEW_INSTALL_STAGING = YES
+LIBGLEW_DEPENDENCIES = \
+	mesa3d \
+	xlib_libX11 \
+	xlib_libXext \
+	xlib_libXi \
+	xlib_libXmu
+
+define LIBGLEW_BUILD_CMDS
+    $(TARGET_MAKE_ENV) \
+    $(MAKE) -C $(@D) \
+    GLEW_DEST="/usr" CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" AR="$(TARGET_AR)" LD="$(TARGET_CC)" \
+    POPT="$(TARGET_CFLAGS)" LDFLAGS.EXTRA="$(TARGET_LDFLAGS)"
+endef
+
+define LIBGLEW_INSTALL_STAGING_CMDS
+    $(TARGET_MAKE_ENV) \
+    $(TARGET_CONFIGURE_OPTS) \
+    $(MAKE) -C $(@D) \
+    GLEW_DEST="$(STAGING_DIR)/usr" install
+endef
+
+define LIBGLEW_INSTALL_TARGET_CMDS
+    $(TARGET_MAKE_ENV) \
+    $(TARGET_CONFIGURE_OPTS) \
+    $(MAKE) -C $(@D) \
+    GLEW_DEST="$(TARGET_DIR)/usr" install
+endef
+
+$(eval $(generic-package))
-- 
1.7.10.4

[Buildroot] [PATCH 13/16] sdl: Add new dependency libglu for opengl support

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/sdl/sdl.mk |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index 086f5e9..fa68198 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -62,9 +62,12 @@ SDL_DEPENDENCIES += alsa-lib
 endif
 
 ifeq ($(BR2_PACKAGE_MESA3D),y)
-SDL_DEPENDENCIES += mesa3d
+SDL_DEPENDENCIES += libglu mesa3d
+SDL_CONF_OPT += --enable-video-opengl
 endif
 
+SDL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+
 SDL_CONF_OPT += --enable-pulseaudio=no \
 		--disable-arts \
 		--disable-esd \
@@ -72,6 +75,7 @@ SDL_CONF_OPT += --enable-pulseaudio=no \
 		--disable-video-ps3
 
 HOST_SDL_CONF_OPT += --enable-pulseaudio=no \
+		--enable-video-x11=no \
 		--disable-arts \
 		--disable-esd \
 		--disable-nasm \
-- 
1.7.10.4

[Buildroot] [PATCH 14/16] opengl: New virtual package

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/mesa3d/Config.in       |    4 ++++
 package/opengl/Config.in       |    1 +
 package/opengl/libgl/Config.in |    6 ++++++
 package/opengl/libgl/libgl.mk  |   16 ++++++++++++++++
 4 files changed, 27 insertions(+)
 create mode 100644 package/opengl/libgl/Config.in
 create mode 100644 package/opengl/libgl/libgl.mk

diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 8ed0c07..d735e76 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -34,6 +34,7 @@ comment "DRI drivers need shared libdrm"
 
 config BR2_PACKAGE_MESA3D_DRIVER
 	bool
+	select BR2_PACKAGE_HAS_OPENGL_GL
 
 menu "Drivers"
 
@@ -106,6 +107,9 @@ config BR2_PACKAGE_MESA3D_OPENGL_ES
 
 endmenu
 
+config BR2_PACKAGE_PROVIDES_OPENGL_GL
+	default "mesa3d" if BR2_PACKAGE_MESA3D_DRIVER
+
 config BR2_PACKAGE_PROVIDES_OPENGL_EGL
 	default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_EGL
 
diff --git a/package/opengl/Config.in b/package/opengl/Config.in
index ed81835..02010a9 100644
--- a/package/opengl/Config.in
+++ b/package/opengl/Config.in
@@ -1,4 +1,5 @@
 source "package/opengl/libegl/Config.in"
+source "package/opengl/libgl/Config.in"
 source "package/opengl/libgles/Config.in"
 source "package/opengl/libopenvg/Config.in"
 source "package/opengl/libopenmax/Config.in"
diff --git a/package/opengl/libgl/Config.in b/package/opengl/libgl/Config.in
new file mode 100644
index 0000000..5421c86
--- /dev/null
+++ b/package/opengl/libgl/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HAS_OPENGL_GL
+	bool
+
+config BR2_PACKAGE_PROVIDES_OPENGL_GL
+	depends on BR2_PACKAGE_HAS_OPENGL_GL
+	string
diff --git a/package/opengl/libgl/libgl.mk b/package/opengl/libgl/libgl.mk
new file mode 100644
index 0000000..66346d6
--- /dev/null
+++ b/package/opengl/libgl/libgl.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# libgl
+#
+################################################################################
+
+LIBGL_SOURCE =
+LIBGL_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENGL_GL))
+
+ifeq ($(BR2_PACKAGE_HAS_OPENGL_GL),y)
+ifeq ($(LIBGL_DEPENDENCIES),)
+$(error No libGL implementation selected. Configuration error.)
+endif
+endif
+
+$(eval $(generic-package))
-- 
1.7.10.4

[Buildroot] [PATCH 14/16] opengl: New virtual package

[Yann E. MORIN]

Bernd, All,

On 2014-03-31 22:06 +0200, Bernd Kuhls spake thusly:
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/mesa3d/Config.in       |    4 ++++
>  package/opengl/Config.in       |    1 +
>  package/opengl/libgl/Config.in |    6 ++++++
>  package/opengl/libgl/libgl.mk  |   16 ++++++++++++++++
>  4 files changed, 27 insertions(+)
>  create mode 100644 package/opengl/libgl/Config.in
>  create mode 100644 package/opengl/libgl/libgl.mk
> 
> diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
> index 8ed0c07..d735e76 100644
> --- a/package/mesa3d/Config.in
> +++ b/package/mesa3d/Config.in
> @@ -34,6 +34,7 @@ comment "DRI drivers need shared libdrm"
>  
>  config BR2_PACKAGE_MESA3D_DRIVER
>  	bool
> +	select BR2_PACKAGE_HAS_OPENGL_GL
>  
>  menu "Drivers"
>  
> @@ -106,6 +107,9 @@ config BR2_PACKAGE_MESA3D_OPENGL_ES
>  
>  endmenu
>  
> +config BR2_PACKAGE_PROVIDES_OPENGL_GL
> +	default "mesa3d" if BR2_PACKAGE_MESA3D_DRIVER
> +
>  config BR2_PACKAGE_PROVIDES_OPENGL_EGL
>  	default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_EGL

Hey! I'm already working on this! :-)

Are you on IRC? There is a very lengthy discussion on this topic right
now in the #buildroot channel. This would have been a nice occasion to
properly sync-up our work, and to avoid duplication...

(adding Paul in Cc, who's been very helpful on IRC on this topic.)

But anyway, this patch should be split in two:
  - a first patch to add the virtual package itself
  - a second patch to make mesa3d a provider to the virtual package

> diff --git a/package/opengl/Config.in b/package/opengl/Config.in
> index ed81835..02010a9 100644
> --- a/package/opengl/Config.in
> +++ b/package/opengl/Config.in
> @@ -1,4 +1,5 @@
>  source "package/opengl/libegl/Config.in"
> +source "package/opengl/libgl/Config.in"
>  source "package/opengl/libgles/Config.in"
>  source "package/opengl/libopenvg/Config.in"
>  source "package/opengl/libopenmax/Config.in"
> diff --git a/package/opengl/libgl/Config.in b/package/opengl/libgl/Config.in
> new file mode 100644
> index 0000000..5421c86
> --- /dev/null
> +++ b/package/opengl/libgl/Config.in
> @@ -0,0 +1,6 @@
> +config BR2_PACKAGE_HAS_OPENGL_GL
> +	bool
> +
> +config BR2_PACKAGE_PROVIDES_OPENGL_GL
> +	depends on BR2_PACKAGE_HAS_OPENGL_GL
> +	string
> diff --git a/package/opengl/libgl/libgl.mk b/package/opengl/libgl/libgl.mk
> new file mode 100644
> index 0000000..66346d6
> --- /dev/null
> +++ b/package/opengl/libgl/libgl.mk
> @@ -0,0 +1,16 @@
> +################################################################################
> +#
> +# libgl
> +#
> +################################################################################
> +
> +LIBGL_SOURCE =
> +LIBGL_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENGL_GL))
> +
> +ifeq ($(BR2_PACKAGE_HAS_OPENGL_GL),y)
> +ifeq ($(LIBGL_DEPENDENCIES),)
> +$(error No libGL implementation selected. Configuration error.)
> +endif
> +endif
> +
> +$(eval $(generic-package))

Strange how this is so similar to what I've done here! Hehehe! ;-)

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 14/16] opengl: New virtual package

[Bernd Kuhls]

"Yann E. MORIN" <yann.morin.1998@free.fr> wrote in
news:20140331202135.GC5004 at free.fr: 

> Hey! I'm already working on this! :-)

Hi,

I deleted my virtual opengl patch already and pulled in your patch series, 
looks good!

Regards, Bernd

[Buildroot] [PATCH WIP 15/16] xbmc: Bump version to Gotham_beta3

[Bernd Kuhls]

- add support for uClibc, X.org, mesa3d, vaapi

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/xbmc/Config.in |   26 +++++++++--------
 package/xbmc/xbmc.mk   |   73 ++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 76 insertions(+), 23 deletions(-)

diff --git a/package/xbmc/Config.in b/package/xbmc/Config.in
index e078d2f..758ad2d 100644
--- a/package/xbmc/Config.in
+++ b/package/xbmc/Config.in
@@ -1,11 +1,5 @@
-comment "xbmc needs an (e)glibc toolchain w/ C++, threads"
-	depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
-
-comment "xbmc requires an OpenGL ES and EGL backend"
-	depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES
-	depends on BR2_TOOLCHAIN_USES_GLIBC
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_HAS_THREADS
+comment "xbmc requires an OpenGL backend"
+	depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES || !BR2_PACKAGE_HAS_OPENGL_GL
 
 menuconfig BR2_PACKAGE_XBMC
 	bool "xbmc"
@@ -23,6 +17,8 @@ menuconfig BR2_PACKAGE_XBMC
 	select BR2_PACKAGE_LIBCDIO
 	select BR2_PACKAGE_LIBCURL
 	select BR2_PACKAGE_LIBFRIBIDI
+	select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_LIBGCRYPT
 	select BR2_PACKAGE_LIBID3TAG
 	select BR2_PACKAGE_LIBMAD
@@ -35,6 +31,7 @@ menuconfig BR2_PACKAGE_XBMC
 	select BR2_PACKAGE_LIBUNGIF
 	select BR2_PACKAGE_LIBVORBIS
 	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_LIBXSLT
 	select BR2_PACKAGE_LZO
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_OPENSSL
@@ -50,16 +47,21 @@ menuconfig BR2_PACKAGE_XBMC
 	select BR2_PACKAGE_PYTHON_UNICODEDATA
 	select BR2_PACKAGE_PYTHON_ZLIB
 	select BR2_PACKAGE_READLINE
+	select BR2_PACKAGE_SDL if BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_SDL_X11 if BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_SDL_IMAGE if BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_SQLITE
 	select BR2_PACKAGE_TAGLIB
 	select BR2_PACKAGE_TIFF
 	select BR2_PACKAGE_TINYXML
+	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XLIB_XMU if BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XLIB_XRANDR if BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XLIB_XT if BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_YAJL
 	select BR2_PACKAGE_ZLIB
-	depends on BR2_TOOLCHAIN_USES_GLIBC
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on BR2_PACKAGE_HAS_OPENGL_EGL && BR2_PACKAGE_HAS_OPENGL_ES
+	depends on (BR2_PACKAGE_HAS_OPENGL_EGL && BR2_PACKAGE_HAS_OPENGL_ES) || BR2_PACKAGE_HAS_OPENGL_GL
 	help
 	  XBMC is an award-winning free and open source (GPL) software
 	  media player and entertainment hub for digital media.
diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
index 9e346bd..974b4dd 100644
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XBMC_VERSION = 12.3-Frodo
+XBMC_VERSION = Gotham_beta3
 XBMC_SITE = $(call github,xbmc,xbmc,$(XBMC_VERSION))
 XBMC_LICENSE = GPLv2
 XBMC_LICENSE_FILES = LICENSE.GPL
@@ -12,10 +12,10 @@ XBMC_LICENSE_FILES = LICENSE.GPL
 # called TexturePacker. It is responsible to take all the images used in the
 # GUI and pack them in a blob.
 # http://wiki.xbmc.org/index.php?title=TexturePacker
-XBMC_DEPENDENCIES = host-gperf host-lzo host-sdl_image host-swig
+XBMC_DEPENDENCIES = host-gawk host-gperf host-lzo host-nasm host-sdl_image host-swig
 XBMC_DEPENDENCIES += boost bzip2 expat flac fontconfig freetype jasper jpeg \
-	libass libcdio libcurl libegl libfribidi libgcrypt libgles libmad libmodplug libmpeg2 \
-	libogg libplist libpng libsamplerate libungif libvorbis libxml2 lzo ncurses \
+	libass libcdio libcurl libfribidi libgcrypt libmad libmodplug libmpeg2 \
+	libogg libplist libpng libsamplerate libungif libvorbis libxml2 libxslt lzo ncurses \
 	openssl pcre python readline sqlite taglib tiff tinyxml yajl zlib
 
 XBMC_CONF_ENV = \
@@ -27,11 +27,9 @@ XBMC_CONF_ENV = \
 	TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr"
 
 XBMC_CONF_OPT +=  \
-	--disable-alsa \
 	--disable-crystalhd \
 	--disable-debug \
 	--disable-dvdcss \
-	--disable-gl \
 	--disable-hal \
 	--disable-joystick \
 	--disable-mysql \
@@ -39,14 +37,11 @@ XBMC_CONF_OPT +=  \
 	--disable-optical-drive \
 	--disable-projectm \
 	--disable-pulse \
-	--disable-sdl \
 	--disable-ssh \
-	--disable-vaapi \
 	--disable-vdpau \
 	--disable-vtbdecoder \
-	--disable-x11 \
-	--disable-xrandr \
-	--enable-gles \
+	--disable-rsxs \
+	--enable-goom \
 	--enable-optimizations
 
 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
@@ -60,6 +55,62 @@ ifeq ($(BR2_PACKAGE_DBUS),y)
 XBMC_DEPENDENCIES += dbus
 endif
 
+ifeq ($(BR2_PACKAGE_LIBVA),y)
+XBMC_DEPENDENCIES += libva
+XBMC_CONF_OPT += --enable-vaapi
+else
+XBMC_CONF_OPT += --disable-vaapi
+endif
+
+ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER),y)
+XBMC_DEPENDENCIES += \
+	libglew \
+	libglu \
+	mesa3d \
+	sdl_image \
+	xlib_libX11 \
+	xlib_libXext \
+	xlib_libXmu \
+	xlib_libXrandr \
+	xlib_libXt
+XBMC_CONF_OPT += \
+	--enable-x11 \
+	--enable-xrandr \
+	--enable-gl \
+	--enable-sdl
+else
+XBMC_CONF_OPT += \
+	--disable-x11 \
+	--disable-xrandr \
+	--disable-gl \
+	--disable-sdl
+endif
+
+ifeq ($(BR2_PACKAGE_HAS_OPENGL_EGL),y)
+XBMC_DEPENDENCIES += libegl
+endif
+
+ifeq ($(BR2_PACKAGE_HAS_OPENGL_ES),y)
+XBMC_DEPENDENCIES += libgles
+XBMC_CONF_OPT += --enable-gles
+else
+XBMC_CONF_OPT += --disable-gles
+endif
+
+ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
+XBMC_DEPENDENCIES += alsa-lib
+XBMC_CONF_OPT += --enable-alsa
+else
+XBMC_CONF_OPT += --disable-alsa
+endif
+
+ifeq ($(BR2_PACKAGE_LAME),y)
+XBMC_DEPENDENCIES += lame
+XBMC_CONF_OPT += --enable-libmp3lame
+else
+XBMC_CONF_OPT += --disable-libmp3lame
+endif
+
 ifeq ($(BR2_PACKAGE_XBMC_LIBUSB),y)
 XBMC_DEPENDENCIES += libusb-compat
 XBMC_CONF_OPT += --enable-libusb
-- 
1.7.10.4

[Buildroot] [PATCH WIP 15/16] xbmc: Bump version to Gotham_beta3

[Yann E. MORIN]

Bernd, All,

Hihi! Gotham! :-)

On 2014-03-31 22:06 +0200, Bernd Kuhls spake thusly:
> - add support for uClibc, X.org, mesa3d, vaapi

For very large and complex beasts like XBMC, it would be better to
split the patch:
  - a first patch to bump
  - a second to add uClibc support
  - a third to add mesa3d
  - a fourth to add vaapi

This will make it easier to review.

As you said, we should consider this bump as an RFC: better wait for the
final release rather than bundle a beta release.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH WIP 15/16] xbmc: Bump version to Gotham_beta3

[Bernd Kuhls]

Hi,

"Yann E. MORIN" <yann.morin.1998@free.fr> wrote in 
news:20140331220546.GD5004 at free.fr:

>   - a first patch to bump
>   - a second to add uClibc support

both is done by the version bump to Gotham. Frodo does not support uClibc, 
Gotham will do thanks to the two small patches[1] I sent to the xbmc team ;) 
Why I do not like the idea to split the Config.in patch? See next comment...

>   - a third to add mesa3d
>   - a fourth to add vaapi
> 
> This will make it easier to review.

I am not sure if the version bump alone creates a bisectable, that means 
buildable xbmc package. My time is limited, so I prefer not to test four 
different patches for "complex beasts like XBMC" and their ability, that each 
of them still compiles without errors.

> As you said, we should consider this bump as an RFC: better wait for the
> final release rather than bundle a beta release.

Of course ;) But we should start testing, especially on non-intel platforms. 
If something is missing, we still have a chance to get it into Gotham release 
code.

Regards, Bernd

[1] https://github.com/xbmc/xbmc/pull/3920
    https://github.com/xbmc/xbmc/pull/4427

[Buildroot] [PATCH WIP 15/16] xbmc: Bump version to Gotham_beta3

[Yann E. MORIN]

On 2014-04-01 19:11 +0200, Bernd Kuhls spake thusly:
> Hi,
> 
> "Yann E. MORIN" <yann.morin.1998@free.fr> wrote in 
> news:20140331220546.GD5004 at free.fr:
> 
> >   - a first patch to bump
> >   - a second to add uClibc support
> 
> both is done by the version bump to Gotham. Frodo does not support uClibc, 
> Gotham will do thanks to the two small patches[1] I sent to the xbmc team ;) 

Great! Thanks! :-)

> Why I do not like the idea to split the Config.in patch? See next comment...
> 
> >   - a third to add mesa3d
> >   - a fourth to add vaapi
> > 
> > This will make it easier to review.
> 
> I am not sure if the version bump alone creates a bisectable, that means 
> buildable xbmc package. My time is limited, so I prefer not to test four 
> different patches for "complex beasts like XBMC" and their ability, that each 
> of them still compiles without errors.

I can understand that your time is precious. But so is mine, and all the
other reviewers.

Reviewing small patches is much easier than reviewing a single patch
with many changes. We already have some difficulties finding time to
review even simple patches, that when we see a large patch, it is just
not that appealing.

For example, you're saying that bumping to Gotham will enable us to
build on uClibc. That's fine, but they are two different things:
  - a bump of version, which keeps the same feature-set
  - a new feature, which is to build with uClibc

If something goes amiss with uClibc, we can just revert that and keep
the bump. If it was a single change, we'd have to revert all of it
just because of the failure of a single new feature.

Ditto with mesa3d and vaapi. If only vaapi has a problem and it is in a
single patch, we may have to revert the whole thing, while if vaapi is
in its own patch, it is easy to revert [*].

Note also, that many of the XBMC sub-options have dependencies on
toolchain features (eg. IPv6, threads, and so on...) which are not
currently expressed, being implicit as XBMC depends on (e)glibc, and so
those features are guaranteed to be present in this case. But when
enabling building with uClibc, those dependencies will have to be added,
which is not a trivial change. And your patch is missing all those new
required dependencies. Having split-patches will make it easier to check
those dependencies.

But in the end, if you can't find the time to split the patch into
atmic, semantically-separated patches, you are still welcome to post
your work on the list. :-) Maybe someone will be interested enough that
he'll get your patch, do the split himself, and resubmit the splitted
patches.

[*] revert: in case the fix is not obvious, the best approach is to
revert changes until they are fixed. Of course, if the ix is trivial,
there is no revert needed, but better safe than sorry.

> > As you said, we should consider this bump as an RFC: better wait for the
> > final release rather than bundle a beta release.
> 
> Of course ;) But we should start testing, especially on non-intel platforms. 
> If something is missing, we still have a chance to get it into Gotham release 
> code.

Yes. I'm sure Maxime will be very happy not to have to handle this bump! ;-)

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH WIP 15/16] xbmc: Bump version to Gotham_beta3

[Bernd Kuhls]

"Yann E. MORIN" <yann.morin.1998@free.fr> wrote in
news:20140401183534.GB3291 at free.fr: 

> Note also, that many of the XBMC sub-options have dependencies on
> toolchain features (eg. IPv6, threads, and so on...) which are not
> currently expressed, being implicit as XBMC depends on (e)glibc, and so
> those features are guaranteed to be present in this case. But when
> enabling building with uClibc, those dependencies will have to be added,
> which is not a trivial change. And your patch is missing all those new
> required dependencies. Having split-patches will make it easier to check
> those dependencies.

Hi,

ok, you convinced me to split the patch, I already started work ;)

efc3c8359e6493dbcdf32afd4f9d4075dd4b9f4a WIP: xbmc: needs host-gawk
bbcfd437efa76bd358a287d0505dc98f2c9987e5 WIP: xbmc: Add option for Goom 
screensaver
3b33e850145ae59e1a51f14933b1d889a7ce8091 WIP: xbmc: Disable broken rsxs 
screensaver
ca08b3b00d44a70cd65bedb5737254ff286b1c72 WIP: xbmc: Add lame support
aaf2d1b40144266446d5764baf65b9ed1a44e7a3 WIP: xbmc: Add alsa support
7a4721ab543e705ced87f8e4dbeb38c91af14914 WIP: xbmc: Add VA-API support
21c7aa5957c8855a1b0ecbe5f2a8a16b583d4439 WIP: xbmc: Add X.org support
283da553c5fe11f64486e825e8d1975403fa633e WIP: xbmc: Allow compilation with 
uClibc
19018489f879c289b41de3013ea98724bb0c550c WIP: xbmc: Bump version to 
Gotham_beta3

Regards, Bernd

[Buildroot] [PATCH WIP 15/16] xbmc: Bump version to Gotham_beta3

[Maxime Hadjinlian]

Hi Bernd, Yann, all
On Tue, Apr 1, 2014 at 9:40 PM, Bernd Kuhls <berndkuhls@hotmail.com> wrote:
> "Yann E. MORIN" <yann.morin.1998@free.fr> wrote in
> news:20140401183534.GB3291 at free.fr:
>
>> Note also, that many of the XBMC sub-options have dependencies on
>> toolchain features (eg. IPv6, threads, and so on...) which are not
>> currently expressed, being implicit as XBMC depends on (e)glibc, and so
>> those features are guaranteed to be present in this case. But when
>> enabling building with uClibc, those dependencies will have to be added,
>> which is not a trivial change. And your patch is missing all those new
>> required dependencies. Having split-patches will make it easier to check
>> those dependencies.
>
> Hi,
>
> ok, you convinced me to split the patch, I already started work ;)
>
> efc3c8359e6493dbcdf32afd4f9d4075dd4b9f4a WIP: xbmc: needs host-gawk
> bbcfd437efa76bd358a287d0505dc98f2c9987e5 WIP: xbmc: Add option for Goom
> screensaver
> 3b33e850145ae59e1a51f14933b1d889a7ce8091 WIP: xbmc: Disable broken rsxs
> screensaver
> ca08b3b00d44a70cd65bedb5737254ff286b1c72 WIP: xbmc: Add lame support
> aaf2d1b40144266446d5764baf65b9ed1a44e7a3 WIP: xbmc: Add alsa support
> 7a4721ab543e705ced87f8e4dbeb38c91af14914 WIP: xbmc: Add VA-API support
> 21c7aa5957c8855a1b0ecbe5f2a8a16b583d4439 WIP: xbmc: Add X.org support
> 283da553c5fe11f64486e825e8d1975403fa633e WIP: xbmc: Allow compilation with
> uClibc
> 19018489f879c289b41de3013ea98724bb0c550c WIP: xbmc: Bump version to
> Gotham_beta3
>
> Regards, Bernd
Thanks a lot for putting this out there. I knew you'd be eager to do
it, I did not expect you'd be *this* eager but I am really pleased to
see this.
Anyway, I will have a close look at your patch and test them out.

As Yann said, the addition of uClibc will not be trivial but hey,
that's no fun if there is no challenge ;).

Looking forward to your following patches.

>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

[Buildroot] [PATCH WIP 15/16] xbmc: Bump version to Gotham_beta3

[Yann E. MORIN]

Bernd, All,

On 2014-04-01 21:40 +0200, Bernd Kuhls spake thusly:
> "Yann E. MORIN" <yann.morin.1998@free.fr> wrote in
> news:20140401183534.GB3291 at free.fr: 
> 
> > Note also, that many of the XBMC sub-options have dependencies on
> > toolchain features (eg. IPv6, threads, and so on...) which are not
> > currently expressed, being implicit as XBMC depends on (e)glibc, and so
> > those features are guaranteed to be present in this case. But when
> > enabling building with uClibc, those dependencies will have to be added,
> > which is not a trivial change. And your patch is missing all those new
> > required dependencies. Having split-patches will make it easier to check
> > those dependencies.
> 
> Hi,
> 
> ok, you convinced me to split the patch, I already started work ;)
> 
> efc3c8359e6493dbcdf32afd4f9d4075dd4b9f4a WIP: xbmc: needs host-gawk
> bbcfd437efa76bd358a287d0505dc98f2c9987e5 WIP: xbmc: Add option for Goom 
> screensaver
> 3b33e850145ae59e1a51f14933b1d889a7ce8091 WIP: xbmc: Disable broken rsxs 
> screensaver
> ca08b3b00d44a70cd65bedb5737254ff286b1c72 WIP: xbmc: Add lame support
> aaf2d1b40144266446d5764baf65b9ed1a44e7a3 WIP: xbmc: Add alsa support
> 7a4721ab543e705ced87f8e4dbeb38c91af14914 WIP: xbmc: Add VA-API support
> 21c7aa5957c8855a1b0ecbe5f2a8a16b583d4439 WIP: xbmc: Add X.org support
> 283da553c5fe11f64486e825e8d1975403fa633e WIP: xbmc: Allow compilation with 
> uClibc
> 19018489f879c289b41de3013ea98724bb0c550c WIP: xbmc: Bump version to 
> Gotham_beta3

Wonderful! :-)

Just to make sure: the bump to Gotham should be the first change, and
then all other changes are additions to that?

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH WIP 16/16] xbmc: Add xbmc-send script to send commands to xbmc service

[Bernd Kuhls]

http://wiki.xbmc.org/index.php?title=List_of_built-in_functions

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/xbmc/xbmc.mk |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
index 974b4dd..d130ae2 100644
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -204,6 +204,12 @@ define XBMC_INSTALL_BR_WRAPPER
 endef
 XBMC_POST_INSTALL_TARGET_HOOKS += XBMC_INSTALL_BR_WRAPPER
 
+define XBMC_INSTALL_XBMC_SEND
+	$(INSTALL) -D $(@D)/tools/EventClients/lib/python/xbmcclient.py $(TARGET_DIR)/usr/lib/python2.7/xbmcclient.py
+	$(INSTALL) -D "$(@D)/tools/EventClients/Clients/XBMC Send/xbmc-send.py" $(TARGET_DIR)/usr/bin/xbmc-send
+endef
+XBMC_POST_INSTALL_TARGET_HOOKS += XBMC_INSTALL_XBMC_SEND
+
 # When run from a startup script, XBMC has no $HOME where to store its
 # configuration, so ends up storing it in /.xbmc  (yes, at the root of
 # the rootfs). This is a problem for read-only filesystems. But we can't
-- 
1.7.10.4

[Buildroot] [PATCH WIP 16/16] xbmc: Add xbmc-send script to send commands to xbmc service

[Yann E. MORIN]

Bernd, All,

On 2014-03-31 22:06 +0200, Bernd Kuhls spake thusly:
> http://wiki.xbmc.org/index.php?title=List_of_built-in_functions

Hey! That's pretty neat! :-)

We can use that to tell XBMC to exit properly, instead of killing it on
reboot. Groovy! :-)

> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/xbmc/xbmc.mk |    6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
> index 974b4dd..d130ae2 100644
> --- a/package/xbmc/xbmc.mk
> +++ b/package/xbmc/xbmc.mk
> @@ -204,6 +204,12 @@ define XBMC_INSTALL_BR_WRAPPER
>  endef
>  XBMC_POST_INSTALL_TARGET_HOOKS += XBMC_INSTALL_BR_WRAPPER
>  
> +define XBMC_INSTALL_XBMC_SEND
> +	$(INSTALL) -D $(@D)/tools/EventClients/lib/python/xbmcclient.py $(TARGET_DIR)/usr/lib/python2.7/xbmcclient.py

If possible, please install both a .py and a .pyc to the target.

Depending on:
  - BR2_PACKAGE_PYTHON_PY_ONLY
  - BR2_PACKAGE_PYTHON_PYC_ONLY
  - BR2_PACKAGE_PYTHON_PY_PYC
some of them will be forcibly removed.

For example, if BR2_PACKAGE_PYTHON_PYC_ONLY is selected, then all .py
files will get removed from the target.

Note that I do not know how you can cross-generate a .pyc from a .py
file in cross-compilation... :-/

At the very least, if cross-generating the .pyc file is not possible,
make this conditional on !BR2_PACKAGE_PYTHON_PYC_ONLY.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH WIP 16/16] xbmc: Add xbmc-send script to send commands to xbmc service

[Bernd Kuhls]

"Yann E. MORIN" <yann.morin.1998@free.fr> wrote in
news:20140331222008.GE5004 at free.fr: 

>> +define XBMC_INSTALL_XBMC_SEND
>> +     $(INSTALL) -D $(@D)/tools/EventClients/lib/python/xbmcclient.py
>> $(TARGET_DIR)/usr/lib/python2.7/xbmcclient.py 
> 
> If possible, please install both a .py and a .pyc to the target.

Hi,

I did not forget this patch, but reworking it is currently postponed.

Regards, Bernd