* [Buildroot] [PATCH v14 00/20] package/xbmc: Add support for uClibc, libva and additional packages
@ 2014-07-15 19:18 Bernd Kuhls
2014-07-15 19:18 ` [Buildroot] [PATCH v14 01/20] package/mesa3d: Bump to version 10.2.3 Bernd Kuhls
` (19 more replies)
0 siblings, 20 replies; 29+ messages in thread
From: Bernd Kuhls @ 2014-07-15 19:18 UTC (permalink / raw)
To: buildroot
The series is compiled-tested using
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_XBMC=y
BR2_PACKAGE_XBMC_AVAHI=y
BR2_PACKAGE_XBMC_DBUS=y
BR2_PACKAGE_XBMC_LIBBLURAY=y
BR2_PACKAGE_XBMC_LIBMICROHTTPD=y
BR2_PACKAGE_XBMC_LIBNFS=y
BR2_PACKAGE_XBMC_RTMPDUMP=y
BR2_PACKAGE_XBMC_LIBSHAIRPLAY=y
BR2_PACKAGE_XBMC_LIBSMBCLIENT=y
BR2_PACKAGE_XBMC_LIBTHEORA=y
BR2_PACKAGE_XBMC_LIBUSB=y
BR2_PACKAGE_XBMC_WAVPACK=y
BR2_PACKAGE_XBMC_GOOM=y
BR2_PACKAGE_XBMC_ADDON_XVDR=y
BR2_PACKAGE_XBMC_PVR_ADDONS=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_DRI_DRIVER_I965=y
BR2_PACKAGE_XORG7=y
Regards, Bernd
v13: - rebased
- bump mesa3d version to 10.2.3
- bump libva-intel-driver to 1.3.2
v13: - rebased
- lots of patches removed after they were committed
v12: - rebased (no more RC versions ;))
- bump xbmc to 13.1
- github helper produces a wrong URL
(wrong: xbmc-13.1-Gotham.tar.gz, correct: 13.1-Gotham.tar.gz),
so I had to switch to _SOURCE until a fix is found
- bump mesa3d version to 10.2.1
v11: - patch series updated by Yann
- series re-ordering
- add new required gconv-related patch
- some commit logs massaging
v10: - reworked patch series based on comments by Yann
- added comment to xproto_dri3proto
- removed emtpy line from libva
- added comment to libglu
- fix libpng support in xbmc?????????s rsxs screensaver
- bump mesa3d version to 10.2-rc4
v9: - reworked patch series based on comments by Yann & Arnout:
- moved some patches before xbmc version bump for bisectability
- removed iconv patch to SDL, to be checked later
- removed rtmpdump/KSV patch from series, to be checked later
- added description to mesa3d/xorg meta package dependency
- reworked OpenGL/egl+gles logic in package/xbmc/
- bump xbmc to 13.1 Beta2
- cec needs udev to be useful
v8: - squashed "[v7 29/31] ffmpeg cross-compile" into
"[v8 16/28] Gotham bump" (Thomas)
- squashed "[v7 21/31] uclibc at arm" & "[v7 31/31] ipv6"
patches into "[v8 20/28] uclibc" patch (Thomas/Yann)
- xbmc-pvr-addons: updated comment (Yann)
v7: - rebased
- bump mesa3d version to 10.2-rc3
- included v2 of "xproto_dri3proto: New package"
v6: - bump mesa3d version to 10.2-rc2
- bump libva and libva-intel-driver to 1.3.1
Bernd Kuhls (20):
package/mesa3d: Bump to version 10.2.3
package/mesa3d: Depend on xorg meta package instead of
xserver_xorg-server
package/mesa3d: add dependency xproto_presentproto
package/mesa3d: Remove dependency for the libxml2 module of
host-python
mesa3d: Add dri3 support
libva: new package
libva-intel-driver: new package
ffmpeg: Add libva support
libglu: new package
sdl: Add new dependency libglu for opengl support
libglew: new package
xdriver_xf86-video-intel: Bump version to 2.99.911
xbmc: Add missing egl-related cflags
xbmc: Allow compilation with uClibc
xbmc: Add alsa support
xbmc: Add lame support
xbmc: Fix TexturePacker compile
xbmc: Add X.org/OpenGL support
xbmc: Add option for Goom screensaver
xbmc: Add VA-API support
package/Config.in | 3 +-
package/eudev/Config.in | 68 +++++---------
package/eudev/eudev.mk | 56 ++----------
package/libatasmart/Config.in | 5 +-
package/libcec/libcec.mk | 4 +-
package/libdrm/libdrm.mk | 4 +-
package/libinput/Config.in | 5 +-
package/libinput/libinput.mk | 2 +-
package/libudev/Config.in | 6 --
package/libudev/libudev.mk | 7 --
package/libusb/libusb.mk | 5 +-
package/mesa3d/Config.in | 6 +-
package/mesa3d/mesa3d.mk | 4 +-
package/systemd/Config.in | 55 +++++++-----
package/systemd/systemd.mk | 2 +-
package/transmission/transmission.mk | 4 +-
package/vlc/vlc.mk | 4 +-
package/weston/Config.in | 6 +-
package/weston/weston.mk | 2 +-
package/x11r7/xdriver_xf86-input-evdev/Config.in | 5 +-
.../xdriver_xf86-input-evdev.mk | 3 +-
.../xserver_xorg-server/xserver_xorg-server.mk | 4 +-
package/xbmc/Config.in | 6 +-
package/xbmc/xbmc.mk | 2 +-
support/scripts/gen-manual-lists.py | 95 ++++----------------
system/Config.in | 76 +++-------------
26 files changed, 133 insertions(+), 306 deletions(-)
delete mode 100644 package/libudev/Config.in
delete mode 100644 package/libudev/libudev.mk
--
1.7.10.4
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 01/20] package/mesa3d: Bump to version 10.2.3
2014-07-15 19:18 [Buildroot] [PATCH v14 00/20] package/xbmc: Add support for uClibc, libva and additional packages Bernd Kuhls
@ 2014-07-15 19:18 ` Bernd Kuhls
2014-07-15 19:18 ` [Buildroot] [PATCH v14 02/20] package/mesa3d: Depend on xorg meta package instead of xserver_xorg-server Bernd Kuhls
` (18 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2014-07-15 19:18 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/mesa3d/mesa3d.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index ca35eb9..49bc849 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -4,7 +4,7 @@
#
################################################################################
-MESA3D_VERSION = 10.2.1
+MESA3D_VERSION = 10.2.3
MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.bz2
MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
MESA3D_LICENSE = MIT, SGI, Khronos
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 02/20] package/mesa3d: Depend on xorg meta package instead of xserver_xorg-server
2014-07-15 19:18 [Buildroot] [PATCH v14 00/20] package/xbmc: Add support for uClibc, libva and additional packages Bernd Kuhls
2014-07-15 19:18 ` [Buildroot] [PATCH v14 01/20] package/mesa3d: Bump to version 10.2.3 Bernd Kuhls
@ 2014-07-15 19:18 ` Bernd Kuhls
2014-07-16 18:00 ` Thomas Petazzoni
2014-07-15 19:18 ` [Buildroot] [PATCH v14 03/20] package/mesa3d: add dependency xproto_presentproto Bernd Kuhls
` (17 subsequent siblings)
19 siblings, 1 reply; 29+ messages in thread
From: Bernd Kuhls @ 2014-07-15 19:18 UTC (permalink / raw)
To: buildroot
mesa3d does not depend on the xorg server as such, only on X libraries.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/mesa3d/Config.in | 22 +++++++++++-----------
package/mesa3d/mesa3d.mk | 4 ++--
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 87fd846..87ff76d 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -3,13 +3,13 @@ menuconfig BR2_PACKAGE_MESA3D
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_EXPAT
select BR2_PACKAGE_HOST_LIBXML2_PYTHON
- select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_XSERVER_XORG_SERVER
- 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_LIBXDAMAGE if BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XSERVER_XORG_SERVER
- select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XSERVER_XORG_SERVER
+ select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XORG7
depends on BR2_PACKAGE_HAS_LIBUDEV
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_LARGEFILE
@@ -62,10 +62,10 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
This is a software opengl implementation using the Gallium3D
infrastructure.
-comment "DRI drivers needs an X.Org server and a toolchain w/ dynamic library"
- depends on BR2_PREFER_STATIC_LIB || !BR2_PACKAGE_XSERVER_XORG_SERVER
+comment "DRI drivers needs X.Org and a toolchain w/ dynamic library"
+ depends on BR2_PREFER_STATIC_LIB || !BR2_PACKAGE_XORG7
-if !BR2_PREFER_STATIC_LIB && BR2_PACKAGE_XSERVER_XORG_SERVER
+if !BR2_PREFER_STATIC_LIB && BR2_PACKAGE_XORG7
comment "DRI drivers"
@@ -92,7 +92,7 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
help
Legacy Radeon driver for R100 series GPUs.
-endif # !BR2_PREFER_STATIC_LIB && BR2_PACKAGE_XSERVER_XORG_SERVER
+endif # !BR2_PREFER_STATIC_LIB && BR2_PACKAGE_XORG7
if BR2_PACKAGE_MESA3D_DRIVER
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 49bc849..d35a124 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -25,7 +25,7 @@ MESA3D_DEPENDENCIES = \
host-xutil_makedepend \
libdrm
-ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER),y)
+ifeq ($(BR2_PACKAGE_XORG7),y)
MESA3D_DEPENDENCIES += \
xproto_xf86driproto \
xproto_dri2proto \
@@ -100,7 +100,7 @@ ifeq ($(BR2_PACKAGE_WAYLAND),y)
MESA3D_DEPENDENCIES += wayland
MESA3D_EGL_PLATFORMS += wayland
endif
-ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER),y)
+ifeq ($(BR2_PACKAGE_XORG7),y)
MESA3D_EGL_PLATFORMS += x11
endif
MESA3D_CONF_OPT += \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 03/20] package/mesa3d: add dependency xproto_presentproto
2014-07-15 19:18 [Buildroot] [PATCH v14 00/20] package/xbmc: Add support for uClibc, libva and additional packages Bernd Kuhls
2014-07-15 19:18 ` [Buildroot] [PATCH v14 01/20] package/mesa3d: Bump to version 10.2.3 Bernd Kuhls
2014-07-15 19:18 ` [Buildroot] [PATCH v14 02/20] package/mesa3d: Depend on xorg meta package instead of xserver_xorg-server Bernd Kuhls
@ 2014-07-15 19:18 ` Bernd Kuhls
2014-07-15 19:22 ` Thomas Petazzoni
2014-07-15 19:18 ` [Buildroot] [PATCH v14 04/20] package/mesa3d: Remove dependency for the libxml2 module of host-python Bernd Kuhls
` (16 subsequent siblings)
19 siblings, 1 reply; 29+ messages in thread
From: Bernd Kuhls @ 2014-07-15 19:18 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/mesa3d/Config.in | 1 +
package/mesa3d/mesa3d.mk | 1 +
2 files changed, 2 insertions(+)
diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 87ff76d..813e120 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -4,6 +4,7 @@ menuconfig BR2_PACKAGE_MESA3D
select BR2_PACKAGE_EXPAT
select BR2_PACKAGE_HOST_LIBXML2_PYTHON
select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_XPROTO_PRESENTPROTO if BR2_PACKAGE_XORG7
select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_XORG7
select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index d35a124..f6bc5a9 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -30,6 +30,7 @@ MESA3D_DEPENDENCIES += \
xproto_xf86driproto \
xproto_dri2proto \
xproto_glproto \
+ xproto_presentproto \
xlib_libX11 \
xlib_libXext \
xlib_libXdamage \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 04/20] package/mesa3d: Remove dependency for the libxml2 module of host-python
2014-07-15 19:18 [Buildroot] [PATCH v14 00/20] package/xbmc: Add support for uClibc, libva and additional packages Bernd Kuhls
` (2 preceding siblings ...)
2014-07-15 19:18 ` [Buildroot] [PATCH v14 03/20] package/mesa3d: add dependency xproto_presentproto Bernd Kuhls
@ 2014-07-15 19:18 ` Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 05/20] mesa3d: Add dri3 support Bernd Kuhls
` (15 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2014-07-15 19:18 UTC (permalink / raw)
To: buildroot
Remove the ugly BR2_PACKAGE_HOST_LIBXML2_PYTHON hack as well as
mesa3d was the only package needing it, this is not the case
anymore since:
http://cgit.freedesktop.org/mesa/mesa/commit/configure.ac?id=2de70fe23f320ce4f559e37057fe07b7af99cf5a
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/libxml2/Config.in | 3 ---
package/libxml2/libxml2-python2.patch | 27 ---------------------------
package/libxml2/libxml2.mk | 16 +---------------
package/mesa3d/Config.in | 1 -
package/mesa3d/mesa3d.mk | 1 -
5 files changed, 1 insertion(+), 47 deletions(-)
delete mode 100644 package/libxml2/libxml2-python2.patch
diff --git a/package/libxml2/Config.in b/package/libxml2/Config.in
index 85694f9..ebd63fe 100644
--- a/package/libxml2/Config.in
+++ b/package/libxml2/Config.in
@@ -4,6 +4,3 @@ config BR2_PACKAGE_LIBXML2
XML C Parser
http://xmlsoft.org/
-
-config BR2_PACKAGE_HOST_LIBXML2_PYTHON
- bool
diff --git a/package/libxml2/libxml2-python2.patch b/package/libxml2/libxml2-python2.patch
deleted file mode 100644
index 19195a6..0000000
--- a/package/libxml2/libxml2-python2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Prefer python2 binary in case python points to python3
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -uNr libxml2-2.9.1.org/configure.in libxml2-2.9.1/configure.in
---- libxml2-2.9.1.org/configure.in 2013-04-19 09:25:20.000000000 +0200
-+++ libxml2-2.9.1/configure.in 2014-04-12 14:16:26.579361068 +0200
-@@ -748,6 +748,11 @@
- PYTHON_TESTS=
- pythondir=
- if test "$with_python" != "no" ; then
-+ if test -x "$with_python/bin/python2"
-+ then
-+ echo Found python2 in $with_python/bin/python2
-+ PYTHON="$with_python/bin/python2"
-+ else
- if test -x "$with_python/bin/python"
- then
- echo Found python in $with_python/bin/python
-@@ -773,6 +778,7 @@
- fi
- fi
- fi
-+ fi
- if test "$PYTHON" != ""
- then
- PYTHON_VERSION=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_version())"`
diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index 62f3e27..9bf4c28 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -20,21 +20,7 @@ LIBXML2_CONF_OPT = --with-gnu-ld --without-python --without-debug --without-lzma
HOST_LIBXML2_DEPENDENCIES = host-pkgconf
-HOST_LIBXML2_CONF_OPT = --without-zlib --without-lzma
-
-# mesa3d uses functions that are only available with debug
-ifeq ($(BR2_PACKAGE_MESA3D),y)
-HOST_LIBXML2_CONF_OPT += --with-debug
-else
-HOST_LIBXML2_CONF_OPT += --without-debug
-endif
-
-ifeq ($(BR2_PACKAGE_HOST_LIBXML2_PYTHON),y)
-HOST_LIBXML2_DEPENDENCIES += host-python
-HOST_LIBXML2_CONF_OPT += --with-python=$(HOST_DIR)/usr
-else
-HOST_LIBXML2_CONF_OPT += --without-python
-endif
+HOST_LIBXML2_CONF_OPT = --without-zlib --without-lzma --without-python
ifeq ($(BR2_PACKAGE_ZLIB),y)
LIBXML2_DEPENDENCIES += zlib
diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 813e120..bc6a1e6 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -2,7 +2,6 @@ menuconfig BR2_PACKAGE_MESA3D
bool "mesa3d"
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_EXPAT
- select BR2_PACKAGE_HOST_LIBXML2_PYTHON
select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_XORG7
select BR2_PACKAGE_XPROTO_PRESENTPROTO if BR2_PACKAGE_XORG7
select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_XORG7
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index f6bc5a9..6282503 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -20,7 +20,6 @@ MESA3D_DEPENDENCIES = \
host-bison \
host-flex \
host-gettext \
- host-libxml2 \
host-python \
host-xutil_makedepend \
libdrm
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 05/20] mesa3d: Add dri3 support
2014-07-15 19:18 [Buildroot] [PATCH v14 00/20] package/xbmc: Add support for uClibc, libva and additional packages Bernd Kuhls
` (3 preceding siblings ...)
2014-07-15 19:18 ` [Buildroot] [PATCH v14 04/20] package/mesa3d: Remove dependency for the libxml2 module of host-python Bernd Kuhls
@ 2014-07-15 19:19 ` Bernd Kuhls
2014-07-16 18:46 ` Thomas Petazzoni
2014-07-15 19:19 ` [Buildroot] [PATCH v14 06/20] libva: new package Bernd Kuhls
` (14 subsequent siblings)
19 siblings, 1 reply; 29+ messages in thread
From: Bernd Kuhls @ 2014-07-15 19:19 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/mesa3d/mesa3d.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 6282503..9fdb7bc 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -24,6 +24,13 @@ MESA3D_DEPENDENCIES = \
host-xutil_makedepend \
libdrm
+ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y)
+MESA3D_DEPENDENCIES += xproto_dri3proto
+MESA3D_CONF_OPT += --enable-dri3
+else
+MESA3D_CONF_OPT += --disable-dri3
+endif
+
ifeq ($(BR2_PACKAGE_XORG7),y)
MESA3D_DEPENDENCIES += \
xproto_xf86driproto \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 06/20] libva: new package
2014-07-15 19:18 [Buildroot] [PATCH v14 00/20] package/xbmc: Add support for uClibc, libva and additional packages Bernd Kuhls
` (4 preceding siblings ...)
2014-07-15 19:19 ` [Buildroot] [PATCH v14 05/20] mesa3d: Add dri3 support Bernd Kuhls
@ 2014-07-15 19:19 ` Bernd Kuhls
2014-07-16 18:44 ` Thomas Petazzoni
2014-07-15 19:19 ` [Buildroot] [PATCH v14 07/20] libva-intel-driver: " Bernd Kuhls
` (13 subsequent siblings)
19 siblings, 1 reply; 29+ messages in thread
From: Bernd Kuhls @ 2014-07-15 19:19 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/Config.in | 1 +
package/libva/Config.in | 18 ++++++++
package/libva/libva-0001-no_test_decode.patch | 17 ++++++++
package/libva/libva.mk | 56 +++++++++++++++++++++++++
4 files changed, 92 insertions(+)
create mode 100644 package/libva/Config.in
create mode 100644 package/libva/libva-0001-no_test_decode.patch
create mode 100644 package/libva/libva.mk
diff --git a/package/Config.in b/package/Config.in
index c1abf8d..f6a1c10 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -617,6 +617,7 @@ menu "Graphics"
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..9d63b52
--- /dev/null
+++ b/package/libva/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_LIBVA
+ bool "libva"
+ select BR2_PACKAGE_LIBDRM
+ select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XORG7
+ depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm/libpthread-stubs
+ depends on BR2_LARGEFILE # libdrm
+ 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/
+
+comment "libva needs a toolchain w/ largefile, threads"
+ depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libva/libva-0001-no_test_decode.patch b/package/libva/libva-0001-no_test_decode.patch
new file mode 100644
index 0000000..0f0d786
--- /dev/null
+++ b/package/libva/libva-0001-no_test_decode.patch
@@ -0,0 +1,17 @@
+mpeg2vldemo is the only file requiring cxx support. It is not needed for
+buildroot, so disable its compilation to avoid depending on cxx.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+diff -uNr libva-1.3.0.org/test/Makefile.am libva-1.3.0/test/Makefile.am
+--- libva-1.3.0.org/test/Makefile.am 2014-03-24 05:49:46.000000000 +0100
++++ libva-1.3.0/test/Makefile.am 2014-04-26 18:12:25.644390292 +0200
+@@ -20,7 +20,7 @@
+ # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-SUBDIRS = common decode encode vainfo
++SUBDIRS = common encode vainfo
+
+ if USE_X11
+ SUBDIRS += basic putsurface
diff --git a/package/libva/libva.mk b/package/libva/libva.mk
new file mode 100644
index 0000000..85fd712
--- /dev/null
+++ b/package/libva/libva.mk
@@ -0,0 +1,56 @@
+################################################################################
+#
+# libva
+#
+################################################################################
+
+LIBVA_VERSION = 1.3.1
+LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2
+LIBVA_SITE = http://www.freedesktop.org/software/vaapi/releases/libva
+LIBVA_LICENSE = MIT
+LIBVA_LICENSE_FILES = COPYING
+LIBVA_AUTORECONF = YES
+LIBVA_INSTALL_STAGING = YES
+LIBVA_DEPENDENCIES = host-pkgconf libdrm
+
+# libdrm is a hard-dependency
+LIBVA_CONF_OPT = \
+ --enable-drm \
+ --disable-dummy-driver \
+ --with-drivers-path="/usr/lib/va"
+
+ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y)
+LIBVA_DEPENDENCIES += mesa3d
+LIBVA_CONF_OPT += --enable-glx
+else
+LIBVA_CONF_OPT += --disable-glx
+endif
+
+ifeq ($(BR2_PACKAGE_XORG7),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_LIBEGL),y)
+LIBVA_DEPENDENCIES += libegl
+LIBVA_CONF_OPT += --enable-egl
+else
+LIBVA_CONF_OPT += --disable-egl
+endif
+
+# Autoreconf requires an m4 directory to exist
+define LIBVA_PATCH_M4
+ mkdir -p $(@D)/m4
+endef
+LIBVA_POST_PATCH_HOOKS += LIBVA_PATCH_M4
+
+$(eval $(autotools-package))
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 07/20] libva-intel-driver: new package
2014-07-15 19:18 [Buildroot] [PATCH v14 00/20] package/xbmc: Add support for uClibc, libva and additional packages Bernd Kuhls
` (5 preceding siblings ...)
2014-07-15 19:19 ` [Buildroot] [PATCH v14 06/20] libva: new package Bernd Kuhls
@ 2014-07-15 19:19 ` Bernd Kuhls
2014-07-16 18:44 ` Thomas Petazzoni
2014-07-18 22:43 ` Thomas Petazzoni
2014-07-15 19:19 ` [Buildroot] [PATCH v14 08/20] ffmpeg: Add libva support Bernd Kuhls
` (12 subsequent siblings)
19 siblings, 2 replies; 29+ messages in thread
From: Bernd Kuhls @ 2014-07-15 19:19 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/Config.in | 1 +
package/libva-intel-driver/Config.in | 19 ++++++++++++++
package/libva-intel-driver/libva-intel-driver.mk | 29 ++++++++++++++++++++++
3 files changed, 49 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 f6a1c10..30b8ded 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -618,6 +618,7 @@ menu "Graphics"
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..89a3264
--- /dev/null
+++ b/package/libva-intel-driver/Config.in
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_LIBVA_INTEL_DRIVER
+ bool "libva-intel-driver"
+ select BR2_PACKAGE_LIBVA
+ select BR2_PACKAGE_LIBDRM
+ select BR2_PACKAGE_LIBDRM_INTEL
+ select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XORG7
+ depends on BR2_i386 || BR2_x86_64
+ depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm/libpthread-stubs
+ depends on BR2_LARGEFILE # libdrm
+ help
+ VA-API back-end driver for Intel graphics chips
+
+ https://01.org/linuxgraphics/community/vaapi
+
+comment "libva intel driver needs a toolchain w/ largefile, threads"
+ depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
+ depends on BR2_i386 || BR2_x86_64
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..48b8559
--- /dev/null
+++ b/package/libva-intel-driver/libva-intel-driver.mk
@@ -0,0 +1,29 @@
+################################################################################
+#
+# libva-intel-driver
+#
+################################################################################
+
+LIBVA_INTEL_DRIVER_VERSION = 1.3.2
+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_LICENSE_FILES = COPYING
+LIBVA_INTEL_DRIVER_AUTORECONF = YES
+LIBVA_INTEL_DRIVER_DEPENDENCIES = host-pkgconf libdrm libva
+
+ifeq ($(BR2_PACKAGE_XORG7),y)
+LIBVA_INTEL_DRIVER_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXfixes
+LIBVA_INTEL_DRIVER_CONF_OPT += --enable-x11
+else
+LIBVA_INTEL_DRIVER_CONF_OPT += --disable-x11
+endif
+
+ifeq ($(BR2_PACKAGE_WAYLAND),y)
+LIBVA_DEPENDENCIES += wayland
+LIBVA_INTEL_DRIVER_CONF_OPT += --enable-wayland
+else
+LIBVA_INTEL_DRIVER_CONF_OPT += --disable-wayland
+endif
+
+$(eval $(autotools-package))
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 08/20] ffmpeg: Add libva support
2014-07-15 19:18 [Buildroot] [PATCH v14 00/20] package/xbmc: Add support for uClibc, libva and additional packages Bernd Kuhls
` (6 preceding siblings ...)
2014-07-15 19:19 ` [Buildroot] [PATCH v14 07/20] libva-intel-driver: " Bernd Kuhls
@ 2014-07-15 19:19 ` Bernd Kuhls
2014-07-16 18:44 ` Thomas Petazzoni
2014-07-15 19:19 ` [Buildroot] [PATCH v14 09/20] libglu: new package Bernd Kuhls
` (11 subsequent siblings)
19 siblings, 1 reply; 29+ messages in thread
From: Bernd Kuhls @ 2014-07-15 19:19 UTC (permalink / raw)
To: buildroot
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 478c66a..2b73fbc 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 \
@@ -209,6 +208,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
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 09/20] libglu: new package
2014-07-15 19:18 [Buildroot] [PATCH v14 00/20] package/xbmc: Add support for uClibc, libva and additional packages Bernd Kuhls
` (7 preceding siblings ...)
2014-07-15 19:19 ` [Buildroot] [PATCH v14 08/20] ffmpeg: Add libva support Bernd Kuhls
@ 2014-07-15 19:19 ` Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 10/20] sdl: Add new dependency libglu for opengl support Bernd Kuhls
` (10 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2014-07-15 19:19 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/Config.in | 1 +
package/libglu/Config.in | 10 ++++++++++
package/libglu/libglu.mk | 17 +++++++++++++++++
3 files changed, 28 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 30b8ded..e139dcf 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -608,6 +608,7 @@ menu "Graphics"
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..de8e1ef
--- /dev/null
+++ b/package/libglu/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_LIBGLU
+ bool "libglu"
+ depends on BR2_PACKAGE_HAS_LIBGL
+ help
+ Mesa OpenGL Utility library
+
+ http://cgit.freedesktop.org/mesa/glu/
+
+comment "libglu needs an OpenGL backend"
+ depends on !BR2_PACKAGE_HAS_LIBGL
diff --git a/package/libglu/libglu.mk b/package/libglu/libglu.mk
new file mode 100644
index 0000000..038d281
--- /dev/null
+++ b/package/libglu/libglu.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# 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
+# upstream does not distribute a autoconf?ed configure script
+LIBGLU_AUTORECONF = YES
+LIBGLU_DEPENDENCIES = libgl
+
+$(eval $(autotools-package))
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 10/20] sdl: Add new dependency libglu for opengl support
2014-07-15 19:18 [Buildroot] [PATCH v14 00/20] package/xbmc: Add support for uClibc, libva and additional packages Bernd Kuhls
` (8 preceding siblings ...)
2014-07-15 19:19 ` [Buildroot] [PATCH v14 09/20] libglu: new package Bernd Kuhls
@ 2014-07-15 19:19 ` Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 11/20] libglew: new package Bernd Kuhls
` (9 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2014-07-15 19:19 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/sdl/sdl.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index 8d0e5bd..8adc66b 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -62,7 +62,8 @@ 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_CONF_OPT += --enable-pulseaudio=no \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 11/20] libglew: new package
2014-07-15 19:18 [Buildroot] [PATCH v14 00/20] package/xbmc: Add support for uClibc, libva and additional packages Bernd Kuhls
` (9 preceding siblings ...)
2014-07-15 19:19 ` [Buildroot] [PATCH v14 10/20] sdl: Add new dependency libglu for opengl support Bernd Kuhls
@ 2014-07-15 19:19 ` Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 12/20] xdriver_xf86-video-intel: Bump version to 2.99.911 Bernd Kuhls
` (8 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2014-07-15 19:19 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/Config.in | 1 +
package/libglew/Config.in | 19 +++++++++++++++++++
package/libglew/libglew.mk | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 56 insertions(+)
create mode 100644 package/libglew/Config.in
create mode 100644 package/libglew/libglew.mk
diff --git a/package/Config.in b/package/Config.in
index e139dcf..028d040 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -608,6 +608,7 @@ menu "Graphics"
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..67c49d4
--- /dev/null
+++ b/package/libglew/Config.in
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_LIBGLEW
+ bool "libglew"
+ depends on BR2_PACKAGE_XORG7
+ depends on BR2_PACKAGE_HAS_LIBGL
+ 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 and needs an OpenGL backend"
+ depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_HAS_LIBGL
diff --git a/package/libglew/libglew.mk b/package/libglew/libglew.mk
new file mode 100644
index 0000000..48ecf97
--- /dev/null
+++ b/package/libglew/libglew.mk
@@ -0,0 +1,36 @@
+################################################################################
+#
+# 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_LICENSE_FILES = LICENSE.txt
+LIBGLEW_INSTALL_STAGING = YES
+LIBGLEW_DEPENDENCIES = libgl xlib_libX11 xlib_libXext xlib_libXi xlib_libXmu
+
+# using $TARGET_CONFIGURE_OPTS breaks compilation
+define LIBGLEW_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+ GLEW_DEST="/usr" LIBDIR="/usr/lib" \
+ AR="$(TARGET_AR)" CC="$(TARGET_CC)" \
+ LD="$(TARGET_CC)" STRIP="$(TARGET_STRIP)" \
+ POPT="$(TARGET_CFLAGS)" LDFLAGS.EXTRA="$(TARGET_LDFLAGS)"
+endef
+
+define LIBGLEW_INSTALL_STAGING_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+ GLEW_DEST="$(STAGING_DIR)/usr" LIBDIR="$(STAGING_DIR)/usr/lib" \
+ $(TARGET_CONFIGURE_OPTS) install
+endef
+
+define LIBGLEW_INSTALL_TARGET_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+ GLEW_DEST="$(TARGET_DIR)/usr" LIBDIR="$(TARGET_DIR)/usr/lib" \
+ $(TARGET_CONFIGURE_OPTS) install
+endef
+
+$(eval $(generic-package))
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 12/20] xdriver_xf86-video-intel: Bump version to 2.99.911
2014-07-15 19:18 [Buildroot] [PATCH v14 00/20] package/xbmc: Add support for uClibc, libva and additional packages Bernd Kuhls
` (10 preceding siblings ...)
2014-07-15 19:19 ` [Buildroot] [PATCH v14 11/20] libglew: new package Bernd Kuhls
@ 2014-07-15 19:19 ` Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 13/20] xbmc: Add missing egl-related cflags Bernd Kuhls
` (7 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2014-07-15 19:19 UTC (permalink / raw)
To: buildroot
- add necessary dependencies
- add -D_GNU_SOURCE to avoid getline compilation error
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/x11r7/xdriver_xf86-video-intel/Config.in | 5 ++--
.../xdriver_xf86-video-intel.mk | 27 +++++++++++++++-----
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/package/x11r7/xdriver_xf86-video-intel/Config.in b/package/x11r7/xdriver_xf86-video-intel/Config.in
index 69a9e78..bba7cd1 100644
--- a/package/x11r7/xdriver_xf86-video-intel/Config.in
+++ b/package/x11r7/xdriver_xf86-video-intel/Config.in
@@ -3,12 +3,13 @@ config BR2_PACKAGE_XDRIVER_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_LIBXRANDR
+ select BR2_PACKAGE_XLIB_LIBXTST
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..52b493f 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,21 @@ 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
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 13/20] xbmc: Add missing egl-related cflags
2014-07-15 19:18 [Buildroot] [PATCH v14 00/20] package/xbmc: Add support for uClibc, libva and additional packages Bernd Kuhls
` (11 preceding siblings ...)
2014-07-15 19:19 ` [Buildroot] [PATCH v14 12/20] xdriver_xf86-video-intel: Bump version to 2.99.911 Bernd Kuhls
@ 2014-07-15 19:19 ` Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 14/20] xbmc: Allow compilation with uClibc Bernd Kuhls
` (6 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2014-07-15 19:19 UTC (permalink / raw)
To: buildroot
A similar patch is used in package/qt/qt.mk.
Fixes compilation error:
In file included from /home/br/br/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/include/EGL/egl.h:36:0,
from /home/br/br/output/build/xbmc-13.0-Gotham/xbmc/windowing/egl/WinSystemEGL.h:28,
from /home/br/br/output/build/xbmc-13.0-Gotham/xbmc/windowing/WindowingFactory.h:39,
from DVDPlayerVideo.cpp:23:
/home/br/br/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/include/EGL/eglplatform.h:118:22: fatal error: X11/Xlib.h: No such file or directory
using this defconfig
BR2_x86_64=y
BR2_x86_corei7=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_PACKAGE_XBMC=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
BR2_PACKAGE_MESA3D_OPENGL_EGL=y
BR2_PACKAGE_MESA3D_OPENGL_ES=y
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/xbmc/xbmc.mk | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
index 45be990..f67f8e4 100644
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -73,6 +73,10 @@ ifeq ($(BR2_PACKAGE_DBUS),y)
XBMC_DEPENDENCIES += dbus
endif
+XBMC_CONF_ENV += \
+ CFLAGS="$(TARGET_CFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" \
+ CXXFLAGS="$(TARGET_CXXFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)"
+
ifeq ($(BR2_PACKAGE_XBMC_LIBUSB),y)
XBMC_DEPENDENCIES += libusb-compat
XBMC_CONF_OPT += --enable-libusb
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 14/20] xbmc: Allow compilation with uClibc
2014-07-15 19:18 [Buildroot] [PATCH v14 00/20] package/xbmc: Add support for uClibc, libva and additional packages Bernd Kuhls
` (12 preceding siblings ...)
2014-07-15 19:19 ` [Buildroot] [PATCH v14 13/20] xbmc: Add missing egl-related cflags Bernd Kuhls
@ 2014-07-15 19:19 ` Bernd Kuhls
2014-07-19 13:11 ` Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 15/20] xbmc: Add alsa support Bernd Kuhls
` (5 subsequent siblings)
19 siblings, 1 reply; 29+ messages in thread
From: Bernd Kuhls @ 2014-07-15 19:19 UTC (permalink / raw)
To: buildroot
- Add dependencies needed by xbmc on BR2_LARGEFILE, BR2_INET_IPV6 &
BR2_USE_WCHAR after the removal of BR2_TOOLCHAIN_USES_GLIBC
- Add xbmc-0002-mathutil.patch to fix ARM compilation
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/xbmc/Config.in | 15 ++-
package/xbmc/xbmc-0002-mathutil.patch | 213 +++++++++++++++++++++++++++++++++
2 files changed, 222 insertions(+), 6 deletions(-)
create mode 100644 package/xbmc/xbmc-0002-mathutil.patch
diff --git a/package/xbmc/Config.in b/package/xbmc/Config.in
index db888ac..19d3043 100644
--- a/package/xbmc/Config.in
+++ b/package/xbmc/Config.in
@@ -1,11 +1,10 @@
-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++, IPv6, largefile, threads, wchar"
+ depends on BR2_arm || BR2_i386 || BR2_x86_64
+ depends on !BR2_INET_IPV6 || !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
comment "xbmc requires an OpenGL ES and EGL backend"
+ depends on BR2_arm || BR2_i386 || BR2_x86_64
depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES
- depends on BR2_TOOLCHAIN_USES_GLIBC
- depends on BR2_INSTALL_LIBSTDCPP
- depends on BR2_TOOLCHAIN_HAS_THREADS
menuconfig BR2_PACKAGE_XBMC
bool "xbmc"
@@ -58,10 +57,14 @@ 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_INET_IPV6
depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_LARGEFILE
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_PACKAGE_HAS_LIBEGL && BR2_PACKAGE_HAS_LIBGLES
+ depends on BR2_USE_MMU # python
+ depends on BR2_USE_WCHAR
+ depends on BR2_arm || BR2_i386 || BR2_x86_64
help
XBMC is an award-winning free and open source (GPL) software
media player and entertainment hub for digital media.
diff --git a/package/xbmc/xbmc-0002-mathutil.patch b/package/xbmc/xbmc-0002-mathutil.patch
new file mode 100644
index 0000000..33f91eb
--- /dev/null
+++ b/package/xbmc/xbmc-0002-mathutil.patch
@@ -0,0 +1,213 @@
+Taken from upstream PR: https://github.com/xbmc/xbmc/pull/3760
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+
+From 7388e8be7cd5e78100532ebf0dba15dccb7b03f8 Mon Sep 17 00:00:00 2001
+From: Ben Avison <bavison@riscosopen.org>
+Date: Tue, 3 Dec 2013 15:51:39 +0000
+Subject: [PATCH] Faster and simpler portable implementation of
+ MathUtils::round_int().
+
+Much as I like a bit of inline assembler, I have also removed the ARM versions
+of MathUtils::truncate_int() and MathUtils::round_int(). The former was just
+how any sane compiler should have assembled a cast from double to signed int
+anyway. The latter was a much too complicated way to achieve the desired
+effect, and was switched out in most ARM builds anyway in favour of the old
+portable implementation that used floor().
+
+Verified that MathUtils::test() still passes, and that GCC is now able to
+inline MathUtils::round_int(), where it didn't previously.
+
+I tested on a Raspberry Pi with the default theme, displaying the front page
+with the RSS ticker enabled. This saturates the CPU, so I'm measuring the
+improvement using the debug window's FPS figure. This patch improves this from
+~50.8 FPS to ~52.6 FPS.
+---
+ xbmc/utils/MathUtils.h | 129 +++++++++++++++++++++++--------------------------
+ 1 file changed, 61 insertions(+), 68 deletions(-)
+
+diff --git a/xbmc/utils/MathUtils.h b/xbmc/utils/MathUtils.h
+index 96af9f4..0dae77d 100644
+--- a/xbmc/utils/MathUtils.h
++++ b/xbmc/utils/MathUtils.h
+@@ -34,17 +34,13 @@
+
+ #if defined(__ppc__) || \
+ defined(__powerpc__) || \
+- (defined(TARGET_DARWIN_IOS) && defined(__llvm__)) || \
+- (defined(TARGET_ANDROID) && defined(__arm__)) || \
+- defined(TARGET_RASPBERRY_PI)
++ defined(__arm__)
+ #define DISABLE_MATHUTILS_ASM_ROUND_INT
+ #endif
+
+ #if defined(__ppc__) || \
+ defined(__powerpc__) || \
+- (defined(TARGET_DARWIN) && defined(__llvm__)) || \
+- (defined(TARGET_ANDROID) && defined(__arm__)) || \
+- defined(TARGET_RASPBERRY_PI)
++ defined(__arm__)
+ #define DISABLE_MATHUTILS_ASM_TRUNCATE_INT
+ #endif
+
+@@ -73,60 +69,63 @@
+ {
+ assert(x > static_cast<double>(INT_MIN / 2) - 1.0);
+ assert(x < static_cast<double>(INT_MAX / 2) + 1.0);
+- const float round_to_nearest = 0.5f;
+- int i;
+
+ #if defined(DISABLE_MATHUTILS_ASM_ROUND_INT)
+- i = floor(x + round_to_nearest);
+-
+-#elif defined(__arm__)
+- // From 'ARM-v7-M Architecture Reference Manual' page A7-569:
+- // "The floating-point to integer operation (vcvt) [normally] uses the Round towards Zero rounding mode"
+- // Because of this...we must use some less-than-straightforward logic to perform this operation without
+- // changing the rounding mode flags
+-
+- /* The assembly below implements the following logic:
+- if (x < 0)
+- inc = -0.5f
+- else
+- inc = 0.5f
+- int_val = trunc(x+inc);
+- err = x - int_val;
+- if (err == 0.5f)
+- int_val++;
+- return int_val;
+- */
++ /* This implementation warrants some further explanation.
++ *
++ * First, a couple of notes on rounding:
++ * 1) C casts from float/double to integer round towards zero.
++ * 2) Float/double additions are rounded according to the normal rules,
++ * in other words: on some architectures, it's fixed at compile-time,
++ * and on others it can be set using fesetround()). The following
++ * analysis assumes round-to-nearest with ties rounding to even. This
++ * is a fairly sensible choice, and is the default with ARM VFP.
++ *
++ * What this function wants is round-to-nearest with ties rounding to
++ * +infinity. This isn't an IEEE rounding mode, even if we could guarantee
++ * that all architectures supported fesetround(), which they don't. Instead,
++ * this adds an offset of 2147483648.5 (= 0x80000000.8p0), then casts to
++ * an unsigned int (crucially, all possible inputs are now in a range where
++ * round to zero acts the same as round to -infinity) and then subtracts
++ * 0x80000000 in the integer domain. The 0.5 component of the offset
++ * converts what is effectively a round down into a round to nearest, with
++ * ties rounding up, as desired.
++ *
++ * There is a catch, that because there is a double rounding, there is a
++ * small region where the input falls just *below* a tie, where the addition
++ * of the offset causes a round *up* to an exact integer, due to the finite
++ * level of precision available in floating point. You need to be aware of
++ * this when calling this function, although@present it is not believed
++ * that XBMC ever attempts to round numbers in this window.
++ *
++ * It is worth proving the size of the affected window. Recall that double
++ * precision employs a mantissa of 52 bits.
++ * 1) For all inputs -0.5 <= x <= INT_MAX
++ * Once the offset is applied, the most significant binary digit in the
++ * floating-point representation is +2^31.
++ * At this magnitude, the smallest step representable in double precision
++ * is 2^31 / 2^52 = 0.000000476837158203125
++ * So the size of the range which is rounded up due to the addition is
++ * half the size of this step, or 0.0000002384185791015625
++ *
++ * 2) For all inputs INT_MIN/2 < x < -0.5
++ * Once the offset is applied, the most significant binary digit in the
++ * floating-point representation is +2^30.
++ * At this magnitude, the smallest step representable in double precision
++ * is 2^30 / 2^52 = 0.0000002384185791015625
++ * So the size of the range which is rounded up due to the addition is
++ * half the size of this step, or 0.00000011920928955078125
++ *
++ * 3) For all inputs INT_MIN <= x <= INT_MIN/2
++ * The representation once the offset is applied has equal or greater
++ * precision than the input, so the addition does not cause rounding.
++ */
++ return ((unsigned int) (x + 0x80000000.8p0)) - 0x80000000;
+
+- __asm__ __volatile__ (
+-#if defined(__ARM_PCS_VFP)
+- "fconstd d1,#%G[rnd_val] \n\t" // Copy round_to_nearest into a working register (d1 = 0.5)
+ #else
+- "vmov.F64 d1,%[rnd_val] \n\t"
+-#endif
+- "fcmpezd %P[value] \n\t" // Check value against zero (value == 0?)
+- "fmstat \n\t" // Copy the floating-point status flags into the general-purpose status flags
+- "it mi \n\t"
+- "vnegmi.F64 d1, d1 \n\t" // if N-flag is set, negate round_to_nearest (if (value < 0) d1 = -1 * d1)
+- "vadd.F64 d1,%P[value],d1 \n\t" // Add round_to_nearest to value, store result in working register (d1 += value)
+- "vcvt.S32.F64 s3,d1 \n\t" // Truncate(round towards zero) (s3 = (int)d1)
+- "vmov %[result],s3 \n\t" // Store the integer result in a general-purpose register (result = s3)
+- "vcvt.F64.S32 d1,s3 \n\t" // Convert back to floating-point (d1 = (double)s3)
+- "vsub.F64 d1,%P[value],d1 \n\t" // Calculate the error (d1 = value - d1)
+-#if defined(__ARM_PCS_VFP)
+- "fconstd d2,#%G[rnd_val] \n\t" // d2 = 0.5;
+-#else
+- "vmov.F64 d2,%[rnd_val] \n\t"
+-#endif
+- "fcmped d1, d2 \n\t" // (d1 == 0.5?)
+- "fmstat \n\t" // Copy the floating-point status flags into the general-purpose status flags
+- "it eq \n\t"
+- "addeq %[result],#1 \n\t" // (if (d1 == d2) result++;)
+- : [result] "=r"(i) // Outputs
+- : [rnd_val] "Dv" (round_to_nearest), [value] "w"(x) // Inputs
+- : "d1", "d2", "s3" // Clobbers
+- );
+-
+-#elif defined(__SSE2__)
++ const float round_to_nearest = 0.5f;
++ int i;
++#if defined(__SSE2__)
+ const float round_dn_to_nearest = 0.4999999f;
+ i = (x > 0) ? _mm_cvttsd_si32(_mm_set_sd(x + round_to_nearest)) : _mm_cvttsd_si32(_mm_set_sd(x - round_dn_to_nearest));
+
+@@ -150,8 +149,8 @@
+ );
+
+ #endif
+-
+ return i;
++#endif
+ }
+
+ /*! \brief Truncate to nearest integer.
+@@ -165,20 +164,13 @@
+ {
+ assert(x > static_cast<double>(INT_MIN / 2) - 1.0);
+ assert(x < static_cast<double>(INT_MAX / 2) + 1.0);
+- int i;
+
+ #if defined(DISABLE_MATHUTILS_ASM_TRUNCATE_INT)
+- return i = (int)x;
+-
+-#elif defined(__arm__)
+- __asm__ __volatile__ (
+- "vcvt.S32.F64 %[result],%P[value] \n\t" // Truncate(round towards zero) and store the result
+- : [result] "=w"(i) // Outputs
+- : [value] "w"(x) // Inputs
+- );
+- return i;
++ return x;
+
+-#elif defined(TARGET_WINDOWS)
++#else
++ int i;
++#if defined(TARGET_WINDOWS)
+ const float round_towards_m_i = -0.5f;
+ __asm
+ {
+@@ -204,6 +196,7 @@
+ if (x < 0)
+ i = -i;
+ return (i);
++#endif
+ }
+
+ inline int64_t abs(int64_t a)
+--
+1.9.1
+
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 15/20] xbmc: Add alsa support
2014-07-15 19:18 [Buildroot] [PATCH v14 00/20] package/xbmc: Add support for uClibc, libva and additional packages Bernd Kuhls
` (13 preceding siblings ...)
2014-07-15 19:19 ` [Buildroot] [PATCH v14 14/20] xbmc: Allow compilation with uClibc Bernd Kuhls
@ 2014-07-15 19:19 ` Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 16/20] xbmc: Add lame support Bernd Kuhls
` (4 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2014-07-15 19:19 UTC (permalink / raw)
To: buildroot
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 f67f8e4..0c45d7d 100644
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -39,7 +39,6 @@ XBMC_CONF_ENV = \
XBMC_CONF_OPT += \
--with-arch=$(BR2_ARCH) \
- --disable-alsa \
--disable-crystalhd \
--disable-debug \
--disable-dvdcss \
@@ -73,6 +72,13 @@ ifeq ($(BR2_PACKAGE_DBUS),y)
XBMC_DEPENDENCIES += dbus
endif
+ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
+XBMC_DEPENDENCIES += alsa-lib
+XBMC_CONF_OPT += --enable-alsa
+else
+XBMC_CONF_OPT += --disable-alsa
+endif
+
XBMC_CONF_ENV += \
CFLAGS="$(TARGET_CFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" \
CXXFLAGS="$(TARGET_CXXFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 16/20] xbmc: Add lame support
2014-07-15 19:18 [Buildroot] [PATCH v14 00/20] package/xbmc: Add support for uClibc, libva and additional packages Bernd Kuhls
` (14 preceding siblings ...)
2014-07-15 19:19 ` [Buildroot] [PATCH v14 15/20] xbmc: Add alsa support Bernd Kuhls
@ 2014-07-15 19:19 ` Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 17/20] xbmc: Fix TexturePacker compile Bernd Kuhls
` (3 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2014-07-15 19:19 UTC (permalink / raw)
To: buildroot
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 0c45d7d..e7c9381 100644
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -79,6 +79,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
+
XBMC_CONF_ENV += \
CFLAGS="$(TARGET_CFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" \
CXXFLAGS="$(TARGET_CXXFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 17/20] xbmc: Fix TexturePacker compile
2014-07-15 19:18 [Buildroot] [PATCH v14 00/20] package/xbmc: Add support for uClibc, libva and additional packages Bernd Kuhls
` (15 preceding siblings ...)
2014-07-15 19:19 ` [Buildroot] [PATCH v14 16/20] xbmc: Add lame support Bernd Kuhls
@ 2014-07-15 19:19 ` Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 18/20] xbmc: Add X.org/OpenGL support Bernd Kuhls
` (2 subsequent siblings)
19 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2014-07-15 19:19 UTC (permalink / raw)
To: buildroot
Patch description:
use_texturepacker_native=yes
is needed because we obviously need a native-compiled binary, but the xbmc
build system does enable this variable only for darwin, android and
raspberry-pi targets.
USE_TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr"
is also needed because
USE_TEXTUREPACKER_NATIVE_ROOT="$TEXTUREPACKER_NATIVE_ROOT"
is only executed for raspberry-pi by xbmc/configure and only
USE_TEXTUREPACKER_NATIVE_ROOT is used by tools/TexturePacker/Makefile.in.
To sum up, building for raspberry-pi and other archs works out-of-the-box,
compiling for an Intel target, for example, fails:
In file included from SDL_anigif.cpp:23:0:
SDL_anigif.h:24:21: fatal error: SDL/SDL.h: No such file or directory
compilation terminated.
XBMCTex.cpp:34:21: fatal error: SDL/SDL.h: No such file or directory
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/xbmc/xbmc.mk | 2 ++
1 file changed, 2 insertions(+)
diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
index e7c9381..6973bf3 100644
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -35,6 +35,8 @@ XBMC_CONF_ENV = \
PYTHON_CPPFLAGS="-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)" \
PYTHON_SITE_PKG="$(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \
PYTHON_NOVERSIONCHECK="no-check" \
+ use_texturepacker_native=yes \
+ USE_TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr" \
TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr"
XBMC_CONF_OPT += \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 18/20] xbmc: Add X.org/OpenGL support
2014-07-15 19:18 [Buildroot] [PATCH v14 00/20] package/xbmc: Add support for uClibc, libva and additional packages Bernd Kuhls
` (16 preceding siblings ...)
2014-07-15 19:19 ` [Buildroot] [PATCH v14 17/20] xbmc: Fix TexturePacker compile Bernd Kuhls
@ 2014-07-15 19:19 ` Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 19/20] xbmc: Add option for Goom screensaver Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 20/20] xbmc: Add VA-API support Bernd Kuhls
19 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2014-07-15 19:19 UTC (permalink / raw)
To: buildroot
- on ARM xbmc only supports EGL/GLES
https://github.com/xbmc/xbmc/blob/Gotham/configure.in#L695
- rsxs depends on OpenGL
https://github.com/xbmc/xbmc/blob/Gotham/configure.in#L1469
so include a compile fix, courtesy of
https://github.com/OpenELEC/OpenELEC.tv/blob/master/packages/mediacenter/xbmc/package.mk#L109
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/xbmc/Config.in | 31 ++++++++++++++++++++++++++++---
package/xbmc/xbmc.mk | 32 ++++++++++++++++++++++++++------
2 files changed, 54 insertions(+), 9 deletions(-)
diff --git a/package/xbmc/Config.in b/package/xbmc/Config.in
index 19d3043..991695f 100644
--- a/package/xbmc/Config.in
+++ b/package/xbmc/Config.in
@@ -2,9 +2,26 @@ comment "xbmc needs a toolchain w/ C++, IPv6, largefile, threads, wchar"
depends on BR2_arm || BR2_i386 || BR2_x86_64
depends on !BR2_INET_IPV6 || !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
+config BR2_PACKAGE_XBMC_EGL_GLES
+ bool
+ default y
+ depends on BR2_PACKAGE_HAS_LIBEGL
+ depends on BR2_PACKAGE_HAS_LIBGLES
+ depends on !BR2_PACKAGE_XBMC_GL # prefer GL if available
+
+config BR2_PACKAGE_XBMC_GL
+ bool
+ default y
+ depends on BR2_PACKAGE_HAS_LIBGL
+ depends on !BR2_arm # xbmc needs egl/gles on arm
+
+comment "xbmc needs an OpenGL or an openGL ES and EGL backend"
+ depends on BR2_i386 || BR2_x86_64
+ depends on !BR2_PACKAGE_XBMC_GL && !BR2_PACKAGE_XBMC_EGL_GLES
+
comment "xbmc requires an OpenGL ES and EGL backend"
- depends on BR2_arm || BR2_i386 || BR2_x86_64
- depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES
+ depends on BR2_arm
+ depends on !BR2_PACKAGE_XBMC_EGL_GLES
menuconfig BR2_PACKAGE_XBMC
bool "xbmc"
@@ -22,6 +39,8 @@ menuconfig BR2_PACKAGE_XBMC
select BR2_PACKAGE_LIBCDIO
select BR2_PACKAGE_LIBCURL
select BR2_PACKAGE_LIBFRIBIDI
+ select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_XBMC_GL
+ select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_XBMC_GL
select BR2_PACKAGE_LIBGCRYPT
select BR2_PACKAGE_LIBID3TAG
select BR2_PACKAGE_LIBMAD
@@ -51,17 +70,23 @@ 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_XBMC_GL
+ select BR2_PACKAGE_SDL_X11 if BR2_PACKAGE_XBMC_GL
+ select BR2_PACKAGE_SDL_IMAGE if BR2_PACKAGE_XBMC_GL
select BR2_PACKAGE_SQLITE
select BR2_PACKAGE_TAGLIB
select BR2_PACKAGE_TIFF
select BR2_PACKAGE_TINYXML
+ select BR2_PACKAGE_XLIB_XMU if BR2_PACKAGE_XBMC_GL # needed by rsxs screensaver
+ select BR2_PACKAGE_XLIB_XRANDR if BR2_PACKAGE_XBMC_GL
+ select BR2_PACKAGE_XLIB_XT if BR2_PACKAGE_XBMC_GL # needed by rsxs screensaver
select BR2_PACKAGE_YAJL
select BR2_PACKAGE_ZLIB
depends on BR2_INET_IPV6
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_LARGEFILE
depends on BR2_TOOLCHAIN_HAS_THREADS
- depends on BR2_PACKAGE_HAS_LIBEGL && BR2_PACKAGE_HAS_LIBGLES
+ depends on BR2_PACKAGE_XBMC_EGL_GLES || BR2_PACKAGE_XBMC_GL
depends on BR2_USE_MMU # python
depends on BR2_USE_WCHAR
depends on BR2_arm || BR2_i386 || BR2_x86_64
diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
index 6973bf3..a002a4c 100644
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -15,7 +15,7 @@ XBMC_LICENSE_FILES = LICENSE.GPL
# http://wiki.xbmc.org/index.php?title=TexturePacker
XBMC_DEPENDENCIES = host-gawk host-gettext 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
@@ -44,7 +44,6 @@ XBMC_CONF_OPT += \
--disable-crystalhd \
--disable-debug \
--disable-dvdcss \
- --disable-gl \
--disable-hal \
--disable-joystick \
--disable-mysql \
@@ -52,14 +51,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)
@@ -88,9 +83,34 @@ else
XBMC_CONF_OPT += --disable-libmp3lame
endif
+# quote from xbmc/configure.in: "GLES overwrites GL if both set to yes."
+# we choose the opposite because opengl offers more features, like libva support
+ifeq ($(BR2_PACKAGE_XBMC_GL),y)
+XBMC_DEPENDENCIES += libglew libglu libgl sdl_image xlib_libX11 xlib_libXext \
+ xlib_libXmu xlib_libXrandr xlib_libXt
+XBMC_CONF_OPT += --enable-gl --enable-sdl --enable-x11 --enable-xrandr--disable-gles
+# fix rsxs compile
+# make sure target libpng-config is used, options taken from rsxs-0.9/acinclude.m4
+XBMC_CONF_ENV += \
+ jm_cv_func_gettimeofday_clobber=no \
+ mac_cv_pkg_png=$(STAGING_DIR)/usr/bin/libpng-config \
+ mac_cv_pkg_cppflags="`$(STAGING_DIR)/usr/bin/libpng-config --I_opts --cppflags`" \
+ mac_cv_pkg_cxxflags="`$(STAGING_DIR)/usr/bin/libpng-config --ccopts`" \
+ mac_cv_pkg_ldflags="`$(STAGING_DIR)/usr/bin/libpng-config --L_opts --R_opts`" \
+ mac_cv_pkg_libs="`$(STAGING_DIR)/usr/bin/libpng-config --libs`"
+XBMC_CONF_OPT += --enable-rsxs
+else
+XBMC_CONF_OPT += --disable-gl --disable-rsxs --disable-sdl --disable-x11 --disable-xrandr
+ifeq ($(BR2_PACKAGE_XBMC_EGL_GLES),y)
+XBMC_DEPENDENCIES += libegl libgles
+XBMC_CONF_OPT += --enable-gles
XBMC_CONF_ENV += \
CFLAGS="$(TARGET_CFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" \
CXXFLAGS="$(TARGET_CXXFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)"
+else
+XBMC_CONF_OPT += --disable-gles
+endif
+endif
ifeq ($(BR2_PACKAGE_XBMC_LIBUSB),y)
XBMC_DEPENDENCIES += libusb-compat
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 19/20] xbmc: Add option for Goom screensaver
2014-07-15 19:18 [Buildroot] [PATCH v14 00/20] package/xbmc: Add support for uClibc, libva and additional packages Bernd Kuhls
` (17 preceding siblings ...)
2014-07-15 19:19 ` [Buildroot] [PATCH v14 18/20] xbmc: Add X.org/OpenGL support Bernd Kuhls
@ 2014-07-15 19:19 ` Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 20/20] xbmc: Add VA-API support Bernd Kuhls
19 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2014-07-15 19:19 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/xbmc/Config.in | 9 +++++++++
package/xbmc/xbmc.mk | 6 ++++++
2 files changed, 15 insertions(+)
diff --git a/package/xbmc/Config.in b/package/xbmc/Config.in
index 991695f..7323eb4 100644
--- a/package/xbmc/Config.in
+++ b/package/xbmc/Config.in
@@ -194,6 +194,15 @@ config BR2_PACKAGE_XBMC_WAVPACK
Enable WAV input support.
Select this if you want to play back WV files.
+config BR2_PACKAGE_XBMC_GOOM
+ bool "goom screensaver"
+ depends on BR2_PACKAGE_XBMC_GL
+ help
+ Enable goom screensaver
+
+comment "goom needs an OpenGL backend"
+ depends on !BR2_PACKAGE_XBMC_GL
+
comment "XBMC addons"
source "package/xbmc-addon-xvdr/Config.in"
diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
index a002a4c..3637db7 100644
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -183,6 +183,12 @@ ifeq ($(BR2_PACKAGE_XBMC_LIBTHEORA),y)
XBMC_DEPENDENCIES += libtheora
endif
+ifeq ($(BR2_PACKAGE_XBMC_GOOM),y)
+XBMC_CONF_OPT += --enable-goom
+else
+XBMC_CONF_OPT += --disable-goom
+endif
+
# Add HOST_DIR to PATH for codegenerator.mk to find swig
define XBMC_BOOTSTRAP
cd $(@D) && PATH=$(BR_PATH) ./bootstrap
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 20/20] xbmc: Add VA-API support
2014-07-15 19:18 [Buildroot] [PATCH v14 00/20] package/xbmc: Add support for uClibc, libva and additional packages Bernd Kuhls
` (18 preceding siblings ...)
2014-07-15 19:19 ` [Buildroot] [PATCH v14 19/20] xbmc: Add option for Goom screensaver Bernd Kuhls
@ 2014-07-15 19:19 ` Bernd Kuhls
19 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2014-07-15 19:19 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/xbmc/xbmc.mk | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
index 3637db7..c0447c9 100644
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -52,7 +52,6 @@ XBMC_CONF_OPT += \
--disable-projectm \
--disable-pulse \
--disable-ssh \
- --disable-vaapi \
--disable-vdpau \
--disable-vtbdecoder \
--enable-optimizations
@@ -112,6 +111,14 @@ XBMC_CONF_OPT += --disable-gles
endif
endif
+# xbmc needs libva & libva-glx
+ifeq ($(BR2_PACKAGE_LIBVA)$(BR2_PACKAGE_MESA3D_DRI_DRIVER),yy)
+XBMC_DEPENDENCIES += mesa3d libva
+XBMC_CONF_OPT += --enable-vaapi
+else
+XBMC_CONF_OPT += --disable-vaapi
+endif
+
ifeq ($(BR2_PACKAGE_XBMC_LIBUSB),y)
XBMC_DEPENDENCIES += libusb-compat
XBMC_CONF_OPT += --enable-libusb
--
1.7.10.4
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 03/20] package/mesa3d: add dependency xproto_presentproto
2014-07-15 19:18 ` [Buildroot] [PATCH v14 03/20] package/mesa3d: add dependency xproto_presentproto Bernd Kuhls
@ 2014-07-15 19:22 ` Thomas Petazzoni
0 siblings, 0 replies; 29+ messages in thread
From: Thomas Petazzoni @ 2014-07-15 19:22 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Tue, 15 Jul 2014 21:18:58 +0200, Bernd Kuhls wrote:
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/mesa3d/Config.in | 1 +
> package/mesa3d/mesa3d.mk | 1 +
> 2 files changed, 2 insertions(+)
Please add a justification about this change in the commit log. Is it
needed following the mesa3d bump? In this case, it should be part of
the patch bumping mesa3d.
Bernd, a good rule of thumb is *all* patches should have a commit log.
So whenever you're about to send a series, please review the commit log
of your patches, and make sure all of them have a non-empty commit log.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 02/20] package/mesa3d: Depend on xorg meta package instead of xserver_xorg-server
2014-07-15 19:18 ` [Buildroot] [PATCH v14 02/20] package/mesa3d: Depend on xorg meta package instead of xserver_xorg-server Bernd Kuhls
@ 2014-07-16 18:00 ` Thomas Petazzoni
0 siblings, 0 replies; 29+ messages in thread
From: Thomas Petazzoni @ 2014-07-16 18:00 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Tue, 15 Jul 2014 21:18:57 +0200, Bernd Kuhls wrote:
> mesa3d does not depend on the xorg server as such, only on X libraries.
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/mesa3d/Config.in | 22 +++++++++++-----------
> package/mesa3d/mesa3d.mk | 4 ++--
> 2 files changed, 13 insertions(+), 13 deletions(-)
This patch does not apply on the current Buildroot, git complains that
there are some missing blobs. It generally indicates that your branch
wasn't based on master, but on master + several commits that are not
part of this patch series. Could you check this?
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 06/20] libva: new package
2014-07-15 19:19 ` [Buildroot] [PATCH v14 06/20] libva: new package Bernd Kuhls
@ 2014-07-16 18:44 ` Thomas Petazzoni
0 siblings, 0 replies; 29+ messages in thread
From: Thomas Petazzoni @ 2014-07-16 18:44 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Tue, 15 Jul 2014 21:19:01 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/Config.in | 1 +
> package/libva/Config.in | 18 ++++++++
> package/libva/libva-0001-no_test_decode.patch | 17 ++++++++
> package/libva/libva.mk | 56 +++++++++++++++++++++++++
> 4 files changed, 92 insertions(+)
> create mode 100644 package/libva/Config.in
> create mode 100644 package/libva/libva-0001-no_test_decode.patch
> create mode 100644 package/libva/libva.mk
Applied, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 07/20] libva-intel-driver: new package
2014-07-15 19:19 ` [Buildroot] [PATCH v14 07/20] libva-intel-driver: " Bernd Kuhls
@ 2014-07-16 18:44 ` Thomas Petazzoni
2014-07-18 22:43 ` Thomas Petazzoni
1 sibling, 0 replies; 29+ messages in thread
From: Thomas Petazzoni @ 2014-07-16 18:44 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Tue, 15 Jul 2014 21:19:02 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/Config.in | 1 +
> package/libva-intel-driver/Config.in | 19 ++++++++++++++
> package/libva-intel-driver/libva-intel-driver.mk | 29 ++++++++++++++++++++++
> 3 files changed, 49 insertions(+)
> create mode 100644 package/libva-intel-driver/Config.in
> create mode 100644 package/libva-intel-driver/libva-intel-driver.mk
Applied, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 08/20] ffmpeg: Add libva support
2014-07-15 19:19 ` [Buildroot] [PATCH v14 08/20] ffmpeg: Add libva support Bernd Kuhls
@ 2014-07-16 18:44 ` Thomas Petazzoni
0 siblings, 0 replies; 29+ messages in thread
From: Thomas Petazzoni @ 2014-07-16 18:44 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Tue, 15 Jul 2014 21:19:03 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/ffmpeg/ffmpeg.mk | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
Applied, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 05/20] mesa3d: Add dri3 support
2014-07-15 19:19 ` [Buildroot] [PATCH v14 05/20] mesa3d: Add dri3 support Bernd Kuhls
@ 2014-07-16 18:46 ` Thomas Petazzoni
0 siblings, 0 replies; 29+ messages in thread
From: Thomas Petazzoni @ 2014-07-16 18:46 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Tue, 15 Jul 2014 21:19:00 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/mesa3d/mesa3d.mk | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
> index 6282503..9fdb7bc 100644
> --- a/package/mesa3d/mesa3d.mk
> +++ b/package/mesa3d/mesa3d.mk
> @@ -24,6 +24,13 @@ MESA3D_DEPENDENCIES = \
> host-xutil_makedepend \
> libdrm
>
> +ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y)
> +MESA3D_DEPENDENCIES += xproto_dri3proto
> +MESA3D_CONF_OPT += --enable-dri3
> +else
> +MESA3D_CONF_OPT += --disable-dri3
> +endif
Why is this outside of the X.org condition? I believe DRI 3 support
only makes sense when DRI is enabled, so I believe your condition here
is misplaced.
Moreover, this fix is needed even for the current Mesa3D version, I've
run into the following build issue:
======================================================================
configure: error: Package requirements (dri3proto >= 1.0) were not met:
Package dri3proto was not found in the pkg-config search path.
Perhaps you should add the directory containing `dri3proto.pc'
to the PKG_CONFIG_PATH environment variable
No package 'dri3proto' found
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
Alternatively, you may set the environment variables DRI3PROTO_CFLAGS
and DRI3PROTO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
make[1]: *** [/home/test/outputs/va-x86/build/mesa3d-10.2.1/.stamp_configured] Error 1
======================================================================
Could you send an updated patch series that has just the mesa3d updates, the
libglu, libglew, sdl and intel driver update (i.e not with the XBMC
patches) ? And in this series, please make sure each patch has a commit
log, that the reason for the changes are properly explained, and that
the changes are ordered properly.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 07/20] libva-intel-driver: new package
2014-07-15 19:19 ` [Buildroot] [PATCH v14 07/20] libva-intel-driver: " Bernd Kuhls
2014-07-16 18:44 ` Thomas Petazzoni
@ 2014-07-18 22:43 ` Thomas Petazzoni
1 sibling, 0 replies; 29+ messages in thread
From: Thomas Petazzoni @ 2014-07-18 22:43 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Tue, 15 Jul 2014 21:19:02 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/Config.in | 1 +
> package/libva-intel-driver/Config.in | 19 ++++++++++++++
> package/libva-intel-driver/libva-intel-driver.mk | 29 ++++++++++++++++++++++
> 3 files changed, 49 insertions(+)
> create mode 100644 package/libva-intel-driver/Config.in
> create mode 100644 package/libva-intel-driver/libva-intel-driver.mk
This package has been added, but is causing build failures in certain
conditions, see:
http://autobuild.buildroot.org/results/896/896010d8a9ef978386ea1af8e21f5999a735997d/build-end.log
The error is:
In file included from i965_drv_video.c:37:0:
i965_output_wayland.h:31:26: error: unknown type name 'VADriverContextP'
i965_output_wayland.h:34:31: error: unknown type name 'VADriverContextP'
CC i965_drv_video_la-i965_encoder.lo
i965_drv_video.c:5243:9: error: 'i965_output_wayland_init' undeclared here (not in a function)
i965_drv_video.c:5244:9: error: 'i965_output_wayland_terminate' undeclared here (not in a function)
make[4]: *** [i965_drv_video_la-i965_drv_video.lo] Error 1
make[4]: *** Waiting for unfinished jobs....
Could you have a look?
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH v14 14/20] xbmc: Allow compilation with uClibc
2014-07-15 19:19 ` [Buildroot] [PATCH v14 14/20] xbmc: Allow compilation with uClibc Bernd Kuhls
@ 2014-07-19 13:11 ` Bernd Kuhls
0 siblings, 0 replies; 29+ messages in thread
From: Bernd Kuhls @ 2014-07-19 13:11 UTC (permalink / raw)
To: buildroot
Bernd Kuhls <bernd.kuhls@t-online.de> wrote in
news:1405451955-10204-15-git-send-email-bernd.kuhls at t-online.de:
> package/xbmc/xbmc-0002-mathutil.patch | 213
+++++++++++++++++++++++++++++++++
Hi,
small note: This patch was applied upstream:
https://github.com/xbmc/xbmc/commit/9e03a265c09bdc6bd3613e71d57735c1ee95e155
Regards, Bernd
^ permalink raw reply [flat|nested] 29+ messages in thread
end of thread, other threads:[~2014-07-19 13:11 UTC | newest]
Thread overview: 29+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-15 19:18 [Buildroot] [PATCH v14 00/20] package/xbmc: Add support for uClibc, libva and additional packages Bernd Kuhls
2014-07-15 19:18 ` [Buildroot] [PATCH v14 01/20] package/mesa3d: Bump to version 10.2.3 Bernd Kuhls
2014-07-15 19:18 ` [Buildroot] [PATCH v14 02/20] package/mesa3d: Depend on xorg meta package instead of xserver_xorg-server Bernd Kuhls
2014-07-16 18:00 ` Thomas Petazzoni
2014-07-15 19:18 ` [Buildroot] [PATCH v14 03/20] package/mesa3d: add dependency xproto_presentproto Bernd Kuhls
2014-07-15 19:22 ` Thomas Petazzoni
2014-07-15 19:18 ` [Buildroot] [PATCH v14 04/20] package/mesa3d: Remove dependency for the libxml2 module of host-python Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 05/20] mesa3d: Add dri3 support Bernd Kuhls
2014-07-16 18:46 ` Thomas Petazzoni
2014-07-15 19:19 ` [Buildroot] [PATCH v14 06/20] libva: new package Bernd Kuhls
2014-07-16 18:44 ` Thomas Petazzoni
2014-07-15 19:19 ` [Buildroot] [PATCH v14 07/20] libva-intel-driver: " Bernd Kuhls
2014-07-16 18:44 ` Thomas Petazzoni
2014-07-18 22:43 ` Thomas Petazzoni
2014-07-15 19:19 ` [Buildroot] [PATCH v14 08/20] ffmpeg: Add libva support Bernd Kuhls
2014-07-16 18:44 ` Thomas Petazzoni
2014-07-15 19:19 ` [Buildroot] [PATCH v14 09/20] libglu: new package Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 10/20] sdl: Add new dependency libglu for opengl support Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 11/20] libglew: new package Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 12/20] xdriver_xf86-video-intel: Bump version to 2.99.911 Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 13/20] xbmc: Add missing egl-related cflags Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 14/20] xbmc: Allow compilation with uClibc Bernd Kuhls
2014-07-19 13:11 ` Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 15/20] xbmc: Add alsa support Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 16/20] xbmc: Add lame support Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 17/20] xbmc: Fix TexturePacker compile Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 18/20] xbmc: Add X.org/OpenGL support Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 19/20] xbmc: Add option for Goom screensaver Bernd Kuhls
2014-07-15 19:19 ` [Buildroot] [PATCH v14 20/20] xbmc: Add VA-API support Bernd Kuhls
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.