[Midnightbsd-cvs] mports [24077] trunk/x11-servers/xorg-server: update xorg server

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Sep 2 17:37:42 EDT 2018 

Revision: 24077
          http://svnweb.midnightbsd.org/mports/?rev=24077
Author:   laffer1
Date:     2018-09-02 17:37:41 -0400 (Sun, 02 Sep 2018)
Log Message:
-----------
update xorg server

Modified Paths:
--------------
    trunk/x11-servers/xorg-server/Makefile
    trunk/x11-servers/xorg-server/distinfo
    trunk/x11-servers/xorg-server/files/patch-config_config-backends.h
    trunk/x11-servers/xorg-server/files/patch-config_devd.c
    trunk/x11-servers/xorg-server/files/patch-xkb_Makefile.in
    trunk/x11-servers/xorg-server/pkg-plist

Removed Paths:
-------------
    trunk/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c

Modified: trunk/x11-servers/xorg-server/Makefile
===================================================================
--- trunk/x11-servers/xorg-server/Makefile	2018-09-02 21:30:58 UTC (rev 24076)
+++ trunk/x11-servers/xorg-server/Makefile	2018-09-02 21:37:41 UTC (rev 24077)
@@ -1,8 +1,8 @@
 # $MidnightBSD$
 
 PORTNAME?=	xorg-server
-PORTVERSION=	1.14.7
-PORTREVISION?=	8
+PORTVERSION?=	1.18.4
+PORTREVISION?=	1
 PORTEPOCH?=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG/individual/xserver
@@ -11,10 +11,9 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT?=	X.Org X server and related programs
 
-LICENSE?=	mit
+LICENSE=	mit
 
-LIB_DEPENDS=	libdrm.so:graphics/libdrm
-RUN_DEPENDS=	xkeyboard-config>=2.5:x11/xkeyboard-config \
+RUN_DEPENDS+=	xkeyboard-config>=2.5:x11/xkeyboard-config \
 		xkbcomp:x11/xkbcomp
 
 XORG_CAT=	xserver
@@ -23,34 +22,47 @@
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	SUID
 OPTIONS_RADIO=	CONF
-OPTIONS_RADIO_CONF=	HAL DEVD
+OPTIONS_RADIO_CONF=	DEVD HAL
+DEVD_DESC=	Use devd for autoconfiguration of input devices
+HAL_DESC=	Use hald for autoconfiguration of input devices
 SUID_DESC=	Install the Xorg server with setuid bit set
-HAL_DESC=	Compile with HAL config support
-DEVD_DESC=	Use devd for autoconfiguration of input devices
-OPTIONS_DEFAULT=SUID DEVD
+OPTIONS_DEFAULT=DEVD SUID
 
+OPTIONS_EXCLUDE_sparc64=	HAL
+
 .include <bsd.mport.options.mk>
 
-USES=		gmake libtool perl5 tar:bzip2 ssl
+USES=		gmake libtool perl5 ssl tar:bzip2
 USE_PERL5=	build
-USE_GL=		gl
-USE_XORG?=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
-		xmu xt xpm xext randrproto renderproto fixesproto damageproto \
-		dri2proto xcmiscproto xextproto xproto xtrans xf86miscproto \
-		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
-		resourceproto fontsproto inputproto xf86dgaproto \
-		videoproto compositeproto trapproto recordproto xineramaproto \
-		xinerama evieproto xfont fontenc xkbui pixman pciaccess
-
-CONFIGURE_ARGS?=--disable-dmx --disable-xvfb --disable-xnest \
-		--without-xmlto --disable-docs --disable-devel-docs \
-		--localstatedir=/var --without-dtrace --disable-xephyr \
-		--enable-record=yes
+USE_GL+=	gl
+USE_XORG+=	bigreqsproto compositeproto damageproto dri2proto dri3proto \
+		fixesproto fontsproto glproto inputproto kbproto pixman \
+		presentproto randrproto recordproto renderproto \
+		resourceproto scrnsaverproto videoproto xau \
+		xcmiscproto xdmcp xextproto xf86driproto xfont \
+		xineramaproto xkbfile xproto xshmfence xtrans
+CONFIGURE_ARGS+=--without-doxygen --without-xmlto --without-fop \
+		--localstatedir=/var --with-shared-memory-dir=/tmp \
+		--disable-config-udev --disable-config-udev-kms \
+		--without-dtrace --enable-glamor
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd10.4
 INSTALL_TARGET=	install-strip
 
+.if ${SLAVE_PORT} == "no" || ${PORTNAME} == "xephyr" || ${PORTNAME} == "xwayland"
+LIB_DEPENDS+=	libdrm.so:graphics/libdrm \
+		libepoxy.so:graphics/libepoxy
+.else
+BUILD_DEPENDS+=	libepoxy>0:graphics/libepoxy	# only for configure
+.endif
+
 .if ${SLAVE_PORT} == "no"
+USE_GL+=	gbm
+USE_XORG+=	pciaccess xf86dgaproto xf86vidmodeproto
+CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disable-xnest --disable-xvfb \
+		--disable-xwayland
 SUB_FILES=	pkg-install pkg-deinstall
 .else
+CONFIGURE_ARGS+=--disable-xorg
 # for slave ports we need to overwrite PLIST, so it doesn't overwrite
 # PLIST_FILES, with the masterport plist.
 PLIST=		${.CURDIR}/pkg-plist
@@ -58,7 +70,7 @@
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_OPENSSL_BASE)
+.if ${SSL_DEFAULT} == base
 # The reason why I use this is cause openssl from base doesn't install a .pc file
 # and configure will fail trying to find it. Setting both of those variables to
 # a *non-empty* value by-passes the pkg-config check.
@@ -67,41 +79,25 @@
 
 .if ${PORT_OPTIONS:MHAL}
 LIB_DEPENDS+=	libhal.so:sysutils/hal
-CONFIGURE_ARGS+=	--enable-config-hal=yes
+CONFIGURE_ARGS+=	--enable-config-hal
 .else
-CONFIGURE_ARGS+=	--enable-config-hal=no
+CONFIGURE_ARGS+=	--disable-config-hal
 .endif
 
 # We handle Xorg setuid in the plist. This allows to build xorg-server as a user.
 CONFIGURE_ARGS+=--disable-install-setuid
 
-.if ${ARCH} == armv6
-EXTRA_PATCHES+=	${FILESDIR}/extra-arm-patch-hw__xfree86__os-support__bsd__Makefile.in
-EXTRA_PATCHES+=	${FILESDIR}/extra-arm-patch-include__servermd.h
+.if ${ARCH} == "i386" || ${ARCH} == "amd64"
+LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .endif
 
-.if ${ARCH} == i386
-EXTRA_PATCHES+=	${FILESDIR}/extra-arch-i386
-.endif
-
-.if ${ARCH} == ia64
-EXTRA_PATCHES+=	${FILESDIR}/extra-arch-ia64
-.endif
-
-.if ${ARCH} == powerpc || ${ARCH} == powerpc64
-EXTRA_PATCHES+=	${FILESDIR}/extra-arch-powerpc
-.endif
-
-.if ${ARCH} == sparc64
+.if ${ARCH} == "sparc64"
 PLIST_SUB+=	SPARC64=""
-EXTRA_PATCHES+=	${FILESDIR}/extra-arch-sparc64
 .else
 PLIST_SUB+=	SPARC64="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSUID}
-PLIST_SUB+=	NOSUID="@comment "
-
 pre-everything::
 	@${ECHO_MSG} "By default, the X Server installs as a set-user-id root binary. When run by"
 	@${ECHO_MSG} "a normal user, it checks arguments and environment as done in the x11/wrapper"
@@ -109,10 +105,6 @@
 	@${ECHO_MSG} "of this, but still want to run an X Server (for example using xdm/kdm/gdm,"
 	@${ECHO_MSG} "which will still run the server as root), you can cancel the build and set"
 	@${ECHO_MSG} "xorg-server_UNSET=SUID in /etc/make.conf."
-
-
-.else
-PLIST_SUB+=	NOSUID="" SUID="@comment "
 .endif
 
 post-patch:
@@ -136,10 +128,10 @@
 post-install:
 # The .xorg dir because else the xorg-server might not load the correct
 # libglx module.
-	@${MKDIR} ${PREFIX}/lib/xorg/modules/extensions/.xorg
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg
 	${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \
-		${PREFIX}/lib/xorg/modules/extensions/.xorg/
-	@${MKDIR} ${PREFIX}/etc/X11/xorg.conf.d
+		${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg/
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d
 .endif # ! SLAVE_PORT
 
 .include <bsd.port.post.mk>

Modified: trunk/x11-servers/xorg-server/distinfo
===================================================================
--- trunk/x11-servers/xorg-server/distinfo	2018-09-02 21:30:58 UTC (rev 24076)
+++ trunk/x11-servers/xorg-server/distinfo	2018-09-02 21:37:41 UTC (rev 24077)
@@ -1,2 +1,3 @@
-SHA256 (xorg/xserver/xorg-server-1.14.7.tar.bz2) = fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f
-SIZE (xorg/xserver/xorg-server-1.14.7.tar.bz2) = 5520884
+TIMESTAMP = 1484803304
+SHA256 (xorg/xserver/xorg-server-1.18.4.tar.bz2) = 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8
+SIZE (xorg/xserver/xorg-server-1.18.4.tar.bz2) = 6009508

Deleted: trunk/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c
===================================================================
--- trunk/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c	2018-09-02 21:30:58 UTC (rev 24076)
+++ trunk/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c	2018-09-02 21:37:41 UTC (rev 24077)
@@ -1,9 +0,0 @@
-Index: hw/xfree86/os-support/bsd/i386_video.c
-@@ -32,6 +32,7 @@
- #include "xf86Priv.h"
- 
- #include <errno.h>
-+#include <sys/types.h>
- #include <sys/mman.h>
- 
- #ifdef HAS_MTRR_SUPPORT

Modified: trunk/x11-servers/xorg-server/files/patch-config_config-backends.h
===================================================================
--- trunk/x11-servers/xorg-server/files/patch-config_config-backends.h	2018-09-02 21:30:58 UTC (rev 24076)
+++ trunk/x11-servers/xorg-server/files/patch-config_config-backends.h	2018-09-02 21:37:41 UTC (rev 24077)
@@ -1,6 +1,6 @@
---- config/config-backends.h.orig	2014-04-12 15:29:14 UTC
+--- config/config-backends.h.orig	2016-07-15 16:17:45 UTC
 +++ config/config-backends.h
-@@ -75,3 +75,8 @@ void config_hal_fini(void);
+@@ -44,3 +44,8 @@ void config_hal_fini(void);
  int config_wscons_init(void);
  void config_wscons_fini(void);
  #endif

Modified: trunk/x11-servers/xorg-server/files/patch-config_devd.c
===================================================================
--- trunk/x11-servers/xorg-server/files/patch-config_devd.c	2018-09-02 21:30:58 UTC (rev 24076)
+++ trunk/x11-servers/xorg-server/files/patch-config_devd.c	2018-09-02 21:37:41 UTC (rev 24077)
@@ -1,6 +1,6 @@
---- config/devd.c.orig	2015-05-19 19:41:49 UTC
+--- config/devd.c.orig	2017-01-19 15:20:42 UTC
 +++ config/devd.c
-@@ -0,0 +1,531 @@
+@@ -0,0 +1,532 @@
 +/*
 + * Copyright (c) 2012 Baptiste Daroussin
 + * Copyright (c) 2013, 2014 Alex Kozlov
@@ -64,7 +64,7 @@
 +static int sock_devd;
 +static bool is_console_kbd = false;
 +static bool is_kbdmux = false;
-+OsTimerPtr rtimer;
++static OsTimerPtr rtimer = NULL;
 +
 +struct hw_type {
 +	const char *driver;
@@ -377,7 +377,7 @@
 +}
 +
 +static CARD32
-+reconnect_handler(OsTimerPtr timer, CARD32 time, pointer arg)
++reconnect_handler(OsTimerPtr timer, CARD32 time, void *arg)
 +{
 +	int newsock;
 +
@@ -417,6 +417,7 @@
 +			disconnect_devd(sock_devd);
 +			rtimer = TimerSet(NULL, 0, 1, reconnect_handler, NULL);
 +			LogMessage(X_WARNING, "config/devd: devd socket is lost\n");
++			free(buf);
 +			return -1;
 +		}
 +		if (c == '\n')

Modified: trunk/x11-servers/xorg-server/files/patch-xkb_Makefile.in
===================================================================
--- trunk/x11-servers/xorg-server/files/patch-xkb_Makefile.in	2018-09-02 21:30:58 UTC (rev 24076)
+++ trunk/x11-servers/xorg-server/files/patch-xkb_Makefile.in	2018-09-02 21:37:41 UTC (rev 24077)
@@ -1,6 +1,6 @@
---- xkb/Makefile.in.orig	2014-12-12 22:12:45 UTC
+--- xkb/Makefile.in.orig	2017-01-19 15:20:42 UTC
 +++ xkb/Makefile.in
-@@ -790,7 +790,7 @@ info: info-am
+@@ -878,7 +878,7 @@ info: info-am
  
  info-am:
  

Modified: trunk/x11-servers/xorg-server/pkg-plist
===================================================================
--- trunk/x11-servers/xorg-server/pkg-plist	2018-09-02 21:30:58 UTC (rev 24076)
+++ trunk/x11-servers/xorg-server/pkg-plist	2018-09-02 21:37:41 UTC (rev 24077)
@@ -1,11 +1,6 @@
 bin/X
-%%SUID%%@owner root
-%%SUID%%@group wheel
-%%SUID%%@mode 4555
-bin/Xorg
-%%SUID%%@owner root
-%%SUID%%@group wheel
-%%SUID%%@mode
+%%SUID%%@(,,4555) bin/Xorg
+%%NO_SUID%%bin/Xorg
 bin/cvt
 bin/gtf
 include/xorg/BT.h
@@ -13,7 +8,6 @@
 include/xorg/TI.h
 include/xorg/XIstubs.h
 include/xorg/Xprintf.h
-include/xorg/bt829.h
 include/xorg/callback.h
 include/xorg/client.h
 include/xorg/closestr.h
@@ -28,6 +22,7 @@
 include/xorg/damagestr.h
 include/xorg/dbestruct.h
 include/xorg/dgaproc.h
+include/xorg/displaymode.h
 include/xorg/dix.h
 include/xorg/dixaccess.h
 include/xorg/dixevents.h
@@ -37,10 +32,11 @@
 include/xorg/dixstruct.h
 include/xorg/dri.h
 include/xorg/dri2.h
+include/xorg/dri3.h
 include/xorg/dristruct.h
 include/xorg/edid.h
+include/xorg/events.h
 include/xorg/exa.h
-include/xorg/events.h
 include/xorg/exevents.h
 include/xorg/extension.h
 include/xorg/extinit.h
@@ -48,17 +44,17 @@
 include/xorg/fb.h
 include/xorg/fbdevhw.h
 include/xorg/fboverlay.h
+include/xorg/fbpict.h
 include/xorg/fbrop.h
-include/xorg/fi1236.h
-include/xorg/fbpict.h
 include/xorg/fourcc.h
 include/xorg/gc.h
 include/xorg/gcstruct.h
 include/xorg/geext.h
 include/xorg/geint.h
+include/xorg/glamor.h
 include/xorg/globals.h
+include/xorg/glx_extinit.h
 include/xorg/glyphstr.h
-include/xorg/glx_extinit.h
 include/xorg/hotplug.h
 include/xorg/i2c_def.h
 include/xorg/input.h
@@ -67,32 +63,32 @@
 include/xorg/mi.h
 include/xorg/micmap.h
 include/xorg/micoord.h
-include/xorg/mifillarc.h
-include/xorg/mifpoly.h
 include/xorg/migc.h
 include/xorg/miline.h
+include/xorg/mioverlay.h
 include/xorg/mipict.h
 include/xorg/mipointer.h
 include/xorg/mipointrst.h
 include/xorg/misc.h
 include/xorg/miscstruct.h
-include/xorg/mispans.h
 include/xorg/mistruct.h
 include/xorg/misync.h
+include/xorg/misyncfd.h
+include/xorg/misyncshm.h
 include/xorg/misyncstr.h
-include/xorg/miwideline.h
 include/xorg/mizerarc.h
-include/xorg/mioverlay.h
-include/xorg/msp3430.h
+include/xorg/nonsdk_extinit.h
 include/xorg/opaque.h
+include/xorg/optionstr.h
 include/xorg/os.h
-include/xorg/optionstr.h
+include/xorg/panoramiX.h
 include/xorg/panoramiXsrv.h
-include/xorg/panoramiX.h
 include/xorg/picture.h
 include/xorg/picturestr.h
 include/xorg/pixmap.h
 include/xorg/pixmapstr.h
+include/xorg/present.h
+include/xorg/presentext.h
 include/xorg/privates.h
 include/xorg/property.h
 include/xorg/propertyst.h
@@ -113,18 +109,11 @@
 include/xorg/shadowfb.h
 include/xorg/shmint.h
 include/xorg/site.h
-include/xorg/swaprep.h
-include/xorg/swapreq.h
 include/xorg/syncsdk.h
-include/xorg/tda8425.h
-include/xorg/tda9850.h
-include/xorg/tda9885.h
-include/xorg/uda1380.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
@@ -145,14 +134,13 @@
 include/xorg/xf86PciInfo.h
 include/xorg/xf86Priv.h
 include/xorg/xf86Privstr.h
+include/xorg/xf86RamDac.h
 include/xorg/xf86RandR12.h
-include/xorg/xf86RamDac.h
-include/xorg/xf86Rename.h
 %%SPARC64%%include/xorg/xf86Sbus.h
+include/xorg/xf86VGAarbiter.h
 include/xorg/xf86Xinput.h
 include/xorg/xf86_OSlib.h
 include/xorg/xf86_OSproc.h
-include/xorg/xf86VGAarbiter.h
 include/xorg/xf86cmap.h
 include/xorg/xf86fbman.h
 include/xorg/xf86i2c.h
@@ -163,7 +151,6 @@
 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
@@ -172,12 +159,15 @@
 include/xorg/xorg-server.h
 include/xorg/xorgVersion.h
 include/xorg/xserver-properties.h
+ at comment include/xorg/xserver_poll.h
 include/xorg/xvdix.h
 include/xorg/xvmcext.h
+lib/xorg/modules/drivers/modesetting_drv.so
 lib/xorg/modules/extensions/.xorg/libglx.so
 lib/xorg/modules/libexa.so
 lib/xorg/modules/libfb.so
 lib/xorg/modules/libfbdevhw.so
+lib/xorg/modules/libglamoregl.so
 lib/xorg/modules/libint10.so
 lib/xorg/modules/libshadow.so
 lib/xorg/modules/libshadowfb.so
@@ -184,13 +174,6 @@
 lib/xorg/modules/libvbe.so
 lib/xorg/modules/libvgahw.so
 lib/xorg/modules/libwfb.so
-lib/xorg/modules/multimedia/bt829_drv.so
-lib/xorg/modules/multimedia/fi1236_drv.so
-lib/xorg/modules/multimedia/msp3430_drv.so
-lib/xorg/modules/multimedia/tda8425_drv.so
-lib/xorg/modules/multimedia/tda9850_drv.so
-lib/xorg/modules/multimedia/tda9885_drv.so
-lib/xorg/modules/multimedia/uda1380_drv.so
 lib/xorg/protocol.txt
 libdata/pkgconfig/xorg-server.pc
 man/man1/Xorg.1.gz
@@ -199,6 +182,7 @@
 man/man1/gtf.1.gz
 man/man4/exa.4.gz
 man/man4/fbdevhw.4.gz
+man/man4/modesetting.4.gz
 man/man5/xorg.conf.5.gz
 man/man5/xorg.conf.d.5.gz
 share/aclocal/xorg-server.m4

More information about the Midnightbsd-cvs mailing list