* [Buildroot] [PATCH 0/8] Various OpenGL-related updates
@ 2014-07-17 5:42 Bernd Kuhls
2014-07-17 5:42 ` [Buildroot] [PATCH 1/8] xlib_libxshmfence: New package Bernd Kuhls
` (8 more replies)
0 siblings, 9 replies; 12+ messages in thread
From: Bernd Kuhls @ 2014-07-17 5:42 UTC (permalink / raw)
To: buildroot
Hi,
this series was split off my xbmc series, as requested by Thomas:
http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/89549
It fixes a DRI3-related build error in mesa3d by adding the needed dependencies,
eases mesa3d dependencies, bumps mesa3d and xdriver_xf86-video-intel and adds
libglu/libglew, which are needed to enable OpenGl support in xbmc.
Regards, Bernd
Bernd Kuhls (8):
xlib_libxshmfence: New package
package/mesa3d: Fix optional DRI3 support
package/mesa3d: Depend on xorg meta package instead of
xserver_xorg-server
package/mesa3d: Remove dependency for the libxml2 module of
host-python
package/mesa3d: Bump to version 10.2.3
libglu: New package
libglew: New package
xdriver_xf86-video-intel: Bump version to 2.99.911
package/Config.in | 2 ++
package/libglew/Config.in | 19 +++++++++++
package/libglew/libglew.mk | 36 ++++++++++++++++++++
package/libglu/Config.in | 10 ++++++
package/libglu/libglu.mk | 17 +++++++++
package/libxml2/Config.in | 3 --
package/libxml2/libxml2-python2.patch | 27 ---------------
package/libxml2/libxml2.mk | 16 +--------
package/mesa3d/Config.in | 23 ++++++-------
package/mesa3d/mesa3d.mk | 13 ++++---
package/x11r7/Config.in | 1 +
package/x11r7/xdriver_xf86-video-intel/Config.in | 5 +--
.../xdriver_xf86-video-intel.mk | 27 +++++++++++----
package/x11r7/xlib_libxshmfence/Config.in | 5 +++
.../x11r7/xlib_libxshmfence/xlib_libxshmfence.mk | 15 ++++++++
15 files changed, 150 insertions(+), 69 deletions(-)
create mode 100644 package/libglew/Config.in
create mode 100644 package/libglew/libglew.mk
create mode 100644 package/libglu/Config.in
create mode 100644 package/libglu/libglu.mk
delete mode 100644 package/libxml2/libxml2-python2.patch
create mode 100644 package/x11r7/xlib_libxshmfence/Config.in
create mode 100644 package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk
--
1.7.10.4
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/8] xlib_libxshmfence: New package
2014-07-17 5:42 [Buildroot] [PATCH 0/8] Various OpenGL-related updates Bernd Kuhls
@ 2014-07-17 5:42 ` Bernd Kuhls
2014-07-17 5:42 ` [Buildroot] [PATCH 2/8] package/mesa3d: Fix optional DRI3 support Bernd Kuhls
` (7 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Bernd Kuhls @ 2014-07-17 5:42 UTC (permalink / raw)
To: buildroot
Needed for DRI3 support in mesa3d:
configure: error: Package requirements (x11 xext xdamage xfixes x11-xcb xcb-glx >= 1.8.1
xcb-dri2 >= 1.8 xcb-dri3 xcb-present xcb-sync xshmfence >= 1.1) were not met:
Package xshmfence was not found in the pkg-config search path.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/x11r7/Config.in | 1 +
package/x11r7/xlib_libxshmfence/Config.in | 5 +++++
package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk | 15 +++++++++++++++
3 files changed, 21 insertions(+)
create mode 100644 package/x11r7/xlib_libxshmfence/Config.in
create mode 100644 package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 087b816..1979a13 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -50,6 +50,7 @@ if BR2_PACKAGE_XORG7
source package/x11r7/xlib_libdmx/Config.in
source package/x11r7/xlib_libfontenc/Config.in
source package/x11r7/xlib_libxkbfile/Config.in
+ source package/x11r7/xlib_libxshmfence/Config.in
source package/x11r7/xlib_xtrans/Config.in
source package/x11r7/xlib_libpciaccess/Config.in
endmenu
diff --git a/package/x11r7/xlib_libxshmfence/Config.in b/package/x11r7/xlib_libxshmfence/Config.in
new file mode 100644
index 0000000..d0595f6
--- /dev/null
+++ b/package/x11r7/xlib_libxshmfence/Config.in
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_XLIB_LIBXSHMFENCE
+ bool "libxshmfence"
+ select BR2_PACKAGE_XPROTO_XPROTO
+ help
+ X.Org shmfence library
diff --git a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk
new file mode 100644
index 0000000..f0fb90f
--- /dev/null
+++ b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libxshmfence
+#
+################################################################################
+
+XLIB_LIBXSHMFENCE_VERSION = 1.1
+XLIB_LIBXSHMFENCE_SOURCE = libxshmfence-$(XLIB_LIBXSHMFENCE_VERSION).tar.bz2
+XLIB_LIBXSHMFENCE_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXSHMFENCE_LICENSE = MIT
+XLIB_LIBXSHMFENCE_LICENSE_FILES = COPYING
+XLIB_LIBXSHMFENCE_INSTALL_STAGING = YES
+XLIB_LIBXSHMFENCE_DEPENDENCIES = host-pkgconf xproto_xproto
+
+$(eval $(autotools-package))
--
1.7.10.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 2/8] package/mesa3d: Fix optional DRI3 support
2014-07-17 5:42 [Buildroot] [PATCH 0/8] Various OpenGL-related updates Bernd Kuhls
2014-07-17 5:42 ` [Buildroot] [PATCH 1/8] xlib_libxshmfence: New package Bernd Kuhls
@ 2014-07-17 5:42 ` Bernd Kuhls
2014-07-17 5:42 ` [Buildroot] [PATCH 3/8] package/mesa3d: Depend on xorg meta package instead of xserver_xorg-server Bernd Kuhls
` (6 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Bernd Kuhls @ 2014-07-17 5:42 UTC (permalink / raw)
To: buildroot
DRI3 support is optional in mesa3d, but mesa3d expects it by default,
so add configure options to disable it when necessary and add the
needed dependencies for DRI3 support. Fixes:
===============================
checking for DRI3PROTO... no
configure: error: Package requirements (dri3proto >= 1.0) were not met:
checking for PRESENTPROTO... no
configure: error: Package requirements (presentproto >= 1.0) were not met:
configure: error: Package requirements (x11 xext xdamage xfixes x11-xcb xcb-glx >= 1.8.1
xcb-dri2 >= 1.8 xcb-dri3 xcb-present xcb-sync xshmfence >= 1.1) were not met:
Package xshmfence was not found in the pkg-config search path.
===============================
This defconfig was broken and fixed by this patch:
BR2_TOOLCHAIN_EXTERNAL=y
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_DRI_DRIVER_I965=y
BR2_PACKAGE_XORG7=y
BR2_PACKAGE_XSERVER_XORG_SERVER=y
BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR=y
BR2_PACKAGE_XPROTO_DRI3PROTO=y
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/mesa3d/mesa3d.mk | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 1a61af8..667e744 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -77,6 +77,12 @@ ifeq ($(MESA3D_DRI_DRIVERS-y),)
MESA3D_CONF_OPT += \
--without-dri-drivers
else
+ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y)
+MESA3D_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto xproto_presentproto
+MESA3D_CONF_OPT += --enable-dri3
+else
+MESA3D_CONF_OPT += --disable-dri3
+endif
MESA3D_PROVIDES += libgl
MESA3D_CONF_OPT += \
--enable-dri \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 3/8] package/mesa3d: Depend on xorg meta package instead of xserver_xorg-server
2014-07-17 5:42 [Buildroot] [PATCH 0/8] Various OpenGL-related updates Bernd Kuhls
2014-07-17 5:42 ` [Buildroot] [PATCH 1/8] xlib_libxshmfence: New package Bernd Kuhls
2014-07-17 5:42 ` [Buildroot] [PATCH 2/8] package/mesa3d: Fix optional DRI3 support Bernd Kuhls
@ 2014-07-17 5:42 ` Bernd Kuhls
2014-07-17 5:42 ` [Buildroot] [PATCH 4/8] package/mesa3d: Remove dependency for the libxml2 module of host-python Bernd Kuhls
` (5 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Bernd Kuhls @ 2014-07-17 5:42 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 e698b3e..852d6d0 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_UDEV
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 667e744..4a00dac 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 \
@@ -106,7 +106,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] 12+ messages in thread
* [Buildroot] [PATCH 4/8] package/mesa3d: Remove dependency for the libxml2 module of host-python
2014-07-17 5:42 [Buildroot] [PATCH 0/8] Various OpenGL-related updates Bernd Kuhls
` (2 preceding siblings ...)
2014-07-17 5:42 ` [Buildroot] [PATCH 3/8] package/mesa3d: Depend on xorg meta package instead of xserver_xorg-server Bernd Kuhls
@ 2014-07-17 5:42 ` Bernd Kuhls
2014-07-17 5:42 ` [Buildroot] [PATCH 5/8] package/mesa3d: Bump to version 10.2.3 Bernd Kuhls
` (4 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Bernd Kuhls @ 2014-07-17 5:42 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 852d6d0..c1be9e3 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_XF86DRIPROTO if BR2_PACKAGE_XORG7
select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 4a00dac..6b9383b 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] 12+ messages in thread
* [Buildroot] [PATCH 5/8] package/mesa3d: Bump to version 10.2.3
2014-07-17 5:42 [Buildroot] [PATCH 0/8] Various OpenGL-related updates Bernd Kuhls
` (3 preceding siblings ...)
2014-07-17 5:42 ` [Buildroot] [PATCH 4/8] package/mesa3d: Remove dependency for the libxml2 module of host-python Bernd Kuhls
@ 2014-07-17 5:42 ` Bernd Kuhls
2014-07-17 5:42 ` [Buildroot] [PATCH 6/8] libglu: New package Bernd Kuhls
` (3 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Bernd Kuhls @ 2014-07-17 5:42 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 6b9383b..fb87858 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] 12+ messages in thread
* [Buildroot] [PATCH 6/8] libglu: New package
2014-07-17 5:42 [Buildroot] [PATCH 0/8] Various OpenGL-related updates Bernd Kuhls
` (4 preceding siblings ...)
2014-07-17 5:42 ` [Buildroot] [PATCH 5/8] package/mesa3d: Bump to version 10.2.3 Bernd Kuhls
@ 2014-07-17 5:42 ` Bernd Kuhls
2014-07-20 9:38 ` Thomas Petazzoni
2014-07-17 5:42 ` [Buildroot] [PATCH 7/8] libglew: " Bernd Kuhls
` (2 subsequent siblings)
8 siblings, 1 reply; 12+ messages in thread
From: Bernd Kuhls @ 2014-07-17 5:42 UTC (permalink / raw)
To: buildroot
This package is needed for OpenGL support in xbmc:
https://github.com/xbmc/xbmc/blob/Gotham/configure.in#L1070
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 4b7ccd9..277cbb4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -611,6 +611,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] 12+ messages in thread
* [Buildroot] [PATCH 7/8] libglew: New package
2014-07-17 5:42 [Buildroot] [PATCH 0/8] Various OpenGL-related updates Bernd Kuhls
` (5 preceding siblings ...)
2014-07-17 5:42 ` [Buildroot] [PATCH 6/8] libglu: New package Bernd Kuhls
@ 2014-07-17 5:42 ` Bernd Kuhls
2014-07-20 9:40 ` Thomas Petazzoni
2014-07-17 5:43 ` [Buildroot] [PATCH 8/8] xdriver_xf86-video-intel: Bump version to 2.99.911 Bernd Kuhls
2014-07-17 8:06 ` [Buildroot] [PATCH 0/8] Various OpenGL-related updates Thomas Petazzoni
8 siblings, 1 reply; 12+ messages in thread
From: Bernd Kuhls @ 2014-07-17 5:42 UTC (permalink / raw)
To: buildroot
This package is needed for OpenGL support in xbmc:
https://github.com/xbmc/xbmc/blob/Gotham/configure.in#L1069
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 277cbb4..753c8d3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -611,6 +611,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] 12+ messages in thread
* [Buildroot] [PATCH 8/8] xdriver_xf86-video-intel: Bump version to 2.99.911
2014-07-17 5:42 [Buildroot] [PATCH 0/8] Various OpenGL-related updates Bernd Kuhls
` (6 preceding siblings ...)
2014-07-17 5:42 ` [Buildroot] [PATCH 7/8] libglew: " Bernd Kuhls
@ 2014-07-17 5:43 ` Bernd Kuhls
2014-07-17 8:06 ` [Buildroot] [PATCH 0/8] Various OpenGL-related updates Thomas Petazzoni
8 siblings, 0 replies; 12+ messages in thread
From: Bernd Kuhls @ 2014-07-17 5:43 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] 12+ messages in thread
* [Buildroot] [PATCH 0/8] Various OpenGL-related updates
2014-07-17 5:42 [Buildroot] [PATCH 0/8] Various OpenGL-related updates Bernd Kuhls
` (7 preceding siblings ...)
2014-07-17 5:43 ` [Buildroot] [PATCH 8/8] xdriver_xf86-video-intel: Bump version to 2.99.911 Bernd Kuhls
@ 2014-07-17 8:06 ` Thomas Petazzoni
8 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2014-07-17 8:06 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Thu, 17 Jul 2014 07:42:52 +0200, Bernd Kuhls wrote:
> Bernd Kuhls (8):
> xlib_libxshmfence: New package
> package/mesa3d: Fix optional DRI3 support
> package/mesa3d: Depend on xorg meta package instead of
> xserver_xorg-server
> package/mesa3d: Remove dependency for the libxml2 module of
> host-python
> package/mesa3d: Bump to version 10.2.3
I've applied those first 5 patches.
> libglu: New package
> libglew: New package
> xdriver_xf86-video-intel: Bump version to 2.99.911
I'll look at those ones a bit later, hopefully tonight.
Thanks a lot for updating the series.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 6/8] libglu: New package
2014-07-17 5:42 ` [Buildroot] [PATCH 6/8] libglu: New package Bernd Kuhls
@ 2014-07-20 9:38 ` Thomas Petazzoni
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2014-07-20 9:38 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Thu, 17 Jul 2014 07:42:58 +0200, Bernd Kuhls wrote:
> This package is needed for OpenGL support in xbmc:
> https://github.com/xbmc/xbmc/blob/Gotham/configure.in#L1070
>
> 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
Applied, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 7/8] libglew: New package
2014-07-17 5:42 ` [Buildroot] [PATCH 7/8] libglew: " Bernd Kuhls
@ 2014-07-20 9:40 ` Thomas Petazzoni
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2014-07-20 9:40 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Thu, 17 Jul 2014 07:42:59 +0200, Bernd Kuhls wrote:
> +LIBGLEW_LICENSE = MIT
There's also some code under BSD-3c, so I've added that and committed.
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2014-07-20 9:40 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-17 5:42 [Buildroot] [PATCH 0/8] Various OpenGL-related updates Bernd Kuhls
2014-07-17 5:42 ` [Buildroot] [PATCH 1/8] xlib_libxshmfence: New package Bernd Kuhls
2014-07-17 5:42 ` [Buildroot] [PATCH 2/8] package/mesa3d: Fix optional DRI3 support Bernd Kuhls
2014-07-17 5:42 ` [Buildroot] [PATCH 3/8] package/mesa3d: Depend on xorg meta package instead of xserver_xorg-server Bernd Kuhls
2014-07-17 5:42 ` [Buildroot] [PATCH 4/8] package/mesa3d: Remove dependency for the libxml2 module of host-python Bernd Kuhls
2014-07-17 5:42 ` [Buildroot] [PATCH 5/8] package/mesa3d: Bump to version 10.2.3 Bernd Kuhls
2014-07-17 5:42 ` [Buildroot] [PATCH 6/8] libglu: New package Bernd Kuhls
2014-07-20 9:38 ` Thomas Petazzoni
2014-07-17 5:42 ` [Buildroot] [PATCH 7/8] libglew: " Bernd Kuhls
2014-07-20 9:40 ` Thomas Petazzoni
2014-07-17 5:43 ` [Buildroot] [PATCH 8/8] xdriver_xf86-video-intel: Bump version to 2.99.911 Bernd Kuhls
2014-07-17 8:06 ` [Buildroot] [PATCH 0/8] Various OpenGL-related updates Thomas Petazzoni
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.