From: Brad Smith Subject: Re: UPDATE: VLC To: ports@openbsd.org Date: Sat, 3 Aug 2024 06:27:55 -0400 ping. On 2024-07-28 4:37 a.m., Brad Smith wrote: > Here is a diff to enable the VA-API support in VLC and roll in a > sndio fix. > > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/x11/vlc/Makefile,v > retrieving revision 1.271 > diff -u -p -u -p -r1.271 Makefile > --- Makefile 15 Jul 2024 21:04:48 -0000 1.271 > +++ Makefile 28 Jul 2024 08:28:00 -0000 > @@ -5,6 +5,7 @@ V= 3.0.20 > DISTNAME= vlc-${V} > PKGNAME-main= ${DISTNAME} > PKGNAME-jack= vlc-jack-${V} > +REVISION-main= 0 > CATEGORIES= x11 > SITES= https://download.videolan.org/pub/videolan/vlc/${V}/ > EXTRACT_SUFX= .tar.xz > @@ -52,11 +53,11 @@ WANTLIB-main += absl_strerror absl_strin > WANTLIB-main += absl_symbolize absl_synchronization absl_throw_delegate > WANTLIB-main += absl_time absl_time_zone absl_vlog_config_internal > WANTLIB-main += aom archive ass atk-1.0 atk-bridge-2.0 atspi avahi-client > -WANTLIB-main += avahi-common avcodec avformat avutil b2 bluray brotlidec > -WANTLIB-main += brotlienc bz2 c cairo cairo-gobject cddb crypto dav1d > -WANTLIB-main += double-conversion drm dvbpsi dvdnav dvdread ebml epoll-shim > -WANTLIB-main += epoxy execinfo expat ffi fontconfig freetype fribidi > -WANTLIB-main += gbm gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 glapi glib-2.0 > +WANTLIB-main += avahi-common avcodec avformat avutil b2 bluray bz2 c > +WANTLIB-main += cairo cairo-gobject cddb crypto dav1d double-conversion > +WANTLIB-main += drm dvbpsi dvdnav dvdread ebml epoll-shim epoxy > +WANTLIB-main += execinfo expat ffi fontconfig freetype fribidi gbm > +WANTLIB-main += gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 glapi glib-2.0 > WANTLIB-main += gmodule-2.0 gmp gnutls gobject-2.0 gpg-error graphite2 > WANTLIB-main += gsm gthread-2.0 gtk-3 harfbuzz hogweed icudata icui18n > WANTLIB-main += icuuc idn2 jpeg lz4 lzma matroska mp3lame nettle nfs > @@ -65,9 +66,9 @@ WANTLIB-main += pcre2-16 pcre2-8 pixman- > WANTLIB-main += rsvg-2 sharpyuv smb2 sndio soxr speex speexdsp ssl > WANTLIB-main += swresample swscale tag tar tasn1 theoradec theoraenc > WANTLIB-main += tiff udfread unibreak unistring usbhid utf8_range utf8_validity > -WANTLIB-main += vorbis vorbisenc vpx wayland-client wayland-cursor > -WANTLIB-main += wayland-egl webp x264 x265 xcb xcb-composite xcb-dri2 > -WANTLIB-main += xcb-dri3 xcb-glx xcb-keysyms xcb-present xcb-randr > +WANTLIB-main += va va-drm va-x11 vorbis vorbisenc vpx wayland-client > +WANTLIB-main += wayland-cursor wayland-egl webp x264 x265 xcb xcb-composite > +WANTLIB-main += xcb-dri2 xcb-dri3 xcb-glx xcb-keysyms xcb-present xcb-randr > WANTLIB-main += xcb-render xcb-shm xcb-sync xcb-xfixes xcb-xv xkbcommon > WANTLIB-main += xml2 xshmfence xvidcore z zstd > # v4l2 is dlopen'd > @@ -175,7 +176,6 @@ CONFIGURE_ARGS+=--disable-a52 \ > --disable-kwallet \ > --disable-libmpeg2 \ > --disable-libplacebo \ > - --disable-libva \ > --disable-linsys \ > --disable-live555 \ > --disable-mad \ > Index: patches/patch-modules_audio_output_sndio_c > =================================================================== > RCS file: patches/patch-modules_audio_output_sndio_c > diff -N patches/patch-modules_audio_output_sndio_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-modules_audio_output_sndio_c 28 Jul 2024 08:28:00 -0000 > @@ -0,0 +1,14 @@ > +Use sio_flush() instead of sio_stop() to improve controls responsiveness. > + > +Index: modules/audio_output/sndio.c > +--- modules/audio_output/sndio.c.orig > ++++ modules/audio_output/sndio.c > +@@ -245,7 +245,7 @@ static void Flush (audio_output_t *aout, bool wait) > + { > + aout_sys_t *sys = aout->sys; > + > +- sio_stop (sys->hdl); > ++ sio_flush (sys->hdl); > + sys->started = 0; > + sys->delay = 0; > + sio_start (sys->hdl); > Index: pkg/PLIST-main > =================================================================== > RCS file: /cvs/ports/x11/vlc/pkg/PLIST-main,v > retrieving revision 1.53 > diff -u -p -u -p -r1.53 PLIST-main > --- pkg/PLIST-main 15 Jul 2024 21:04:48 -0000 1.53 > +++ pkg/PLIST-main 28 Jul 2024 08:28:00 -0000 > @@ -268,6 +268,8 @@ lib/vlc/plugins/codec/ > @so lib/vlc/plugins/codec/libtextst_plugin.so > @so lib/vlc/plugins/codec/libttml_plugin.so > @so lib/vlc/plugins/codec/libuleaddvaudio_plugin.so > +@so lib/vlc/plugins/codec/libvaapi_drm_plugin.so > +@so lib/vlc/plugins/codec/libvaapi_plugin.so > @so lib/vlc/plugins/codec/libvorbis_plugin.so > @so lib/vlc/plugins/codec/libwebvtt_plugin.so > @so lib/vlc/plugins/codec/libx26410b_plugin.so > @@ -435,6 +437,8 @@ lib/vlc/plugins/stream_out/ > lib/vlc/plugins/text_renderer/ > @so lib/vlc/plugins/text_renderer/libfreetype_plugin.so > @so lib/vlc/plugins/text_renderer/libtdummy_plugin.so > +lib/vlc/plugins/vaapi/ > +@so lib/vlc/plugins/vaapi/libvaapi_filters_plugin.so > lib/vlc/plugins/video_chroma/ > @so lib/vlc/plugins/video_chroma/libchain_plugin.so > @so lib/vlc/plugins/video_chroma/libgrey_yuv_plugin.so > @@ -495,6 +499,8 @@ lib/vlc/plugins/video_output/ > @so lib/vlc/plugins/video_output/libegl_x11_plugin.so > @so lib/vlc/plugins/video_output/libflaschen_plugin.so > @so lib/vlc/plugins/video_output/libgl_plugin.so > +@so lib/vlc/plugins/video_output/libglconv_vaapi_drm_plugin.so > +@so lib/vlc/plugins/video_output/libglconv_vaapi_x11_plugin.so > @so lib/vlc/plugins/video_output/libglx_plugin.so > @so lib/vlc/plugins/video_output/libvdummy_plugin.so > @so lib/vlc/plugins/video_output/libvmem_plugin.so