CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Wed, 21 Aug 2019 17:40:43 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Aug 21 17:40:43 UTC 2019

Modified Files:
        pkgsrc/graphics: Makefile
        pkgsrc/x11: Makefile
        pkgsrc/x11/modular-xorg-server: buildlink3.mk
Removed Files:
        pkgsrc/graphics/MesaLib7: DESCR Makefile PLIST buildlink3.mk distinfo
            glx-config.mk options.mk
        pkgsrc/graphics/MesaLib7/files: gen_matypes.awk gen_matypes.sh
            mapfile.externs
        pkgsrc/graphics/MesaLib7/patches: patch-af patch-bin_mklib
            patch-configure.ac patch-include_GL_gl.h
            patch-src_gallium_auxiliary_util_u__atomic.h
            patch-src_gallium_include_pipe_p__config.h
            patch-src_glsl_ir__constant__expression.cpp patch-src_glsl_ralloc.c
            patch-src_glu_sgi_glu.exports patch-src_glu_sgi_libtess_sweep.c
            patch-src_glx_XF86dri.c
            patch-src_mesa_drivers_dri_common_dri__util.h
            patch-src_mesa_drivers_dri_common_mmio.h
            patch-src_mesa_drivers_dri_i915_intel__batchbuffer.c
            patch-src_mesa_drivers_dri_i915_intel__tris.c
            patch-src_mesa_drivers_dri_i965_brw__draw.c
            patch-src_mesa_drivers_dri_i965_brw__draw__upload.c
            patch-src_mesa_drivers_dri_i965_brw__misc__state.c
            patch-src_mesa_drivers_dri_i965_gen6__vs__state.c
            patch-src_mesa_drivers_dri_i965_gen6__wm__state.c
            patch-src_mesa_drivers_dri_i965_intel__batchbuffer.c
            patch-src_mesa_drivers_dri_intel_intel__context.c
            patch-src_mesa_drivers_dri_intel_intel__context.h
            patch-src_mesa_drivers_dri_mach64_mach64__context.h
            patch-src_mesa_drivers_x11_Makefile patch-src_mesa_main_compiler.h
            patch-src_mesa_main_context.c patch-src_mesa_main_imports.c
            patch-src_mesa_main_imports.h
        pkgsrc/x11/modular-xorg-server112: DESCR MESSAGE Makefile PLIST
            distinfo options.mk
        pkgsrc/x11/modular-xorg-server112/patches: patch-Xext_xcmisc.c
            patch-Xext_xvdisp.c patch-Xi_chgdctl.c patch-Xi_chgfctl.c
            patch-Xi_sendexev.c patch-Xi_xiallowev.c patch-Xi_xichangecursor.c
            patch-Xi_xichangehierarchy.c patch-Xi_xigetclientpointer.c
            patch-Xi_xigrabdev.c patch-Xi_xipassivegrab.c patch-Xi_xiproperty.c
            patch-Xi_xiquerydevice.c patch-Xi_xiquerypointer.c
            patch-Xi_xiselectev.c patch-Xi_xisetclientpointer.c
            patch-Xi_xisetdevfocus.c patch-Xi_xiwarppointer.c patch-configure
            patch-configure.ac patch-dbe_dbe.c patch-dix_dispatch.c
            patch-dix_dixfonts.c patch-dix_region.c patch-exa_exa__render.c
            patch-glx_glxcmds.c patch-glx_glxcmdsswap.c patch-glx_glxserver.h
            patch-glx_indirect__program.c patch-glx_indirect__reqsize.c
            patch-glx_indirect__reqsize.h
            patch-glx_indirect__texture__compression.c
            patch-glx_indirect__util.c patch-glx_rensize.c patch-glx_single2.c
            patch-glx_single2swap.c patch-glx_singlepix.c
            patch-glx_singlepixswap.c patch-glx_swap__interval.c
            patch-glx_unpack.h patch-hw_xfree86_common_compiler.h
            patch-hw_xfree86_common_xf86sbusBus.h patch-hw_xfree86_dri2_dri2.c
            patch-hw_xfree86_dri2_dri2ext.c
            patch-hw_xfree86_os-support_bsd_sparc64__video.c
            patch-hw_xfree86_os-support_bus_Sbus.c
            patch-hw_xfree86_os-support_bus_xf86Sbus.h
            patch-hw_xfree86_os-support_xf86__OSlib.h patch-include_dix.h
            patch-include_regionstr.h patch-os_WaitFor.c patch-os_access.c
            patch-os_connection.c patch-os_io.c patch-os_rpcauth.c
            patch-os_xdmcp.c patch-randr_randr.c patch-randr_randrstr.h
            patch-randr_rrsdispatch.c patch-render_picture.h
            patch-render_render.c patch-test_Makefile.am patch-test_misc.c
            patch-test_xi1_Makefile.am
            patch-test_xi1_protocol-xchangedevicecontrol.c
            patch-test_xi2_protocol-xigetclientpointer.c
            patch-test_xi2_protocol-xipassivegrabdevice.c
            patch-test_xi2_protocol-xiquerypointer.c
            patch-test_xi2_protocol-xiwarppointer.c patch-xfixes_select.c
            patch-xkb_xkb.c
        pkgsrc/x11/xf86-video-modesetting: DESCR Makefile PLIST distinfo
        pkgsrc/x11/xf86-video-newport: DESCR Makefile PLIST distinfo options.mk

Log Message:
Remove graphics/MesaLib7, x11/modular-xorg-server112

Also remove legacy drivers only building against mxs112:

* x11/xf86-video-newport
* x11/xf86-video-modesetting (integrated into later X versions)

According to tnn, these are no longer useful.

* Originally kept for drm1 users (NetBSD 6).
* The one use case that actually worked was xf86-video-ati6.
* That driver has been patched to work with the new server ABI.


To generate a diff of this commit:
cvs rdiff -u -r1.841 -r1.842 pkgsrc/graphics/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/graphics/MesaLib7/DESCR \
    pkgsrc/graphics/MesaLib7/glx-config.mk
cvs rdiff -u -r1.17 -r0 pkgsrc/graphics/MesaLib7/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/graphics/MesaLib7/PLIST \
    pkgsrc/graphics/MesaLib7/options.mk
cvs rdiff -u -r1.4 -r0 pkgsrc/graphics/MesaLib7/buildlink3.mk \
    pkgsrc/graphics/MesaLib7/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/MesaLib7/files/gen_matypes.awk \
    pkgsrc/graphics/MesaLib7/files/gen_matypes.sh \
    pkgsrc/graphics/MesaLib7/files/mapfile.externs
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/MesaLib7/patches/patch-af \
    pkgsrc/graphics/MesaLib7/patches/patch-include_GL_gl.h \
    pkgsrc/graphics/MesaLib7/patches/patch-src_gallium_auxiliary_util_u__atomic.h \
    pkgsrc/graphics/MesaLib7/patches/patch-src_gallium_include_pipe_p__config.h \
    pkgsrc/graphics/MesaLib7/patches/patch-src_glsl_ir__constant__expression.cpp \
    pkgsrc/graphics/MesaLib7/patches/patch-src_glsl_ralloc.c \
    pkgsrc/graphics/MesaLib7/patches/patch-src_glu_sgi_glu.exports \
    pkgsrc/graphics/MesaLib7/patches/patch-src_glu_sgi_libtess_sweep.c \
    pkgsrc/graphics/MesaLib7/patches/patch-src_glx_XF86dri.c \
    pkgsrc/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_common_dri__util.h \
    pkgsrc/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_common_mmio.h \
    pkgsrc/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i915_intel__batchbuffer.c \
    pkgsrc/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i915_intel__tris.c \
    pkgsrc/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_brw__draw.c \
    pkgsrc/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_brw__draw__upload.c \
    pkgsrc/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_brw__misc__state.c \
    pkgsrc/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_gen6__vs__state.c \
    pkgsrc/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_gen6__wm__state.c \
    pkgsrc/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_intel__batchbuffer.c \
    pkgsrc/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_intel_intel__context.c \
    pkgsrc/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_intel_intel__context.h \
    pkgsrc/graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_mach64_mach64__context.h \
    pkgsrc/graphics/MesaLib7/patches/patch-src_mesa_drivers_x11_Makefile \
    pkgsrc/graphics/MesaLib7/patches/patch-src_mesa_main_compiler.h \
    pkgsrc/graphics/MesaLib7/patches/patch-src_mesa_main_context.c \
    pkgsrc/graphics/MesaLib7/patches/patch-src_mesa_main_imports.c \
    pkgsrc/graphics/MesaLib7/patches/patch-src_mesa_main_imports.h
cvs rdiff -u -r1.2 -r0 pkgsrc/graphics/MesaLib7/patches/patch-bin_mklib \
    pkgsrc/graphics/MesaLib7/patches/patch-configure.ac
cvs rdiff -u -r1.841 -r1.842 pkgsrc/x11/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/x11/modular-xorg-server/buildlink3.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/modular-xorg-server112/DESCR \
    pkgsrc/x11/modular-xorg-server112/MESSAGE \
    pkgsrc/x11/modular-xorg-server112/options.mk
cvs rdiff -u -r1.11 -r0 pkgsrc/x11/modular-xorg-server112/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/modular-xorg-server112/PLIST
cvs rdiff -u -r1.5 -r0 pkgsrc/x11/modular-xorg-server112/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/x11/modular-xorg-server112/patches/patch-Xext_xcmisc.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-Xext_xvdisp.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-Xi_chgdctl.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-Xi_chgfctl.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-Xi_sendexev.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-Xi_xiallowev.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-Xi_xichangecursor.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-Xi_xichangehierarchy.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-Xi_xigetclientpointer.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-Xi_xigrabdev.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-Xi_xipassivegrab.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-Xi_xiproperty.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-Xi_xiquerydevice.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-Xi_xiquerypointer.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-Xi_xiselectev.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-Xi_xisetclientpointer.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-Xi_xisetdevfocus.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-Xi_xiwarppointer.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-configure \
    pkgsrc/x11/modular-xorg-server112/patches/patch-configure.ac \
    pkgsrc/x11/modular-xorg-server112/patches/patch-dbe_dbe.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-dix_dispatch.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-dix_dixfonts.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-dix_region.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-exa_exa__render.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-glx_glxcmds.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-glx_glxcmdsswap.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-glx_glxserver.h \
    pkgsrc/x11/modular-xorg-server112/patches/patch-glx_indirect__program.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-glx_indirect__reqsize.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-glx_indirect__reqsize.h \
    pkgsrc/x11/modular-xorg-server112/patches/patch-glx_indirect__texture__compression.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-glx_indirect__util.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-glx_rensize.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-glx_single2.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-glx_single2swap.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-glx_singlepix.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-glx_singlepixswap.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-glx_swap__interval.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-glx_unpack.h \
    pkgsrc/x11/modular-xorg-server112/patches/patch-hw_xfree86_common_xf86sbusBus.h \
    pkgsrc/x11/modular-xorg-server112/patches/patch-hw_xfree86_dri2_dri2.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-hw_xfree86_dri2_dri2ext.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-hw_xfree86_os-support_bsd_sparc64__video.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-hw_xfree86_os-support_bus_Sbus.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-hw_xfree86_os-support_bus_xf86Sbus.h \
    pkgsrc/x11/modular-xorg-server112/patches/patch-hw_xfree86_os-support_xf86__OSlib.h \
    pkgsrc/x11/modular-xorg-server112/patches/patch-include_dix.h \
    pkgsrc/x11/modular-xorg-server112/patches/patch-include_regionstr.h \
    pkgsrc/x11/modular-xorg-server112/patches/patch-os_WaitFor.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-os_access.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-os_connection.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-os_io.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-os_rpcauth.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-os_xdmcp.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-randr_randr.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-randr_randrstr.h \
    pkgsrc/x11/modular-xorg-server112/patches/patch-randr_rrsdispatch.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-render_picture.h \
    pkgsrc/x11/modular-xorg-server112/patches/patch-render_render.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-test_Makefile.am \
    pkgsrc/x11/modular-xorg-server112/patches/patch-test_misc.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-test_xi1_Makefile.am \
    pkgsrc/x11/modular-xorg-server112/patches/patch-test_xi1_protocol-xchangedevicecontrol.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-test_xi2_protocol-xigetclientpointer.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-test_xi2_protocol-xipassivegrabdevice.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-test_xi2_protocol-xiquerypointer.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-test_xi2_protocol-xiwarppointer.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-xfixes_select.c \
    pkgsrc/x11/modular-xorg-server112/patches/patch-xkb_xkb.c
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/x11/modular-xorg-server112/patches/patch-hw_xfree86_common_compiler.h
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/xf86-video-modesetting/DESCR \
    pkgsrc/x11/xf86-video-modesetting/PLIST
cvs rdiff -u -r1.6 -r0 pkgsrc/x11/xf86-video-modesetting/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/xf86-video-modesetting/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/xf86-video-newport/DESCR \
    pkgsrc/x11/xf86-video-newport/PLIST \
    pkgsrc/x11/xf86-video-newport/options.mk
cvs rdiff -u -r1.9 -r0 pkgsrc/x11/xf86-video-newport/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/xf86-video-newport/distinfo

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

Modified files:

Index: pkgsrc/graphics/Makefile
diff -u pkgsrc/graphics/Makefile:1.841 pkgsrc/graphics/Makefile:1.842
--- pkgsrc/graphics/Makefile:1.841      Wed Aug 21 16:30:28 2019
+++ pkgsrc/graphics/Makefile    Wed Aug 21 17:40:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.841 2019/08/21 16:30:28 nia Exp $
+# $NetBSD: Makefile,v 1.842 2019/08/21 17:40:41 nia Exp $
 #
 
 COMMENT=       Graphics tools and libraries
@@ -16,7 +16,6 @@ SUBDIR+=      ImageViewer
 SUBDIR+=       Mesa
 SUBDIR+=       MesaDemos
 SUBDIR+=       MesaLib
-SUBDIR+=       MesaLib7
 SUBDIR+=       Ngraph
 SUBDIR+=       OpenRM
 SUBDIR+=       PanoTools

Index: pkgsrc/x11/Makefile
diff -u pkgsrc/x11/Makefile:1.841 pkgsrc/x11/Makefile:1.842
--- pkgsrc/x11/Makefile:1.841   Sun Jul 21 10:34:52 2019
+++ pkgsrc/x11/Makefile Wed Aug 21 17:40:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.841 2019/07/21 10:34:52 wiz Exp $
+# $NetBSD: Makefile,v 1.842 2019/08/21 17:40:41 nia Exp $
 #
 
 COMMENT=       Packages to support the X window system
@@ -298,7 +298,6 @@ SUBDIR+=    mkcomposecache
 SUBDIR+=       mlterm
 SUBDIR+=       modeline
 SUBDIR+=       modular-xorg-server
-SUBDIR+=       modular-xorg-server112
 SUBDIR+=       modular-xorg-xephyr
 SUBDIR+=       modular-xorg-xquartz
 SUBDIR+=       motif
@@ -534,9 +533,7 @@ SUBDIR+=    xf86-video-i740
 SUBDIR+=       xf86-video-intel
 SUBDIR+=       xf86-video-mach64
 SUBDIR+=       xf86-video-mga
-SUBDIR+=       xf86-video-modesetting
 SUBDIR+=       xf86-video-neomagic
-SUBDIR+=       xf86-video-newport
 SUBDIR+=       xf86-video-nouveau
 SUBDIR+=       xf86-video-nv
 SUBDIR+=       xf86-video-openchrome

Index: pkgsrc/x11/modular-xorg-server/buildlink3.mk
diff -u pkgsrc/x11/modular-xorg-server/buildlink3.mk:1.22 pkgsrc/x11/modular-xorg-server/buildlink3.mk:1.23
--- pkgsrc/x11/modular-xorg-server/buildlink3.mk:1.22   Fri May 11 13:47:35 2018
+++ pkgsrc/x11/modular-xorg-server/buildlink3.mk        Wed Aug 21 17:40:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2018/05/11 13:47:35 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2019/08/21 17:40:41 nia Exp $
 
 BUILDLINK_TREE+=       modular-xorg-server
 
@@ -7,28 +7,16 @@ MODULAR_XORG_SERVER_BUILDLINK3_MK:=
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-USE_OLD_MODULAR_XORG_SERVER?=  no
-
-.if !empty(USE_OLD_MODULAR_XORG_SERVER:M[yY][eE][sS])
-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.18
 BUILDLINK_PKGSRCDIR.modular-xorg-server?=      ../../x11/modular-xorg-server
-.endif
 
 BUILDLINK_DEPMETHOD.libpciaccess=      full
 .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"
-.else
 .include "../../x11/libXfont2/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk" # XXX should not be needed for non-dri build
-.endif
 .endif # MODULAR_XORG_SERVER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -modular-xorg-server

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index