From: Jonathan Gray Subject: change vaapi .so dirs in xenocara To: tech@openbsd.org Cc: rsadowski@openbsd.org, matthieu@openbsd.org Date: Tue, 23 Jul 2024 18:38:51 +1000 Change the directory vaapi .so files get installed in. From the xserver driver directory: /usr/X11R6/lib/modules/drivers to the Mesa/dri directory: /usr/X11R6/lib/modules/dri this closer matches the Mesa meson defaults if va_drivers_path == '' va_drivers_path = join_paths(get_option('libdir'), 'dri') Also search ${LOCALBASE}/lib/dri so the intel ports can be less awkward. Patches for those will go to ports@ Index: lib/libva/Makefile.bsd-wrapper =================================================================== RCS file: /cvs/xenocara/lib/libva/Makefile.bsd-wrapper,v diff -u -p -r1.1 Makefile.bsd-wrapper --- lib/libva/Makefile.bsd-wrapper 19 Jul 2024 14:35:16 -0000 1.1 +++ lib/libva/Makefile.bsd-wrapper 23 Jul 2024 08:24:51 -0000 @@ -5,8 +5,10 @@ SHARED_LIBS += va-glx 2.22 SHARED_LIBS += va-x11 2.22 SHARED_LIBS += va 2.22 +LOCALBASE ?= /usr/local + CONFIGURE_ARGS= --disable-wayland CONFIGURE_ARGS+= \ - --with-drivers-path=${DESTDIR}${X11BASE}/lib/modules/drivers/ + --with-drivers-path=${DESTDIR}${X11BASE}/lib/modules/dri:${LOCALBASE}/lib/dri .include Index: lib/mesa/mk/libgallium_drv_video/Makefile =================================================================== RCS file: /cvs/xenocara/lib/mesa/mk/libgallium_drv_video/Makefile,v diff -u -p -r1.3 Makefile --- lib/mesa/mk/libgallium_drv_video/Makefile 22 Jul 2024 00:40:30 -0000 1.3 +++ lib/mesa/mk/libgallium_drv_video/Makefile 23 Jul 2024 08:24:51 -0000 @@ -39,12 +39,12 @@ CPPFLAGS+= -DGALLIUM_LLVMPIPE install: ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} \ -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - lib${LIB}.so ${DESTDIR}${X11BASE}/lib/modules/drivers + lib${LIB}.so ${DESTDIR}${X11BASE}/lib/modules/dri .for driver in ${GALLIUM_DRIVERS} - ln -f ${DESTDIR}${X11BASE}/lib/modules/drivers/lib${LIB}.so \ - ${DESTDIR}${X11BASE}/lib/modules/drivers/${driver}_drv_video.so + ln -f ${DESTDIR}${X11BASE}/lib/modules/dri/lib${LIB}.so \ + ${DESTDIR}${X11BASE}/lib/modules/dri/${driver}_drv_video.so .endfor - rm ${DESTDIR}${X11BASE}/lib/modules/drivers/lib${LIB}.so + rm ${DESTDIR}${X11BASE}/lib/modules/dri/lib${LIB}.so obj: _xenocara_obj Index: distrib/sets/lists/xserv/md.amd64 =================================================================== RCS file: /cvs/xenocara/distrib/sets/lists/xserv/md.amd64,v diff -u -p -r1.84 md.amd64 --- distrib/sets/lists/xserv/md.amd64 19 Jul 2024 14:45:27 -0000 1.84 +++ distrib/sets/lists/xserv/md.amd64 23 Jul 2024 08:24:52 -0000 @@ -9,7 +9,9 @@ ./usr/X11R6/lib/modules/dri/kms_swrast_dri.so ./usr/X11R6/lib/modules/dri/r300_dri.so ./usr/X11R6/lib/modules/dri/r600_dri.so +./usr/X11R6/lib/modules/dri/r600_drv_video.so ./usr/X11R6/lib/modules/dri/radeonsi_dri.so +./usr/X11R6/lib/modules/dri/radeonsi_drv_video.so ./usr/X11R6/lib/modules/dri/swrast_dri.so ./usr/X11R6/lib/modules/drivers/amdgpu_drv.la ./usr/X11R6/lib/modules/drivers/amdgpu_drv.so @@ -41,10 +43,8 @@ ./usr/X11R6/lib/modules/drivers/openchrome_drv.so ./usr/X11R6/lib/modules/drivers/r128_drv.la ./usr/X11R6/lib/modules/drivers/r128_drv.so -./usr/X11R6/lib/modules/drivers/r600_drv_video.so ./usr/X11R6/lib/modules/drivers/radeon_drv.la ./usr/X11R6/lib/modules/drivers/radeon_drv.so -./usr/X11R6/lib/modules/drivers/radeonsi_drv_video.so ./usr/X11R6/lib/modules/drivers/savage_drv.la ./usr/X11R6/lib/modules/drivers/savage_drv.so ./usr/X11R6/lib/modules/drivers/siliconmotion_drv.la Index: distrib/sets/lists/xserv/md.arm64 =================================================================== RCS file: /cvs/xenocara/distrib/sets/lists/xserv/md.arm64,v diff -u -p -r1.7 md.arm64 --- distrib/sets/lists/xserv/md.arm64 19 Jul 2024 14:45:27 -0000 1.7 +++ distrib/sets/lists/xserv/md.arm64 23 Jul 2024 08:24:52 -0000 @@ -6,7 +6,9 @@ ./usr/X11R6/lib/modules/dri/kms_swrast_dri.so ./usr/X11R6/lib/modules/dri/r300_dri.so ./usr/X11R6/lib/modules/dri/r600_dri.so +./usr/X11R6/lib/modules/dri/r600_drv_video.so ./usr/X11R6/lib/modules/dri/radeonsi_dri.so +./usr/X11R6/lib/modules/dri/radeonsi_drv_video.so ./usr/X11R6/lib/modules/dri/swrast_dri.so ./usr/X11R6/lib/modules/drivers/amdgpu_drv.la ./usr/X11R6/lib/modules/drivers/amdgpu_drv.so @@ -14,10 +16,8 @@ ./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/r600_drv_video.so ./usr/X11R6/lib/modules/drivers/radeon_drv.la ./usr/X11R6/lib/modules/drivers/radeon_drv.so -./usr/X11R6/lib/modules/drivers/radeonsi_drv_video.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 Index: distrib/sets/lists/xserv/md.i386 =================================================================== RCS file: /cvs/xenocara/distrib/sets/lists/xserv/md.i386,v diff -u -p -r1.89 md.i386 --- distrib/sets/lists/xserv/md.i386 19 Jul 2024 14:45:27 -0000 1.89 +++ distrib/sets/lists/xserv/md.i386 23 Jul 2024 08:24:52 -0000 @@ -9,7 +9,9 @@ ./usr/X11R6/lib/modules/dri/kms_swrast_dri.so ./usr/X11R6/lib/modules/dri/r300_dri.so ./usr/X11R6/lib/modules/dri/r600_dri.so +./usr/X11R6/lib/modules/dri/r600_drv_video.so ./usr/X11R6/lib/modules/dri/radeonsi_dri.so +./usr/X11R6/lib/modules/dri/radeonsi_drv_video.so ./usr/X11R6/lib/modules/dri/swrast_dri.so ./usr/X11R6/lib/modules/drivers/amdgpu_drv.la ./usr/X11R6/lib/modules/drivers/amdgpu_drv.so @@ -43,10 +45,8 @@ ./usr/X11R6/lib/modules/drivers/openchrome_drv.so ./usr/X11R6/lib/modules/drivers/r128_drv.la ./usr/X11R6/lib/modules/drivers/r128_drv.so -./usr/X11R6/lib/modules/drivers/r600_drv_video.so ./usr/X11R6/lib/modules/drivers/radeon_drv.la ./usr/X11R6/lib/modules/drivers/radeon_drv.so -./usr/X11R6/lib/modules/drivers/radeonsi_drv_video.so ./usr/X11R6/lib/modules/drivers/savage_drv.la ./usr/X11R6/lib/modules/drivers/savage_drv.so ./usr/X11R6/lib/modules/drivers/siliconmotion_drv.la Index: distrib/sets/lists/xserv/md.macppc =================================================================== RCS file: /cvs/xenocara/distrib/sets/lists/xserv/md.macppc,v diff -u -p -r1.64 md.macppc --- distrib/sets/lists/xserv/md.macppc 19 Jul 2024 14:45:27 -0000 1.64 +++ distrib/sets/lists/xserv/md.macppc 23 Jul 2024 08:24:52 -0000 @@ -6,6 +6,7 @@ ./usr/X11R6/lib/modules/dri/kms_swrast_dri.so ./usr/X11R6/lib/modules/dri/r300_dri.so ./usr/X11R6/lib/modules/dri/r600_dri.so +./usr/X11R6/lib/modules/dri/r600_drv_video.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 @@ -17,7 +18,6 @@ ./usr/X11R6/lib/modules/drivers/nv_drv.so ./usr/X11R6/lib/modules/drivers/r128_drv.la ./usr/X11R6/lib/modules/drivers/r128_drv.so -./usr/X11R6/lib/modules/drivers/r600_drv_video.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 Index: distrib/sets/lists/xserv/md.riscv64 =================================================================== RCS file: /cvs/xenocara/distrib/sets/lists/xserv/md.riscv64,v diff -u -p -r1.5 md.riscv64 --- distrib/sets/lists/xserv/md.riscv64 19 Jul 2024 15:08:23 -0000 1.5 +++ distrib/sets/lists/xserv/md.riscv64 23 Jul 2024 08:24:52 -0000 @@ -8,7 +8,9 @@ ./usr/X11R6/lib/modules/dri/kms_swrast_dri.so ./usr/X11R6/lib/modules/dri/r300_dri.so ./usr/X11R6/lib/modules/dri/r600_dri.so +./usr/X11R6/lib/modules/dri/r600_drv_video.so ./usr/X11R6/lib/modules/dri/radeonsi_dri.so +./usr/X11R6/lib/modules/dri/radeonsi_drv_video.so ./usr/X11R6/lib/modules/dri/swrast_dri.so ./usr/X11R6/lib/modules/drivers/amdgpu_drv.la ./usr/X11R6/lib/modules/drivers/amdgpu_drv.so @@ -16,10 +18,8 @@ ./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/r600_drv_video.so ./usr/X11R6/lib/modules/drivers/radeon_drv.la ./usr/X11R6/lib/modules/drivers/radeon_drv.so -./usr/X11R6/lib/modules/drivers/radeonsi_drv_video.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 Index: distrib/sets/lists/xserv/md.sparc64 =================================================================== RCS file: /cvs/xenocara/distrib/sets/lists/xserv/md.sparc64,v diff -u -p -r1.61 md.sparc64 --- distrib/sets/lists/xserv/md.sparc64 19 Jul 2024 14:45:27 -0000 1.61 +++ distrib/sets/lists/xserv/md.sparc64 23 Jul 2024 08:24:52 -0000 @@ -6,6 +6,7 @@ ./usr/X11R6/lib/modules/dri/kms_swrast_dri.so ./usr/X11R6/lib/modules/dri/r300_dri.so ./usr/X11R6/lib/modules/dri/r600_dri.so +./usr/X11R6/lib/modules/dri/r600_drv_video.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 @@ -15,7 +16,6 @@ ./usr/X11R6/lib/modules/drivers/modesetting_drv.so ./usr/X11R6/lib/modules/drivers/r128_drv.la ./usr/X11R6/lib/modules/drivers/r128_drv.so -./usr/X11R6/lib/modules/drivers/r600_drv_video.so ./usr/X11R6/lib/modules/drivers/radeon_drv.la ./usr/X11R6/lib/modules/drivers/radeon_drv.so ./usr/X11R6/lib/modules/drivers/sunffb_drv.la