[Buildroot] [PATCH v2 00/41] XBMC Gotham Beta3 + misc stuff

[Buildroot] [PATCH v2 00/41] XBMC Gotham Beta3 + misc stuff

[Bernd Kuhls]

Hi,

this series replaces mondays patch series "[PATCH 00/16] XBMC Gotham Beta3".

patches 1-12: unrelated version bumps
patch 13: removed
patches 14-15: Kconfig comments
patches 16-21: Add virtual package for full-openGL (branch yem/fixes)
               (Yann, deprecated, but working - DO NOT COMMIT)
patches 22-27: new packages needed for xbmc, especially for intel support
patch 28: v5 of xdriver_xf86-video-intel version bump
patch 29: WIP - Add xbmc-send script to send commands to xbmc
patch 30: rebased http://patchwork.ozlabs.org/patch/334971/ (Ryan)
patch 31: rebased http://patchwork.ozlabs.org/patch/335219/ (Maxime)
patches 32-33: rebased host-infozip http://patchwork.ozlabs.org/patch/336195/
               http://patchwork.ozlabs.org/patch/336196/ (Maxime)
patches 34-41: WIP - xbmc version bump to Gotham Beta3 with uClibc support
               http://xbmc.org/xbmc-13-0-gotham-beta-3-returns/

I consider patches 1-15, 22-28 & 30-33 git-ready.

Regards, Bernd


Bernd Kuhls (33):
  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
  flac: version bump 1.3.0, add sse support
  libcdio: version bump 0.92
  libmodplug: version bump 0.8.8.5
  libogg: version bump 1.3.1
  taglib: version bump 1.9.1
  nasm: version bump 2.11.02
  libnfs: version bump 1.9.3
  libdrm: Explain dependency on xorg in Kconfig
  mesa3d: Explain dependency for i965 DRI driver on xorg in Kconfig
  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
  xdriver_xf86-video-intel: Bump version to 2.99.911
  xbmc: Add xbmc-send script to send commands to xbmc service
  xbmc: needs host-gawk (v3)
  xbmc: Add missing host-infozip dependency (v2)
  WIP: xbmc: Bump version to Gotham_beta3
  WIP: xbmc: Allow compilation with uClibc
  WIP: xbmc: Add X.org support
  WIP: xbmc: Add VA-API support
  WIP: xbmc: Add alsa support
  WIP: xbmc: Add lame support
  WIP: xbmc: Disable broken rsxs screensaver
  WIP: xbmc: Add option for Goom screensaver

Maxime Hadjinlian (2):
  xbmc: Fix Java dependency check
  infozip: Add a host variant

Yann E. MORIN (6) DO NOT COMMIT:
  package/libevas: quick fix to get rid of circular deps
  package/libgl: introduce as a new virtual package for full-openGL
    providers
  package/mesa3d: is a full-openGL provider if X.org is present
  package/vlc: depends on the virtual package libgl
  package/x11-video-drivers: do not select, but depends on mesa3d
  package/xorg-server: do not force-select xf86driproto for mesa3d

 package/Config.in                                  |    4 +
 package/efl/libevas/Config.in                      |    2 +-
 package/ffmpeg/ffmpeg.mk                           |    8 +-
 package/file/file.mk                               |    2 +-
 package/flac/flac-no-altivec.patch                 |   28 -------
 package/flac/flac.mk                               |   16 +++-
 package/flex/flex-prog-ar.patch                    |   11 ---
 package/flex/flex.mk                               |    2 +-
 package/infozip/infozip.mk                         |   13 +++
 package/libcdio/libcdio.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/libmodplug/libmodplug.mk                   |    2 +-
 package/libnfs/libnfs.mk                           |    2 +-
 package/libogg/libogg.mk                           |    2 +-
 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                           |    7 ++
 package/nasm/nasm.mk                               |    2 +-
 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/taglib/taglib.mk                           |    4 +-
 package/vlc/vlc.mk                                 |    4 +-
 package/x11r7/xdriver_xf86-video-ati/Config.in     |    5 +-
 package/x11r7/xdriver_xf86-video-glint/Config.in   |    5 +-
 package/x11r7/xdriver_xf86-video-intel/Config.in   |   18 +++--
 .../xdriver_xf86-video-intel.mk                    |   31 ++++++--
 package/x11r7/xdriver_xf86-video-mach64/Config.in  |    3 +
 package/x11r7/xdriver_xf86-video-mga/Config.in     |    5 +-
 .../x11r7/xdriver_xf86-video-openchrome/Config.in  |    5 +-
 package/x11r7/xdriver_xf86-video-r128/Config.in    |    5 +-
 package/x11r7/xdriver_xf86-video-savage/Config.in  |    5 +-
 package/x11r7/xdriver_xf86-video-sis/Config.in     |    5 +-
 package/x11r7/xdriver_xf86-video-tdfx/Config.in    |    5 +-
 package/x11r7/xdriver_xf86-video-vmware/Config.in  |    5 +-
 package/x11r7/xlib_xtrans/xlib_xtrans.mk           |    2 +-
 package/x11r7/xserver_xorg-server/Config.in        |    1 -
 package/xbmc/Config.in                             |   45 ++++++++---
 package/xbmc/xbmc.mk                               |   84 +++++++++++++++++---
 51 files changed, 470 insertions(+), 145 deletions(-)
 delete mode 100644 package/flac/flac-no-altivec.patch
 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 v2 01/41] 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 v2 02/41] 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 v2 03/41] 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 v2 04/41] flex: Version bump 2.5.39

[Bernd Kuhls]

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 v2 05/41] 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 v2 06/41] flac: version bump 1.3.0, add sse support

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/flac/flac-no-altivec.patch |   28 ----------------------------
 package/flac/flac.mk               |   16 +++++++++++++---
 2 files changed, 13 insertions(+), 31 deletions(-)
 delete mode 100644 package/flac/flac-no-altivec.patch

diff --git a/package/flac/flac-no-altivec.patch b/package/flac/flac-no-altivec.patch
deleted file mode 100644
index c6a535b..0000000
--- a/package/flac/flac-no-altivec.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-FLAC assumes every powerpc around has altivec ABI which is wrong.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura flac-1.2.1/src/libFLAC/Makefile.am flac-1.2.1-noaltivec/src/libFLAC/Makefile.am
---- flac-1.2.1/src/libFLAC/Makefile.am	2007-09-14 18:06:17.000000000 -0300
-+++ flac-1.2.1-noaltivec/src/libFLAC/Makefile.am	2011-01-06 15:14:36.384242614 -0300
-@@ -41,7 +41,7 @@
- else
- # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
- #@@@ PPC optimizations temporarily disabled
--CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
-+CPUCFLAGS = -DFLAC__NO_ASM
- endif
- endif
- 
-diff -Nura flac-1.2.1/src/libFLAC/Makefile.in flac-1.2.1-noaltivec/src/libFLAC/Makefile.in
---- flac-1.2.1/src/libFLAC/Makefile.in	2007-09-16 17:05:12.000000000 -0300
-+++ flac-1.2.1-noaltivec/src/libFLAC/Makefile.in	2011-01-06 15:14:50.997545602 -0300
-@@ -240,7 +240,7 @@
- @FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_TRUE at CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
- # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
- #@@@ PPC optimizations temporarily disabled
-- at FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE at CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
-+ at FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE at CPUCFLAGS = -DFLAC__NO_ASM
- 
- AM_CFLAGS = $(DEBUGCFLAGS) $(CPUCFLAGS) @OGG_CFLAGS@
- @FLaC__CPU_PPC_TRUE@@FLaC__NO_ASM_FALSE at ARCH_SUBDIRS = ppc
diff --git a/package/flac/flac.mk b/package/flac/flac.mk
index 95cd5a1..69e4a90 100644
--- a/package/flac/flac.mk
+++ b/package/flac/flac.mk
@@ -4,19 +4,29 @@
 #
 ################################################################################
 
-FLAC_VERSION = 1.2.1
-FLAC_SITE = http://downloads.sourceforge.net/project/flac/flac-src/flac-$(FLAC_VERSION)-src
+FLAC_VERSION = 1.3.0
+FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz
+FLAC_SITE = http://downloads.xiph.org/releases/flac
 FLAC_INSTALL_STAGING = YES
 
 FLAC_CONF_OPT = \
 	--disable-cpplibs \
 	--disable-xmms-plugin
 
+ifeq ($(BR2_X86_CPU_HAS_SSE),y)
+FLAC_DEPENDENCIES += host-nasm
+FLAC_CONF_OPT += --enable-sse
+else
+FLAC_CONF_OPT += --disable-sse
+endif
+
 ifeq ($(BR2_PACKAGE_LIBOGG),y)
 FLAC_CONF_OPT += --with-ogg=$(STAGING_DIR)/usr
-FLAC_DEPENDENCIES = libogg
+FLAC_DEPENDENCIES += libogg
 else
 FLAC_CONF_OPT += --disable-ogg
 endif
 
+FLAC_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+
 $(eval $(autotools-package))
-- 
1.7.10.4

[Buildroot] [PATCH v2 06/41] flac: version bump 1.3.0, add sse support

[Gustavo Zacarias]

On 04/02/2014 04:46 PM, Bernd Kuhls wrote:

> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/flac/flac-no-altivec.patch |   28 ----------------------------
>  package/flac/flac.mk               |   16 +++++++++++++---
>  2 files changed, 13 insertions(+), 31 deletions(-)
>  delete mode 100644 package/flac/flac-no-altivec.patch

NACK without the altivec patch i sent upstream that i've previously
discussed with Sven Neumann, otherwise it breaks powerpc horribly.
It also seems to be hit & miss on mips with qemu (whereas 1.2.1 worked).
Regards.

[Buildroot] [PATCH v2 07/41] libcdio: version bump 0.92

[Bernd Kuhls]

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

diff --git a/package/libcdio/libcdio.mk b/package/libcdio/libcdio.mk
index b9aec9e..7fd8113 100644
--- a/package/libcdio/libcdio.mk
+++ b/package/libcdio/libcdio.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBCDIO_VERSION = 0.90
+LIBCDIO_VERSION = 0.92
 LIBCDIO_SITE = $(BR2_GNU_MIRROR)/libcdio
 LIBCDIO_INSTALL_STAGING = YES
 LIBCDIO_LICENSE = GPLv3+
-- 
1.7.10.4

[Buildroot] [PATCH v2 08/41] libmodplug: version bump 0.8.8.5

[Bernd Kuhls]

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

diff --git a/package/libmodplug/libmodplug.mk b/package/libmodplug/libmodplug.mk
index 1d01252..d9d74df 100644
--- a/package/libmodplug/libmodplug.mk
+++ b/package/libmodplug/libmodplug.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBMODPLUG_VERSION = 0.8.8.4
+LIBMODPLUG_VERSION = 0.8.8.5
 LIBMODPLUG_SITE = http://downloads.sourceforge.net/project/modplug-xmms/libmodplug/$(LIBMODPLUG_VERSION)
 LIBMODPLUG_INSTALL_STAGING = YES
 LIBMODPLUG_LICENSE = Public Domain
-- 
1.7.10.4

[Buildroot] [PATCH v2 09/41] libogg: version bump 1.3.1

[Bernd Kuhls]

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

diff --git a/package/libogg/libogg.mk b/package/libogg/libogg.mk
index 23554d9..984e7b7 100644
--- a/package/libogg/libogg.mk
+++ b/package/libogg/libogg.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBOGG_VERSION = 1.3.0
+LIBOGG_VERSION = 1.3.1
 LIBOGG_SOURCE = libogg-$(LIBOGG_VERSION).tar.xz
 LIBOGG_SITE = http://downloads.xiph.org/releases/ogg
 LIBOGG_LICENSE = BSD-3c
-- 
1.7.10.4

[Buildroot] [PATCH v2 10/41] taglib: version bump 1.9.1

[Bernd Kuhls]

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

diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk
index c04c88b..8e6a3bd 100644
--- a/package/taglib/taglib.mk
+++ b/package/taglib/taglib.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-TAGLIB_VERSION = 1.8
-TAGLIB_SITE = http://github.com/downloads/taglib/taglib
+TAGLIB_VERSION = 1.9.1
+TAGLIB_SITE = http://taglib.github.io/releases
 TAGLIB_INSTALL_STAGING = YES
 TAGLIB_LICENSE = LGPLv2.1 MPL
 TAGLIB_LICENSE_FILES = COPYING.LGPL COPYING.MPL
-- 
1.7.10.4

[Buildroot] [PATCH v2 11/41] nasm: version bump 2.11.02

[Bernd Kuhls]

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

diff --git a/package/nasm/nasm.mk b/package/nasm/nasm.mk
index d8045da..18efa4a 100644
--- a/package/nasm/nasm.mk
+++ b/package/nasm/nasm.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NASM_VERSION = 2.10.01
+NASM_VERSION = 2.11.02
 NASM_SOURCE  = nasm-$(NASM_VERSION).tar.xz
 NASM_SITE    = http://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION)
 
-- 
1.7.10.4

[Buildroot] [PATCH v2 12/41] libnfs: version bump 1.9.3

[Bernd Kuhls]

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

diff --git a/package/libnfs/libnfs.mk b/package/libnfs/libnfs.mk
index a17d8c3..55ce57a 100644
--- a/package/libnfs/libnfs.mk
+++ b/package/libnfs/libnfs.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBNFS_VERSION = libnfs-1.8.0
+LIBNFS_VERSION = libnfs-1.9.3
 LIBNFS_SITE = $(call github,sahlberg,libnfs,$(LIBNFS_VERSION))
 LIBNFS_INSTALL_STAGING = YES
 LIBNFS_AUTORECONF = YES
-- 
1.7.10.4

[Buildroot] [PATCH v2 14/41] 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 v2 15/41] mesa3d: Explain dependency for i965 DRI driver on xorg in Kconfig

[Bernd Kuhls]

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

diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 8ed0c07..324f1b6 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -76,6 +76,9 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER_I965
 	help
 	  Supports all Intel GPUs.  This version is most supported by Intel.
 
+comment "DRI i965 driver depends on X.org"
+	depends on !BR2_PACKAGE_XORG7
+
 config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
 	bool "DRI radeon driver"
 	depends on BR2_i386 || BR2_x86_64
-- 
1.7.10.4

[Buildroot] [PATCH v2 16/41] DO NOT COMMIT package/libevas: quick fix to get rid of circular deps

[Bernd Kuhls]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

This is a quick workaround against the recently-introduced circular
dependencies hell:

    package/xbmc/Config.in:10:error: recursive dependency detected!
    package/xbmc/Config.in:10:      symbol BR2_PACKAGE_XBMC depends on BR2_PACKAGE_HAS_OPENGL_EGL
    package/opengl/libegl/Config.in:1:      symbol BR2_PACKAGE_HAS_OPENGL_EGL is selected by BR2_PACKAGE_MESA3D_OPENGL_EGL
    package/mesa3d/Config.in:92:    symbol BR2_PACKAGE_MESA3D_OPENGL_EGL depends on BR2_PACKAGE_MESA3D
    package/mesa3d/Config.in:1:     symbol BR2_PACKAGE_MESA3D is selected by BR2_PACKAGE_LIBEVAS_GL
    package/efl/libevas/Config.in:149:      symbol BR2_PACKAGE_LIBEVAS_GL is part of choice <choice>
    package/efl/libevas/Config.in:144:      choice <choice> contains symbol <choice>
    package/efl/libevas/Config.in:144:      choice <choice> contains symbol BR2_PACKAGE_LIBEVAS_SDL_GL
    package/efl/libevas/Config.in:90:       symbol BR2_PACKAGE_LIBEVAS_SDL_GL depends on BR2_PACKAGE_SDL_X11
    package/sdl/Config.in:24:       symbol BR2_PACKAGE_SDL_X11 depends on BR2_PACKAGE_SDL
    package/sdl/Config.in:1:        symbol BR2_PACKAGE_SDL is selected by BR2_PACKAGE_PYTHON_PYGAME
    package/python-pygame/Config.in:1:      symbol BR2_PACKAGE_PYTHON_PYGAME depends on BR2_PACKAGE_PYTHON
    package/python/Config.in:1:     symbol BR2_PACKAGE_PYTHON is selected by BR2_PACKAGE_XBMC

Until this is properly fixed with the addition of a virtual package for
full-openGL providers, just depend on mesa3d instead of selecting it.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Bernd Kuhls <berndkuhls@hotmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/efl/libevas/Config.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/efl/libevas/Config.in b/package/efl/libevas/Config.in
index 2afa888..8eea23d 100644
--- a/package/efl/libevas/Config.in
+++ b/package/efl/libevas/Config.in
@@ -148,7 +148,7 @@ choice
 
 config BR2_PACKAGE_LIBEVAS_GL
 	bool "generic OpenGL"
-	select BR2_PACKAGE_MESA3D
+	depends on BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_LIBEET
 
 config BR2_PACKAGE_LIBEVAS_GLES_SGX
-- 
1.7.10.4

[Buildroot] [PATCH v2 17/41] DO NOT COMMIT package/libgl: introduce as a new virtual package for full-openGL providers

[Bernd Kuhls]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

Currently, on mesa3d is such a full-openGL provider.

But it is easy to see a few more cropping at the door:
  - NVidia's binary blob
  - ATI's fglrx binary blob

Having this virtual full-openGL package will help when those are getting in.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Bernd Kuhls <berndkuhls@hotmail.com>
Cc: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/opengl/Config.in       |    1 +
 package/opengl/libgl/Config.in |    6 ++++++
 package/opengl/libgl/libgl.mk  |   16 ++++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 package/opengl/libgl/Config.in
 create mode 100644 package/opengl/libgl/libgl.mk

diff --git a/package/opengl/Config.in b/package/opengl/Config.in
index ed81835..20ee28b 100644
--- a/package/opengl/Config.in
+++ b/package/opengl/Config.in
@@ -1,3 +1,4 @@
+source "package/opengl/libgl/Config.in"
 source "package/opengl/libegl/Config.in"
 source "package/opengl/libgles/Config.in"
 source "package/opengl/libopenvg/Config.in"
diff --git a/package/opengl/libgl/Config.in b/package/opengl/libgl/Config.in
new file mode 100644
index 0000000..5eb277a
--- /dev/null
+++ b/package/opengl/libgl/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HAS_OPENGL
+	bool
+
+config BR2_PACKAGE_PROVIDES_OPENGL
+	depends on BR2_PACKAGE_HAS_OPENGL
+	string
diff --git a/package/opengl/libgl/libgl.mk b/package/opengl/libgl/libgl.mk
new file mode 100644
index 0000000..cf9daa5
--- /dev/null
+++ b/package/opengl/libgl/libgl.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# libgl
+#
+################################################################################
+
+LIBGL_SOURCE =
+LIBGL_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENGL))
+
+ifeq ($(BR2_PACKAGE_HAS_OPENGL),y)
+ifeq ($(LIBGL_DEPENDENCIES),)
+$(error No libGL implementation selected. Configuration error.)
+endif
+endif
+
+$(eval $(generic-package))
-- 
1.7.10.4

[Buildroot] [PATCH v2 18/41] DO NOT COMMIT package/mesa3d: is a full-openGL provider if X.org is present

[Bernd Kuhls]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

In combination with X.org, mesa3d is a full-openGL provider, as long
as at least one driver is being built.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Bernd Kuhls <berndkuhls@hotmail.com>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/mesa3d/Config.in |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 324f1b6..12ec068 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
 
 menu "Drivers"
 
@@ -109,6 +110,9 @@ config BR2_PACKAGE_MESA3D_OPENGL_ES
 
 endmenu
 
+config BR2_PACKAGE_PROVIDES_OPENGL
+	default "mesa3d" if BR2_PACKAGE_MESA3D_DRIVER
+
 config BR2_PACKAGE_PROVIDES_OPENGL_EGL
 	default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_EGL
 
-- 
1.7.10.4

[Buildroot] [PATCH v2 19/41] DO NOT COMMIT package/vlc: depends on the virtual package libgl

[Bernd Kuhls]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

Currently, vlc depends on mesa3d to provide the openGL support.

We now have a virtual package, libgl, which ensures openGL is available.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Bernd Kuhls <berndkuhls@hotmail.com>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/vlc/vlc.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk
index a9ee620..f78f209 100644
--- a/package/vlc/vlc.mk
+++ b/package/vlc/vlc.mk
@@ -118,9 +118,9 @@ else
 VLC_CONF_OPT += --disable-flac
 endif
 
-ifeq ($(BR2_PACKAGE_MESA3D),y)
+ifeq ($(BR2_PACKAGE_HAS_OPENGL),y)
 VLC_CONF_OPT += --enable-glx
-VLC_DEPENDENCIES += mesa3d
+VLC_DEPENDENCIES += libgl
 else
 VLC_CONF_OPT += --disable-glx
 endif
-- 
1.7.10.4

[Buildroot] [PATCH v2 20/41] DO NOT COMMIT package/x11-video-drivers: do not select, but depends on mesa3d

[Bernd Kuhls]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

mesa3d is now a full-openGL provider for the virtual package libgl.

It is currently the only provider, but we can safely envision more
providers to be added later: NVidia's binary blob, ATI's fglrx
binary blob... So, forcibly selecting mesa3d would come clashing
with other full-openGL providers.

Also, since mesa3d has implementations for different chips, selecting
mesa3d is not enough. There would still be the need to select the
required galium driver.

So, just transform all instances of 'select mesa3d' to 'depends on
mesa3d'.

To be noted: xf86-video-mach64 already used a 'depends on' rather
than a 'select'.

At the same time, move the intel drivers dependencies to the top.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Cc: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/x11r7/xdriver_xf86-video-ati/Config.in        |    5 ++++-
 package/x11r7/xdriver_xf86-video-glint/Config.in      |    5 ++++-
 package/x11r7/xdriver_xf86-video-intel/Config.in      |    7 +++++--
 package/x11r7/xdriver_xf86-video-mach64/Config.in     |    3 +++
 package/x11r7/xdriver_xf86-video-mga/Config.in        |    5 ++++-
 package/x11r7/xdriver_xf86-video-openchrome/Config.in |    5 ++++-
 package/x11r7/xdriver_xf86-video-r128/Config.in       |    5 ++++-
 package/x11r7/xdriver_xf86-video-savage/Config.in     |    5 ++++-
 package/x11r7/xdriver_xf86-video-sis/Config.in        |    5 ++++-
 package/x11r7/xdriver_xf86-video-tdfx/Config.in       |    5 ++++-
 package/x11r7/xdriver_xf86-video-vmware/Config.in     |    5 ++++-
 11 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/package/x11r7/xdriver_xf86-video-ati/Config.in b/package/x11r7/xdriver_xf86-video-ati/Config.in
index 3c0cac3..3beee68 100644
--- a/package/x11r7/xdriver_xf86-video-ati/Config.in
+++ b/package/x11r7/xdriver_xf86-video-ati/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI
 	bool "xf86-video-ati"
+	depends on BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_LIBDRM_RADEON
-	select BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_GLPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
@@ -13,3 +13,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI
 	select BR2_PACKAGE_XPROTO_XPROTO
 	help
 	  ATI video driver
+
+comment "xf86-video-ati needs mesa3d"
+	depends on !BR2_PACKAGE_MESA3D
diff --git a/package/x11r7/xdriver_xf86-video-glint/Config.in b/package/x11r7/xdriver_xf86-video-glint/Config.in
index bd92788..acae30b 100644
--- a/package/x11r7/xdriver_xf86-video-glint/Config.in
+++ b/package/x11r7/xdriver_xf86-video-glint/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT
 	bool "xf86-video-glint"
+	depends on BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_LIBDRM
-	select BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_GLPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
@@ -13,3 +13,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT
 	select BR2_PACKAGE_XPROTO_XPROTO
 	help
 	  GLINT/Permedia video driver
+
+comment "xf86-video-glint needs mesa3d"
+	depends on !BR2_PACKAGE_MESA3D
diff --git a/package/x11r7/xdriver_xf86-video-intel/Config.in b/package/x11r7/xdriver_xf86-video-intel/Config.in
index 83b714a..8781e1c 100644
--- a/package/x11r7/xdriver_xf86-video-intel/Config.in
+++ b/package/x11r7/xdriver_xf86-video-intel/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL
 	bool "xf86-video-intel"
+	depends on (BR2_i386 || BR2_x86_64)
+	depends on BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
@@ -7,7 +9,8 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL
 	select BR2_PACKAGE_XLIB_LIBPCIACCESS
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_LIBDRM_INTEL
-	select BR2_PACKAGE_MESA3D
-	depends on (BR2_i386 || BR2_x86_64)
 	help
 	  Intel video driver
+
+comment "xf86-video-intel needs mesa3d"
+	depends on BR2_PACKAGE_MESA3D
diff --git a/package/x11r7/xdriver_xf86-video-mach64/Config.in b/package/x11r7/xdriver_xf86-video-mach64/Config.in
index 674071c..42535e4 100644
--- a/package/x11r7/xdriver_xf86-video-mach64/Config.in
+++ b/package/x11r7/xdriver_xf86-video-mach64/Config.in
@@ -9,3 +9,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MACH64
 	select BR2_PACKAGE_XPROTO_XPROTO
 	help
 	  mach64 video driver
+
+comment "xf86-video-mach64 needs mesa3d"
+	depends on !BR2_PACKAGE_MESA3D
diff --git a/package/x11r7/xdriver_xf86-video-mga/Config.in b/package/x11r7/xdriver_xf86-video-mga/Config.in
index 2fc3837..a504ec0 100644
--- a/package/x11r7/xdriver_xf86-video-mga/Config.in
+++ b/package/x11r7/xdriver_xf86-video-mga/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA
 	bool "xf86-video-mga"
+	depends on BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_LIBDRM
-	select BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_GLPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
@@ -12,3 +12,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA
 	select BR2_PACKAGE_XPROTO_XPROTO
 	help
 	  Matrox video driver
+
+comment "xf86-video-mga needs mesa3d"
+	depends on !BR2_PACKAGE_MESA3D
diff --git a/package/x11r7/xdriver_xf86-video-openchrome/Config.in b/package/x11r7/xdriver_xf86-video-openchrome/Config.in
index 24b74bc..db27eef 100644
--- a/package/x11r7/xdriver_xf86-video-openchrome/Config.in
+++ b/package/x11r7/xdriver_xf86-video-openchrome/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_OPENCHROME
 	bool "xf86-video-openchrome"
+	depends on BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_LIBDRM
-	select BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXCOMPOSITE
 	select BR2_PACKAGE_XLIB_LIBXVMC
@@ -14,3 +14,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_OPENCHROME
 	help
 	  Openchrome, A free and Open Source video driver for the VIA/S3G
 	  UniChrome and UniChrome Pro graphics chipsets.
+
+comment "xf86-video-openchrome needs mesa3d"
+	depends on !BR2_PACKAGE_MESA3D
diff --git a/package/x11r7/xdriver_xf86-video-r128/Config.in b/package/x11r7/xdriver_xf86-video-r128/Config.in
index 07e3142..647156f 100644
--- a/package/x11r7/xdriver_xf86-video-r128/Config.in
+++ b/package/x11r7/xdriver_xf86-video-r128/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_R128
 	bool "xf86-video-r128"
-	select BR2_PACKAGE_MESA3D
+	depends on BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
@@ -8,3 +8,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_R128
 	select BR2_PACKAGE_XPROTO_XPROTO
 	help
 	  R128 video driver
+
+comment "xf86-video-r128 needs mesa3d"
+	depends on !BR2_PACKAGE_MESA3D
diff --git a/package/x11r7/xdriver_xf86-video-savage/Config.in b/package/x11r7/xdriver_xf86-video-savage/Config.in
index 93a731e..77dde87 100644
--- a/package/x11r7/xdriver_xf86-video-savage/Config.in
+++ b/package/x11r7/xdriver_xf86-video-savage/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SAVAGE
 	bool "xf86-video-savage"
+	depends on BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_LIBDRM
-	select BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
@@ -11,3 +11,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SAVAGE
 	select BR2_PACKAGE_XPROTO_XPROTO
 	help
 	  S3 Savage video driver
+
+comment "xf86-video-savage needs mesa3d"
+	depends on !BR2_PACKAGE_MESA3D
diff --git a/package/x11r7/xdriver_xf86-video-sis/Config.in b/package/x11r7/xdriver_xf86-video-sis/Config.in
index e184505..3c86bd4 100644
--- a/package/x11r7/xdriver_xf86-video-sis/Config.in
+++ b/package/x11r7/xdriver_xf86-video-sis/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SIS
 	bool "xf86-video-sis"
+	depends on BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_LIBDRM
-	select BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
@@ -13,3 +13,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SIS
 	select BR2_PACKAGE_XPROTO_XPROTO
 	help
 	  SiS and XGI video driver
+
+comment "xf86-video-sis needs mesa3d"
+	depends on !BR2_PACKAGE_MESA3D
diff --git a/package/x11r7/xdriver_xf86-video-tdfx/Config.in b/package/x11r7/xdriver_xf86-video-tdfx/Config.in
index 811eba2..96a69ba 100644
--- a/package/x11r7/xdriver_xf86-video-tdfx/Config.in
+++ b/package/x11r7/xdriver_xf86-video-tdfx/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX
 	bool "xf86-video-tdfx"
+	depends on BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_LIBDRM
-	select BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
@@ -11,3 +11,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX
 	select BR2_PACKAGE_XPROTO_XPROTO
 	help
 	  3Dfx video driver
+
+comment "xf86-video-tdfx needs mesa3d"
+	depends on !BR2_PACKAGE_MESA3D
diff --git a/package/x11r7/xdriver_xf86-video-vmware/Config.in b/package/x11r7/xdriver_xf86-video-vmware/Config.in
index a4d2052..2e6b24d 100644
--- a/package/x11r7/xdriver_xf86-video-vmware/Config.in
+++ b/package/x11r7/xdriver_xf86-video-vmware/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VMWARE
 	bool "xf86-video-vmware"
-	select BR2_PACKAGE_MESA3D
+	depends on BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
@@ -10,3 +10,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VMWARE
 	select BR2_PACKAGE_XPROTO_XPROTO
 	help
 	  VMware SVGA video driver
+
+comment "xf86-video-vmware needs mesa3d"
+	depends on !BR2_PACKAGE_MESA3D
-- 
1.7.10.4

[Buildroot] [PATCH v2 21/41] DO NOT COMMIT package/xorg-server: do not force-select xf86driproto for mesa3d

[Bernd Kuhls]

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

This is already handled by mesa3d itself.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/x11r7/xserver_xorg-server/Config.in |    1 -
 1 file changed, 1 deletion(-)

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index dfa7d10..e191dce 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -45,7 +45,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_XEXTPROTO
 	select BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO
 	select BR2_PACKAGE_XPROTO_XF86DGAPROTO
-	select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
 	select BR2_PACKAGE_XUTIL_UTIL_MACROS
-- 
1.7.10.4

[Buildroot] [PATCH v2 22/41] 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 v2 23/41] 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 v2 24/41] 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 v2 25/41] 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 v2 26/41] 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 v2 27/41] 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 v2 28/41] xdriver_xf86-video-intel: Bump version to 2.99.911

[Bernd Kuhls]

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

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v5: rebased
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   |   11 +++----
 .../xdriver_xf86-video-intel.mk                    |   31 ++++++++++++++++----
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/package/x11r7/xdriver_xf86-video-intel/Config.in b/package/x11r7/xdriver_xf86-video-intel/Config.in
index 8781e1c..e9074cf 100644
--- a/package/x11r7/xdriver_xf86-video-intel/Config.in
+++ b/package/x11r7/xdriver_xf86-video-intel/Config.in
@@ -2,13 +2,14 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL
 	bool "xf86-video-intel"
 	depends on (BR2_i386 || BR2_x86_64)
 	depends on BR2_PACKAGE_MESA3D
-	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_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_XPROTO
 	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 v2 29/41] 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 9e346bd..79fb484 100644
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -153,6 +153,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 v2 30/41] xbmc: needs host-gawk (v3)

[Bernd Kuhls]

Changes
v3: rebased http://patchwork.ozlabs.org/patch/334971/
v2: Keep dependencies sorted

Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
Acked-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/xbmc/xbmc.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
index 79fb484..a16ba2f 100644
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -12,7 +12,7 @@ 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-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 \
-- 
1.7.10.4

[Buildroot] [PATCH v2 30/41] xbmc: needs host-gawk (v3)

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Wed,  2 Apr 2014 21:46:44 +0200, Bernd Kuhls wrote:
> Changes
> v3: rebased http://patchwork.ozlabs.org/patch/334971/
> v2: Keep dependencies sorted
> 
> Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
> Acked-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/xbmc/xbmc.mk |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

The title of this patch makes it non-applicable: the (v3) should not be
at the end of the commit title between parenthesis, because if it is,
then it gets preserved as part of the commit title when applying the
patch.

If you want to add such information, please use [blabla] at the
beginning of the commit title, so that the title of the patch becomes:

[PATCH v2 30/41] [v3] xbmc: needs host-gawk

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH v2 31/41] xbmc: Fix Java dependency check (v2)

[Bernd Kuhls]

From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>

A check for Java has been implemented in dependencies.sh, but during the
review, the name of the variable had been changed from:
BR2_HOST_NEEDS_JAVA to BR2_NEEDS_HOST_JAVA
as it is more accurate.

The change was not made in XBMC and as such, you could start the build
of XBMC without Java on your system.

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: rebased http://patchwork.ozlabs.org/patch/335219/ (Maxime)

 package/xbmc/Config.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/xbmc/Config.in b/package/xbmc/Config.in
index e078d2f..cf6a6b9 100644
--- a/package/xbmc/Config.in
+++ b/package/xbmc/Config.in
@@ -9,7 +9,7 @@ comment "xbmc requires an OpenGL ES and EGL backend"
 
 menuconfig BR2_PACKAGE_XBMC
 	bool "xbmc"
-	select BR2_HOST_NEEDS_JAVA
+	select BR2_NEEDS_HOST_JAVA
 	select BR2_PACKAGE_BOOST
 	select BR2_PACKAGE_BOOST_THREAD
 	select BR2_PACKAGE_BZIP2
-- 
1.7.10.4

[Buildroot] [PATCH v2 31/41] xbmc: Fix Java dependency check (v2)

[Yann E. MORIN]

Bernd, Maxime, All,

On 2014-04-02 21:46 +0200, Bernd Kuhls spake thusly:
> From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
> 
> A check for Java has been implemented in dependencies.sh, but during the
> review, the name of the variable had been changed from:
> BR2_HOST_NEEDS_JAVA to BR2_NEEDS_HOST_JAVA
> as it is more accurate.
> 
> The change was not made in XBMC and as such, you could start the build
> of XBMC without Java on your system.
> 
> Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
> v2: rebased http://patchwork.ozlabs.org/patch/335219/ (Maxime)
> 
>  package/xbmc/Config.in |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/xbmc/Config.in b/package/xbmc/Config.in
> index e078d2f..cf6a6b9 100644
> --- a/package/xbmc/Config.in
> +++ b/package/xbmc/Config.in
> @@ -9,7 +9,7 @@ comment "xbmc requires an OpenGL ES and EGL backend"
>  
>  menuconfig BR2_PACKAGE_XBMC
>  	bool "xbmc"
> -	select BR2_HOST_NEEDS_JAVA
> +	select BR2_NEEDS_HOST_JAVA
>  	select BR2_PACKAGE_BOOST
>  	select BR2_PACKAGE_BOOST_THREAD
>  	select BR2_PACKAGE_BZIP2
> -- 
> 1.7.10.4
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  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 v2 32/41] infozip: Add a host variant

[Bernd Kuhls]

From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>

Adding a host variant to the package infozip.
It will be used by XBMC.

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/infozip/infozip.mk |   13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/package/infozip/infozip.mk b/package/infozip/infozip.mk
index 8e51224..9648b4f 100644
--- a/package/infozip/infozip.mk
+++ b/package/infozip/infozip.mk
@@ -26,4 +26,17 @@ define INFOZIP_INSTALL_TARGET_CMDS
 		prefix=$(TARGET_DIR)/usr
 endef
 
+define HOST_INFOZIP_BUILD_CMDS
+	$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \
+		CFLAGS="$(HOST_CFLAGS) -I. -DUNIX" \
+		AS="$(HOST_CC) -c" \
+		-f unix/Makefile generic
+endef
+
+define HOST_INFOZIP_INSTALL_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \
+		prefix=$(HOST_DIR)/usr
+endef
+
 $(eval $(generic-package))
+$(eval $(host-generic-package))
-- 
1.7.10.4

[Buildroot] [PATCH v2 33/41] xbmc: Add missing host-infozip dependency (v2)

[Bernd Kuhls]

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Reported-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

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

diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
index a16ba2f..f29e04d 100644
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -12,7 +12,7 @@ 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-gawk host-gperf host-lzo host-sdl_image host-swig
+XBMC_DEPENDENCIES = host-gawk host-gperf host-infozip host-lzo 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 \
-- 
1.7.10.4

[Buildroot] [PATCH v2 34/41] WIP: xbmc: Bump version to Gotham_beta3

[Bernd Kuhls]

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

diff --git a/package/xbmc/Config.in b/package/xbmc/Config.in
index cf6a6b9..fc8811e 100644
--- a/package/xbmc/Config.in
+++ b/package/xbmc/Config.in
@@ -35,6 +35,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
diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
index f29e04d..e5eadd9 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
@@ -15,7 +15,7 @@ XBMC_LICENSE_FILES = LICENSE.GPL
 XBMC_DEPENDENCIES = host-gawk host-gperf host-infozip host-lzo 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 \
+	libogg libplist libpng libsamplerate libungif libvorbis libxml2 libxslt lzo ncurses \
 	openssl pcre python readline sqlite taglib tiff tinyxml yajl zlib
 
 XBMC_CONF_ENV = \
-- 
1.7.10.4

[Buildroot] [PATCH v2 35/41] WIP: xbmc: Allow compilation with uClibc

[Bernd Kuhls]

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

diff --git a/package/xbmc/Config.in b/package/xbmc/Config.in
index fc8811e..e0576b6 100644
--- a/package/xbmc/Config.in
+++ b/package/xbmc/Config.in
@@ -1,11 +1,8 @@
-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 needs a toolchain w/ C++, largefile, threads, wchar"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
 
-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 needs an OpenGL backend"
+	depends on !BR2_PACKAGE_HAS_OPENGL && !BR2_PACKAGE_HAS_OPENGL_EGL && !BR2_PACKAGE_HAS_OPENGL_ES
 
 menuconfig BR2_PACKAGE_XBMC
 	bool "xbmc"
@@ -57,10 +54,12 @@ menuconfig BR2_PACKAGE_XBMC
 	select BR2_PACKAGE_TINYXML
 	select BR2_PACKAGE_YAJL
 	select BR2_PACKAGE_ZLIB
-	depends on BR2_TOOLCHAIN_USES_GLIBC
+	depends on BR2_LARGEFILE
 	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_USE_MMU # python
+	depends on BR2_USE_WCHAR
+	depends on BR2_PACKAGE_HAS_OPENGL || (BR2_PACKAGE_HAS_OPENGL_EGL && BR2_PACKAGE_HAS_OPENGL_ES)
 	help
 	  XBMC is an award-winning free and open source (GPL) software
 	  media player and entertainment hub for digital media.
@@ -92,14 +91,14 @@ config BR2_PACKAGE_XBMC_LIBBLURAY
 
 config BR2_PACKAGE_XBMC_LIBCEC
 	bool "hdmi cec"
-	depends on !BR2_PREFER_STATIC_LIB # libcec
+	depends on !BR2_PREFER_STATIC_LIB || !BR2_USE_WCHAR # libcec
 	select BR2_PACKAGE_LIBCEC
 	help
 	  Enable CEC (Consumer Electronics Control) support.
 	  Select this if you want XBMC to support HDMI CEC.
 
-comment "hdmi cec support needs a toolchain w/ dynamic library"
-	depends on BR2_PREFER_STATIC_LIB
+comment "hdmi cec support needs a toolchain w/ dynamic library, wchar"
+	depends on BR2_PREFER_STATIC_LIB || !BR2_USE_WCHAR
 
 config BR2_PACKAGE_XBMC_LIBMICROHTTPD
 	bool "web server"
@@ -126,11 +125,15 @@ config BR2_PACKAGE_XBMC_RTMPDUMP
 
 config BR2_PACKAGE_XBMC_LIBSHAIRPLAY
 	bool "shairport"
+	depends on BR2_INET_IPV6
 	select BR2_PACKAGE_LIBSHAIRPLAY
 	help
 	  Enable Shairport support.
 	  Select this if you want to stream content from an Apple device.
 
+comment "shairport support needs a toolchain w/ IPv6"
+	depends on !BR2_INET_IPV6
+
 config BR2_PACKAGE_XBMC_LIBSMBCLIENT
 	bool "samba"
 	select BR2_PACKAGE_SAMBA
-- 
1.7.10.4

[Buildroot] [PATCH v2 36/41] WIP: xbmc: Add X.org support

[Bernd Kuhls]

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

diff --git a/package/xbmc/Config.in b/package/xbmc/Config.in
index e0576b6..765f325 100644
--- a/package/xbmc/Config.in
+++ b/package/xbmc/Config.in
@@ -20,6 +20,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
@@ -48,10 +50,18 @@ 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_LARGEFILE
diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
index e5eadd9..691cad6 100644
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -14,7 +14,7 @@ XBMC_LICENSE_FILES = LICENSE.GPL
 # http://wiki.xbmc.org/index.php?title=TexturePacker
 XBMC_DEPENDENCIES = host-gawk host-gperf host-infozip host-lzo 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 \
+	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
 
@@ -31,7 +31,6 @@ XBMC_CONF_OPT +=  \
 	--disable-crystalhd \
 	--disable-debug \
 	--disable-dvdcss \
-	--disable-gl \
 	--disable-hal \
 	--disable-joystick \
 	--disable-mysql \
@@ -39,14 +38,10 @@ 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 \
 	--enable-optimizations
 
 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
@@ -60,6 +55,41 @@ ifeq ($(BR2_PACKAGE_DBUS),y)
 XBMC_DEPENDENCIES += dbus
 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_XBMC_LIBUSB),y)
 XBMC_DEPENDENCIES += libusb-compat
 XBMC_CONF_OPT += --enable-libusb
-- 
1.7.10.4

[Buildroot] [PATCH v2 37/41] WIP: xbmc: Add VA-API support

[Bernd Kuhls]

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

diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
index 691cad6..6c79c4c 100644
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -39,7 +39,6 @@ XBMC_CONF_OPT +=  \
 	--disable-projectm \
 	--disable-pulse \
 	--disable-ssh \
-	--disable-vaapi \
 	--disable-vdpau \
 	--disable-vtbdecoder \
 	--enable-optimizations
@@ -55,6 +54,13 @@ 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 \
-- 
1.7.10.4

[Buildroot] [PATCH v2 38/41] WIP: xbmc: Add alsa support

[Bernd Kuhls]

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

diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
index 6c79c4c..a46fe11 100644
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -27,7 +27,6 @@ XBMC_CONF_ENV = \
 	TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr"
 
 XBMC_CONF_OPT +=  \
-	--disable-alsa \
 	--disable-crystalhd \
 	--disable-debug \
 	--disable-dvdcss \
@@ -96,6 +95,13 @@ 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_XBMC_LIBUSB),y)
 XBMC_DEPENDENCIES += libusb-compat
 XBMC_CONF_OPT += --enable-libusb
-- 
1.7.10.4

[Buildroot] [PATCH v2 39/41] WIP: xbmc: Add lame support

[Bernd Kuhls]

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

diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
index a46fe11..bb62db5 100644
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -102,6 +102,13 @@ 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 v2 40/41] WIP: xbmc: Disable broken rsxs screensaver

[Bernd Kuhls]

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

diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
index bb62db5..8d8dfbe 100644
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -40,6 +40,7 @@ XBMC_CONF_OPT +=  \
 	--disable-ssh \
 	--disable-vdpau \
 	--disable-vtbdecoder \
+	--disable-rsxs \
 	--enable-optimizations
 
 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
-- 
1.7.10.4

[Buildroot] [PATCH v2 41/41] WIP: xbmc: Add option for Goom screensaver

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/xbmc/Config.in |    5 +++++
 package/xbmc/xbmc.mk   |    6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/package/xbmc/Config.in b/package/xbmc/Config.in
index 765f325..7bb6386 100644
--- a/package/xbmc/Config.in
+++ b/package/xbmc/Config.in
@@ -116,6 +116,11 @@ config BR2_PACKAGE_XBMC_LIBMICROHTTPD
 	help
 	  Enable webserver feature
 
+config BR2_PACKAGE_XBMC_GOOM
+	bool "goom screensaver"
+	help
+	  Enable goom screensaver
+
 config BR2_PACKAGE_XBMC_LIBNFS
 	bool "nfs"
 	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
index 8d8dfbe..b4e0fb0 100644
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -110,6 +110,12 @@ else
 XBMC_CONF_OPT += --disable-libmp3lame
 endif
 
+ifeq ($(BR2_PACKAGE_XBMC_GOOM),y)
+XBMC_CONF_OPT += --enable-goom
+else
+XBMC_CONF_OPT += --disable-goom
+endif
+
 ifeq ($(BR2_PACKAGE_XBMC_LIBUSB),y)
 XBMC_DEPENDENCIES += libusb-compat
 XBMC_CONF_OPT += --enable-libusb
-- 
1.7.10.4

[Buildroot] [PATCH v2 00/41] XBMC Gotham Beta3 + misc stuff

[Arnout Vandecappelle]

On 02/04/14 21:46, Bernd Kuhls wrote:
> Hi,
> 
> this series replaces mondays patch series "[PATCH 00/16] XBMC Gotham Beta3".
> 
> patches 1-12: unrelated version bumps

 Could you submit unrelated version bumps as a separate series/branch? If
they are also unrelated between them, then you can submit each bump
separately.

 Regards,
 Arnout

> patch 13: removed
> patches 14-15: Kconfig comments
> patches 16-21: Add virtual package for full-openGL (branch yem/fixes)
>                (Yann, deprecated, but working - DO NOT COMMIT)
> patches 22-27: new packages needed for xbmc, especially for intel support
> patch 28: v5 of xdriver_xf86-video-intel version bump
> patch 29: WIP - Add xbmc-send script to send commands to xbmc
> patch 30: rebased http://patchwork.ozlabs.org/patch/334971/ (Ryan)
> patch 31: rebased http://patchwork.ozlabs.org/patch/335219/ (Maxime)
> patches 32-33: rebased host-infozip http://patchwork.ozlabs.org/patch/336195/
>                http://patchwork.ozlabs.org/patch/336196/ (Maxime)
> patches 34-41: WIP - xbmc version bump to Gotham Beta3 with uClibc support
>                http://xbmc.org/xbmc-13-0-gotham-beta-3-returns/
> 
> I consider patches 1-15, 22-28 & 30-33 git-ready.
> 
> Regards, Bernd
> 
> 
> Bernd Kuhls (33):
>   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
>   flac: version bump 1.3.0, add sse support
>   libcdio: version bump 0.92
>   libmodplug: version bump 0.8.8.5
>   libogg: version bump 1.3.1
>   taglib: version bump 1.9.1
>   nasm: version bump 2.11.02
>   libnfs: version bump 1.9.3
>   libdrm: Explain dependency on xorg in Kconfig
>   mesa3d: Explain dependency for i965 DRI driver on xorg in Kconfig
>   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
>   xdriver_xf86-video-intel: Bump version to 2.99.911
>   xbmc: Add xbmc-send script to send commands to xbmc service
>   xbmc: needs host-gawk (v3)
>   xbmc: Add missing host-infozip dependency (v2)
>   WIP: xbmc: Bump version to Gotham_beta3
>   WIP: xbmc: Allow compilation with uClibc
>   WIP: xbmc: Add X.org support
>   WIP: xbmc: Add VA-API support
>   WIP: xbmc: Add alsa support
>   WIP: xbmc: Add lame support
>   WIP: xbmc: Disable broken rsxs screensaver
>   WIP: xbmc: Add option for Goom screensaver
> 
> Maxime Hadjinlian (2):
>   xbmc: Fix Java dependency check
>   infozip: Add a host variant
> 
> Yann E. MORIN (6) DO NOT COMMIT:
>   package/libevas: quick fix to get rid of circular deps
>   package/libgl: introduce as a new virtual package for full-openGL
>     providers
>   package/mesa3d: is a full-openGL provider if X.org is present
>   package/vlc: depends on the virtual package libgl
>   package/x11-video-drivers: do not select, but depends on mesa3d
>   package/xorg-server: do not force-select xf86driproto for mesa3d
> 
>  package/Config.in                                  |    4 +
>  package/efl/libevas/Config.in                      |    2 +-
>  package/ffmpeg/ffmpeg.mk                           |    8 +-
>  package/file/file.mk                               |    2 +-
>  package/flac/flac-no-altivec.patch                 |   28 -------
>  package/flac/flac.mk                               |   16 +++-
>  package/flex/flex-prog-ar.patch                    |   11 ---
>  package/flex/flex.mk                               |    2 +-
>  package/infozip/infozip.mk                         |   13 +++
>  package/libcdio/libcdio.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/libmodplug/libmodplug.mk                   |    2 +-
>  package/libnfs/libnfs.mk                           |    2 +-
>  package/libogg/libogg.mk                           |    2 +-
>  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                           |    7 ++
>  package/nasm/nasm.mk                               |    2 +-
>  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/taglib/taglib.mk                           |    4 +-
>  package/vlc/vlc.mk                                 |    4 +-
>  package/x11r7/xdriver_xf86-video-ati/Config.in     |    5 +-
>  package/x11r7/xdriver_xf86-video-glint/Config.in   |    5 +-
>  package/x11r7/xdriver_xf86-video-intel/Config.in   |   18 +++--
>  .../xdriver_xf86-video-intel.mk                    |   31 ++++++--
>  package/x11r7/xdriver_xf86-video-mach64/Config.in  |    3 +
>  package/x11r7/xdriver_xf86-video-mga/Config.in     |    5 +-
>  .../x11r7/xdriver_xf86-video-openchrome/Config.in  |    5 +-
>  package/x11r7/xdriver_xf86-video-r128/Config.in    |    5 +-
>  package/x11r7/xdriver_xf86-video-savage/Config.in  |    5 +-
>  package/x11r7/xdriver_xf86-video-sis/Config.in     |    5 +-
>  package/x11r7/xdriver_xf86-video-tdfx/Config.in    |    5 +-
>  package/x11r7/xdriver_xf86-video-vmware/Config.in  |    5 +-
>  package/x11r7/xlib_xtrans/xlib_xtrans.mk           |    2 +-
>  package/x11r7/xserver_xorg-server/Config.in        |    1 -
>  package/xbmc/Config.in                             |   45 ++++++++---
>  package/xbmc/xbmc.mk                               |   84 +++++++++++++++++---
>  51 files changed, 470 insertions(+), 145 deletions(-)
>  delete mode 100644 package/flac/flac-no-altivec.patch
>  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
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F