From da0e4619cf9cca9c4c6ca1124293c7b2602c824b Mon Sep 17 00:00:00 2001 From: tnn Date: Tue, 5 Jan 2016 13:04:23 +0000 Subject: Update to xorg-server-1.18.0 (2015-11-09) The main highlight of this release are RandR 1.5 with reworked multi-monitor support, GLAMOR optimizations and better generic modesetting driver support. --- x11/modular-xorg-server/Makefile.common | 7 +-- x11/modular-xorg-server/PLIST | 7 +-- x11/modular-xorg-server/buildlink3.mk | 5 +- x11/modular-xorg-server/distinfo | 11 ++--- .../patches/patch-hw_xfree86_common_compiler.h | 53 ---------------------- 5 files changed, 14 insertions(+), 69 deletions(-) delete mode 100644 x11/modular-xorg-server/patches/patch-hw_xfree86_common_compiler.h (limited to 'x11') diff --git a/x11/modular-xorg-server/Makefile.common b/x11/modular-xorg-server/Makefile.common index 22657a3f576..a0e1404730c 100644 --- a/x11/modular-xorg-server/Makefile.common +++ b/x11/modular-xorg-server/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.4 2015/11/08 15:08:00 sevan Exp $ +# $NetBSD: Makefile.common,v 1.5 2016/01/05 13:04:23 tnn Exp $ # used by x11/modular-xorg-server/Makefile # used by x11/modular-xorg-xephyr/Makefile -XORG_VERSION= 1.17.4 +XORG_VERSION= 1.18.0 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} EXTRACT_SUFX= .tar.bz2 @@ -38,6 +38,7 @@ DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" +CPPFLAGS+= -D_OPENBSD_SOURCE # for reallocarray(3) CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org" CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation" # TLS is not supported by NetBSD<6 @@ -120,7 +121,7 @@ BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.16 BUILDLINK_API_DEPENDS.inputproto+= inputproto>=2.1.99.6 BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3 BUILDLINK_API_DEPENDS.pixman+= pixman>=0.21.8 -BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.4.0 +BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.5.0 BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.11 BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3 BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.1.0 diff --git a/x11/modular-xorg-server/PLIST b/x11/modular-xorg-server/PLIST index 22457ce3532..b717a174ed0 100644 --- a/x11/modular-xorg-server/PLIST +++ b/x11/modular-xorg-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2015/09/26 08:47:17 tnn Exp $ +@comment $NetBSD: PLIST,v 1.24 2016/01/05 13:04:23 tnn Exp $ bin/X bin/Xnest bin/Xorg @@ -78,6 +78,7 @@ include/xorg/misyncfd.h include/xorg/misyncshm.h include/xorg/misyncstr.h include/xorg/mizerarc.h +include/xorg/nonsdk_extinit.h include/xorg/opaque.h include/xorg/optionstr.h include/xorg/os.h @@ -110,14 +111,11 @@ include/xorg/shadowfb.h include/xorg/shmint.h include/xorg/site.h ${PLIST.sunos}include/xorg/solaris-${SUNOS_ARCH}.il -include/xorg/swaprep.h -include/xorg/swapreq.h include/xorg/syncsdk.h include/xorg/validate.h include/xorg/vbe.h include/xorg/vbeModes.h include/xorg/vgaHW.h -include/xorg/vidmodeproc.h include/xorg/wfbrename.h include/xorg/window.h include/xorg/windowstr.h @@ -155,7 +153,6 @@ include/xorg/xf86str.h include/xorg/xf86xv.h include/xorg/xf86xvmc.h include/xorg/xf86xvpriv.h -include/xorg/xfixes.h include/xorg/xisb.h include/xorg/xkbfile.h include/xorg/xkbrules.h diff --git a/x11/modular-xorg-server/buildlink3.mk b/x11/modular-xorg-server/buildlink3.mk index a1993a6c30e..32c7d53790a 100644 --- a/x11/modular-xorg-server/buildlink3.mk +++ b/x11/modular-xorg-server/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2015/09/25 00:57:16 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2016/01/05 13:04:23 tnn Exp $ BUILDLINK_TREE+= modular-xorg-server @@ -13,7 +13,7 @@ USE_OLD_MODULAR_XORG_SERVER?= no BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.12.4nb12<1.17 BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../x11/modular-xorg-server112 .else -BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.17 +BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.18 BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../x11/modular-xorg-server .endif @@ -34,6 +34,7 @@ BUILDLINK_DEPMETHOD.libpciaccess= full .include "../../x11/presentproto/buildlink3.mk" .endif .include "../../x11/inputproto/buildlink3.mk" +.include "../../x11/libXfont/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" .include "../../x11/renderproto/buildlink3.mk" .include "../../x11/videoproto/buildlink3.mk" diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo index eb30bf9e9f5..f7ba187db0c 100644 --- a/x11/modular-xorg-server/distinfo +++ b/x11/modular-xorg-server/distinfo @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.68 2015/11/01 22:58:52 tnn Exp $ +$NetBSD: distinfo,v 1.69 2016/01/05 13:04:23 tnn Exp $ -SHA1 (xorg-server-1.17.4.tar.bz2) = 139c4d6795eb4c3848616cc514d134532975e49e -RMD160 (xorg-server-1.17.4.tar.bz2) = d89d56015d093666e932fd0afc7d51aa2db7cc2f -SHA512 (xorg-server-1.17.4.tar.bz2) = 4b8377b86ca88f27dcf59db2996b2ee620ce6f181a37dc47600365db588d48f2f3ca66a3149e7c856e686e5783b1cccb2ba0827aa7413299163dfca869f4d376 -Size (xorg-server-1.17.4.tar.bz2) = 5791384 bytes +SHA1 (xorg-server-1.18.0.tar.bz2) = f37f9ca17d211552c775c3ce78ff03385026bf3a +RMD160 (xorg-server-1.18.0.tar.bz2) = d154fa2a43ad32e746fba9893d51206036a6daa7 +SHA512 (xorg-server-1.18.0.tar.bz2) = c7b1403e79e26ea96690f5634eb2fa424f9436a8a3c8a17779f71d254a813ae9b2ff1eb3dc8c6b4c37da125f3108ee86f6f5b1c27c1db6ab28eb6c8ee62e5768 +Size (xorg-server-1.18.0.tar.bz2) = 5818703 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_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99 diff --git a/x11/modular-xorg-server/patches/patch-hw_xfree86_common_compiler.h b/x11/modular-xorg-server/patches/patch-hw_xfree86_common_compiler.h deleted file mode 100644 index d49f2d78ccb..00000000000 --- a/x11/modular-xorg-server/patches/patch-hw_xfree86_common_compiler.h +++ /dev/null @@ -1,53 +0,0 @@ -$NetBSD: patch-hw_xfree86_common_compiler.h,v 1.2 2015/04/25 11:47:03 tnn Exp $ - ---- hw/xfree86/common/compiler.h.orig 2015-01-17 23:42:52.000000000 +0000 -+++ hw/xfree86/common/compiler.h -@@ -972,26 +972,26 @@ inl(unsigned PORT_SIZE port) - static __inline__ void - outb(unsigned short port, unsigned char val) - { -- __asm__ __volatile__("out%B0 (%1)"::"a"(val), "d"(port)); -+ __asm__ __volatile__("outb %0, %1"::"a"(val), "d"(port)); - } - - static __inline__ void - outw(unsigned short port, unsigned short val) - { -- __asm__ __volatile__("out%W0 (%1)"::"a"(val), "d"(port)); -+ __asm__ __volatile__("outw %0, %1"::"a"(val), "d"(port)); - } - - static __inline__ void - outl(unsigned short port, unsigned int val) - { -- __asm__ __volatile__("out%L0 (%1)"::"a"(val), "d"(port)); -+ __asm__ __volatile__("outl %0, %1"::"a"(val), "d"(port)); - } - - static __inline__ unsigned int - inb(unsigned short port) - { - unsigned char ret; -- __asm__ __volatile__("in%B0 (%1)":"=a"(ret):"d"(port)); -+ __asm__ __volatile__("inb %1, %0":"=a"(ret):"d"(port)); - - return ret; - } -@@ -1000,7 +1000,7 @@ static __inline__ unsigned int - inw(unsigned short port) - { - unsigned short ret; -- __asm__ __volatile__("in%W0 (%1)":"=a"(ret):"d"(port)); -+ __asm__ __volatile__("inw %1, %0":"=a"(ret):"d"(port)); - - return ret; - } -@@ -1009,7 +1009,7 @@ static __inline__ unsigned int - inl(unsigned short port) - { - unsigned int ret; -- __asm__ __volatile__("in%L0 (%1)":"=a"(ret):"d"(port)); -+ __asm__ __volatile__("inl %1, %0":"=a"(ret):"d"(port)); - - return ret; - } -- cgit v1.2.3