Skip to contentSkip to conversation

XBMC Gotham Beta3 + misc stuff

PATCH New Bernd Kuhls 2 participants 41 messages Apr 3, 2014 – Apr 5, 2014

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

v4 cover XBMC Gotham Beta3 + misc stuff

Hi,

-----------------------------
Changelog:
v3: - rebased
- removed flac version bump (Gustavo)
- removed libfs version bump https://github.com/OpenELEC/OpenELEC.tv/commit/b55859
-----------------------------

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

patches 1-12: unrelated version bumps
patches 13-14: Kconfig comments
patches 15-20: Add virtual package for full-openGL (branch yem/fixes)
(Yann, deprecated, but working - DO NOT COMMIT)
patches 21-26: new packages needed for xbmc, especially for intel support patch 27: v5 of xdriver_xf86-video-intel version bump
patch 28: WIP - Add xbmc-send script to send commands to xbmc patch 29: rebased http://patchwork.ozlabs.org/patch/334971/ (Ryan) patches 30-37: WIP - xbmc version bump to Gotham Beta3 with uClibc support

               http://xbmc.org/xbmc-13-0-gotham-beta-3-returns/

I consider patches 1-14, 21-27 & 29 git-ready.

Regards, Bernd

Bernd Kuhls (31):
pixman: Version bump 0.32.4
xlib_xtrans: Version bump 1.3.4
xapp_xauth: version bump 1.0.9
file: Version bump 5.18
flex: Version bump 2.5.39
sqlite: Version bump 3.8.4.2
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
php: version bump 5.5.11
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 [v3] xbmc: needs host-gawk
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

Yann E. MORIN (6):
DO NOT COMMIT - package/libevas: quick fix to get rid of circular
deps
DO NOT COMMIT - package/libgl: introduce as a new virtual package for
full-openGL providers
DO NOT COMMIT - package/mesa3d: is a full-openGL provider if X.org is
present
DO NOT COMMIT - package/vlc: depends on the virtual package libgl DO NOT COMMIT - package/x11-video-drivers: do not select, but depends
on mesa3d
DO NOT COMMIT - 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/flex/flex-prog-ar.patch                    |   11 ---
 package/flex/flex.mk                               |    2 +-
 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/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/php/php.mk                                 |    2 +-
 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/xapp_xauth/xapp_xauth.mk             |    2 +-
 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                             |   43 +++++++---
 package/xbmc/xbmc.mk                               |   84 +++++++++++++++++---
 48 files changed, 443 insertions(+), 113 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
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH v4 1/37 pixman: Version bump 0.32.4

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

Signed-off-by Bernd Kuhls <[email protected]>
---
 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
package/pixman/pixman-01-loongson-cflags.patch deleted +0 -38
deleted file mode 100644
index fc53be2..0000000
@@ -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 <[email protected]>
-
-From d77d75cc6e5de14d027d22b70389a4d0c71048b9 Mon Sep 17 00:00:00 2001
-From: Markos Chandras <[email protected]>
-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 <[email protected]>
-Signed-off-by: Markos Chandras <[email protected]>
----
-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
package/pixman/pixman.mk +1 -1
index 4f70ce5..91f3332 100644
@@ -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
Signature · 1 line
1.7.10.4
author
#2 lore raw

PATCH v4 2/37 xlib_xtrans: Version bump 1.3.4

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/x11r7/xlib_xtrans/xlib_xtrans.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/x11r7/xlib_xtrans/xlib_xtrans.mk +1 -1
index 8c5fd42..bc84dfb 100644
@@ -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
Signature · 1 line
1.7.10.4
author
#3 lore raw

PATCH v4 3/37 xapp_xauth: version bump 1.0.9

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/x11r7/xapp_xauth/xapp_xauth.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/x11r7/xapp_xauth/xapp_xauth.mk +1 -1
index 9fa72ae..a2307f2 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XAUTH_VERSION = 1.0.8
+XAPP_XAUTH_VERSION = 1.0.9
 XAPP_XAUTH_SOURCE = xauth-$(XAPP_XAUTH_VERSION).tar.bz2
 XAPP_XAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XAUTH_LICENSE = MIT
Signature · 1 line
1.7.10.4
author
#4 lore raw

PATCH v4 4/37 file: Version bump 5.18

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/file/file.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/file/file.mk +1 -1
index ac9cf55..846d56a 100644
@@ -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
Signature · 1 line
1.7.10.4
author
#5 lore raw

PATCH v4 5/37 flex: Version bump 2.5.39

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 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
package/flex/flex-prog-ar.patch deleted +0 -11
deleted file mode 100644
index e0626ff..0000000
@@ -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 =
package/flex/flex.mk +1 -1
index 17f651b..2373d04 100644
@@ -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
Signature · 1 line
1.7.10.4
#6 lore raw

PATCH v4 5/37 flex: Version bump 2.5.39

Dear Bernd Kuhls,

Quoted 7 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 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

After applying this patch, host-thrift and ipsec-tools started to fail building, due to an undefined reference to yylex. Since no simple solution has been found, I've for now reverted your flex bump patch.

Can you have a look at the host-thrift and ipsec-tools problems?

See:

http://autobuild.buildroot.org/results/759/7590122fd85b644ae0886a127005188d1f882bef/
http://autobuild.buildroot.org/results/238/238296556663d52015beb43df97106f6e164ce55/

Regarding host-thrift, it might be worth having a look at:

https://issues.apache.org/jira/browse/THRIFT-2386

Regarding ipsec-tools, it might be worth having a look at:

https://www.mail-archive.com/openembedded-devel at lists.openembedded.org/msg35108.html

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#7 lore raw

PATCH v4 6/37 sqlite: Version bump 3.8.4.2

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/sqlite/sqlite.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/sqlite/sqlite.mk +1 -1
index 7893e6b..af59479 100644
@@ -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
Signature · 1 line
1.7.10.4
author
#8 lore raw

PATCH v4 7/37 libcdio: version bump 0.92

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/libcdio/libcdio.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/libcdio/libcdio.mk +1 -1
index b9aec9e..7fd8113 100644
@@ -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+
Signature · 1 line
1.7.10.4
author
#9 lore raw

PATCH v4 8/37 libmodplug: version bump 0.8.8.5

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/libmodplug/libmodplug.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/libmodplug/libmodplug.mk +1 -1
index 1d01252..d9d74df 100644
@@ -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
Signature · 1 line
1.7.10.4
author
#10 lore raw

PATCH v4 9/37 libogg: version bump 1.3.1

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/libogg/libogg.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/libogg/libogg.mk +1 -1
index 23554d9..984e7b7 100644
@@ -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
Signature · 1 line
1.7.10.4
author
#11 lore raw

PATCH v4 10/37 taglib: version bump 1.9.1

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/taglib/taglib.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/taglib/taglib.mk +2 -2
index c04c88b..8e6a3bd 100644
@@ -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
Signature · 1 line
1.7.10.4
author
#12 lore raw

PATCH v4 11/37 nasm: version bump 2.11.02

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/nasm/nasm.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/nasm/nasm.mk +1 -1
index d8045da..18efa4a 100644
@@ -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)
Signature · 1 line
1.7.10.4
author
#13 lore raw

PATCH v4 12/37 php: version bump 5.5.11

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/php/php.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/php/php.mk +1 -1
index b3ffbef..ef42e58 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PHP_VERSION = 5.5.10
+PHP_VERSION = 5.5.11
 PHP_SITE = http://www.php.net/distributions
 PHP_INSTALL_STAGING = YES
 PHP_INSTALL_STAGING_OPT = INSTALL_ROOT=$(STAGING_DIR) install
Signature · 1 line
1.7.10.4
author
#14 lore raw

PATCH v4 13/37 libdrm: Explain dependency on xorg in Kconfig

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/libdrm/Config.in |    3 +++
 1 file changed, 3 insertions(+)
package/libdrm/Config.in +3 -0
index 7192e94..0a8c681 100644
@@ -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
Signature · 1 line
1.7.10.4
author
#15 lore raw

PATCH v4 14/37 mesa3d: Explain dependency for i965 DRI driver on xorg in Kconfig

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mesa3d/Config.in |    3 +++
 1 file changed, 3 insertions(+)
package/mesa3d/Config.in +3 -0
index 8ed0c07..324f1b6 100644
@@ -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
Signature · 1 line
1.7.10.4
author
#16 lore raw

PATCH v4 15/37 DO NOT COMMIT - package/libevas: quick fix to get rid of circular deps

In reply to Bernd Kuhls

From: "Yann E. MORIN" <[email protected]>

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" <[email protected]>
Cc Bernd Kuhls <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/efl/libevas/Config.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/efl/libevas/Config.in +1 -1
index 2afa888..8eea23d 100644
@@ -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
Signature · 1 line
1.7.10.4
author
#17 lore raw

PATCH v4 16/37 DO NOT COMMIT - package/libgl: introduce as a new virtual package for full-openGL providers

In reply to Bernd Kuhls

From: "Yann E. MORIN" <[email protected]>

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" <[email protected]>
Cc Bernd Kuhls <[email protected]>
Cc Paul Cercueil <[email protected]>
Signed-off-by Bernd Kuhls <[email protected]>
---
 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
package/opengl/Config.in +1 -0
index ed81835..20ee28b 100644
@@ -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"
package/opengl/libgl/Config.in new file +6 -0
new file mode 100644
index 0000000..5eb277a
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HAS_OPENGL
+	bool
+
+config BR2_PACKAGE_PROVIDES_OPENGL
+	depends on BR2_PACKAGE_HAS_OPENGL
+	string
package/opengl/libgl/libgl.mk new file +16 -0
new file mode 100644
index 0000000..cf9daa5
@@ -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))
Signature · 1 line
1.7.10.4
author
#18 lore raw

PATCH v4 17/37 DO NOT COMMIT - package/mesa3d: is a full-openGL provider if X.org is present

In reply to Bernd Kuhls

From: "Yann E. MORIN" <[email protected]>

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" <[email protected]>
Cc Paul Cercueil <[email protected]>
Cc Bernd Kuhls <[email protected]>
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mesa3d/Config.in |    4 ++++
 1 file changed, 4 insertions(+)
package/mesa3d/Config.in +4 -0
index 324f1b6..12ec068 100644
@@ -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
Signature · 1 line
1.7.10.4
author
#19 lore raw

PATCH v4 18/37 DO NOT COMMIT - package/vlc: depends on the virtual package libgl

In reply to Bernd Kuhls

From: "Yann E. MORIN" <[email protected]>

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" <[email protected]>
Cc Bernd Kuhls <[email protected]>
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/vlc/vlc.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/vlc/vlc.mk +2 -2
index a9ee620..f78f209 100644
@@ -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
Signature · 1 line
1.7.10.4
author
#20 lore raw

PATCH v4 19/37 DO NOT COMMIT - package/x11-video-drivers: do not select, but depends on mesa3d

In reply to Bernd Kuhls

From: "Yann E. MORIN" <[email protected]>

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" <[email protected]>
Cc Bernd Kuhls <[email protected]>
Cc Paul Cercueil <[email protected]>
Signed-off-by Bernd Kuhls <[email protected]>
---
 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(-)
package/x11r7/xdriver_xf86-video-ati/Config.in +4 -1
index 3c0cac3..3beee68 100644
@@ -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
package/x11r7/xdriver_xf86-video-glint/Config.in +4 -1
index bd92788..acae30b 100644
@@ -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
package/x11r7/xdriver_xf86-video-intel/Config.in +5 -2
index 83b714a..8781e1c 100644
@@ -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
package/x11r7/xdriver_xf86-video-mach64/Config.in +3 -0
index 674071c..42535e4 100644
@@ -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
package/x11r7/xdriver_xf86-video-mga/Config.in +4 -1
index 2fc3837..a504ec0 100644
@@ -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
package/x11r7/xdriver_xf86-video-openchrome/Config.in +4 -1
index 24b74bc..db27eef 100644
@@ -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
package/x11r7/xdriver_xf86-video-r128/Config.in +4 -1
index 07e3142..647156f 100644
@@ -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
package/x11r7/xdriver_xf86-video-savage/Config.in +4 -1
index 93a731e..77dde87 100644
@@ -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
package/x11r7/xdriver_xf86-video-sis/Config.in +4 -1
index e184505..3c86bd4 100644
@@ -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
package/x11r7/xdriver_xf86-video-tdfx/Config.in +4 -1
index 811eba2..96a69ba 100644
@@ -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
package/x11r7/xdriver_xf86-video-vmware/Config.in +4 -1
index a4d2052..2e6b24d 100644
@@ -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
Signature · 1 line
1.7.10.4
author
#21 lore raw

PATCH v4 20/37 DO NOT COMMIT - package/xorg-server: do not force-select xf86driproto for mesa3d

In reply to Bernd Kuhls

From: "Yann E. MORIN" <[email protected]>

This is already handled by mesa3d itself.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Bernd Kuhls <[email protected]>
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/x11r7/xserver_xorg-server/Config.in |    1 -
 1 file changed, 1 deletion(-)
package/x11r7/xserver_xorg-server/Config.in +0 -1
index dfa7d10..e191dce 100644
@@ -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
Signature · 1 line
1.7.10.4
author
#22 lore raw

PATCH v4 21/37 libva: new package

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 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
package/Config.in +1 -0
index e816603..b45c6e9 100644
@@ -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"
package/libva/Config.in new file +12 -0
new file mode 100644
index 0000000..98a5ee8
@@ -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/
package/libva/libva.mk new file +59 -0

59 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#23 lore raw

PATCH v4 21/37 libva: new package

Dear Bernd Kuhls,

Quoted 11 lines · Bernd Kuhls
package/libva/libva.mk new file +5 -0
new file mode 100644
index 0000000..1c7e6e0
@@ -0,0 +1,59 @@
+################################################################################
+#
+# libva
+#
+################################################################################

package/libva/libva.mk line 15

Quoted 10 lines
package/libva/libva.mk new file +10 -0
+
+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

You're cutting lines a bit too much. This should be:

LIBVA_DEPENDENCIES = host-pkgconf libdram

package/libva/libva.mk line 26

Quoted 5 lines
package/libva/libva.mk new file +5 -0
+ifeq ($(BR2_PACKAGE_MESA3D),y)
+LIBVA_DEPENDENCIES += \
+	mesa3d
+LIBVA_CONF_OPT += \
+	--enable-glx

Same here.

package/libva/libva.mk line 38

Quoted 12 lines
package/libva/libva.mk new file +12 -0
+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

And here, and so on.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#24 lore raw

PATCH v4 22/37 libva-intel-driver: new package

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 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
package/Config.in +1 -0
index b45c6e9..3550935 100644
@@ -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"
package/libva-intel-driver/Config.in new file +13 -0
new file mode 100644
index 0000000..343f45f
@@ -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
package/libva-intel-driver/libva-intel-driver.mk new file +13 -0
new file mode 100644
index 0000000..86d2dcc
@@ -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))
Signature · 1 line
1.7.10.4
author
#25 lore raw

PATCH v4 23/37 ffmpeg: Add libva support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/ffmpeg/ffmpeg.mk |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/ffmpeg/ffmpeg.mk +7 -1
index a067fe6..0084a53 100644
@@ -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
Signature · 1 line
1.7.10.4
author
#26 lore raw

PATCH v4 24/37 libglu: new package

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 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
package/Config.in +1 -0
index 3550935..3240188 100644
@@ -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"
package/libglu/Config.in new file +10 -0
new file mode 100644
index 0000000..042a0c3
@@ -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
package/libglu/libglu.mk new file +19 -0
new file mode 100644
index 0000000..3e5aafa
@@ -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))
Signature · 1 line
1.7.10.4
author
#27 lore raw

PATCH v4 25/37 libglew: new package

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 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
package/Config.in +1 -0
index 3240188..8433020 100644
@@ -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"
package/libglew/Config.in new file +19 -0
new file mode 100644
index 0000000..fdb2b91
@@ -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
package/libglew/libglew-0001-lib64.patch new file +14 -0
new file mode 100644
index 0000000..b961aec
@@ -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
package/libglew/libglew.mk new file +40 -0
new file mode 100644
index 0000000..e9c08d7
@@ -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))
Signature · 1 line
1.7.10.4
author
#28 lore raw

PATCH v4 26/37 sdl: Add new dependency libglu for opengl support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/sdl/sdl.mk |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
package/sdl/sdl.mk +5 -1
index 086f5e9..fa68198 100644
@@ -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 \
Signature · 1 line
1.7.10.4
author
#29 lore raw

PATCH v4 27/37 xdriver_xf86-video-intel: Bump version to 2.99.911

In reply to Bernd Kuhls

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

Signed-off-by Bernd Kuhls <[email protected]>

---
v6: reworked dependency
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   |   13 ++++----
 .../xdriver_xf86-video-intel.mk                    |   31 ++++++++++++++++----
 2 files changed, 32 insertions(+), 12 deletions(-)
package/x11r7/xdriver_xf86-video-intel/Config.in +7 -6
index 8781e1c..b897261 100644
@@ -2,15 +2,16 @@ 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
 
 comment "xf86-video-intel needs mesa3d"
-	depends on BR2_PACKAGE_MESA3D
+	depends on !BR2_PACKAGE_MESA3D
package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +25 -6
index 332de54..e9d3871 100644
@@ -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))
Signature · 1 line
1.7.10.4
author
#30 lore raw

PATCH v4 28/37 xbmc: Add xbmc-send script to send commands to xbmc service

In reply to Bernd Kuhls

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

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/xbmc/xbmc.mk |    6 ++++++
 1 file changed, 6 insertions(+)
package/xbmc/xbmc.mk +6 -0
index 59255a4..d51bc18 100644
@@ -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
Signature · 1 line
1.7.10.4
author
#31 lore raw

PATCH v3 29/37 xbmc: needs host-gawk

In reply to Bernd Kuhls

Changes
v3: rebased
v2: Keep dependencies sorted

Signed-off-by Ryan Coe <[email protected]>
Acked-by Maxime Hadjinlian <[email protected]>
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/xbmc/xbmc.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/xbmc/xbmc.mk +1 -1
index d51bc18..f29e04d 100644
@@ -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-infozip 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 \
Signature · 1 line
1.7.10.4
author
#32 lore raw

PATCH v4 30/37 WIP: xbmc: Bump version to Gotham_beta3

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/xbmc/Config.in |    1 +
 package/xbmc/xbmc.mk   |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
package/xbmc/Config.in +1 -0
index cf6a6b9..fc8811e 100644
@@ -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
package/xbmc/xbmc.mk +2 -2
index f29e04d..e5eadd9 100644
@@ -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 = \
Signature · 1 line
1.7.10.4
author
#33 lore raw

PATCH v4 31/37 WIP: xbmc: Allow compilation with uClibc

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/xbmc/Config.in |   27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)
package/xbmc/Config.in +15 -12
index fc8811e..e0576b6 100644
@@ -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
Signature · 1 line
1.7.10.4
author
#34 lore raw

PATCH v4 32/37 WIP: xbmc: Add X.org support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/xbmc/Config.in |   10 ++++++++++
 package/xbmc/xbmc.mk   |   42 ++++++++++++++++++++++++++++++++++++------
 2 files changed, 46 insertions(+), 6 deletions(-)
package/xbmc/Config.in +10 -0
index e0576b6..765f325 100644
@@ -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
package/xbmc/xbmc.mk +36 -6

70 lines not on this page · raw message

Signature · 1 line
1.7.10.4
author
#35 lore raw

PATCH v4 33/37 WIP: xbmc: Add VA-API support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/xbmc/xbmc.mk |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/xbmc/xbmc.mk +7 -1
index 691cad6..6c79c4c 100644
@@ -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 \
Signature · 1 line
1.7.10.4
author
#36 lore raw

PATCH v4 34/37 WIP: xbmc: Add alsa support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/xbmc/xbmc.mk |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/xbmc/xbmc.mk +7 -1
index 6c79c4c..a46fe11 100644
@@ -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
Signature · 1 line
1.7.10.4
author
#37 lore raw

PATCH v4 35/37 WIP: xbmc: Add lame support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/xbmc/xbmc.mk |    7 +++++++
 1 file changed, 7 insertions(+)
package/xbmc/xbmc.mk +7 -0
index a46fe11..bb62db5 100644
@@ -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
Signature · 1 line
1.7.10.4
author
#38 lore raw

PATCH v4 36/37 WIP: xbmc: Disable broken rsxs screensaver

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/xbmc/xbmc.mk |    1 +
 1 file changed, 1 insertion(+)
package/xbmc/xbmc.mk +1 -0
index bb62db5..8d8dfbe 100644
@@ -40,6 +40,7 @@ XBMC_CONF_OPT +=  \
 	--disable-ssh \
 	--disable-vdpau \
 	--disable-vtbdecoder \
+	--disable-rsxs \
 	--enable-optimizations
 
 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
Signature · 1 line
1.7.10.4
author
#39 lore raw

PATCH v4 37/37 WIP: xbmc: Add option for Goom screensaver

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/xbmc/Config.in |    5 +++++
 package/xbmc/xbmc.mk   |    6 ++++++
 2 files changed, 11 insertions(+)
package/xbmc/Config.in +5 -0
index 765f325..7bb6386 100644
@@ -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
package/xbmc/xbmc.mk +6 -0
index 8d8dfbe..b4e0fb0 100644
@@ -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
Signature · 1 line
1.7.10.4
Applied
#40 lore raw

v4 cover XBMC Gotham Beta3 + misc stuff

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 3 lines · Bernd Kuhls

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

patches 1-12: unrelated version bumps

I've applied patches 1 to 12.

Thanks!

Thomas

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