CVS commit: pkgsrc/x11/modular-xorg-server

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Sat Jan 13 20:35:21 UTC 2024

Modified Files:
        pkgsrc/x11/modular-xorg-server: distinfo
        pkgsrc/x11/modular-xorg-server/patches: patch-configure

Log Message:
modular-xorg-server: Use ppc_video.c for NetBSD m68k, sh3, mips.

As we do in xsrc.

No revbump because this wouldn't build otherwise.


To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 pkgsrc/x11/modular-xorg-server/distinfo
cvs rdiff -u -r1.9 -r1.10 \
    pkgsrc/x11/modular-xorg-server/patches/patch-configure

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/distinfo
diff -u pkgsrc/x11/modular-xorg-server/distinfo:1.125 pkgsrc/x11/modular-xorg-server/distinfo:1.126
--- pkgsrc/x11/modular-xorg-server/distinfo:1.125       Wed Dec 13 07:45:07 2023
+++ pkgsrc/x11/modular-xorg-server/distinfo     Sat Jan 13 20:35:21 2024
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.125 2023/12/13 07:45:07 wiz Exp $
+$NetBSD: distinfo,v 1.126 2024/01/13 20:35:21 riastradh Exp $
 
 BLAKE2s (xorg-server-21.1.10.tar.xz) = b7773fcdab7bd8ae649e35ca25e4238c0ff2915f46e2ad1bff6c3f49df4a2fae
 SHA512 (xorg-server-21.1.10.tar.xz) = 8135d9b7c0c71f427ba0a3b80741fee4f6ae195779399b73261a00858882f3516e367a08e2da1403734b04eacabae9aa231e5375eff23b57a3ff764e9caf8926
 Size (xorg-server-21.1.10.tar.xz) = 4935984 bytes
-SHA1 (patch-configure) = 8096805cb1ac6eb25e03fdbd1d3362b720f7354e
+SHA1 (patch-configure) = e1497e39151d602028fc33a2dd307347c6afec9e
 SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3
 SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9
 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92

Index: pkgsrc/x11/modular-xorg-server/patches/patch-configure
diff -u pkgsrc/x11/modular-xorg-server/patches/patch-configure:1.9 pkgsrc/x11/modular-xorg-server/patches/patch-configure:1.10
--- pkgsrc/x11/modular-xorg-server/patches/patch-configure:1.9  Thu Dec 15 10:29:59 2022
+++ pkgsrc/x11/modular-xorg-server/patches/patch-configure      Sat Jan 13 20:35:21 2024
@@ -1,13 +1,15 @@
-$NetBSD: patch-configure,v 1.9 2022/12/15 10:29:59 wiz Exp $
+$NetBSD: patch-configure,v 1.10 2024/01/13 20:35:21 riastradh Exp $
 
 Use USE_AMD64_IOPL (actually x86_64_iopl) on NetBSD/amd64.
 (c.f. patch-hw_xfree86_os-support_bsd_i386.c)
 
 for netbsd, force pass pthread configure checks (pthread not needed)
 
---- configure.orig     2022-12-14 02:25:26.000000000 +0000
+For NetBSD, on m68k, sh3, and mips, use ppc_video.c as we do in xsrc.
+
+--- configure.orig     2023-12-13 01:31:14.000000000 +0000
 +++ configure
-@@ -24606,7 +24606,7 @@ printf "%s\n" "#define USE_ALPHA_PIO 1" 
+@@ -24672,7 +24672,7 @@ printf "%s\n" "#define USE_ALPHA_PIO 1" 
        esac
        GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
        ;;
@@ -16,7 +18,16 @@ for netbsd, force pass pthread configure
        ARM_VIDEO=yes
        DEFAULT_INT10="stub"
        ;;
-@@ -24648,7 +24648,8 @@ printf "%s\n" "#define USE_DEV_IO 1" >>c
+@@ -24693,7 +24693,7 @@ printf "%s\n" "#define USE_ALPHA_PIO 1" 
+                               ;;
+       esac
+         ;;
+-  powerpc*)
++  powerpc*|m68k|sh3*|mips*)
+       PPC_VIDEO=yes
+       case $host_os in
+               *freebsd*)      DEFAULT_INT10=stub ;;
+@@ -24714,7 +24714,8 @@ printf "%s\n" "#define USE_DEV_IO 1" >>c
  printf "%s\n" "#define USE_DEV_IO 1" >>confdefs.h
   ;;
                *netbsd*)
@@ -26,7 +37,7 @@ for netbsd, force pass pthread configure
  
                                SYS_LIBS=-lx86_64
                                ;;
-@@ -26523,7 +26524,8 @@ case ${host_os} in
+@@ -26588,7 +26589,8 @@ case ${host_os} in
        netbsd*)
        # use libc stubs, don't link against libpthread, to allow
        # dynamic loading