Skip to contentSkip to conversation

package/apache: bump version to 2.4.18

PATCH New Bernd Kuhls 4 participants 19 messages Dec 19, 2015 – Dec 20, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/12 package/apache: bump version to 2.4.18

---
 package/apache/apache.hash | 4 ++--
 package/apache/apache.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
package/apache/apache.hash +2 -2
index e99253a..d4a8a9f 100644
@@ -1,2 +1,2 @@
-# From http://www.apache.org/dist/httpd/httpd-2.4.17.tar.bz2.sha1
-sha1 3a1b0db8b6c71b9c9ac507ba8723b95a8d3da1df  httpd-2.4.17.tar.bz2
+# From http://www.apache.org/dist/httpd/httpd-2.4.18.tar.bz2.sha1
+sha1	271a129f2f04e3aa694e5c2091df9b707bf8ef80	httpd-2.4.18.tar.bz2
package/apache/apache.mk +1 -1
index daf8fe2..8e7b6be 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-APACHE_VERSION = 2.4.17
+APACHE_VERSION = 2.4.18
 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2
 APACHE_SITE = http://archive.apache.org/dist/httpd
 APACHE_LICENSE = Apache-2.0
Signature · 1 line
2.6.4
#1 lore raw

PATCH 2/12 package/{mesa3d, mesa3d-headers}: bump version to 11.1.0

---
 package/mesa3d-headers/mesa3d-headers.mk | 2 +-
 package/mesa3d/mesa3d.hash               | 4 ++--
 package/mesa3d/mesa3d.mk                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
package/mesa3d-headers/mesa3d-headers.mk +1 -1
index 03b596f..bdfc92f 100644
@@ -12,7 +12,7 @@ endif
 
 # Not possible to directly refer to mesa3d variables, because of
 # first/second expansion trickery...
-MESA3D_HEADERS_VERSION = 11.0.7
+MESA3D_HEADERS_VERSION = 11.1.0
 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
 MESA3D_HEADERS_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_HEADERS_VERSION)
 MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos
package/mesa3d/mesa3d.hash +2 -2
index 22ee25b..51a456c 100644
@@ -1,2 +1,2 @@
-# From http://lists.freedesktop.org/archives/mesa-announce/2015-November/000190.html
-sha256	e7e90a332ede6c8fd08eff90786a3fd1605a4e62ebf3a9b514047838194538cb	mesa-11.0.7.tar.xz
+# From http://lists.freedesktop.org/archives/mesa-announce/2015-December/000194.html
+sha256	9befe03b04223eb1ede177fa8cac001e2850292c8c12a3ec9929106afad9cf1f	mesa-11.1.0.tar.xz
package/mesa3d/mesa3d.mk +1 -1
index a082216..4c8a151 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 # When updating the version, please also update mesa3d-headers
-MESA3D_VERSION = 11.0.7
+MESA3D_VERSION = 11.1.0
 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
 MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
 MESA3D_LICENSE = MIT, SGI, Khronos
Signature · 1 line
2.6.4
#2 lore raw

PATCH 3/12 package/mesa3d: add support for new virgl Gallium driver

In reply to Bernd Kuhls

http://cgit.freedesktop.org/mesa/mesa/commit/configure.ac?h=11.1&id=a8987b88ff1db4ac00720a9b56c4bc3aeb666537
"virgl is the 3D acceleration backend for the virtio-gpu shipping with
qemu. The 3D acceleration is designed around gallium and TGSI as the virtualisation layer. The backend renderer translates the virgl interface into OpenGL currently."

---
 package/mesa3d/Config.in | 7 +++++++
 package/mesa3d/mesa3d.mk | 1 +
 2 files changed, 8 insertions(+)
package/mesa3d/Config.in +7 -0
index fdeb599..8560794 100644
@@ -77,6 +77,13 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
 	  This is a software opengl implementation using the Gallium3D
 	  infrastructure.
 
+config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL
+	bool "Gallium virgl driver"
+	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
+	help
+	  virgl is the 3D acceleration backend for the virtio-gpu
+	  shipping with qemu.
+
 comment "DRI drivers need X.Org"
 	depends on !BR2_PACKAGE_XORG7
 
package/mesa3d/mesa3d.mk +1 -0
index 4c8a151..40e53cc 100644
@@ -65,6 +65,7 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU)  += nouveau
 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600)     += r600
 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA)     += svga
 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST)   += swrast
+MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL)    += virgl
 # DRI Drivers
 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST) += swrast
 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915)   += i915
Signature · 1 line
2.6.4
#3 lore raw

PATCH 3/12 package/mesa3d: add support for new virgl Gallium driver

Bernd, Al,

On 2015-12-19 12:01 +0100, Bernd Kuhls spake thusly:

Quoted 5 lines

http://cgit.freedesktop.org/mesa/mesa/commit/configure.ac?h=11.1&id=a8987b88ff1db4ac00720a9b56c4bc3aeb666537
"virgl is the 3D acceleration backend for the virtio-gpu shipping with
qemu. The 3D acceleration is designed around gallium and TGSI as the virtualisation layer. The backend renderer translates the virgl interface into OpenGL currently."

This is causing some build failures, like:

    http://autobuild.buildroot.org/results/399/399cca80ada5798decc87bff69a3acc432e8f3d0/
    http://autobuild.buildroot.org/results/60f/60f63958b2310e00937c498ddf2a0295ff77683a/

with errors like:

configure: error: --with-egl-platforms=drm is required to build the virgl driver.

Care to have a look, please?

Regards,
Yann E. MORIN.

Quoted 43 lines
---
 package/mesa3d/Config.in | 7 +++++++
 package/mesa3d/mesa3d.mk | 1 +
 2 files changed, 8 insertions(+)
package/mesa3d/Config.in +7 -0
index fdeb599..8560794 100644
@@ -77,6 +77,13 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
 	  This is a software opengl implementation using the Gallium3D
 	  infrastructure.
 
+config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL
+	bool "Gallium virgl driver"
+	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
+	help
+	  virgl is the 3D acceleration backend for the virtio-gpu
+	  shipping with qemu.
+
 comment "DRI drivers need X.Org"
 	depends on !BR2_PACKAGE_XORG7
 
package/mesa3d/mesa3d.mk +1 -0
index 4c8a151..40e53cc 100644
@@ -65,6 +65,7 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU)  += nouveau
 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600)     += r600
 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA)     += svga
 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST)   += swrast
+MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL)    += virgl
 # DRI Drivers
 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST) += swrast
 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915)   += i915
Signature · 6 lines
2.6.4

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#4 lore raw

PATCH 3/12 package/mesa3d: add support for new virgl Gallium driver

Am Sat, 19 Dec 2015 22:48:27 +0100 schrieb Yann E. MORIN:

Quoted 2 lines

configure: error: --with-egl-platforms=drm is required to build the virgl driver.

Hi Yann,

fixed by http://patchwork.ozlabs.org/patch/559347/

Regards, Bernd

#5 lore raw

PATCH 4/12 package/mesa3d: add support for Nouveau DRI driver

In reply to Bernd Kuhls

Needed by new package xdriver_xf86-video-nouveau.

---
 package/mesa3d/Config.in | 7 +++++++
 package/mesa3d/mesa3d.mk | 1 +
 2 files changed, 8 insertions(+)
package/mesa3d/Config.in +7 -0
index 8560794..90523d9 100644
@@ -114,6 +114,13 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER_I965
 	help
 	  Support for i965-based Intel GPUs.
 
+config BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU
+	bool "DRI nouveau driver"
+	select BR2_PACKAGE_MESA3D_DRI_DRIVER
+	select BR2_PACKAGE_LIBDRM_NOUVEAU
+	help
+	  Support for Nvidia-based GPUs.
+
 config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
 	bool "DRI radeon driver"
 	depends on BR2_i386 || BR2_x86_64
package/mesa3d/mesa3d.mk +1 -0
index 40e53cc..195ccff 100644
@@ -70,6 +70,7 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL)    += virgl
 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST) += swrast
 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915)   += i915
 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965)   += i965
+MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU) += nouveau
 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += radeon
 
 ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER),)
Signature · 1 line
2.6.4
#6 lore raw

PATCH 5/12 package/libva: bump version to 1.6.2

In reply to Bernd Kuhls
---
 package/libva/libva.hash | 4 ++--
 package/libva/libva.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
package/libva/libva.hash +2 -2
index 07284d2..4d7cdaa 100644
@@ -1,2 +1,2 @@
-# From http://lists.freedesktop.org/archives/libva/2015-September/003520.html
-sha1	84a026dfa8e3985a250ca92b135ae859ba5e9728	libva-1.6.1.tar.bz2
+# From http://lists.freedesktop.org/archives/libva/2015-December/003819.html
+sha1	8a857db50305e9e3ddb8fe4e342ddd2924ae16f6	libva-1.6.2.tar.bz2
package/libva/libva.mk +1 -1
index f8eab0f..4adfd52 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBVA_VERSION = 1.6.1
+LIBVA_VERSION = 1.6.2
 LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2
 LIBVA_SITE = http://www.freedesktop.org/software/vaapi/releases/libva
 LIBVA_LICENSE = MIT
Signature · 1 line
2.6.4
#7 lore raw

PATCH 6/12 package/libva-intel-driver: bump version to 1.6.2

In reply to Bernd Kuhls
---
 package/libva-intel-driver/libva-intel-driver.hash | 4 ++--
 package/libva-intel-driver/libva-intel-driver.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
package/libva-intel-driver/libva-intel-driver.hash +2 -2
index 0c57fab..1b2d754 100644
@@ -1,2 +1,2 @@
-# From http://lists.freedesktop.org/archives/libva/2015-September/003521.html
-sha1	ee2ef304b0cca8323bf4840a3af50278f8806944	libva-intel-driver-1.6.1.tar.bz2
+# From http://lists.freedesktop.org/archives/libva/2015-December/003820.html
+sha1	7ecc2a10d22129407fa5ce011da7066037e13255	libva-intel-driver-1.6.2.tar.bz2
package/libva-intel-driver/libva-intel-driver.mk +1 -1
index e199286..909d73b 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBVA_INTEL_DRIVER_VERSION = 1.6.1
+LIBVA_INTEL_DRIVER_VERSION = 1.6.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
Signature · 1 line
2.6.4
#8 lore raw

PATCH 7/12 package/nvidia-driver: bump version to 358.16

In reply to Bernd Kuhls

Needed for compatibility with X.org xserver >= 1.18:
http://www.nvidia.com/download/driverResults.aspx/95921/en-us
"Added support for X.Org xserver ABI 20 (xorg-server 1.18)."

---
 package/nvidia-driver/nvidia-driver.hash | 4 ++--
 package/nvidia-driver/nvidia-driver.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
package/nvidia-driver/nvidia-driver.hash +2 -2
index 137590f..ba2f555 100644
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  bba63c30c730ad7b8500a77c81cae58562b9f9b57cd576b61f37a2d8bc45df25  NVIDIA-Linux-x86-346.35.run
-sha256  8625acbbc7a2abdda436a5cb9d06f2a7f5913b16e0a35ac4f9f106853a94d086  NVIDIA-Linux-x86_64-346.35.run
+sha256	d3a2842cbfb1163e20c658fbfaf5a235d5c9f035cd2d657f15df8a14b3fe80b1	NVIDIA-Linux-x86-358.16.run
+sha256	a942cdb29ed715ff1ce25beb06b6c2490126b98ef8bee5d9973967b557596bf2	NVIDIA-Linux-x86_64-358.16.run
package/nvidia-driver/nvidia-driver.mk +1 -1
index 4bcb65e..a021ab8 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NVIDIA_DRIVER_VERSION = 346.35
+NVIDIA_DRIVER_VERSION = 358.16
 NVIDIA_DRIVER_SUFFIX = $(if $(BR2_x86_64),_64)
 NVIDIA_DRIVER_SITE = ftp://download.nvidia.com/XFree86/Linux-x86$(NVIDIA_DRIVER_SUFFIX)/$(NVIDIA_DRIVER_VERSION)
 NVIDIA_DRIVER_SOURCE = NVIDIA-Linux-x86$(NVIDIA_DRIVER_SUFFIX)-$(NVIDIA_DRIVER_VERSION).run
Signature · 1 line
2.6.4
#9 lore raw

PATCH 8/12 package/x11r7/xdriver_xf86-video-ati: bump version to 7.6.1

In reply to Bernd Kuhls
---
 package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash | 4 ++--
 package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk   | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash +2 -2
index ccb8665..57ebfe8 100644
@@ -1,2 +1,2 @@
-# From http://lists.x.org/archives/xorg-announce/2014-October/002486.html
-sha256	ec3e6f06b6cf9a40c72aafa3448aae8b034c80b37410ca9442d5cf6806e07936	xf86-video-ati-7.5.0.tar.bz2
+# From http://lists.x.org/archives/xorg-announce/2015-November/002658.html
+sha256 2516d9eeb8da8bcd3a01365ed1314919777910fa904ab268af342b5693e1d34c        xf86-video-ati-7.6.1.tar.bz2
package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +4 -1
index cba9e76..3dd3d07 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_ATI_VERSION = 7.5.0
+XDRIVER_XF86_VIDEO_ATI_VERSION = 7.6.1
 XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_ATI_LICENSE = MIT
@@ -28,4 +28,7 @@ else
 XDRIVER_XF86_VIDEO_ATI_CONF_OPTS = --disable-glamor
 endif
 
+# xdriver_xf86-video-ati requires O_CLOEXEC
+XDRIVER_XF86_VIDEO_ATI_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
+
 $(eval $(autotools-package))
Signature · 1 line
2.6.4
#10 lore raw

PATCH 8/12 package/x11r7/xdriver_xf86-video-ati: bump version to 7.6.1

Dear Bernd Kuhls,

package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk else · line 32

Quoted 2 lines · Bernd Kuhls
package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +2 -0
+# xdriver_xf86-video-ati requires O_CLOEXEC
+XDRIVER_XF86_VIDEO_ATI_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"

Can you report this problem upstream so that they fix their code to define _GNU_SOURCE when needed ?

Thanks!

Thomas

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

PATCH 9/12 package/x11r7/xdriver_xf86-video-intel: bump version

In reply to Bernd Kuhls

Needed for X.org xserver 1.18 bump, removed patches applied upstream.

---
 .../0001-sna-udev-fstat.patch                      | 61 -------------------
 .../0002-uxa-udev-fstat.patch                      | 31 ----------
 .../0003-sna-libdrm-abi-protection.patch           | 69 ----------------------
 .../xdriver_xf86-video-intel.hash                  |  2 -
 .../xdriver_xf86-video-intel.mk                    |  6 +-
 5 files changed, 2 insertions(+), 167 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-video-intel/0001-sna-udev-fstat.patch
 delete mode 100644 package/x11r7/xdriver_xf86-video-intel/0002-uxa-udev-fstat.patch
 delete mode 100644 package/x11r7/xdriver_xf86-video-intel/0003-sna-libdrm-abi-protection.patch
 delete mode 100644 package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash
package/x11r7/xdriver_xf86-video-intel/0001-sna-udev-fstat.patch deleted +0 -61
deleted file mode 100644
index e4ded3a..0000000
@@ -1,61 +0,0 @@
-From 12af8a575d1518d40416f83195049157c3a062a5 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <[email protected]>
-Date: Tue, 24 Feb 2015 15:25:40 +0000
-Subject: sna: udev integration depends on fstat and sys/stat.h
-
-src/sna/sna_driver.c: In function 'sna_handle_uevents':
-src/sna/sna_driver.c:759:2: error: implicit declaration of function 'fstat' [-Werror=implicit-function-declaration]
-
-Also take the opportunity to include udev support in the configure
-summary.
-
-Signed-off-by: Chris Wilson <[email protected]>
-
-Upstream at: http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?id=12af8a575d1518d40416f83195049157c3a062a5
-
-Signed-off-by: James Knight <[email protected]>
-
-diff --git a/configure.ac b/configure.ac
-index 7476e2b..de3a4b3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -197,11 +197,15 @@ AC_ARG_ENABLE(udev,
- 
- if test "x$UDEV" != "xno"; then
- 	PKG_CHECK_MODULES(UDEV, [libudev], [udev="yes"], [udev="no"])
-+	AC_CHECK_HEADERS([sys/stat.h], [], [udev="no"])
- 	if test "x$UDEV" = "xyes" -a "x$udev" != "xyes"; then
- 		AC_MSG_ERROR([udev support requested but not found (libudev)])
- 	fi
- 	if test "x$udev" = "xyes"; then
- 		AC_DEFINE(HAVE_UDEV,1,[Enable udev-based monitor hotplug detection])
-+		udev_msg=" yes"
-+	else
-+		udev_msg=" no"
- 	fi
- fi
- 
-@@ -911,6 +915,7 @@ echo "  Support for Kernel Mode Setting? $KMS"
- echo "  Support for legacy User Mode Setting (for i810)? $UMS"
- echo "  Support for Direct Rendering Infrastructure:$dri_msg"
- echo "  Support for Xv motion compensation (XvMC and libXvMC):$xvmc_msg"
-+echo "  Support for display hotplug notifications (udev):$udev_msg"
- echo "  Build additional tools and utilities?$tools_msg"
- if test -n "$xp_msg"; then
- echo "  Experimental support:$xp_msg"
-diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
-index 8c0d0b5..bc20ef0 100644
---- a/src/sna/sna_driver.c
-+++ b/src/sna/sna_driver.c
-@@ -740,6 +740,8 @@ sna_wakeup_handler(WAKEUPHANDLER_ARGS_DECL)
- }
- 
- #if HAVE_UDEV
-+#include <sys/stat.h>
-+
- static void
- sna_handle_uevents(int fd, void *closure)
- {
--- 
-cgit v0.10.2
-
package/x11r7/xdriver_xf86-video-intel/0002-uxa-udev-fstat.patch deleted +0 -31
deleted file mode 100644
index 3ab255b..0000000
@@ -1,31 +0,0 @@
-From 369ceec0e4910ba2c37736a59c55c0d6c26433bf Mon Sep 17 00:00:00 2001
-From: Chris Wilson <[email protected]>
-Date: Tue, 24 Feb 2015 15:25:40 +0000
-Subject: uxa: udev integration depends on fstat and sys/stat.h
-
-src/uxa/intel_driver.c: In function 'I830HandleUEvents':
-src/uxa/intel_driver.c:738:14: error: storage size of 's' isn't known
-src/uxa/intel_driver.c:746:2: error: implicit declaration of function 'fstat' [-Werror=implicit-function-declaration]
-
-Signed-off-by: Chris Wilson <[email protected]>
-
-Upstream at: Signed-off-by: James Knight <[email protected]>
-
-Signed-off-by: James Knight <[email protected]>
-
-diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
-index c554124..6e64b8c 100644
---- a/src/uxa/intel_driver.c
-+++ b/src/uxa/intel_driver.c
-@@ -728,6 +728,8 @@ intel_flush_callback(CallbackListPtr *list,
- }
- 
- #if HAVE_UDEV
-+#include <sys/stat.h>
-+
- static void
- I830HandleUEvents(int fd, void *closure)
- {
--- 
-cgit v0.10.2
-
package/x11r7/xdriver_xf86-video-intel/0003-sna-libdrm-abi-protection.patch deleted +0 -69

69 lines not on this page · raw message

package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash deleted +0 -2
deleted file mode 100644
index 6c3c6ba..0000000
@@ -1,2 +0,0 @@
-# From http://lists.x.org/archives/xorg-announce/2014-December/002508.html
-sha256	00b781eea055582820a123c47b62411bdf6aabf4f03dc0568faec55faf9667c9	xf86-video-intel-2.99.917.tar.bz2
package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +2 -4
index f0b0753..bf4f7a6 100644
@@ -4,12 +4,10 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.99.917
-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_VERSION = 82293901da23d79fd074e5255fda5c95405d52de
+XDRIVER_XF86_VIDEO_INTEL_SITE = git://anongit.freedesktop.org/xorg/driver/xf86-video-intel
 XDRIVER_XF86_VIDEO_INTEL_LICENSE = MIT
 XDRIVER_XF86_VIDEO_INTEL_LICENSE_FILES = COPYING
-# We're patching configure.ac
 XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES
 
 # this fixes a getline-related compilation error in src/sna/kgem.c
Signature · 1 line
2.6.4
#12 lore raw

PATCH 10/12 package/x11r7/xserver_xorg-server: bump version to 1.18.0

In reply to Bernd Kuhls

- added legacy handling for BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
- legacy handling for BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 is not needed because this option is not used by other packages

---
 Config.in.legacy                                           |  7 +++++++
 package/x11r7/xserver_xorg-server/Config.in                | 10 +++++-----
 package/x11r7/xserver_xorg-server/xserver_xorg-server.hash |  6 +++---
 3 files changed, 15 insertions(+), 8 deletions(-)
Config.in.legacy +7 -0
index e1ea06f..1ebfe07 100644
@@ -107,6 +107,13 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2016.02"
 
+config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
+	bool "xserver_xorg-server package was bumped to 1.18"
+	select BR2_LEGACY
+	select BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18
+	help
+	  xserver_xorg-server package was bumped to 1.18
+
 config BR2_PACKAGE_LIBEINA
 	bool "libeina package has been removed"
 	select BR2_LEGACY
package/x11r7/xserver_xorg-server/Config.in +5 -5
index 84f0298..3e31dc7 100644
@@ -64,14 +64,14 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
 config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI
 	int
 	default 14 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14
-	default 19 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
+	default 20 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20
 
 choice
 	bool "X Window System server version"
 
-config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
-	bool "1.17.4"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
+config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18
+	bool "1.18.0"
+	select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20
 	select BR2_PACKAGE_XPROTO_PRESENTPROTO
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14
@@ -82,7 +82,7 @@ endchoice
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION
 	string
-	default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
+	default "1.18.0" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18
 	default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14
 
 choice
package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +3 -3
index 0119e37..72c00c4 100644
@@ -1,6 +1,6 @@
 # From http://lists.x.org/archives/xorg-announce/2014-June/002440.html
 sha1   7a95765e56b124758fcd7b609589e65b8870880b                                xorg-server-1.14.7.tar.bz2
 sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f        xorg-server-1.14.7.tar.bz2
-# From http://lists.x.org/archives/xorg-announce/2015-October/002650.html
-sha1	139c4d6795eb4c3848616cc514d134532975e49e				xorg-server-1.17.4.tar.bz2
-sha256	0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457	xorg-server-1.17.4.tar.bz2
+# From http://lists.x.org/archives/xorg-announce/2015-November/002655.html
+sha1	f37f9ca17d211552c775c3ce78ff03385026bf3a				xorg-server-1.18.0.tar.bz2
+sha256	195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e	xorg-server-1.18.0.tar.bz2
Signature · 1 line
2.6.4
#13 lore raw

PATCH 10/12 package/x11r7/xserver_xorg-server: bump version to 1.18.0

Dear Bernd Kuhls,

Adding Arnout in Cc, since he is our legacy handling expert :)

Quoted 1 line · Bernd Kuhls

- added legacy handling for BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17

Is this really needed? In any case, without legacy handling, the thing will automatically fall back to version 1.18, which is what we want. So I'm questioning whether legacy handling is needed.

Quoted 2 lines

- legacy handling for BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 is not needed because this option is not used by other packages

BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 is a blind option, so there is no point in adding legacy handling for it.

Config.in.legacy endif · line 113

Quoted 4 lines
Config.in.legacy +4 -0
+config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
+	bool "xserver_xorg-server package was bumped to 1.18"
+	select BR2_LEGACY
+	select BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18

Doing a "select" on an item of a choice doesn't work. See the commit from Arnout about this:
https://git.busybox.net/buildroot/commit/?id=94d403d709eb5d0c487630b2eb651932bb488470.

package/x11r7/xserver_xorg-server/Config.in config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 · line 67

Quoted 10 lines
package/x11r7/xserver_xorg-server/Config.in +1 -1
index 84f0298..3e31dc7 100644
@@ -64,14 +64,14 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
 config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI
 	int
 	default 14 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14
-	default 19 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
+	default 20 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20

I don't see where you are adding the definition of the option BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20.

I'll mark this patch (and the nouveau patch) as Changes Requested in patchwork. I don't really have any comments on the nouveau patch, but since I assumed it depended on this one, I didn't apply it. Can you resend both once the xserver bump issues are resolved ?

Thanks a lot!

Thomas

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

PATCH 10/12 package/x11r7/xserver_xorg-server: bump version to 1.18.0

Quoted 10 lines · Thomas Petazzoni

Dear Bernd Kuhls,

Adding Arnout in Cc, since he is our legacy handling expert :)

Quoted 1 line · Bernd Kuhls

- added legacy handling for BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17

Is this really needed? In any case, without legacy handling, the thing will automatically fall back to version 1.18, which is what we want. So I'm questioning whether legacy handling is needed.

I would normally say that we should still have legacy handling here, to draw
people's attention to the fact that something in the .config changed. However, it's just a change of version, and versions are changing all over the place, so indeed legacy handling isn't needed here.

Regards,
Arnout

Quoted 6 lines
Quoted 3 lines

- legacy handling for BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 is not needed because this option is not used by other packages

BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 is a blind option, so there is no point in adding legacy handling for it.

[snip]

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
#15 lore raw

PATCH 10/12 package/x11r7/xserver_xorg-server: bump version to 1.18.0

Arnout,

Quoted 4 lines · Arnout Vandecappelle

I would normally say that we should still have legacy handling here, to draw
people's attention to the fact that something in the .config changed. However, it's just a change of version, and versions are changing all over the place, so indeed legacy handling isn't needed here.

As you say, we're bumping versions of tons of packages all the time, without notifying users each time (it would be horrible), so why should we do it specifically for the X.org server ? Especially when the user has chosen to use the "tip" (1.17) and we're just updating to the more recent "tip".

If we were to remove the 1.14 version, which is kept so far only for compatibility with old NVidia X.org drivers, then maybe we should do legacy handling (and even I'm not sure, because if we are to remove this version, it means that we would have upgraded the NVidia drivers to a version that works fine with a more recent X.org server).

Too much legacy handling is not good IMO.

Thomas

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

PATCH 11/12 package/libinput: bump version to 1.1.2

In reply to Bernd Kuhls
---
 package/libinput/libinput.hash | 4 ++--
 package/libinput/libinput.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
package/libinput/libinput.hash +2 -2
index 18bd4a7..56b2c10 100644
@@ -1,2 +1,2 @@
-# From http://lists.freedesktop.org/archives/wayland-devel/2015-October/025065.html
-sha256	673186ea2a0d2b695afaa9758834f9217b175774d9ae222e1b43ff63c663f582	libinput-1.1.0.tar.xz
+# From http://lists.freedesktop.org/archives/wayland-devel/2015-December/026041.html
+sha256	a323a32718a8f0f5e85e1ed3a81f0dde45eb52b215a15c7887bec40961d97a84	libinput-1.1.2.tar.xz
package/libinput/libinput.mk +1 -1
index 8b51b2b..91d6e53 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBINPUT_VERSION = 1.1.0
+LIBINPUT_VERSION = 1.1.2
 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz
 LIBINPUT_SITE = http://www.freedesktop.org/software/libinput
 LIBINPUT_LICENSE = MIT
Signature · 1 line
2.6.4
#17 lore raw

PATCH 12/12 package/x11r7/xdriver_xf86-video-nouveau: new package

In reply to Bernd Kuhls
---
 package/x11r7/Config.in                            |  1 +
 package/x11r7/xdriver_xf86-video-nouveau/Config.in | 18 ++++++++++++++++
 .../xdriver_xf86-video-nouveau.hash                |  2 ++
 .../xdriver_xf86-video-nouveau.mk                  | 25 ++++++++++++++++++++++
 4 files changed, 46 insertions(+)
 create mode 100644 package/x11r7/xdriver_xf86-video-nouveau/Config.in
 create mode 100644 package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash
 create mode 100644 package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk
package/x11r7/Config.in +1 -0
index 4e996fc..2f87cbd 100644
@@ -173,6 +173,7 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xdriver_xf86-video-mach64/Config.in
 		source package/x11r7/xdriver_xf86-video-mga/Config.in
 		source package/x11r7/xdriver_xf86-video-neomagic/Config.in
+		source package/x11r7/xdriver_xf86-video-nouveau/Config.in
 		source package/x11r7/xdriver_xf86-video-nv/Config.in
 		source package/x11r7/xdriver_xf86-video-openchrome/Config.in
 		source package/x11r7/xdriver_xf86-video-qxl/Config.in
package/x11r7/xdriver_xf86-video-nouveau/Config.in new file +18 -0
new file mode 100644
index 0000000..7e756e2
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NOUVEAU
+	bool "xf86-video-nouveau"
+	depends on BR2_PACKAGE_MESA3D
+	select BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU
+	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_LIBDRM_NOUVEAU
+	select BR2_PACKAGE_XPROTO_DRI2PROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	help
+	  Nouveau video driver
+
+	  http://nouveau.freedesktop.org
+
+comment "xf86-video-nouveau needs mesa3d"
+	depends on !BR2_PACKAGE_MESA3D
package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash new file +2 -0
new file mode 100644
index 0000000..9633641
@@ -0,0 +1,2 @@
+# From http://lists.x.org/archives/xorg-announce/2015-December/002662.html
+sha256	0ea057ad7fc31caba2d4e46c7e418fe2b3c762b04fb8d382f53383397fd8391e	xf86-video-nouveau-1.0.12.tar.bz2
package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk new file +25 -0
new file mode 100644
index 0000000..af84e79
@@ -0,0 +1,25 @@
+################################################################################
+#
+# xdriver_xf86-video-nouveau
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_NOUVEAU_VERSION = 1.0.12
+XDRIVER_XF86_VIDEO_NOUVEAU_SOURCE = xf86-video-nouveau-$(XDRIVER_XF86_VIDEO_NOUVEAU_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_NOUVEAU_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_NOUVEAU_LICENSE = MIT
+XDRIVER_XF86_VIDEO_NOUVEAU_LICENSE_FILES = COPYING
+XDRIVER_XF86_VIDEO_NOUVEAU_DEPENDENCIES = \
+	host-pkgconf \
+	libdrm \
+	xproto_dri2proto \
+	xproto_randrproto \
+	xproto_renderproto \
+	xproto_videoproto \
+	xproto_xextproto \
+	xserver_xorg-server
+
+# xdriver_xf86-video-nouveau requires O_CLOEXEC
+XDRIVER_XF86_VIDEO_NOUVEAU_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
+
+$(eval $(autotools-package))
Signature · 1 line
2.6.4
#18 lore raw

PATCH 1/12 package/apache: bump version to 2.4.18

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 5 lines · Bernd Kuhls
---
 package/apache/apache.hash | 4 ++--
 package/apache/apache.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

I've applied patches 1 to 9 and patch 11.

I have some concerns on patch 10, and since I believe the nouveau driver probably needs the newer X.org server version, I didn't merge patch 12.

Thanks!

Thomas

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