modular-xorg-server-dfbsd-meson: Fix using patch for -Wmissing-braces on llvm

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: modular-xorg-server-dfbsd-meson: Fix using patch for -Wmissing-braces on llvm
From: David Shao <davshao%gmail.com@localhost>
Date: Sun, 03 Mar 2019 22:02:11 +0000
Module Name:	pkgsrc-wip
Committed By:	David Shao <davshao%gmail.com@localhost>
Pushed By:	dshao
Date:		Sun Mar 3 14:02:11 2019 -0800
Changeset:	0e3aa62763b046365dc2b6e69c6a1214a4737d94

Modified Files:
	modular-xorg-server-dfbsd-meson/Makefile
	modular-xorg-server-dfbsd-meson/Makefile.common
	modular-xorg-server-dfbsd-meson/PLIST
	modular-xorg-server-dfbsd-meson/TODO
	modular-xorg-server-dfbsd-meson/distinfo
	modular-xorg-server-dfbsd-meson/options.mk
Added Files:
	modular-xorg-server-dfbsd-meson/patches/patch-test_xtest.c

Log Message:
modular-xorg-server-dfbsd-meson: Fix using patch for -Wmissing-braces on llvm

Update through 2019-02-27.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0e3aa62763b046365dc2b6e69c6a1214a4737d94

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 modular-xorg-server-dfbsd-meson/Makefile           | 18 +++-----
 modular-xorg-server-dfbsd-meson/Makefile.common    | 45 +++++++++----------
 modular-xorg-server-dfbsd-meson/PLIST              |  4 +-
 modular-xorg-server-dfbsd-meson/TODO               |  4 ++
 modular-xorg-server-dfbsd-meson/distinfo           | 11 ++---
 modular-xorg-server-dfbsd-meson/options.mk         | 50 +++++++---------------
 .../patches/patch-test_xtest.c                     | 15 +++++++
 7 files changed, 72 insertions(+), 75 deletions(-)

diffs:
diff --git a/modular-xorg-server-dfbsd-meson/Makefile b/modular-xorg-server-dfbsd-meson/Makefile
index 6835986f99..3d91f220e5 100644
--- a/modular-xorg-server-dfbsd-meson/Makefile
+++ b/modular-xorg-server-dfbsd-meson/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.117 2018/10/26 10:20:12 maya Exp $
+# $NetBSD: Makefile,v 1.118 2019/02/27 16:32:58 wiz Exp $
 
-DISTNAME=	xorg-server-${XORG_VERSION}
-PKGNAME=	modular-${DISTNAME}
+# DISTNAME=	xorg-server-${XORG_VERSION}
+PKGNAME=	modular-xorg-server-${XORG_VERSION}
 # PKGREVISION=	1
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
@@ -9,6 +9,9 @@ COMMENT=	Modular X11 server from modular X.org
 
 SPECIAL_PERMS+=		bin/Xorg ${SETUID_ROOT_PERMS}
 
+post-install:
+	${LN} -sf ${PREFIX}/bin/Xorg ${DESTDIR}${PREFIX}/bin/X
+
 NOT_FOR_PLATFORM=	Darwin-*-*
 
 .include "Makefile.common"
@@ -17,7 +20,7 @@ CONFIGURE_ARGS+=	--enable-xorg
 CONFIGURE_ARGS+=	--disable-xephyr
 CONFIGURE_ARGS+=	--disable-kdrive
 CONFIGURE_ARGS.SunOS+=	--disable-input-thread
-# MESON_ARGS+=	-Dxorg=true
+MESON_ARGS+=	-Dxorg=true
 MESON_ARGS+=	-Dxephyr=false
 .if ${OPSYS} == "SunOS"
 MESON_ARGS+=	-Dinput_thread=false
@@ -25,11 +28,4 @@ MESON_ARGS+=	-Dinput_thread=false
 
 .include "options.mk"
 
-# Autotools
-# pre-configure:
-#	cd ${WRKSRC} && autoreconf -vif
-
-# Meson
-.include "../../devel/py-meson/build.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/modular-xorg-server-dfbsd-meson/Makefile.common b/modular-xorg-server-dfbsd-meson/Makefile.common
index 0f40604831..90c4ec19ff 100644
--- a/modular-xorg-server-dfbsd-meson/Makefile.common
+++ b/modular-xorg-server-dfbsd-meson/Makefile.common
@@ -1,26 +1,23 @@
-# $NetBSD: Makefile.common,v 1.26 2018/10/25 22:40:57 maya Exp $
+# $NetBSD: Makefile.common,v 1.27 2019/02/27 16:32:58 wiz Exp $
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 
-# 2019-02-25	os-support/solaris: Set IOPL for input thread too
-COMMIT_ID=	12769c516d9356bd92f90e2f53a4853dbfdc4aed
+# 2019-02-27	Revert "gitlab-ci: Only run docker-image stage if relevant source files change"
+COMMIT_ID=	0ec9a13c2a207e98e2dd6b352552c0e069af0727
 
-# 2019-01-30	ramdac: Remove core ramdac code
-# COMMIT_ID=	8f8d358bad2d33de36686e8405ade8b5b921cafd
+# 2019-02-25	os-support/solaris: Set IOPL for input thread too
+# COMMIT_ID=	12769c516d9356bd92f90e2f53a4853dbfdc4aed
 
 PORTNAME=	xserver
 
 DISTNAME=	${PORTNAME}-${COMMIT_ID}
-PKGNAME=	modular-xorg-server-1.20.4
-# PKGREVISION=	2
-CATEGORIES=	x11
-MASTER_SITES=	http://cgit.freedesktop.org/xorg/${PORTNAME}/snapshot/
-EXTRACT_SUFX=	.tar.xz
 
-# XORG_VERSION=	1.20.3
-# CATEGORIES=	x11
+XORG_VERSION=	1.20.4
+CATEGORIES=	x11
 # MASTER_SITES=	${MASTER_SITE_XORG:=xserver/}
 # EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	http://cgit.freedesktop.org/xorg/${PORTNAME}/snapshot/
+EXTRACT_SUFX=	.tar.xz
 
 HOMEPAGE=	http://xorg.freedesktop.org/
 LICENSE=	mit AND modified-bsd AND x11 # with no-advertising clause
@@ -43,7 +40,8 @@ XKB_OUTPUT_DIR?=	${VARBASE}/db/xkb # XXX sync with xkeyboard-config
 
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--with-xkb-output=${XKB_OUTPUT_DIR:Q}
-MESON_ARGS+=		-Dlog_dir=${VARBASE:Q}/log
+# MESON_ARGS+=		-Dlog_dir=${VARBASE:Q}/log
+MESON_ARGS+=		-Dlocalstatedir=${VARBASE:Q}
 MESON_ARGS+=		-Dxkb_output_dir=${XKB_OUTPUT_DIR:Q}
 
 .if !empty(USE_TOOLS:Mauto*)
@@ -86,21 +84,17 @@ CONFIGURE_ARGS+=	--disable-config-hal
 CONFIGURE_ARGS+=	--disable-dmx
 MESON_ARGS+=		-Dhal=false
 MESON_ARGS+=		-Ddmx=false
-.if ${OPSYS} != "FreeBSD" &&  ${OPSYS} != "DragonFly"
 CONFIGURE_ARGS+=	--disable-xwin
 MESON_ARGS+=		-Dxwin=false
-.endif
 CONFIGURE_ARGS+=	--disable-xephyr
 MESON_ARGS+=		-Dxephyr=false
 
-.if ${OPSYS} != "FreeBSD" &&  ${OPSYS} != "DragonFly"
 CONFIGURE_ARGS+=	--disable-kdrive
 #CONFIGURE_ARGS+=	--disable-kdrive-vesa
 CONFIGURE_ARGS+=	--enable-xtrans-send-fds
 
 CONFIGURE_ARGS+=	--with-int10=x86emu
 MESON_ARGS+=		-Dint10=x86emu
-.endif
 
 .if ${OPSYS} != "Linux"
 MESON_ARGS+=		-Dudev=false
@@ -164,6 +158,10 @@ CONFIGURE_ENV.SunOS+=	ac_cv_func_mkostemp=no
 MESON_ARGS+=	-Dsecure-rpc=false
 .endif
 
+# .if ${OPSYS} == "FreeBSD"
+# CFLAGS+=	-Wno-missing-braces
+# .endif
+
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
 # Workaround glamor lockups when drm-devel-kmod (4.15-4.17) is installed
 # with partial reverting of commit
@@ -186,16 +184,19 @@ BUILDLINK_API_DEPENDS.pixman+=		pixman>=0.21.8
 BUILD_DEPENDS+=		tradcpp-[0-9]*:../../devel/tradcpp
 CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
 
-# .if ${OPSYS} == "OpenBSD" || ${OPSYS} == "Bitrig" || ${OPSYS} == "MirBSD"
+# .if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Bitrig" || ${OPSYS} == "MirBSD"
 # CONFIGURE_ARGS+=	--with-sha1=libc
 # .else
 .include "../../security/nettle/buildlink3.mk"
-# CONFIGURE_ARGS+=	--with-sha1=libnettle
+CONFIGURE_ARGS+=	--with-sha1=libnettle
 # .endif
 
-.if ${OPSYS} == "FreeBSD"
-CFLAGS+=	-Wno-missing-braces
-.endif
+# Autotools
+# pre-configure:
+#	cd ${WRKSRC} && autoreconf -vif
+
+# Meson
+.include "../../devel/py-meson/build.mk"
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/modular-xorg-server-dfbsd-meson/PLIST b/modular-xorg-server-dfbsd-meson/PLIST
index 00279d1e65..786a8f4342 100644
--- a/modular-xorg-server-dfbsd-meson/PLIST
+++ b/modular-xorg-server-dfbsd-meson/PLIST
@@ -1,5 +1,5 @@
 @comment $NetBSD: PLIST,v 1.28 2018/05/11 13:47:35 wiz Exp $
-@comment bin/X
+bin/X
 bin/Xnest
 bin/Xorg
 bin/Xvfb
@@ -34,7 +34,7 @@ include/xorg/dixgrabs.h
 include/xorg/dixstruct.h
 ${PLIST.dri}include/xorg/dri.h
 ${PLIST.dri}include/xorg/dri2.h
-${PLIST.dri3}include/xorg/dri3.h
+${PLIST.dri}include/xorg/dri3.h
 ${PLIST.dri}include/xorg/dristruct.h
 include/xorg/edid.h
 include/xorg/events.h
diff --git a/modular-xorg-server-dfbsd-meson/TODO b/modular-xorg-server-dfbsd-meson/TODO
index ff35145371..9a1403ffc2 100644
--- a/modular-xorg-server-dfbsd-meson/TODO
+++ b/modular-xorg-server-dfbsd-meson/TODO
@@ -7,3 +7,7 @@ to be accepted.
 
 Port devd patches for 1.19.6 that have not been merged
 into FreeBSD ports, supports evdev.
+
+Get modular-xorg-xephyr to build again.
+
+Get xf86-video-nv, xf86-video-vmware to build again.
diff --git a/modular-xorg-server-dfbsd-meson/distinfo b/modular-xorg-server-dfbsd-meson/distinfo
index c06fa2216f..a700a90ed8 100644
--- a/modular-xorg-server-dfbsd-meson/distinfo
+++ b/modular-xorg-server-dfbsd-meson/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.92 2018/10/26 10:20:12 maya Exp $
+$NetBSD: distinfo,v 1.94 2019/02/28 12:32:39 tnn Exp $
 
-SHA1 (xserver-12769c516d9356bd92f90e2f53a4853dbfdc4aed.tar.xz) = eebbf29bf4cae996a18b7f4b08e65d374634791e
-RMD160 (xserver-12769c516d9356bd92f90e2f53a4853dbfdc4aed.tar.xz) = 1e681226b67436f618bbd6637d2814580327992c
-SHA512 (xserver-12769c516d9356bd92f90e2f53a4853dbfdc4aed.tar.xz) = 907138bde5c0aaaed61848d7d7ffab4f150d5a876e0541dbc8542558d12c693a0dcc6b05cbaca7868d1b0122f12e7d2e0468fc5811cb4be49478df1c8a5e1b1a
-Size (xserver-12769c516d9356bd92f90e2f53a4853dbfdc4aed.tar.xz) = 3097256 bytes
+SHA1 (xserver-0ec9a13c2a207e98e2dd6b352552c0e069af0727.tar.xz) = 0a0953659df36258e2f0adfea0d183ad16b7a0ac
+RMD160 (xserver-0ec9a13c2a207e98e2dd6b352552c0e069af0727.tar.xz) = cb04f4fc07f3a137032f7fd2d62db9e02ed28ecd
+SHA512 (xserver-0ec9a13c2a207e98e2dd6b352552c0e069af0727.tar.xz) = 8bb933dccdf7b854faa3f03bf3c5c9a6cdc477dc28cc696278847e33c55a4ff195727600fca9caa3a17917f4ebe7120b3c93536204dca5f55fe0cbfa3a235f5e
+Size (xserver-0ec9a13c2a207e98e2dd6b352552c0e069af0727.tar.xz) = 3097888 bytes
 SHA1 (patch-config_config-backends.h) = f44868caa51e972a76949f73ac6083640af2c351
 SHA1 (patch-config_config.c) = 5a3fe4cb6c2170335ab547f438386cff77a9c152
 SHA1 (patch-config_devd.c) = d8c534837b1c448563c363465570b9dc403f19fa
@@ -31,3 +31,4 @@ SHA1 (patch-hw_xfree86_xorg-wrapper.c) = d1178c088307cd3781f8989522bab570b551ff5
 SHA1 (patch-include_meson.build) = 8e7cfb8140e325279fbd8fcebc165b9ddcf4c32d
 SHA1 (patch-randr_randr.c) = eb44a07770ca7308d706aa2324408bb8c6c6b7ba
 SHA1 (patch-randr_rrlease.c) = 82ace923fe7b65f4cf1be2ff243eabd886f3109e
+SHA1 (patch-test_xtest.c) = 77622ef481e91e64b3a6dd64b8579404f33ec88f
diff --git a/modular-xorg-server-dfbsd-meson/options.mk b/modular-xorg-server-dfbsd-meson/options.mk
index 7115c61a58..1d3e50e46f 100644
--- a/modular-xorg-server-dfbsd-meson/options.mk
+++ b/modular-xorg-server-dfbsd-meson/options.mk
@@ -2,13 +2,21 @@
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.modular-xorg-server
 PKG_SUPPORTED_OPTIONS=	inet6 debug dtrace
-PKG_SUPPORTED_OPTIONS+=	revert_flink
-PKG_SUPPORTED_OPTIONS+=	revert_randr_lease
+PKG_SUGGESTED_OPTIONS=	inet6
+.if ${X11_TYPE} == "modular"
+PKG_SUPPORTED_OPTIONS+=	dri
+PKG_SUGGESTED_OPTIONS+=	dri
+.endif
+
+PKG_SUPPORTED_OPTIONS+= devd
+PKG_SUPPORTED_OPTIONS+= revert_flink
+PKG_SUPPORTED_OPTIONS+= revert_randr_lease
 PKG_SUPPORTED_OPTIONS+= allow_unprivileged
-PKG_SUPPORTED_OPTIONS+= suid_wrapper
 PKG_SUPPORTED_OPTIONS+= xkb_evdev
-PKG_SUGGESTED_OPTIONS=	inet6
-# PKG_SUGGESTED_OPTIONS+= suid_wrapper
+
+.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
+PKG_SUGGESTED_OPTIONS+= devd
+.endif
 
 .if ${OPSYS} == "DragonFly"
 PKG_SUGGESTED_OPTIONS+=	revert_flink
@@ -19,37 +27,11 @@ PKG_SUGGESTED_OPTIONS+=	revert_randr_lease
 PKG_SUGGESTED_OPTIONS+=	allow_unprivileged
 .endif
 
-PKG_SUPPORTED_OPTIONS+=	devd
-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+= devd
-.endif
-
-.if ${X11_TYPE} == "modular"
-PKG_SUPPORTED_OPTIONS+=	dri
-PKG_SUGGESTED_OPTIONS+=	dri
-PKG_SUPPORTED_OPTIONS+=	dri3
-# dri3 requires kernel support for dma_buf
-.if ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+=	dri3
-.endif
-.endif
-
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=		dri dtrace
-PLIST_VARS+=		dri3
 
 .if !empty(PKG_OPTIONS:Mdri)
-
-.if !empty(PKG_OPTIONS:Mdri3)
-CONFIGURE_ARGS+=	--enable-dri3
-MESON_ARGS+=		-Ddri3=true
-PLIST.dri3=		yes
-.else
-CONFIGURE_ARGS+=	--disable-dri3
-MESON_ARGS+=		-Ddri3=false
-.endif
-
 .include "../../graphics/libepoxy/buildlink3.mk"
 BUILDLINK_API_DEPENDS.MesaLib+=	MesaLib>=11
 .include "../../graphics/MesaLib/buildlink3.mk"
@@ -59,11 +41,13 @@ BUILDLINK_API_DEPENDS.MesaLib+=	MesaLib>=11
 PLIST.dri=		yes
 CONFIGURE_ARGS+=	--enable-dri
 CONFIGURE_ARGS+=	--enable-dri2
+CONFIGURE_ARGS+=	--enable-dri3
 CONFIGURE_ARGS+=	--enable-glx
 CONFIGURE_ARGS+=	--enable-glamor
 CONFIGURE_ARGS+=	--enable-present
 MESON_ARGS+=		-Ddri1=true
 MESON_ARGS+=		-Ddri2=true
+MESON_ARGS+=		-Ddri3=true
 MESON_ARGS+=		-Dglx=true
 MESON_ARGS+=		-Dglamor=true
 .else
@@ -144,10 +128,6 @@ SUBST_SED.lease+=		 -e 's|XF86_LEASE_VERSION|REVERT_XF86_LEASE_VERSION|g'
 CPPFLAGS+=	-DALLOW_UNPRIVILEGED
 .endif
 
-.if !empty(PKG_OPTIONS:Msuid_wrapper)
-MESON_ARGS+=	-Dsuid_wrapper=true
-.endif
-
 .if !empty(PKG_OPTIONS:Mxkb_evdev)
 MESON_ARGS+=	-Dxkb_default_rules=evdev
 .else
diff --git a/modular-xorg-server-dfbsd-meson/patches/patch-test_xtest.c b/modular-xorg-server-dfbsd-meson/patches/patch-test_xtest.c
new file mode 100644
index 0000000000..63b68d28d3
--- /dev/null
+++ b/modular-xorg-server-dfbsd-meson/patches/patch-test_xtest.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-test_xtest.c,v 1.1 2019/02/28 12:32:39 tnn Exp $
+
+xtest.c:64:23: error: suggest braces around initialization of subobject
+
+--- test/xtest.c.orig	2019-02-26 19:28:50.000000000 +0000
++++ test/xtest.c
+@@ -61,7 +61,7 @@ xtest_init_devices(void)
+ {
+     ScreenRec screen = {0};
+     ClientRec server_client = {0};
+-    WindowRec root = {0};
++    WindowRec root = {{0}};
+     WindowOptRec optional = {0};
+ 
+     /* random stuff that needs initialization */
Prev by Date: libdrm-dfbsd-meson: Update wip/libdrm-dfbsd-meson through 2019-02-26
Next by Date: xf86-video-ati-dfbsd: Update wip/xf86-video-ati-dfbsd to git 2019-02-11
Previous by Thread: libdrm-dfbsd-meson: Update wip/libdrm-dfbsd-meson through 2019-02-26
Next by Thread: xf86-video-ati-dfbsd: Update wip/xf86-video-ati-dfbsd to git 2019-02-11
Indexes:
Home | Main Index | Thread Index | Old Index