[Buildroot] [PATCH v2 1/5] package/nvidia-driver: bump version to 375.20

Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] [PATCH v2 1/5] package/nvidia-driver: bump version to 375.20
@ 2016-12-03 11:58 Bernd Kuhls
  2016-12-03 11:58 ` [Buildroot] [PATCH v2 2/5] package/x11r7/xlib_libXfont2: new package Bernd Kuhls
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Bernd Kuhls @ 2016-12-03 11:58 UTC (permalink / raw)
  To: buildroot

http://www.nvidia.com/download/driverResults.aspx/111596/en-us
"Added support for X.Org xserver ABI 23 (xorg-server 1.19)"

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: initial version

 package/nvidia-driver/nvidia-driver.hash | 4 ++--
 package/nvidia-driver/nvidia-driver.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/nvidia-driver/nvidia-driver.hash b/package/nvidia-driver/nvidia-driver.hash
index 9427ffb..04a44b8 100644
--- a/package/nvidia-driver/nvidia-driver.hash
+++ b/package/nvidia-driver/nvidia-driver.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  38cb22fa85ef74ea960d3e5d644838cd961984ffc32bb0d052414cc7fa32e315  NVIDIA-Linux-x86-367.35.run
-sha256  d2df3fcb1a145984b9de4f2f38a90e353469e9d12279cf5e2c67c553b112d075  NVIDIA-Linux-x86_64-367.35.run
+sha256 cc79d3ac2b688009ed2e47a1cf27557aea5dd745b3b6e9b83945c359ddab4335  NVIDIA-Linux-x86-375.20.run
+sha256 d10e40a19dc57ac958567a2b247c2b113e5f1e4186ad48e9a58e70a46d07620b  NVIDIA-Linux-x86_64-375.20.run
diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk
index 36f6e13..cb9b7fa 100644
--- a/package/nvidia-driver/nvidia-driver.mk
+++ b/package/nvidia-driver/nvidia-driver.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NVIDIA_DRIVER_VERSION = 367.35
+NVIDIA_DRIVER_VERSION = 375.20
 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
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v2 2/5] package/x11r7/xlib_libXfont2: new package
  2016-12-03 11:58 [Buildroot] [PATCH v2 1/5] package/nvidia-driver: bump version to 375.20 Bernd Kuhls
@ 2016-12-03 11:58 ` Bernd Kuhls
  2016-12-03 11:58 ` [Buildroot] [PATCH v2 3/5] package/x11r7/xdriver_xf86-video-qxl: add support for xlib_libXfont2 Bernd Kuhls
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Bernd Kuhls @ 2016-12-03 11:58 UTC (permalink / raw)
  To: buildroot

Needed for xserver_xorg-server 1.19+
https://cgit.freedesktop.org/xorg/xserver/commit/?id=05a793f5b3c40747d5a92a076def7f4fb673c7e7

We need to keep the xlib_libXfont package because xapp_bdftopcf and
xapp_xfs were not ported yet to xlib_libXfont2:
https://lists.x.org/archives/xorg-announce/2016-August/002702.html

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: simplified patch, added note about xlib_libXfont (Thomas)

 package/x11r7/Config.in                          |  1 +
 package/x11r7/xlib_libXfont2/Config.in           | 10 +++++++
 package/x11r7/xlib_libXfont2/xlib_libXfont2.hash |  2 ++
 package/x11r7/xlib_libXfont2/xlib_libXfont2.mk   | 33 ++++++++++++++++++++++++
 4 files changed, 46 insertions(+)
 create mode 100644 package/x11r7/xlib_libXfont2/Config.in
 create mode 100644 package/x11r7/xlib_libXfont2/xlib_libXfont2.hash
 create mode 100644 package/x11r7/xlib_libXfont2/xlib_libXfont2.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 40aa80c..c40a643 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -35,6 +35,7 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xlib_libXext/Config.in
 		source package/x11r7/xlib_libXfixes/Config.in
 		source package/x11r7/xlib_libXfont/Config.in
+		source package/x11r7/xlib_libXfont2/Config.in
 		source package/x11r7/xlib_libXft/Config.in
 		source package/x11r7/xlib_libXi/Config.in
 		source package/x11r7/xlib_libXinerama/Config.in
diff --git a/package/x11r7/xlib_libXfont2/Config.in b/package/x11r7/xlib_libXfont2/Config.in
new file mode 100644
index 0000000..6cba465
--- /dev/null
+++ b/package/x11r7/xlib_libXfont2/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XLIB_LIBXFONT2
+	bool "libXfont2"
+	select BR2_PACKAGE_FREETYPE
+	select BR2_PACKAGE_XLIB_LIBFONTENC
+	select BR2_PACKAGE_XLIB_XTRANS
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	select BR2_PACKAGE_XFONT_ENCODINGS
+	help
+	  X.Org Xfont library
diff --git a/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash b/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash
new file mode 100644
index 0000000..81a3c9f
--- /dev/null
+++ b/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash
@@ -0,0 +1,2 @@
+# From https://lists.x.org/archives/xorg-announce/2015-December/002663.html
+sha256 e9fbbb475ddd171b3a6a54b989cbade1f6f874fc35d505ebc5be426bc6e4db7e  libXfont2-2.0.1.tar.bz2
diff --git a/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk
new file mode 100644
index 0000000..fef1e68
--- /dev/null
+++ b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk
@@ -0,0 +1,33 @@
+################################################################################
+#
+# xlib_libXfont2
+#
+################################################################################
+
+XLIB_LIBXFONT2_VERSION = 2.0.1
+XLIB_LIBXFONT2_SOURCE = libXfont2-$(XLIB_LIBXFONT2_VERSION).tar.bz2
+XLIB_LIBXFONT2_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXFONT2_LICENSE = MIT
+XLIB_LIBXFONT2_LICENSE_FILES = COPYING
+XLIB_LIBXFONT2_INSTALL_STAGING = YES
+XLIB_LIBXFONT2_DEPENDENCIES = \
+	freetype \
+	xlib_libfontenc \
+	xlib_xtrans \
+	xproto_fontsproto \
+	xproto_xproto \
+	xfont_encodings
+
+HOST_XLIB_LIBXFONT2_DEPENDENCIES = \
+	host-freetype \
+	host-xlib_libfontenc \
+	host-xlib_xtrans \
+	host-xproto_fontsproto \
+	host-xproto_xproto \
+	host-xfont_encodings
+
+XLIB_LIBXFONT2_CONF_OPTS = --disable-devel-docs
+HOST_XLIB_LIBXFONT2_CONF_OPTS = --disable-devel-docs
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v2 3/5] package/x11r7/xdriver_xf86-video-qxl: add support for xlib_libXfont2
  2016-12-03 11:58 [Buildroot] [PATCH v2 1/5] package/nvidia-driver: bump version to 375.20 Bernd Kuhls
  2016-12-03 11:58 ` [Buildroot] [PATCH v2 2/5] package/x11r7/xlib_libXfont2: new package Bernd Kuhls
@ 2016-12-03 11:58 ` Bernd Kuhls
  2016-12-03 11:58 ` [Buildroot] [PATCH v2 4/5] package/x11r7/xdriver_xf86-video-intel: bump version to fix crash with xserver_xorg-server 1.19.x Bernd Kuhls
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Bernd Kuhls @ 2016-12-03 11:58 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: initial version

 .../x11r7/xdriver_xf86-video-qxl/0003-xfont2.patch | 69 ++++++++++++++++++++++
 package/x11r7/xdriver_xf86-video-qxl/Config.in     |  2 +-
 .../xdriver_xf86-video-qxl.mk                      |  7 ++-
 3 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 package/x11r7/xdriver_xf86-video-qxl/0003-xfont2.patch

diff --git a/package/x11r7/xdriver_xf86-video-qxl/0003-xfont2.patch b/package/x11r7/xdriver_xf86-video-qxl/0003-xfont2.patch
new file mode 100644
index 0000000..e93b746
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-qxl/0003-xfont2.patch
@@ -0,0 +1,69 @@
+From e13d28ee5d8724fc4b22f26bce01a7d36355f272 Mon Sep 17 00:00:00 2001
+From: "Owen W. Taylor" <otaylor@fishsoup.net>
+Date: Fri, 26 Aug 2016 11:44:55 -0400
+Subject: Check for either xfont.pc or xfont2.pc
+
+More recent versions of Xfont have a different API (with namespacing
+for libXfont functions.) Check for xfont2.pc and if found, use that, and
+use the new API. The rational for preferring libXfont2 is that as a recent
+change the xserver module looks for and requires libXfont2, and it's better
+not to have both versions of the library in process.
+---
+Downloaded from
+https://cgit.freedesktop.org/xorg/driver/xf86-video-qxl/commit/?id=e13d28ee5d8724fc4b22f26bce01a7d36355f272
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+diff --git a/configure.ac b/configure.ac
+index 7e95b01..451d42a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -60,8 +60,14 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+ XORG_DRIVER_CHECK_EXT(XV, videoproto)
+ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
+ 
++# We can use either version 1 or version 2 of libXfont
++PKG_CHECK_EXISTS(xfont2,
++                 [xfont_pc=xfont2
++                  AC_DEFINE(HAVE_XFONT2,1,[Version 2 of the libXfont library])],
++                 [xfont_pc=xfont])
++
+ # Obtain compiler/linker options for the driver dependencies
+-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto xfont $REQUIRED_MODULES)
++PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $xfont_pc $REQUIRED_MODULES)
+ 
+ 
+ save_CFLAGS="$CFLAGS"
+diff --git a/src/uxa/uxa-damage.c b/src/uxa/uxa-damage.c
+index a6d1ee3..6afb346 100644
+--- a/src/uxa/uxa-damage.c
++++ b/src/uxa/uxa-damage.c
+@@ -35,7 +35,11 @@
+ #include    <X11/X.h>
+ #include    <X11/fonts/font.h>
+ #include    <X11/fonts/fontstruct.h>
++#ifdef HAVE_XFONT2
++#include    <X11/fonts/libxfont2.h>
++#else
+ #include    <X11/fonts/fontutil.h>
++#endif
+ 
+ #include    "uxa-damage.h"
+ 
+@@ -947,8 +951,12 @@ uxa_damage_chars (RegionPtr	region,
+ {
+     ExtentInfoRec   extents;
+     BoxRec	    box;
+-    
++
++#ifdef HAVE_XFONT2
++    xfont2_query_glyph_extents(font, charinfo, n, &extents);
++#else
+     QueryGlyphExtents(font, charinfo, n, &extents);
++#endif
+     if (imageblt)
+     {
+ 	if (extents.overallWidth > extents.overallRight)
+-- 
+cgit v0.10.2
+
diff --git a/package/x11r7/xdriver_xf86-video-qxl/Config.in b/package/x11r7/xdriver_xf86-video-qxl/Config.in
index 04bde0f..967ecaf 100644
--- a/package/x11r7/xdriver_xf86-video-qxl/Config.in
+++ b/package/x11r7/xdriver_xf86-video-qxl/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_QXL
 	select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_UDEV # for KMS
 	select BR2_PACKAGE_LIBPCIACCESS
 	select BR2_PACKAGE_SPICE_PROTOCOL
-	select BR2_PACKAGE_XLIB_LIBXFONT
+	select BR2_PACKAGE_XLIB_LIBXFONT2 if !BR2_PACKAGE_XLIB_LIBXFONT
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
 	help
diff --git a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk
index 30cd7a2..ac43b95 100644
--- a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk
+++ b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk
@@ -18,7 +18,6 @@ XDRIVER_XF86_VIDEO_QXL_CONF_OPTS = \
 XDRIVER_XF86_VIDEO_QXL_DEPENDENCIES = \
 	libpciaccess \
 	spice-protocol \
-	xlib_libXfont \
 	xproto_fontsproto \
 	xproto_xproto \
 	xserver_xorg-server
@@ -32,4 +31,10 @@ else
 XDRIVER_XF86_VIDEO_QXL_CONF_OPTS += --disable-kms
 endif
 
+ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT2),y)
+XDRIVER_XF86_VIDEO_QXL_DEPENDENCIES += xlib_libXfont2
+else
+XDRIVER_XF86_VIDEO_QXL_DEPENDENCIES += xlib_libXfont
+endif
+
 $(eval $(autotools-package))
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v2 4/5] package/x11r7/xdriver_xf86-video-intel: bump version to fix crash with xserver_xorg-server 1.19.x
  2016-12-03 11:58 [Buildroot] [PATCH v2 1/5] package/nvidia-driver: bump version to 375.20 Bernd Kuhls
  2016-12-03 11:58 ` [Buildroot] [PATCH v2 2/5] package/x11r7/xlib_libXfont2: new package Bernd Kuhls
  2016-12-03 11:58 ` [Buildroot] [PATCH v2 3/5] package/x11r7/xdriver_xf86-video-qxl: add support for xlib_libXfont2 Bernd Kuhls
@ 2016-12-03 11:58 ` Bernd Kuhls
  2016-12-03 11:58 ` [Buildroot] [PATCH v2 5/5] package/x11r7/xserver_xorg-server: bump version to 1.19.0 Bernd Kuhls
  2016-12-04 15:11 ` [Buildroot] [PATCH v2 1/5] package/nvidia-driver: bump version to 375.20 Thomas Petazzoni
  4 siblings, 0 replies; 6+ messages in thread
From: Bernd Kuhls @ 2016-12-03 11:58 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: initial version

 package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 bfe0527..29228bb 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,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_INTEL_VERSION = 6988b873b041130d88dd0aae70c10f86550ee2b3
+XDRIVER_XF86_VIDEO_INTEL_VERSION = 9ac7a3370ab265d4cbdbbf3dc588af88c37048e1
 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
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v2 5/5] package/x11r7/xserver_xorg-server: bump version to 1.19.0
  2016-12-03 11:58 [Buildroot] [PATCH v2 1/5] package/nvidia-driver: bump version to 375.20 Bernd Kuhls
                   ` (2 preceding siblings ...)
  2016-12-03 11:58 ` [Buildroot] [PATCH v2 4/5] package/x11r7/xdriver_xf86-video-intel: bump version to fix crash with xserver_xorg-server 1.19.x Bernd Kuhls
@ 2016-12-03 11:58 ` Bernd Kuhls
  2016-12-04 15:11 ` [Buildroot] [PATCH v2 1/5] package/nvidia-driver: bump version to 375.20 Thomas Petazzoni
  4 siblings, 0 replies; 6+ messages in thread
From: Bernd Kuhls @ 2016-12-03 11:58 UTC (permalink / raw)
  To: buildroot

This release bumped video ABI to version 23
https://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/common/xf86Module.h?id=8d3f0e964e399dcfa8eb5e85d405217fdc5dbcd4
https://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/common/xf86Module.h?id=c07b796b47ae7f5a616d5e8e02ab0f84dc438a93
https://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/common/xf86Module.h?id=4af00242ef1e39499b932d12423fdf449296090a

and depends on xlib_libXfont2
https://cgit.freedesktop.org/xorg/xserver/commit/?id=05a793f5b3c40747d5a92a076def7f4fb673c7e7

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: instead of adding 1.19 as additional choice this patch contains a
    version bump (Thomas)

 .../0001-modesettings-needs-dri2.patch                   |  0
 package/x11r7/xserver_xorg-server/Config.in              | 16 +++++++++-------
 .../x11r7/xserver_xorg-server/xserver_xorg-server.hash   |  4 ++--
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk |  9 ++++++++-
 4 files changed, 19 insertions(+), 10 deletions(-)
 rename package/x11r7/xserver_xorg-server/{1.18.4 => 1.19.0}/0001-modesettings-needs-dri2.patch (100%)

diff --git a/package/x11r7/xserver_xorg-server/1.18.4/0001-modesettings-needs-dri2.patch b/package/x11r7/xserver_xorg-server/1.19.0/0001-modesettings-needs-dri2.patch
similarity index 100%
rename from package/x11r7/xserver_xorg-server/1.18.4/0001-modesettings-needs-dri2.patch
rename to package/x11r7/xserver_xorg-server/1.19.0/0001-modesettings-needs-dri2.patch
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index df3801c..1d4a1fb 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -17,7 +17,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XLIB_LIBXDMCP
 	select BR2_PACKAGE_XLIB_LIBXEXT
 	select BR2_PACKAGE_XLIB_LIBXFIXES
-	select BR2_PACKAGE_XLIB_LIBXFONT
 	select BR2_PACKAGE_XLIB_LIBXFT
 	select BR2_PACKAGE_XLIB_LIBXI
 	select BR2_PACKAGE_XLIB_LIBXINERAMA
@@ -61,37 +60,40 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14
 config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
 	bool
 
-config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20
+config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23
 	bool
 
 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
+	default 23 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23
 
 choice
 	bool "X Window System server version"
 
-config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18
-	bool "1.18.4"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20
+config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
+	bool "1.19.0"
+	select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23
+	select BR2_PACKAGE_XLIB_LIBXFONT2
 	select BR2_PACKAGE_XPROTO_PRESENTPROTO
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
 	bool "1.17.4"
 	select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
+	select BR2_PACKAGE_XLIB_LIBXFONT
 	select BR2_PACKAGE_XPROTO_PRESENTPROTO
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14
 	bool "1.14.7"
 	select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14
+	select BR2_PACKAGE_XLIB_LIBXFONT
 
 endchoice
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION
 	string
-	default "1.18.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18
+	default "1.19.0" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
 	default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
 	default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14
 
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
index ab7ba7e..54ae0ec 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
@@ -3,5 +3,5 @@ sha1   7a95765e56b124758fcd7b609589e65b8870880b                                x
 sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f        xorg-server-1.14.7.tar.bz2
 # From https://lists.x.org/archives/xorg-announce/2015-October/002650.html
 sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457        xorg-server-1.17.4.tar.bz2
-# From https://lists.x.org/archives/xorg-announce/2016-July/002699.html
-sha256 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8        xorg-server-1.18.4.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2016-November/002737.html
+sha256 149a708b50befc2d5a40b98d45ddd2ebe0beec018e6d0c663c43bad6210e4da3        xorg-server-1.19.0.tar.bz2
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 51c3efc..48cd2a7 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -15,7 +15,6 @@ XSERVER_XORG_SERVER_AUTORECONF = YES
 XSERVER_XORG_SERVER_DEPENDENCIES = 	\
 	xfont_font-util			\
 	xutil_util-macros 		\
-	xlib_libXfont 			\
 	xlib_libX11 			\
 	xlib_libXau 			\
 	xlib_libXdmcp 			\
@@ -194,6 +193,14 @@ else
 XSERVER_XORG_SERVER_CONF_OPTS += --disable-record
 endif
 
+ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT2),y)
+XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont2
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT),y)
+XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont
+endif
+
 ifneq ($(BR2_PACKAGE_XLIB_LIBXVMC),y)
 XSERVER_XORG_SERVER_CONF_OPTS += --disable-xvmc
 endif
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v2 1/5] package/nvidia-driver: bump version to 375.20
  2016-12-03 11:58 [Buildroot] [PATCH v2 1/5] package/nvidia-driver: bump version to 375.20 Bernd Kuhls
                   ` (3 preceding siblings ...)
  2016-12-03 11:58 ` [Buildroot] [PATCH v2 5/5] package/x11r7/xserver_xorg-server: bump version to 1.19.0 Bernd Kuhls
@ 2016-12-04 15:11 ` Thomas Petazzoni
  4 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2016-12-04 15:11 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat,  3 Dec 2016 12:58:05 +0100, Bernd Kuhls wrote:
> http://www.nvidia.com/download/driverResults.aspx/111596/en-us
> "Added support for X.Org xserver ABI 23 (xorg-server 1.19)"
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> v2: initial version

All 5 patches applied to master. Thanks!

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2016-12-04 15:11 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-03 11:58 [Buildroot] [PATCH v2 1/5] package/nvidia-driver: bump version to 375.20 Bernd Kuhls
2016-12-03 11:58 ` [Buildroot] [PATCH v2 2/5] package/x11r7/xlib_libXfont2: new package Bernd Kuhls
2016-12-03 11:58 ` [Buildroot] [PATCH v2 3/5] package/x11r7/xdriver_xf86-video-qxl: add support for xlib_libXfont2 Bernd Kuhls
2016-12-03 11:58 ` [Buildroot] [PATCH v2 4/5] package/x11r7/xdriver_xf86-video-intel: bump version to fix crash with xserver_xorg-server 1.19.x Bernd Kuhls
2016-12-03 11:58 ` [Buildroot] [PATCH v2 5/5] package/x11r7/xserver_xorg-server: bump version to 1.19.0 Bernd Kuhls
2016-12-04 15:11 ` [Buildroot] [PATCH v2 1/5] package/nvidia-driver: bump version to 375.20 Thomas Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox