On 2018/03/15 3:59, matthew green wrote:
"Rin Okuyama" writes:
Module Name: src
Committed By: rin
Date: Wed Mar 14 13:23:31 UTC 2018
Modified Files:
src/distrib/sets/lists/xdebug: md.i386
Log Message:
Restore shlib version accidentally bumped in the previous commit.
Fix debug build for i386.
this seems incorrect.
for x86, the ati driver should be .so.18 and the ati_old should
be .so.6. for everyone else (aka non-drm), only ati should be
around at .so.6.
I understand what you meant. New ati driver can be built with attached
patch (both for amd64 and i386). However, I cannot test it because of
lack of hardware.
Thanks,
rin
diff -Naru src.orig/distrib/sets/lists/xdebug/md.amd64
src/distrib/sets/lists/xdebug/md.amd64
--- src.orig/distrib/sets/lists/xdebug/md.amd64 2018-03-15 15:14:25.812467133
+0900
+++ src/distrib/sets/lists/xdebug/md.amd64 2018-03-15 15:14:50.165167564
+0900
@@ -80,7 +80,8 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug
-unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug
-unknown- xorg,debug,xorg_server_ver=118,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug
-unknown- xorg
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug
-unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.18.debug
-unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv_old.so.6.debug
-unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug
-unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug
-unknown- xorg,debug,xorg_server_ver=118,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2.debug
-unknown- xorg,debug,xorg_server_ver=110
diff -Naru src.orig/distrib/sets/lists/xdebug/md.i386
src/distrib/sets/lists/xdebug/md.i386
--- src.orig/distrib/sets/lists/xdebug/md.i386 2018-03-15 15:14:25.813034878
+0900
+++ src/distrib/sets/lists/xdebug/md.i386 2018-03-15 15:14:50.165481812
+0900
@@ -90,7 +90,8 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug
-unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug
-unknown- xorg,debug,xorg_server_ver=118,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug
-unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug
-unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.18.debug
-unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv_old.so.6.debug
-unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug
-unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug
-unknown- xorg,debug,xorg_server_ver=118,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2.debug
-unknown- xorg,debug,xorg_server_ver=110
diff -Naru src.orig/distrib/sets/lists/xserver/md.amd64
src/distrib/sets/lists/xserver/md.amd64
--- src.orig/distrib/sets/lists/xserver/md.amd64 2018-03-15
15:14:25.815816354 +0900
+++ src/distrib/sets/lists/xserver/md.amd64 2018-03-15 15:14:50.165954724
+0900
@@ -60,7 +60,9 @@
./usr/X11R7/lib/modules/drivers/ast_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ast_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/ati_drv.so.6 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ati_drv.so.18 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ati_drv_old.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ati_drv_old.so.6 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ch7017_drv.so -unknown-
xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/ch7017_drv.so -unknown-
xorg,xorg_server_ver=118,obsolete
./usr/X11R7/lib/modules/drivers/ch7017_drv.so.2 -unknown-
xorg,xorg_server_ver=110
@@ -349,6 +351,7 @@
./usr/X11R7/man/cat4/void.0 -unknown- obsolete
./usr/X11R7/man/cat4/ws.0 -unknown-
.cat,xorg
./usr/X11R7/man/cat4/wsfb.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/x86/ati.0 -unknown-
.cat,xorg
./usr/X11R7/man/cat4/x86/radeon.0 -unknown-
.cat,xorg
./usr/X11R7/man/cat4/xgi.0 -unknown-
.cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/xgi.0 -unknown-
.cat,xorg,xorg_server_ver=118,obsolete
@@ -403,6 +406,7 @@
./usr/X11R7/man/html4/void.html -unknown-
obsolete
./usr/X11R7/man/html4/ws.html -unknown-
html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown-
html,xorg
+./usr/X11R7/man/html4/x86/ati.html -unknown-
html,xorg
./usr/X11R7/man/html4/x86/radeon.html -unknown-
html,xorg
./usr/X11R7/man/html4/xgi.html -unknown-
html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/xgi.html -unknown-
html,xorg,xorg_server_ver=118,obsolete
@@ -456,6 +460,7 @@
./usr/X11R7/man/man4/void.4 -unknown- obsolete
./usr/X11R7/man/man4/ws.4 -unknown-
.man,xorg
./usr/X11R7/man/man4/wsfb.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/x86/ati.4 -unknown-
.man,xorg
./usr/X11R7/man/man4/x86/radeon.4 -unknown-
.man,xorg
./usr/X11R7/man/man4/xgi.4 -unknown-
.man,xorg,xorg_server_ver=110
./usr/X11R7/man/man4/xgi.4 -unknown-
.man,xorg,xorg_server_ver=118,obsolete
diff -Naru src.orig/distrib/sets/lists/xserver/md.i386
src/distrib/sets/lists/xserver/md.i386
--- src.orig/distrib/sets/lists/xserver/md.i386 2018-03-15 15:14:25.816436974
+0900
+++ src/distrib/sets/lists/xserver/md.i386 2018-03-15 15:14:50.166391346
+0900
@@ -67,7 +67,9 @@
./usr/X11R7/lib/modules/drivers/ast_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ast_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/ati_drv.so.6 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ati_drv.so.18 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ati_drv_old.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ati_drv_old.so.6 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ch7017_drv.so -unknown-
xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/ch7017_drv.so -unknown-
xorg,xorg_server_ver=118,obsolete
./usr/X11R7/lib/modules/drivers/ch7017_drv.so.2 -unknown-
xorg,xorg_server_ver=110
@@ -361,6 +363,7 @@
./usr/X11R7/man/cat4/void.0 -unknown- obsolete
./usr/X11R7/man/cat4/ws.0 -unknown-
.cat,xorg
./usr/X11R7/man/cat4/wsfb.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/x86/ati.0 -unknown-
.cat,xorg
./usr/X11R7/man/cat4/x86/radeon.0 -unknown-
.cat,xorg
./usr/X11R7/man/cat4/xgi.0 -unknown-
.cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/xgi.0 -unknown-
.cat,xorg,xorg_server_ver=118,obsolete
@@ -416,6 +419,7 @@
./usr/X11R7/man/html4/void.html -unknown-
obsolete
./usr/X11R7/man/html4/ws.html -unknown-
html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown-
html,xorg
+./usr/X11R7/man/html4/x86/ati.html -unknown-
html,xorg
./usr/X11R7/man/html4/x86/radeon.html -unknown-
html,xorg
./usr/X11R7/man/html4/xgi.html -unknown-
html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/xgi.html -unknown-
html,xorg,xorg_server_ver=118,obsolete
@@ -471,6 +475,7 @@
./usr/X11R7/man/man4/void.4 -unknown- obsolete
./usr/X11R7/man/man4/ws.4 -unknown-
.man,xorg
./usr/X11R7/man/man4/wsfb.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/x86/ati.4 -unknown-
.man,xorg
./usr/X11R7/man/man4/x86/radeon.4 -unknown-
.man,xorg
./usr/X11R7/man/man4/xgi.4 -unknown-
.man,xorg,xorg_server_ver=110
./usr/X11R7/man/man4/xgi.4 -unknown-
.man,xorg,xorg_server_ver=118,obsolete
diff -Naru src.orig/external/mit/xorg/server/drivers/Makefile
src/external/mit/xorg/server/drivers/Makefile
--- src.orig/external/mit/xorg/server/drivers/Makefile 2018-03-15
15:14:38.469189948 +0900
+++ src/external/mit/xorg/server/drivers/Makefile 2018-03-15
15:14:50.166649219 +0900
@@ -35,6 +35,7 @@
SUBDIR+= \
xf86-video-ast \
xf86-video-ati \
+ xf86-video-ati-kms \
xf86-video-chips \
xf86-video-cirrus \
xf86-video-cirrus_alpine \
diff -Naru src.orig/external/mit/xorg/server/drivers/xf86-video-ati/Makefile
src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile
--- src.orig/external/mit/xorg/server/drivers/xf86-video-ati/Makefile
2018-03-15 15:14:38.472497503 +0900
+++ src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile
2018-03-15 15:14:50.166867217 +0900
@@ -1,7 +1,11 @@
# $NetBSD: Makefile,v 1.6 2016/08/16 06:24:01 mrg Exp $
DRIVER= xf86-video-ati
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+DRIVER_NAME= ati_drv_old
+.else
DRIVER_NAME= ati_drv
+.endif
SRCS= ati.c atimodule.c
MAN= ati.4
diff -Naru
src.orig/external/mit/xorg/server/drivers/xf86-video-ati-kms/Makefile
src/external/mit/xorg/server/drivers/xf86-video-ati-kms/Makefile
--- src.orig/external/mit/xorg/server/drivers/xf86-video-ati-kms/Makefile
1970-01-01 09:00:00.000000000 +0900
+++ src/external/mit/xorg/server/drivers/xf86-video-ati-kms/Makefile
2018-03-15 15:15:12.518639863 +0900
@@ -0,0 +1,19 @@
+# $NetBSD$
+
+.include <bsd.own.mk>
+
+DRIVER= xf86-video-ati-kms
+DRIVER_NAME= ati_drv
+
+LIBDPLIBS+= drm_radeon ${.CURDIR}/../../../lib/libdrm_radeon
+
+SRCS= ati.c atimodule.c
+
+MAN= ati.4
+MANSUBDIR= /x86
+
+CPPFLAGS+= -DHAVE_CONFIG_H
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm \
+ -I${X11SRCDIR.${DRIVER}}/../include
+
+.include "../Makefile.xf86-driver"
