pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11/modular-xorg-server
Module Name: pkgsrc
Committed By: wiz
Date: Thu Mar 30 08:25:06 UTC 2023
Modified Files:
pkgsrc/x11/modular-xorg-server: Makefile Makefile.common buildlink3.mk
distinfo options.mk
pkgsrc/x11/modular-xorg-server/patches:
patch-hw_xfree86_os-support_bsd_i386__video.c
Removed Files:
pkgsrc/x11/modular-xorg-server/patches: patch-composite_compwindow.c
Log Message:
modular-xorg-server: update to 21.1.8.
Clean lots of pkglint while here.
Benno Schulenberg (1):
xkbUtils: use existing symbol names instead of deleted deprecated ones
Olivier Fourdan (2):
composite: Fix use-after-free of the COW
xserver 21.1.8
To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 pkgsrc/x11/modular-xorg-server/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/x11/modular-xorg-server/Makefile.common
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/modular-xorg-server/buildlink3.mk
cvs rdiff -u -r1.122 -r1.123 pkgsrc/x11/modular-xorg-server/distinfo
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/modular-xorg-server/options.mk
cvs rdiff -u -r1.1 -r0 \
pkgsrc/x11/modular-xorg-server/patches/patch-composite_compwindow.c
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bsd_i386__video.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/x11/modular-xorg-server/Makefile
diff -u pkgsrc/x11/modular-xorg-server/Makefile:1.138 pkgsrc/x11/modular-xorg-server/Makefile:1.139
--- pkgsrc/x11/modular-xorg-server/Makefile:1.138 Wed Mar 29 12:46:36 2023
+++ pkgsrc/x11/modular-xorg-server/Makefile Thu Mar 30 08:25:06 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.138 2023/03/29 12:46:36 wiz Exp $
+# $NetBSD: Makefile,v 1.139 2023/03/30 08:25:06 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
@@ -15,7 +14,6 @@ NOT_FOR_PLATFORM= Darwin-*-*
CONFIGURE_ARGS+= --enable-xorg
CONFIGURE_ARGS+= --disable-xephyr
-CONFIGURE_ARGS+= --disable-xwayland
CONFIGURE_ARGS+= --disable-kdrive
.include "options.mk"
Index: pkgsrc/x11/modular-xorg-server/Makefile.common
diff -u pkgsrc/x11/modular-xorg-server/Makefile.common:1.54 pkgsrc/x11/modular-xorg-server/Makefile.common:1.55
--- pkgsrc/x11/modular-xorg-server/Makefile.common:1.54 Tue Feb 7 13:53:07 2023
+++ pkgsrc/x11/modular-xorg-server/Makefile.common Thu Mar 30 08:25:06 2023
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile.common,v 1.54 2023/02/07 13:53:07 wiz Exp $
+# $NetBSD: Makefile.common,v 1.55 2023/03/30 08:25:06 wiz Exp $
# used by x11/modular-xorg-server/Makefile
# used by x11/modular-xorg-xephyr/Makefile
-# used by x11/modular-xorg-xwayland/Makefile
-XORG_VERSION= 21.1.7
+XORG_VERSION= 21.1.8
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
EXTRACT_SUFX= .tar.xz
@@ -35,7 +34,7 @@ CONFIGURE_ARGS+= --localstatedir=${VARBA
CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q}
.if ${USE_TOOLS:Mauto*}
-TOOLS_DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros
+TOOL_DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros
.endif
DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp
@@ -46,14 +45,12 @@ DEPENDS+= xkeyboard-config-[0-9]*:../../
.if ${OPSYS} == "NetBSD"
CPPFLAGS+= -D_OPENBSD_SOURCE # for reallocarray(3)
CONFIGURE_ARGS+= --with-builder-addr="tech-x11%NetBSD.org@localhost"
-CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation"
# TLS is not supported by NetBSD<6
. if ${OPSYS_VERSION} < 060000
CONFIGURE_ENV+= ac_cv_tls=no
CONFIGURE_ARGS+= --disable-glx-tls
. endif
.endif
-CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q}
CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts/X11
@@ -68,7 +65,6 @@ FONT_PATHS= ${DEFAULT_FONT_PATHS} ${LEG
CONFIGURE_ARGS+= --with-default-font-path=${FONT_PATHS:ts,:Q}
CONFIGURE_ARGS+= --disable-config-hal
-CONFIGURE_ARGS+= --disable-dmx
CONFIGURE_ARGS+= --disable-xwin
CONFIGURE_ARGS+= --disable-xephyr
CONFIGURE_ARGS+= --disable-kdrive
Index: pkgsrc/x11/modular-xorg-server/buildlink3.mk
diff -u pkgsrc/x11/modular-xorg-server/buildlink3.mk:1.26 pkgsrc/x11/modular-xorg-server/buildlink3.mk:1.27
--- pkgsrc/x11/modular-xorg-server/buildlink3.mk:1.26 Sun Jan 29 21:15:12 2023
+++ pkgsrc/x11/modular-xorg-server/buildlink3.mk Thu Mar 30 08:25:06 2023
@@ -1,25 +1,29 @@
-# $NetBSD: buildlink3.mk,v 1.26 2023/01/29 21:15:12 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2023/03/30 08:25:06 wiz Exp $
BUILDLINK_TREE+= modular-xorg-server
.if !defined(MODULAR_XORG_SERVER_BUILDLINK3_MK)
MODULAR_XORG_SERVER_BUILDLINK3_MK:=
-.include "../../mk/bsd.fast.prefs.mk"
-
BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=21.1.4nb1
BUILDLINK_ABI_DEPENDS.modular-xorg-server?= modular-xorg-server>=21.1.6nb1
BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../x11/modular-xorg-server
BUILDLINK_INCDIRS.modular-xorg-server+= include/xorg
-BUILDLINK_DEPMETHOD.libpciaccess= full
+.include "../../mk/bsd.fast.prefs.mk"
+
+pkgbase := modular-xorg-server
+.include "../../mk/pkg-build-options.mk"
+
.include "../../sysutils/libpciaccess/buildlink3.mk"
.include "../../x11/pixman/buildlink3.mk"
.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libxcvt/buildlink3.mk"
.include "../../x11/libXfont2/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk" # XXX should not be needed for non-dri build
+.if ${PKG_BUILD_OPTIONS.modular-xorg-server:Mdri}
+.include "../../graphics/MesaLib/buildlink3.mk"
+.endif
.endif # MODULAR_XORG_SERVER_BUILDLINK3_MK
BUILDLINK_TREE+= -modular-xorg-server
Index: pkgsrc/x11/modular-xorg-server/distinfo
diff -u pkgsrc/x11/modular-xorg-server/distinfo:1.122 pkgsrc/x11/modular-xorg-server/distinfo:1.123
--- pkgsrc/x11/modular-xorg-server/distinfo:1.122 Wed Mar 29 12:46:36 2023
+++ pkgsrc/x11/modular-xorg-server/distinfo Thu Mar 30 08:25:06 2023
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.122 2023/03/29 12:46:36 wiz Exp $
+$NetBSD: distinfo,v 1.123 2023/03/30 08:25:06 wiz Exp $
-BLAKE2s (xorg-server-21.1.7.tar.xz) = 3e4178506a5eec4c2062024ad11a86f51e628e2ea5327050f66352ce4b6c6513
-SHA512 (xorg-server-21.1.7.tar.xz) = e2a093381e28da9b2aa700c6609349fa851f4ca8df23c776f30e4e2733e7a6c1b257576b93f4c4e87fb09df901385bf52528982f6e7a6ad469597aeae8640bb5
-Size (xorg-server-21.1.7.tar.xz) = 4933292 bytes
-SHA1 (patch-composite_compwindow.c) = 5b8ca9a09ef59af3ebc1b1d23fbf80555314c2ac
+BLAKE2s (xorg-server-21.1.8.tar.xz) = 8ebdcba54b9c8b7da698ad6af601c33265d983342f7391474794af50858b9133
+SHA512 (xorg-server-21.1.8.tar.xz) = 6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937
+Size (xorg-server-21.1.8.tar.xz) = 4980208 bytes
SHA1 (patch-configure) = 8096805cb1ac6eb25e03fdbd1d3362b720f7354e
SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3
SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9
@@ -13,7 +12,7 @@ SHA1 (patch-hw_xfree86_os-support_bsd_al
SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 521cf3bf2bb0529b4546d5343f67388bc59bd68b
SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99
SHA1 (patch-hw_xfree86_os-support_bsd_bsd__init.c) = b58ce2005251c1b3f723ee87c759f75bcb27e230
-SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b
+SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = e227a473f48f921c9c20bdc8b536c91ecc41a542
SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 50e6ffa8f58ffeed0f734d3bbabf1939649c3208
SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400
SHA1 (patch-hw_xfree86_os-support_solaris_sun__init.c) = 6148072cfaf1cb8d0a2f465b51429563c8ea2c15
Index: pkgsrc/x11/modular-xorg-server/options.mk
diff -u pkgsrc/x11/modular-xorg-server/options.mk:1.23 pkgsrc/x11/modular-xorg-server/options.mk:1.24
--- pkgsrc/x11/modular-xorg-server/options.mk:1.23 Sun Jun 13 06:55:17 2021
+++ pkgsrc/x11/modular-xorg-server/options.mk Thu Mar 30 08:25:06 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.23 2021/06/13 06:55:17 nia Exp $
+# $NetBSD: options.mk,v 1.24 2023/03/30 08:25:06 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server
PKG_SUPPORTED_OPTIONS= inet6 dri debug dtrace
@@ -12,7 +12,6 @@ PLIST_VARS+= dri dtrace
.include "../../graphics/libepoxy/buildlink3.mk"
BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=11
.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libdrm/buildlink3.mk"
.include "../../x11/libxshmfence/buildlink3.mk"
PLIST.dri= yes
Index: pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bsd_i386__video.c
diff -u pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bsd_i386__video.c:1.1 pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bsd_i386__video.c:1.2
--- pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bsd_i386__video.c:1.1 Sat Apr 25 11:47:03 2015
+++ pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_bsd_i386__video.c Thu Mar 30 08:25:06 2023
@@ -1,4 +1,6 @@
-$NetBSD: patch-hw_xfree86_os-support_bsd_i386__video.c,v 1.1 2015/04/25 11:47:03 tnn Exp $
+$NetBSD: patch-hw_xfree86_os-support_bsd_i386__video.c,v 1.2 2023/03/30 08:25:06 wiz Exp $
+
+Use correct symbol and amd64.
--- hw/xfree86/os-support/bsd/i386_video.c.orig 2015-01-17 23:42:52.000000000 +0000
+++ hw/xfree86/os-support/bsd/i386_video.c
Home |
Main Index |
Thread Index |
Old Index