This is a rather large patch that moves my previously submitted VA-API ports into xenocara. For your convenience, I've inlined a diff that shows you all of the changes I made to existing files that you can easily read in your MUA. The xenocara patch also contains these changes and should be the only xenocara patch you need to apply. The patch to BSD.x11.dist is inlined in this email alone.
I tried sending this email yesterday with the gzipped xenocara patch as an attachment, but it was apparently rejected from the mailing list. I've used xz to compress it instead and uploaded it to my google drive. Here is a link to download it instead: https://drive.google.com/open?id=1_Jwd08vteJzM0mm4sXI_zjAq2pNj3yIK Summary of Changes: - libva added to xenocara/lib/libva - vainfo added to xenocara/app/vainfo - intel-vaapi-driver added to xenocara/driver/intel-vaapi-driver - Mesa Makefile.bsd-wrapper updated to build with --enable-va flag - 3RDPARTY file updated to include libva, libva-utils, and intel-vaapi-driver - BSD.x11.dist updated to include /usr/X11R6/include/va/ (patch inlined here) Architectures Tested: amd64 Testing Instructions: 1. pkg_add xz 1. save xenocara-vaapi.patch.xz to /tmp 2. xz -d /tmp/xenocara-vaapi.patch.xz 3. cd /usr/xenocara 4. patch -p0 < /tmp/xenocara-vaapi.patch 5. Follow normal build instructions in README within the root of xenocara 6. Run vainfo. It should report available profiles and entrypoints for VA-API. Example of successful execution: libva info: VA-API version 1.6.0 libva info: va_getDriverName() returns 0 libva info: Trying to open /usr/X11R6/lib/dri/i965_drv_video.so libva info: Found init function __vaDriverInit_1_6 libva info: va_openDriver() returns 0 vainfo: VA-API version: 1.6 (libva 2.6.0.pre1) vainfo: Driver version: Intel i965 driver for Intel(R) Kaby Lake - 2.4.0 vainfo: Supported profile and entrypoints VAProfileMPEG2Simple : VAEntrypointVLD VAProfileMPEG2Simple : VAEntrypointEncSlice VAProfileMPEG2Main : VAEntrypointVLD VAProfileMPEG2Main : VAEntrypointEncSlice VAProfileH264ConstrainedBaseline: VAEntrypointVLD VAProfileH264ConstrainedBaseline: VAEntrypointEncSlice VAProfileH264ConstrainedBaseline: VAEntrypointEncSliceLP VAProfileH264Main : VAEntrypointVLD VAProfileH264Main : VAEntrypointEncSlice VAProfileH264Main : VAEntrypointEncSliceLP VAProfileH264High : VAEntrypointVLD VAProfileH264High : VAEntrypointEncSlice VAProfileH264High : VAEntrypointEncSliceLP VAProfileH264MultiviewHigh : VAEntrypointVLD VAProfileH264MultiviewHigh : VAEntrypointEncSlice VAProfileH264StereoHigh : VAEntrypointVLD VAProfileH264StereoHigh : VAEntrypointEncSlice VAProfileVC1Simple : VAEntrypointVLD VAProfileVC1Main : VAEntrypointVLD VAProfileVC1Advanced : VAEntrypointVLD VAProfileNone : VAEntrypointVideoProc VAProfileJPEGBaseline : VAEntrypointVLD VAProfileJPEGBaseline : VAEntrypointEncPicture VAProfileVP8Version0_3 : VAEntrypointVLD VAProfileVP8Version0_3 : VAEntrypointEncSlice VAProfileHEVCMain : VAEntrypointVLD VAProfileHEVCMain : VAEntrypointEncSlice VAProfileHEVCMain10 : VAEntrypointVLD VAProfileHEVCMain10 : VAEntrypointEncSlice VAProfileVP9Profile0 : VAEntrypointVLD VAProfileVP9Profile0 : VAEntrypointEncSlice VAProfileVP9Profile2 : VAEntrypointVLD Inline diff for BSD.x11.dist: Index: BSD.x11.dist =================================================================== RCS file: /cvs/src/etc/mtree/BSD.x11.dist,v retrieving revision 1.54 diff -u -p -u -p -r1.54 BSD.x11.dist --- BSD.x11.dist 27 May 2019 07:03:11 -0000 1.54 +++ BSD.x11.dist 18 Dec 2019 18:23:46 -0000 @@ -87,6 +87,8 @@ .. pixman-1 .. + va + .. vulkan .. xcb List of existing xenocara files that have changed: brad-laptop$ grep -E '^Index: ' xenocara-vaapi.patch | grep -v 'app/vainfo' | grep -v 'lib/libva' | grep -v 'driver/intel-vaapi-driver' Index: 3RDPARTY Index: app/Makefile Index: driver/Makefile Index: lib/Makefile Index: lib/mesa/Makefile.bsd-wrapper Inline diffs for these files: Index: 3RDPARTY =================================================================== RCS file: /cvs/xenocara/3RDPARTY,v retrieving revision 1.354 diff -u -p -u -p -r1.354 3RDPARTY --- 3RDPARTY 12 Dec 2019 06:08:12 -0000 1.354 +++ 3RDPARTY 18 Dec 2019 19:32:09 -0000 @@ -1,5 +1,17 @@ # $OpenBSD: 3RDPARTY,v 1.354 2019/12/12 06:08:12 matthieu Exp $ # +Package: libva +Version: 2.6.0.pre1 +Archive Site: https://github.com/intel/libva/releases + +Package: libva-utils +Version: 2.6.0.pre1 +Archive Site: https://github.com/intel/libva-utils/releases + +Package: intel-vaapi-driver +Version: 2.4.0 +Archive Site: https://github.com/intel/intel-vaapi-driver/releases + Package: Freetype Version: 2.10.1 Current Vers: 2.10.1 Index: app/Makefile =================================================================== RCS file: /cvs/xenocara/app/Makefile,v retrieving revision 1.38 diff -u -p -u -p -r1.38 Makefile --- app/Makefile 15 Aug 2019 17:01:12 -0000 1.38 +++ app/Makefile 18 Dec 2019 19:32:09 -0000 @@ -18,7 +18,7 @@ SUBDIR= bdftopcf mkfontscale \ # GL .if ${XENOCARA_BUILD_GL:L} == "yes" -SUBDIR += xdriinfo glxgears glxinfo +SUBDIR += xdriinfo glxgears glxinfo vainfo .endif # extras Index: driver/Makefile =================================================================== RCS file: /cvs/xenocara/driver/Makefile,v retrieving revision 1.75 diff -u -p -u -p -r1.75 Makefile --- driver/Makefile 28 Aug 2019 08:03:10 -0000 1.75 +++ driver/Makefile 18 Dec 2019 19:32:19 -0000 @@ -52,7 +52,8 @@ VIDEO_DRV_amd64= \ xf86-video-nv xf86-video-openchrome xf86-video-r128 \ xf86-video-savage xf86-video-siliconmotion \ xf86-video-vesa xf86-video-vmware \ - xf86-video-wsfb xf86-video-wsudl + xf86-video-wsfb xf86-video-wsudl \ + intel-vaapi-driver VIDEO_DRV_arm64= \ xf86-video-amdgpu xf86-video-ati xf86-video-wsfb xf86-video-wsudl Index: lib/Makefile =================================================================== RCS file: /cvs/xenocara/lib/Makefile,v retrieving revision 1.42 diff -u -p -u -p -r1.42 Makefile --- lib/Makefile 26 Apr 2019 09:51:57 -0000 1.42 +++ lib/Makefile 18 Dec 2019 19:33:52 -0000 @@ -51,6 +51,7 @@ SUBDIR+= libxshmfence .if ${XENOCARA_BUILD_GL:L} == "yes" SUBDIR+= libdrm +SUBDIR+= libva SUBDIR+= mesa SUBDIR+= libGLU libGLw libtxc_dxtn SUBDIR+= libepoxy Index: lib/mesa/Makefile.bsd-wrapper =================================================================== RCS file: /cvs/xenocara/lib/mesa/Makefile.bsd-wrapper,v retrieving revision 1.28 diff -u -p -u -p -r1.28 Makefile.bsd-wrapper --- lib/mesa/Makefile.bsd-wrapper 28 Aug 2019 08:01:48 -0000 1.28 +++ lib/mesa/Makefile.bsd-wrapper 18 Dec 2019 19:34:01 -0000 @@ -41,6 +41,7 @@ CONFIGURE_ARGS= --with-dri-drivers=${DR --enable-gles1 --enable-gles2 \ --enable-shared-glapi \ --enable-osmesa \ + --enable-va \ --enable-gbm \ --enable-texture-float \ --enable-autotools \ -- Regards, Brad DeMorrow
