diff options
Diffstat (limited to 'x11/modular-xorg-server')
6 files changed, 14 insertions, 74 deletions
diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile index 88ccd5f1d17..397ab811f25 100644 --- a/x11/modular-xorg-server/Makefile +++ b/x11/modular-xorg-server/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.95 2015/06/27 18:46:35 sevan Exp $ +# $NetBSD: Makefile,v 1.96 2015/06/29 11:12:45 wiz Exp $ -DISTNAME= xorg-server-1.17.1 +DISTNAME= xorg-server-1.17.2 PKGNAME= modular-${DISTNAME} CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo index 1fb42eb081d..0421896e8d8 100644 --- a/x11/modular-xorg-server/distinfo +++ b/x11/modular-xorg-server/distinfo @@ -1,17 +1,15 @@ -$NetBSD: distinfo,v 1.59 2015/04/25 11:47:03 tnn Exp $ +$NetBSD: distinfo,v 1.60 2015/06/29 11:12:45 wiz Exp $ -SHA1 (xorg-server-1.17.1.tar.bz2) = 490118810a54e91c8814245c99d6285caf4985dd -RMD160 (xorg-server-1.17.1.tar.bz2) = 425a3a1f60d68750812d8cb3a341f27a8ff2e1be -Size (xorg-server-1.17.1.tar.bz2) = 5852385 bytes -SHA1 (patch-configure) = 0dd7b81199a9b0d7b23eb938cdebfeaf0e961558 +SHA1 (xorg-server-1.17.2.tar.bz2) = 56ac29a82b99bcf4c7ba2fca41a44cfa18748262 +RMD160 (xorg-server-1.17.2.tar.bz2) = bf575a269f1e7b729992a20989be84e09fcc88a2 +Size (xorg-server-1.17.2.tar.bz2) = 5767983 bytes +SHA1 (patch-configure) = b3c5ae8cd7aca96dbb5a237dda061e8c2569b2f2 SHA1 (patch-exa_exa__render.c) = 4e144b977797d9cdc7e08c286aaedb303f1a1aa8 SHA1 (patch-hw_xfree86_common_compiler.h) = c6f2a1ec352e3577dcd46acc8c9c45d81a0c3964 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92 SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a -SHA1 (patch-hw_xfree86_int10_generic.c) = 46dd9ae14cd5a8ed362c398001c9e62eb1a09c33 SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b SHA1 (patch-hw_xfree86_os-support_bsd_sparc64__video.c) = eddf15142e26f10f9028088f8e4e910bb6b5df59 SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 499e536a1189b88bc17e3df44a9ae2397decdc8b -SHA1 (patch-hw_xfree86_os-support_linux_int10_linux.c) = f553c1232e7af2ae239f6ed6dfca513a0baf1eab SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544 -SHA1 (patch-include_servermd.h) = b23759e39717965c34652e5caff0870cc6a8f124 +SHA1 (patch-include_servermd.h) = 301a1cd902490b5512a430204e7a05eda8d9097f diff --git a/x11/modular-xorg-server/patches/patch-configure b/x11/modular-xorg-server/patches/patch-configure index 624e360e517..2704aeafbfa 100644 --- a/x11/modular-xorg-server/patches/patch-configure +++ b/x11/modular-xorg-server/patches/patch-configure @@ -1,6 +1,5 @@ -$NetBSD: patch-configure,v 1.2 2015/04/25 11:47:03 tnn Exp $ +$NetBSD: patch-configure,v 1.3 2015/06/29 11:12:45 wiz Exp $ -Allow x86_64 as a SunOS arch. Use USE_AMD64_IOPL (actually x86_64_iopl) on NetBSD/amd64. (c.f. patch-hw_xfree86_os-support_bsd_i386.c) @@ -15,12 +14,3 @@ Use USE_AMD64_IOPL (actually x86_64_iopl) on NetBSD/amd64. SYS_LIBS=-lx86_64 ;; -@@ -28341,7 +28341,7 @@ fi - sparc*) - SOLARIS_INOUT_ARCH="sparcv8plus" - ;; -- i*86) -+ i*86|x86_64) - if test x$SOLARIS_64 = xyes ; then - SOLARIS_INOUT_ARCH="amd64" - else diff --git a/x11/modular-xorg-server/patches/patch-hw_xfree86_int10_generic.c b/x11/modular-xorg-server/patches/patch-hw_xfree86_int10_generic.c deleted file mode 100644 index a4f5ad9fe39..00000000000 --- a/x11/modular-xorg-server/patches/patch-hw_xfree86_int10_generic.c +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-hw_xfree86_int10_generic.c,v 1.1 2015/04/25 11:47:03 tnn Exp $ - -From 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch> -Date: Sat, 7 Feb 2015 18:13:21 +0100 -Subject: int10: Fix error check for pci_device_map_legacy - -pci_device_map_legacy returns 0 on success. - -Signed-off-by: Jürg Billeter <j@bitron.ch> -Reviewed-by: Adam Jackson <ajax@redhat.com> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - ---- hw/xfree86/int10/generic.c.orig 2014-09-18 22:53:19.000000000 +0000 -+++ hw/xfree86/int10/generic.c -@@ -104,7 +104,7 @@ readIntVec(struct pci_device *dev, unsig - { - void *map; - -- if (!pci_device_map_legacy(dev, 0, len, 0, &map)) -+ if (pci_device_map_legacy(dev, 0, len, 0, &map)) - return FALSE; - - memcpy(buf, map, len); diff --git a/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_linux_int10_linux.c b/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_linux_int10_linux.c deleted file mode 100644 index ab9b9c38b0d..00000000000 --- a/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_linux_int10_linux.c +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-hw_xfree86_os-support_linux_int10_linux.c,v 1.1 2015/04/25 11:47:03 tnn Exp $ - -From 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch> -Date: Sat, 7 Feb 2015 18:13:21 +0100 -Subject: int10: Fix error check for pci_device_map_legacy - -pci_device_map_legacy returns 0 on success. - -Signed-off-by: Jürg Billeter <j@bitron.ch> -Reviewed-by: Adam Jackson <ajax@redhat.com> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - ---- hw/xfree86/os-support/linux/int10/linux.c.orig 2014-09-18 22:53:19.000000000 +0000 -+++ hw/xfree86/os-support/linux/int10/linux.c -@@ -75,7 +75,7 @@ readLegacy(struct pci_device *dev, unsig - { - void *map; - -- if (!pci_device_map_legacy(dev, base, len, 0, &map)) -+ if (pci_device_map_legacy(dev, base, len, 0, &map)) - return FALSE; - - memcpy(buf, map, len); diff --git a/x11/modular-xorg-server/patches/patch-include_servermd.h b/x11/modular-xorg-server/patches/patch-include_servermd.h index c99db521921..f113104686f 100644 --- a/x11/modular-xorg-server/patches/patch-include_servermd.h +++ b/x11/modular-xorg-server/patches/patch-include_servermd.h @@ -1,14 +1,14 @@ -$NetBSD: patch-include_servermd.h,v 1.1 2015/04/25 11:47:03 tnn Exp $ +$NetBSD: patch-include_servermd.h,v 1.2 2015/06/29 11:12:45 wiz Exp $ Try to fix broken X_BYTE_ORDER handling for big endian. Probably broken here: http://cgit.freedesktop.org/xorg/xserver/commit/?id=4302484ef2e67b2e05756c7ee0834dce938f1b44 ---- include/servermd.h.orig 2015-01-17 23:42:52.000000000 +0000 +--- include/servermd.h.orig 2015-06-16 15:21:07.000000000 +0000 +++ include/servermd.h -@@ -52,10 +52,16 @@ SOFTWARE. - #error xserver code must include dix-config.h before any other headers - #endif +@@ -54,10 +54,16 @@ SOFTWARE. + + #include <X11/Xarch.h> /* for X_LITTLE_ENDIAN/X_BIG_ENDIAN */ -#if X_BYTE_ORDER == X_LITTLE_ENDIAN +#ifndef X_LITTLE_ENDIAN |