projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ad916fe)
package/x11r7/xserver_xorg-server: bump version to 1.19.0
authorBernd Kuhls <bernd.kuhls@t-online.de>
Sat, 3 Dec 2016 11:58:09 +0000 (12:58 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sun, 4 Dec 2016 15:11:09 +0000 (16:11 +0100)
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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/x11r7/xserver_xorg-server/1.18.4/0001-modesettings-needs-dri2.patch [deleted file] patch | blob | history
package/x11r7/xserver_xorg-server/1.19.0/0001-modesettings-needs-dri2.patch [new file with mode: 0644] patch | blob
package/x11r7/xserver_xorg-server/Config.in patch | blob | history
package/x11r7/xserver_xorg-server/xserver_xorg-server.hash patch | blob | history
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk patch | blob | history

diff --git a/package/x11r7/xserver_xorg-server/1.18.4/0001-modesettings-needs-dri2.patch b/package/x11r7/xserver_xorg-server/1.18.4/0001-modesettings-needs-dri2.patch
deleted file mode 100644 (file)
index 4ef95ef..0000000
--- a/package/x11r7/xserver_xorg-server/1.18.4/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.0/0001-modesettings-needs-dri2.patch b/package/x11r7/xserver_xorg-server/1.19.0/0001-modesettings-needs-dri2.patch
new file mode 100644 (file)
index 0000000..4ef95ef
--- /dev/null
+++ b/package/x11r7/xserver_xorg-server/1.19.0/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 df3801c5aeab45450f07fcadcc970aaef2a8d5f7..1d4a1fb5ee7547b4d3cdac4689ce097e0ddb6d43 100644 (file)
--- 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 ab7ba7eb29608694909a51b80a49b0827bcea5cb..54ae0ec37fa01da62c24fcf91356e8338db605c8 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-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 51c3efccc8f1557416804cb37927d1afde44fbd8..48cd2a78dfedbe97696444c61c3294172925fa46 100644 (file)
--- 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