pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/modular-xorg-server modular-xorg-server: update to...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ff0ce11db274
branches: trunk
changeset: 380087:ff0ce11db274
user: wiz <wiz%pkgsrc.org@localhost>
date: Fri May 11 13:47:35 2018 +0000
description:
modular-xorg-server: update to 1.20.0.
1.20.0
Lots of Present, DRI3 modifier, and buildsystem fixes. Thanks to
everyone who contributed to this release!
1.19.99.905
More bugfixes, and streams support for Xwayland. This will almost
certainly be the last RC.
1.19.99.904
Another batch of cleanups and fixes, mostly in glamor and DRI3.
At this point the only outstanding major feature for 1.20 that hasn't
landed yet is EGLStreams support for Xwayland. The patches require some
minor rebasing to account for per-window flips in Present, I'll post
that momentarily I suppose. I'm honestly of two minds about merging it,
the deafening silence of review feedback has not been encouraging.
1.19.99.903
Fixes for meson, modesetting, and a crash I introduced right before RC2.
1.19.99.902
This merges the DRI3 1.2 support (with an asterisk) and per-window
flips for Xwayland, along with the usual collection of miscellaneous
fixes. In particular the meson build is much closer to production-
ready. The asterisk for DRI3 is that the modesetting driver has some
known issues still, so the code to enable planes and modifiers is
hidden behind an xorg.conf option:
Section "ServerFlags"
Option "Debug" "dmabuf_capable"
EndSection
Thanks to all for testing and debugging.
diffstat:
x11/modular-xorg-server/Makefile | 3 +-
x11/modular-xorg-server/Makefile.common | 9 +--
x11/modular-xorg-server/PLIST | 5 +-
x11/modular-xorg-server/buildlink3.mk | 4 +-
x11/modular-xorg-server/distinfo | 12 ++---
x11/modular-xorg-server/options.mk | 2 +-
x11/modular-xorg-server/patches/patch-hw_xfree86_sdksyms.sh | 27 -------------
x11/modular-xorg-server/patches/patch-os_xstrans.c | 21 ----------
8 files changed, 17 insertions(+), 66 deletions(-)
diffs (199 lines):
diff -r a5d9d9c08297 -r ff0ce11db274 x11/modular-xorg-server/Makefile
--- a/x11/modular-xorg-server/Makefile Fri May 11 13:39:57 2018 +0000
+++ b/x11/modular-xorg-server/Makefile Fri May 11 13:47:35 2018 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.115 2018/03/07 11:57:38 wiz Exp $
+# $NetBSD: Makefile,v 1.116 2018/05/11 13:47:35 wiz Exp $
DISTNAME= xorg-server-${XORG_VERSION}
PKGNAME= modular-${DISTNAME}
-PKGREVISION= 1
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= Modular X11 server from modular X.org
diff -r a5d9d9c08297 -r ff0ce11db274 x11/modular-xorg-server/Makefile.common
--- a/x11/modular-xorg-server/Makefile.common Fri May 11 13:39:57 2018 +0000
+++ b/x11/modular-xorg-server/Makefile.common Fri May 11 13:47:35 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.21 2018/03/07 11:57:38 wiz Exp $
+# $NetBSD: Makefile.common,v 1.22 2018/05/11 13:47:35 wiz Exp $
# used by x11/modular-xorg-server/Makefile
# used by x11/modular-xorg-xephyr/Makefile
-XORG_VERSION= 1.19.6
+XORG_VERSION= 1.20.0
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
EXTRACT_SUFX= .tar.bz2
@@ -67,8 +67,6 @@
CONFIGURE_ARGS+= --disable-xephyr
CONFIGURE_ARGS+= --disable-kdrive
#CONFIGURE_ARGS+= --disable-kdrive-vesa
-CONFIGURE_ARGS+= --disable-xfake
-CONFIGURE_ARGS+= --disable-xfbdev
CONFIGURE_ARGS+= --enable-xtrans-send-fds
CONFIGURE_ARGS+= --with-int10=x86emu
@@ -126,6 +124,8 @@
BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.11.0
BUILDLINK_DEPMETHOD.libpciaccess= full
.include "../../sysutils/libpciaccess/buildlink3.mk"
+BUILDLINK_API_DEPENDS.xorgproto+= xorgproto>=2018.3
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/evieext/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXau/buildlink3.mk"
@@ -142,6 +142,5 @@
.include "../../x11/libxkbui/buildlink3.mk"
.include "../../x11/pixman/buildlink3.mk"
.include "../../x11/xcb-util-keysyms/buildlink3.mk"
-.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/xtrans/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff -r a5d9d9c08297 -r ff0ce11db274 x11/modular-xorg-server/PLIST
--- a/x11/modular-xorg-server/PLIST Fri May 11 13:39:57 2018 +0000
+++ b/x11/modular-xorg-server/PLIST Fri May 11 13:47:35 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2016/11/16 10:14:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.28 2018/05/11 13:47:35 wiz Exp $
bin/X
bin/Xnest
bin/Xorg
@@ -56,6 +56,7 @@
${PLIST.dri}include/xorg/glamor.h
include/xorg/globals.h
include/xorg/glx_extinit.h
+include/xorg/glxvndabi.h
include/xorg/glyphstr.h
include/xorg/hotplug.h
include/xorg/i2c_def.h
@@ -117,6 +118,7 @@
include/xorg/vbe.h
include/xorg/vbeModes.h
include/xorg/vgaHW.h
+include/xorg/vndserver.h
include/xorg/wfbrename.h
include/xorg/window.h
include/xorg/windowstr.h
@@ -127,6 +129,7 @@
include/xorg/xf86Crtc.h
include/xorg/xf86Cursor.h
include/xorg/xf86DDC.h
+include/xorg/xf86MatchDrivers.h
include/xorg/xf86Modes.h
include/xorg/xf86Module.h
include/xorg/xf86Opt.h
diff -r a5d9d9c08297 -r ff0ce11db274 x11/modular-xorg-server/buildlink3.mk
--- a/x11/modular-xorg-server/buildlink3.mk Fri May 11 13:39:57 2018 +0000
+++ b/x11/modular-xorg-server/buildlink3.mk Fri May 11 13:47:35 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2018/03/07 11:57:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2018/05/11 13:47:35 wiz Exp $
BUILDLINK_TREE+= modular-xorg-server
@@ -21,6 +21,7 @@
.include "../../sysutils/libpciaccess/buildlink3.mk"
.include "../../x11/pixman/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.if !empty(USE_OLD_MODULAR_XORG_SERVER:M[yY][eE][sS])
.include "../../graphics/MesaLib7/buildlink3.mk" # XXX should not be needed for non-dri build
.include "../../x11/libXfont/buildlink3.mk"
@@ -28,7 +29,6 @@
.include "../../x11/libXfont2/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk" # XXX should not be needed for non-dri build
.endif
-.include "../../x11/xorgproto/buildlink3.mk"
.endif # MODULAR_XORG_SERVER_BUILDLINK3_MK
BUILDLINK_TREE+= -modular-xorg-server
diff -r a5d9d9c08297 -r ff0ce11db274 x11/modular-xorg-server/distinfo
--- a/x11/modular-xorg-server/distinfo Fri May 11 13:39:57 2018 +0000
+++ b/x11/modular-xorg-server/distinfo Fri May 11 13:47:35 2018 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.87 2018/01/25 15:06:10 jperkin Exp $
+$NetBSD: distinfo,v 1.88 2018/05/11 13:47:35 wiz Exp $
-SHA1 (xorg-server-1.19.6.tar.bz2) = 2dd560ac49bdbda7f67166546af43541fabf517f
-RMD160 (xorg-server-1.19.6.tar.bz2) = c2b6f9fe3957c99cddd44bc3ae38343a1c4f314e
-SHA512 (xorg-server-1.19.6.tar.bz2) = 38519a8d0af9dd034045fc346959496dd718fa59b6188307974797a1cd9c349deb54987f6232ea8396baf810dcc710c0ff191f76ed2186cae4d44921b3680412
-Size (xorg-server-1.19.6.tar.bz2) = 5984528 bytes
+SHA1 (xorg-server-1.20.0.tar.bz2) = a9e999c15a2322bc423d5d6e1978ba38f9635901
+RMD160 (xorg-server-1.20.0.tar.bz2) = 0b148a40cb372ffaffacbeac8d7765d5a108812a
+SHA512 (xorg-server-1.20.0.tar.bz2) = 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
+Size (xorg-server-1.20.0.tar.bz2) = 6096838 bytes
SHA1 (patch-configure) = 9e9f497f14d563ef66f25c637a14b0bea2243c3f
SHA1 (patch-hw_xfree86_common_xf86pciBus.c) = 896825ba12646431cba603938d118acbdde305dd
SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
@@ -15,5 +15,3 @@
SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400
SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e
SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
-SHA1 (patch-hw_xfree86_sdksyms.sh) = c403149ad35ffb70ee44f70de94b4497b751c118
-SHA1 (patch-os_xstrans.c) = 489a4f4b226ecd361b922895204fb9041b065d4e
diff -r a5d9d9c08297 -r ff0ce11db274 x11/modular-xorg-server/options.mk
--- a/x11/modular-xorg-server/options.mk Fri May 11 13:39:57 2018 +0000
+++ b/x11/modular-xorg-server/options.mk Fri May 11 13:47:35 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2018/03/07 11:57:38 wiz Exp $
+# $NetBSD: options.mk,v 1.19 2018/05/11 13:47:35 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server
PKG_SUPPORTED_OPTIONS= inet6 debug dtrace
diff -r a5d9d9c08297 -r ff0ce11db274 x11/modular-xorg-server/patches/patch-hw_xfree86_sdksyms.sh
--- a/x11/modular-xorg-server/patches/patch-hw_xfree86_sdksyms.sh Fri May 11 13:39:57 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$NetBSD: patch-hw_xfree86_sdksyms.sh,v 1.1 2016/04/10 07:35:20 tnn Exp $
-
-Kludge sdksyms.c generator to not fail on GetClientPid.
-It returns pid_t which on NetBSD is #define pid_t __pid_t
-This slightly alters the GCC preprocessor output which this fragile
-code could not deal with when using GCC 5+
-
---- hw/xfree86/sdksyms.sh.orig 2016-03-08 20:22:17.000000000 +0000
-+++ hw/xfree86/sdksyms.sh
-@@ -357,6 +357,17 @@ BEGIN {
- n = 1;
- }
- }
-+ # hack: pid_t becomes __pid_t on NetBSD.
-+ # GCC 5 inserts additional lines around this.
-+ if ($1 == "__pid_t" && NF == 1) {
-+ getline;
-+ n++;
-+ # skip line numbers GCC 5 adds (after typedef return type?)
-+ while ($n == "" || $0 ~ /^# [0-9]+ "/) {
-+ getline;
-+ n = 1;
-+ }
-+ }
-
- # type specifier may not be set, as in
- # extern _X_EXPORT unsigned name(...)
diff -r a5d9d9c08297 -r ff0ce11db274 x11/modular-xorg-server/patches/patch-os_xstrans.c
--- a/x11/modular-xorg-server/patches/patch-os_xstrans.c Fri May 11 13:39:57 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-os_xstrans.c,v 1.1 2015/09/26 18:35:41 tnn Exp $
-
-CMSG_SPACE must evaluate to a constant, but doesn't on netbsd-5.
-See sys/socket.h r1.104.
-
---- os/xstrans.c.orig 2015-05-21 14:23:54.000000000 +0000
-+++ os/xstrans.c
-@@ -14,4 +14,13 @@ _X_ATTRIBUTE_PRINTF(1, 2);
- #define TRANS_REOPEN
- #define TRANS_SERVER
- #define XSERV_t
-+#if defined(__NetBSD__)
-+#include <sys/param.h>
-+#if (__NetBSD_Version__ < 600000000)
-+#include <sys/socket.h>
-+#define __MY_CMSG_ALIGN(n) (((n) + 7) & ~7)
-+#undef CMSG_SPACE
-+#define CMSG_SPACE(l) (__MY_CMSG_ALIGN(sizeof(struct msghdr)) + __MY_CMSG_ALIGN(l))
-+#endif
-+#endif
- #include <X11/Xtrans/transport.c>
Home |
Main Index |
Thread Index |
Old Index