Re: No libfb.so module in netbsd-10 on HAVE_XORG_SERVER_VER=110 ports?
Izumi Tsutsui <[email protected]>
| Newsgroups | gmane.os.netbsd.ports.vax,gmane.os.netbsd.devel.x11 |
|---|---|
| Message-ID | <[email protected]> |
mrg@ wrote:
> > Maybe should we also remove XMODULEDIRANDSTATIC= line from
> > dixmods/fb/Makefile?
> > Or should I rather remove "obsolete" from list files?
>
> if it isn't necessary, i guess removing is the right thing.
Sure, I'll remove XMODULEDIRANDSTATIC= from dixmods/fb/Makefile and
commit fixes once after a test of "build.sh release -V MKDEBUG=yes" here.
(I'll also apply to xorg-server (Xorg 21.1) ones separately)
> > I wonder if we should stop "postinstall-fix-obsolete" on makesetfiles
> > to detect errors in set files during daily build..
>
> hmmm. non-update builds shouldn't need to run this, so perhaps
> we can try to handle it with non-update builds checking to see it
> would do nothing, and erroring if it would delete something.
Ah, I see. I think this should be discussed in another thread..
---
Index: distrib/sets/lists/xcomp/mi
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/xcomp/mi,v
retrieving revision 1.239
diff -u -p -d -r1.239 mi
--- distrib/sets/lists/xcomp/mi 29 Oct 2022 21:06:48 -0000 1.239
+++ distrib/sets/lists/xcomp/mi 25 Jan 2024 15:06:13 -0000
@@ -780,9 +780,12 @@
./usr/X11R7/include/xcb/xvmc.h xcomp-libxcb-include xorg
./usr/X11R7/include/xf86drm.h xcomp-libdrm-include xorg
./usr/X11R7/include/xf86drmMode.h xcomp-libdrm-include xorg
-./usr/X11R7/include/xorg/BT.h xcomp-obsolete obsolete
-./usr/X11R7/include/xorg/IBM.h xcomp-obsolete obsolete
-./usr/X11R7/include/xorg/TI.h xcomp-obsolete obsolete
+./usr/X11R7/include/xorg/BT.h xcomp-xorg-server-include xorg,xorg_server_ver=110
+./usr/X11R7/include/xorg/BT.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
+./usr/X11R7/include/xorg/IBM.h xcomp-xorg-server-include xorg,xorg_server_ver=110
+./usr/X11R7/include/xorg/IBM.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
+./usr/X11R7/include/xorg/TI.h xcomp-xorg-server-include xorg,xorg_server_ver=110
+./usr/X11R7/include/xorg/TI.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
./usr/X11R7/include/xorg/XIstubs.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/Xprintf.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/afb.h xcomp-obsolete obsolete
@@ -790,8 +793,8 @@
./usr/X11R7/include/xorg/atKeynames.h xcomp-obsolete obsolete
./usr/X11R7/include/xorg/bstore.h xcomp-obsolete obsolete
./usr/X11R7/include/xorg/bstorestr.h xcomp-obsolete obsolete
-./usr/X11R7/include/xorg/bt829.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
./usr/X11R7/include/xorg/bt829.h xcomp-xorg-server-include xorg,xorg_server_ver=110
+./usr/X11R7/include/xorg/bt829.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
./usr/X11R7/include/xorg/callback.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/cfb.h xcomp-obsolete obsolete
./usr/X11R7/include/xorg/cfb16.h xcomp-obsolete obsolete
@@ -815,7 +818,7 @@
./usr/X11R7/include/xorg/dbestruct.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/dgaproc.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/displaymode.h xcomp-xorg-server-include xorg,xorg_server_ver=120
-./usr/X11R7/include/xorg/dix-config.h xcomp-xorg-server-include xorg,obsolete
+./usr/X11R7/include/xorg/dix-config.h xcomp-obsolete xorg,obsolete
./usr/X11R7/include/xorg/dix.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/dixaccess.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/dixevents.h xcomp-xorg-server-include xorg
@@ -843,7 +846,7 @@
./usr/X11R7/include/xorg/fbpseudocolor.h xcomp-obsolete obsolete
./usr/X11R7/include/xorg/fbrop.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/fi1236.h xcomp-xorg-server-include xorg,xorg_server_ver=110
-./usr/X11R7/include/xorg/fi1236.h xcomp-xorg-server-include xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/include/xorg/fi1236.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
./usr/X11R7/include/xorg/fourcc.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/gc.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/gcstruct.h xcomp-xorg-server-include xorg
@@ -865,13 +868,13 @@
./usr/X11R7/include/xorg/mi.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/mibank.h xcomp-obsolete obsolete
./usr/X11R7/include/xorg/mibstore.h xcomp-xorg-server-include xorg,xorg_server_ver=110
-./usr/X11R7/include/xorg/mibstore.h xcomp-xorg-server-include xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/include/xorg/mibstore.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
./usr/X11R7/include/xorg/micmap.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/micoord.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/mifillarc.h xcomp-xorg-server-include xorg,xorg_server_ver=110
-./usr/X11R7/include/xorg/mifillarc.h xcomp-xorg-server-include xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/include/xorg/mifillarc.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
./usr/X11R7/include/xorg/mifpoly.h xcomp-xorg-server-include xorg,xorg_server_ver=110
-./usr/X11R7/include/xorg/mifpoly.h xcomp-xorg-server-include xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/include/xorg/mifpoly.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
./usr/X11R7/include/xorg/migc.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/miline.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/mipict.h xcomp-xorg-server-include xorg
@@ -880,17 +883,17 @@
./usr/X11R7/include/xorg/misc.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/miscstruct.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/mispans.h xcomp-xorg-server-include xorg,xorg_server_ver=110
-./usr/X11R7/include/xorg/mispans.h xcomp-xorg-server-include xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/include/xorg/mispans.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
./usr/X11R7/include/xorg/mistruct.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/misync.h xcomp-xorg-server-include xorg,xorg_server_ver=120
./usr/X11R7/include/xorg/misyncfd.h xcomp-xorg-server-include xorg,xorg_server_ver=120
./usr/X11R7/include/xorg/misyncshm.h xcomp-xorg-server-include xorg,xorg_server_ver=120
./usr/X11R7/include/xorg/misyncstr.h xcomp-xorg-server-include xorg,xorg_server_ver=120
./usr/X11R7/include/xorg/miwideline.h xcomp-xorg-server-include xorg,xorg_server_ver=110
-./usr/X11R7/include/xorg/miwideline.h xcomp-xorg-server-include xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/include/xorg/miwideline.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
./usr/X11R7/include/xorg/mizerarc.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/msp3430.h xcomp-xorg-server-include xorg,xorg_server_ver=110
-./usr/X11R7/include/xorg/msp3430.h xcomp-xorg-server-include xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/include/xorg/msp3430.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
./usr/X11R7/include/xorg/nonsdk_extinit.h xcomp-xorg-server-include xorg,xorg_server_ver=120
./usr/X11R7/include/xorg/opaque.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/optionstr.h xcomp-xorg-server-include xorg,xorg_server_ver=120
@@ -924,19 +927,20 @@
./usr/X11R7/include/xorg/shadow.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/shadowfb.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/shmint.h xcomp-xorg-server-include xorg
-./usr/X11R7/include/xorg/site.h xcomp-obsolete obsolete
+./usr/X11R7/include/xorg/site.h xcomp-xorg-server-include xorg,xorg_server_ver=110
+./usr/X11R7/include/xorg/site.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
./usr/X11R7/include/xorg/swaprep.h xcomp-xorg-server-include xorg,xorg_server_ver=110
-./usr/X11R7/include/xorg/swaprep.h xcomp-xorg-server-include xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/include/xorg/swaprep.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
./usr/X11R7/include/xorg/swapreq.h xcomp-xorg-server-include xorg,xorg_server_ver=110
-./usr/X11R7/include/xorg/swapreq.h xcomp-xorg-server-include xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/include/xorg/swapreq.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
./usr/X11R7/include/xorg/tda8425.h xcomp-xorg-server-include xorg,xorg_server_ver=110
-./usr/X11R7/include/xorg/tda8425.h xcomp-xorg-server-include xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/include/xorg/tda8425.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
./usr/X11R7/include/xorg/tda9850.h xcomp-xorg-server-include xorg,xorg_server_ver=110
-./usr/X11R7/include/xorg/tda9850.h xcomp-xorg-server-include xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/include/xorg/tda9850.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
./usr/X11R7/include/xorg/tda9885.h xcomp-xorg-server-include xorg,xorg_server_ver=110
-./usr/X11R7/include/xorg/tda9885.h xcomp-xorg-server-include xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/include/xorg/tda9885.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
./usr/X11R7/include/xorg/uda1380.h xcomp-xorg-server-include xorg,xorg_server_ver=110
-./usr/X11R7/include/xorg/uda1380.h xcomp-xorg-server-include xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/include/xorg/uda1380.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
./usr/X11R7/include/xorg/validate.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/vbe.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/vbeModes.h xcomp-xorg-server-include xorg
@@ -946,10 +950,10 @@
./usr/X11R7/include/xorg/window.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/windowstr.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/xaa.h xcomp-xorg-server-include xorg,xorg_server_ver=110
-./usr/X11R7/include/xorg/xaa.h xcomp-xorg-server-include xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/include/xorg/xaa.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
./usr/X11R7/include/xorg/xaaWrapper.h xcomp-obsolete obsolete
./usr/X11R7/include/xorg/xaalocal.h xcomp-xorg-server-include xorg,xorg_server_ver=110
-./usr/X11R7/include/xorg/xaalocal.h xcomp-xorg-server-include xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/include/xorg/xaalocal.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
./usr/X11R7/include/xorg/xaarop.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/xf1bpp.h xcomp-obsolete obsolete
./usr/X11R7/include/xorg/xf4bpp.h xcomp-obsolete obsolete
@@ -971,10 +975,11 @@
./usr/X11R7/include/xorg/xf86Priv.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/xf86Privstr.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/xf86RAC.h xcomp-obsolete obsolete
-./usr/X11R7/include/xorg/xf86RamDac.h xcomp-obsolete obsolete
+./usr/X11R7/include/xorg/xf86RamDac.h xcomp-xorg-server-include xorg,xorg_server_ver=110
+./usr/X11R7/include/xorg/xf86RamDac.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
./usr/X11R7/include/xorg/xf86RandR12.h xcomp-xorg-server-include xorg
./usr/X11R7/include/xorg/xf86Rename.h xcomp-xorg-server-include xorg,xorg_server_ver=110
-./usr/X11R7/include/xorg/xf86Rename.h xcomp-xorg-server-include xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/include/xorg/xf86Rename.h xcomp-obsolete xorg,obsolete,xorg_server_ver=120
./usr/X11R7/include/xorg/xf86Resources.h xcomp-obsolete obsolete
./usr/X11R7/include/xorg/xf86Version.h xcomp-obsolete obsolete
./usr/X11R7/include/xorg/xf86Xinput.h xcomp-xorg-server-include xorg
Index: distrib/sets/lists/xdebug/md.vax
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/xdebug/md.vax,v
retrieving revision 1.15
diff -u -p -d -r1.15 md.vax
--- distrib/sets/lists/xdebug/md.vax 15 Jul 2022 04:47:56 -0000 1.15
+++ distrib/sets/lists/xdebug/md.vax 25 Jan 2024 15:06:13 -0000
@@ -34,10 +34,12 @@
./usr/libdata/debug/usr/X11R7/lib/modules/extensions/librecord.so.0.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120
./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libshadow.so.0.debug xdebug-shadow-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/libexa.so.0.debug xdebug-exa-debug xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/libfb.so.0.debug xdebug-obsolete obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/libfb.so.0.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/libfb.so.0.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120
./usr/libdata/debug/usr/X11R7/lib/modules/libi2c.so.0.debug xdebug-obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/libshadowfb.so.0.debug xdebug-shadowfb-debug xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/libvbe.so.0.debug xdebug-obsolete obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/libvbe.so.0.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/libvbe.so.0.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120
./usr/libdata/debug/usr/X11R7/lib/modules/libvgahw.so.0.debug xdebug-vgahw-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/libxaa.so.0.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/libxaa.so.0.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120
Index: distrib/sets/lists/xserver/md.vax
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/xserver/md.vax,v
retrieving revision 1.27
diff -u -p -d -r1.27 md.vax
--- distrib/sets/lists/xserver/md.vax 15 Jul 2022 04:47:56 -0000 1.27
+++ distrib/sets/lists/xserver/md.vax 25 Jan 2024 15:06:13 -0000
@@ -49,10 +49,12 @@
./usr/X11R7/lib/modules/libexa.so xserver-exa-modules xorg
./usr/X11R7/lib/modules/libexa.so.0 xserver-exa-modules xorg
./usr/X11R7/lib/modules/libexa_pic.a xserver-obsolete xorg,picinstall,obsolete
-./usr/X11R7/lib/modules/libfb.a xdebug-obsolete obsolete
-./usr/X11R7/lib/modules/libfb.so xdebug-obsolete obsolete
-./usr/X11R7/lib/modules/libfb.so.0 xdebug-obsolete obsolete
-./usr/X11R7/lib/modules/libfb_pic.a xdebug-obsolete obsolete
+./usr/X11R7/lib/modules/libfb.a xserver-obsolete obsolete
+./usr/X11R7/lib/modules/libfb.so -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/libfb.so xserver-obsolete xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/libfb.so.0 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/libfb.so.0 xserver-obsolete xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/libfb_pic.a xserver-obsolete obsolete
./usr/X11R7/lib/modules/libi2c.a xserver-obsolete xorg,obsolete
./usr/X11R7/lib/modules/libi2c.so xserver-obsolete xorg,obsolete
./usr/X11R7/lib/modules/libi2c.so.0 xserver-obsolete xorg,obsolete
@@ -61,10 +63,13 @@
./usr/X11R7/lib/modules/libshadowfb.so xserver-shadowfb-modules xorg
./usr/X11R7/lib/modules/libshadowfb.so.0 xserver-shadowfb-modules xorg
./usr/X11R7/lib/modules/libshadowfb_pic.a xserver-obsolete xorg,picinstall,obsolete
-./usr/X11R7/lib/modules/libvbe.a xdebug-obsolete obsolete
-./usr/X11R7/lib/modules/libvbe.so xdebug-obsolete obsolete
-./usr/X11R7/lib/modules/libvbe.so.0 xdebug-obsolete obsolete
-./usr/X11R7/lib/modules/libvbe_pic.a xdebug-obsolete obsolete
+./usr/X11R7/lib/modules/libvbe.a xserver-obsolete obsolete
+./usr/X11R7/lib/modules/libvbe.so -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/libvbe.so xserver-obsolete xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/libvbe.so.0 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/libvbe.so.0 xserver-obsolete xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/libvbe_pic.a xserver-obsolete obsolete
+./usr/X11R7/lib/modules/libvbe_pic.a xserver-obsolete obsolete
./usr/X11R7/lib/modules/libvgahw.a xserver-obsolete xorg,obsolete
./usr/X11R7/lib/modules/libvgahw.so xserver-vgahw-modules xorg
./usr/X11R7/lib/modules/libvgahw.so.0 xserver-vgahw-modules xorg
Index: external/mit/xorg/server/xorg-server.old/Makefile.servermod
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/server/xorg-server.old/Makefile.servermod,v
retrieving revision 1.5
diff -u -p -d -r1.5 Makefile.servermod
--- external/mit/xorg/server/xorg-server.old/Makefile.servermod 1 Nov 2021 10:05:19 -0000 1.5
+++ external/mit/xorg/server/xorg-server.old/Makefile.servermod 25 Jan 2024 15:06:15 -0000
@@ -7,7 +7,7 @@ NOFULLRELRO= yes
.if defined(XMODULEDIR)
SHLIB_MAJOR=0
-# dri, dri2 and fb need to be linked statically as well?
+# dri and dri2 need to be linked statically as well?
.if !defined(XMODULEDIRANDSTATIC)
MKSTATICLIB:= no
.endif
Index: external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -d -r1.1.1.1 Makefile
--- external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/Makefile 10 Jun 2016 03:42:14 -0000 1.1.1.1
+++ external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/Makefile 25 Jan 2024 15:06:16 -0000
@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
-XMODULEDIRANDSTATIC= # defined
.include "../../../../Makefile.serverlib"
.include "../../../../Makefile.servermod"
---
Izumi Tsutsui