From 3f2eb1e745cd58675b711dff1ac86dc76399dd62 Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Tue, 28 Aug 2018 06:41:42 +0000 Subject: sync --- distrib/sets/lists/xbase/md.arm64 | 1 + distrib/sets/lists/xserv/md.arm64 | 11 +++++++++++ distrib/sets/lists/xshare/mi | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) (limited to 'distrib') diff --git a/distrib/sets/lists/xbase/md.arm64 b/distrib/sets/lists/xbase/md.arm64 index 0bd223b2b..5bd756330 100644 --- a/distrib/sets/lists/xbase/md.arm64 +++ b/distrib/sets/lists/xbase/md.arm64 @@ -270,6 +270,7 @@ ./usr/X11R6/lib/libGLw.so.6.0 ./usr/X11R6/lib/libOSMesa.la ./usr/X11R6/lib/libOSMesa.so.11.0 +./usr/X11R6/lib/libXvMCr600.so.1.0 ./usr/X11R6/lib/libdrm.la ./usr/X11R6/lib/libdrm.so.7.6 ./usr/X11R6/lib/libdrm_amdgpu.la diff --git a/distrib/sets/lists/xserv/md.arm64 b/distrib/sets/lists/xserv/md.arm64 index f43b8ee62..e4391476b 100644 --- a/distrib/sets/lists/xserv/md.arm64 +++ b/distrib/sets/lists/xserv/md.arm64 @@ -3,9 +3,17 @@ ./usr/X11R6/bin/cvt ./usr/X11R6/bin/gtf ./usr/X11R6/lib/modules/dri/kms_swrast_dri.so +./usr/X11R6/lib/modules/dri/r200_dri.so +./usr/X11R6/lib/modules/dri/r300_dri.so +./usr/X11R6/lib/modules/dri/r600_dri.so +./usr/X11R6/lib/modules/dri/radeon_dri.so ./usr/X11R6/lib/modules/dri/swrast_dri.so +./usr/X11R6/lib/modules/drivers/ati_drv.la +./usr/X11R6/lib/modules/drivers/ati_drv.so ./usr/X11R6/lib/modules/drivers/modesetting_drv.la ./usr/X11R6/lib/modules/drivers/modesetting_drv.so +./usr/X11R6/lib/modules/drivers/radeon_drv.la +./usr/X11R6/lib/modules/drivers/radeon_drv.so ./usr/X11R6/lib/modules/drivers/wsfb_drv.la ./usr/X11R6/lib/modules/drivers/wsfb_drv.so ./usr/X11R6/lib/modules/drivers/wsudl_drv.la @@ -47,12 +55,14 @@ ./usr/X11R6/man/man1/Xorg.1 ./usr/X11R6/man/man1/cvt.1 ./usr/X11R6/man/man1/gtf.1 +./usr/X11R6/man/man4/ati.4 ./usr/X11R6/man/man4/exa.4 ./usr/X11R6/man/man4/fbdevhw.4 ./usr/X11R6/man/man4/kbd.4 ./usr/X11R6/man/man4/modesetting.4 ./usr/X11R6/man/man4/mouse.4 ./usr/X11R6/man/man4/mousedrv.4 +./usr/X11R6/man/man4/radeon.4 ./usr/X11R6/man/man4/usbtablet.4 ./usr/X11R6/man/man4/void.4 ./usr/X11R6/man/man4/ws.4 @@ -60,4 +70,5 @@ ./usr/X11R6/man/man4/wsudl.4 ./usr/X11R6/man/man5/xorg.conf.5 ./usr/X11R6/man/man5/xorg.conf.d.5 +./usr/X11R6/share/X11/xorg.conf.d/10-radeon.conf ./usr/X11R6/share/aclocal/xorg-server.m4 diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi index 618091967..52664b1c0 100644 --- a/distrib/sets/lists/xshare/mi +++ b/distrib/sets/lists/xshare/mi @@ -2083,8 +2083,8 @@ ./usr/X11R6/man/man3/XkbSetIndicatorMap.3 ./usr/X11R6/man/man3/XkbSetMap.3 ./usr/X11R6/man/man3/XkbSetModActionVMods.3 -./usr/X11R6/man/man3/XkbSetNamedIndicator.3 ./usr/X11R6/man/man3/XkbSetNamedDeviceIndicator.3 +./usr/X11R6/man/man3/XkbSetNamedIndicator.3 ./usr/X11R6/man/man3/XkbSetNames.3 ./usr/X11R6/man/man3/XkbSetPtrActionX.3 ./usr/X11R6/man/man3/XkbSetPtrActionY.3 @@ -2117,6 +2117,7 @@ ./usr/X11R6/man/man3/XmbufGetVersion.3 ./usr/X11R6/man/man3/XmbufGetWindowAttributes.3 ./usr/X11R6/man/man3/XmbufQueryExtension.3 +./usr/X11R6/man/man3/Xpresent.3 ./usr/X11R6/man/man3/Xrandr.3 ./usr/X11R6/man/man3/XrmCombineDatabase.3 ./usr/X11R6/man/man3/XrmCombineFileDatabase.3 @@ -2149,7 +2150,6 @@ ./usr/X11R6/man/man3/XrmStringToQuarkList.3 ./usr/X11R6/man/man3/XrmUniqueQuark.3 ./usr/X11R6/man/man3/XrmValue.3 -./usr/X11R6/man/man3/Xpresent.3 ./usr/X11R6/man/man3/Xss.3 ./usr/X11R6/man/man3/XtAddActions.3 ./usr/X11R6/man/man3/XtAddCallback.3 -- cgit v1.2.3