package/x11r7/xserver_xorg-server: bump to version 1.19.1

Include this bugfix [1] (freeze with DRI2).
Tested using Enlightenment and Lugaru game on x86_64 target using DRI2.

[1] https://bugs.freedesktop.org/show_bug.cgi?id=99333

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/x11r7/xserver_xorg-server/1.19.0/0001-modesettings-needs-dri2.patch b/package/x11r7/xserver_xorg-server/1.19.0/0001-modesettings-needs-dri2.patch
deleted file mode 100644 (file)
index 4ef95ef..0000000
--- a/package/x11r7/xserver_xorg-server/1.19.0/0001-modesettings-needs-dri2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Kernel modesettings support also depends on dri2, see
-http://cgit.freedesktop.org/xorg/xserver/tree/hw/xfree86/drivers/modesetting/Makefile.am#n46
-
-Patch sent upstream: https://bugs.freedesktop.org/show_bug.cgi?id=91584
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -uNr xorg-server-1.17.2.org/configure.ac xorg-server-1.17.2/configure.ac
---- xorg-server-1.17.2.org/configure.ac        2015-06-16 17:42:40.000000000 +0200
-+++ xorg-server-1.17.2/configure.ac    2015-08-08 10:44:59.702382624 +0200
-@@ -2036,7 +2036,7 @@
-               XORG_SYS_LIBS="$XORG_SYS_LIBS $XORG_MODULES_LIBS"
-       fi
- 
--      if test "x$DRM" = xyes; then
-+      if test "x$DRM" = xyes -a "x$DRI2" = xyes; then
-               dnl 2.4.46 is required for cursor hotspot support.
-               PKG_CHECK_EXISTS(libdrm >= 2.4.46)
-               XORG_DRIVER_MODESETTING=yes

diff --git a/package/x11r7/xserver_xorg-server/1.19.1/0001-modesettings-needs-dri2.patch b/package/x11r7/xserver_xorg-server/1.19.1/0001-modesettings-needs-dri2.patch
new file mode 100644 (file)
index 0000000..4ef95ef
--- /dev/null
+++ b/package/x11r7/xserver_xorg-server/1.19.1/0001-modesettings-needs-dri2.patch
@@ -0,0 +1,19 @@
+Kernel modesettings support also depends on dri2, see
+http://cgit.freedesktop.org/xorg/xserver/tree/hw/xfree86/drivers/modesetting/Makefile.am#n46
+
+Patch sent upstream: https://bugs.freedesktop.org/show_bug.cgi?id=91584
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+diff -uNr xorg-server-1.17.2.org/configure.ac xorg-server-1.17.2/configure.ac
+--- xorg-server-1.17.2.org/configure.ac        2015-06-16 17:42:40.000000000 +0200
++++ xorg-server-1.17.2/configure.ac    2015-08-08 10:44:59.702382624 +0200
+@@ -2036,7 +2036,7 @@
+               XORG_SYS_LIBS="$XORG_SYS_LIBS $XORG_MODULES_LIBS"
+       fi
+ 
+-      if test "x$DRM" = xyes; then
++      if test "x$DRM" = xyes -a "x$DRI2" = xyes; then
+               dnl 2.4.46 is required for cursor hotspot support.
+               PKG_CHECK_EXISTS(libdrm >= 2.4.46)
+               XORG_DRIVER_MODESETTING=yes

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 1ee1f0b0045d350e8391f540c2f4e7a0bcb2beb1..0f1d1fecc11c865e4ef3570e9baa686a48b7c580 100644 (file)
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -74,7 +74,7 @@ choice
        bool "X Window System server version"
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
-       bool "1.19.0"
+       bool "1.19.1"
        select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23
        select BR2_PACKAGE_XLIB_LIBXFONT2
        select BR2_PACKAGE_XPROTO_PRESENTPROTO
@@ -94,7 +94,7 @@ endchoice
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION
        string
-       default "1.19.0" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
+       default "1.19.1" 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 54ae0ec37fa01da62c24fcf91356e8338db605c8..2f13ca6419295374c902fa72b972253c57dc0f91 100644 (file)
--- 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-November/002737.html
-sha256 149a708b50befc2d5a40b98d45ddd2ebe0beec018e6d0c663c43bad6210e4da3        xorg-server-1.19.0.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2017-January/002754.html
+sha256 79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb        xorg-server-1.19.1.tar.bz2