El sáb, 20 jul 2024 a la(s) 6:52 a.m., Stuart Henderson
(s...@spacehopper.org) escribió:
>
> On 2024/07/20 11:40, Rafael Sadowski wrote:
> > Tested by many, OK to enable VA-API support in mpv?
> >
> > -Ddmabuf-wayland=disabled \
> > - -Ddrm=disabled \
> > + -Ddrm=enabled \
> > + -Degl=enabled \
> > -Ddvbin=disabled \
> > -Degl-android=disabled \
> > -Degl-angle=disabled \
> > @@ -82,6 +84,7 @@ CONFIGURE_ARGS = -Dlua=lua${MODLUA_DEP_VERSION} \
> > -Degl-angle-win32=disabled \
> > -Degl-drm=disabled \
> > -Degl-wayland=disabled \
> > + -Dgl-x11=disabled \
> > -Dgbm=disabled \
> > -Dgl-cocoa=disabled \
> > -Dgl-dxinterop=disabled \
>
> Could you keep CONFIGURE_ARGS sorted please?
>
Tested this changes on amd64, with ffmpeg+patches, all ok. h264 and
h265 hwdec using VAAPI work fine on RX 580 using Vulkan and
personalized shaders.
Attached diff with sorted CONFIGURE_ARGS
--
"Dios en su Cielo, todo bien en la Tierra"
***********************************************
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mpv/Makefile,v
diff -u -p -r1.101 Makefile
--- Makefile 7 May 2024 15:12:07 -0000 1.101
+++ Makefile 21 Jul 2024 03:12:18 -0000
@@ -4,6 +4,8 @@ GH_ACCOUNT = mpv-player
GH_PROJECT = mpv
GH_TAGNAME = v0.38.0
USE_NOBTCFI = Yes
+REVISION = 0
+
SHARED_LIBS += mpv 2.0
@@ -17,8 +19,9 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${MODLUA_WANTLIB}
WANTLIB += EGL SDL2 X11 Xext Xpresent Xrandr Xss Xv archive
WANTLIB += ass avcodec avdevice avfilter avformat avutil bluray
-WANTLIB += c cdio cdio_cdda cdio_paranoia dvdnav iconv jpeg lcms2
-WANTLIB += m placebo pthread sndio swresample swscale vulkan z zimg
+WANTLIB += c cdio cdio_cdda cdio_paranoia drm dvdnav gbm iconv jpeg lcms2
+WANTLIB += m placebo pthread sndio swresample swscale va va-drm
+WANTLIB += va-x11 vulkan z zimg
MODULES = devel/meson \
lang/lua \
@@ -37,7 +40,7 @@ LIB_DEPENDS = archivers/libarchive \
audio/libcdio-paranoia \
converters/libiconv \
devel/sdl2 \
- graphics/ffmpeg \
+ graphics/ffmpeg>=4.4.4p5 \
graphics/jpeg \
graphics/lcms2 \
graphics/libplacebo \
@@ -54,17 +57,12 @@ RUN_DEPENDS = devel/desktop-file-utils
x11/gtk+4,-guic
CONFIGURE_ARGS = -Dlua=lua${MODLUA_DEP_VERSION} \
- -Dcdda=enabled \
- -Ddvdnav=enabled \
- -Dlibmpv=true \
- -Dsdl2=enabled \
- -Dsndio=enabled \
- -Dvulkan=enabled \
-Dalsa=disabled \
-Dandroid-media-ndk=disabled \
-Daudiounit=disabled \
-Davfoundation=disabled \
-Dcaca=disabled \
+ -Dcdda=enabled \
-Dcocoa=disabled \
-Dcoreaudio=disabled \
-Dcuda-hwaccel=disabled \
@@ -74,8 +72,10 @@ CONFIGURE_ARGS = -Dlua=lua${MODLUA_DEP_V
-Dd3d-hwaccel=disabled \
-Ddirect3d=disabled \
-Ddmabuf-wayland=disabled \
- -Ddrm=disabled \
+ -Ddrm=enabled \
-Ddvbin=disabled \
+ -Ddvdnav=enabled \
+ -Degl=enabled \
-Degl-android=disabled \
-Degl-angle=disabled \
-Degl-angle-lib=disabled \
@@ -86,10 +86,12 @@ CONFIGURE_ARGS = -Dlua=lua${MODLUA_DEP_V
-Dgl-cocoa=disabled \
-Dgl-dxinterop=disabled \
-Dgl-dxinterop-d3d9=disabled \
+ -Dgl-x11=disabled \
-Dgl-win32=disabled \
-Dios-gl=disabled \
-Djack=disabled \
-Djavascript=disabled \
+ -Dlibmpv=true \
-Dmacos-cocoa-cb=disabled \
-Dmacos-media-player=disabled \
-Dmacos-touchbar=disabled \
@@ -99,16 +101,18 @@ CONFIGURE_ARGS = -Dlua=lua${MODLUA_DEP_V
-Dpipewire=disabled \
-Dpulse=disabled \
-Drubberband=disabled \
+ -Dsdl2=enabled \
-Dsdl2-audio=disabled \
-Dshaderc=disabled \
-Dsixel=disabled \
+ -Dsndio=enabled \
-Dspirv-cross=disabled \
-Dswift-build=disabled \
-Dswift-flags=disabled \
-Duchardet=disabled \
- -Dvaapi=disabled \
- -Dvaapi-drm=disabled \
- -Dvaapi-x11=disabled \
+ -Dvaapi=enabled \
+ -Dvaapi-drm=enabled \
+ -Dvaapi-x11=enabled \
-Dvaapi-wayland=disabled \
-Dvaapi-win32=disabled \
-Dvapoursynth=disabled \
@@ -116,6 +120,7 @@ CONFIGURE_ARGS = -Dlua=lua${MODLUA_DEP_V
-Dvdpau-gl-x11=disabled \
-Dvideotoolbox-gl=disabled \
-Dvideotoolbox-pl=disabled \
+ -Dvulkan=enabled \
-Dvulkan-interop=disabled \
-Dwayland=disabled \
-Dwin32-threads=disabled \
Index: patches/patch-meson_build
===================================================================
RCS file: /cvs/ports/multimedia/mpv/patches/patch-meson_build,v
diff -u -p -r1.8 patch-meson_build
--- patches/patch-meson_build 7 May 2024 15:12:07 -0000 1.8
+++ patches/patch-meson_build 21 Jul 2024 03:12:18 -0000
@@ -25,3 +25,12 @@ Index: meson.build
cplugins = get_option('cplugins').require(
win32 or (features['libdl'] and cc.has_link_argument('-rdynamic')),
+@@ -525,7 +537,7 @@ features += {'glob': features['glob-posix'] or feature
+
+ features += {'vt.h': cc.has_header_symbol('sys/vt.h', 'VT_GETMODE')}
+
+-features += {'consio.h': not features['vt.h'] and cc.has_header_symbol('sys/consio.h', 'VT_GETMODE')}
++features += {'consio.h': not features['vt.h'] and cc.has_header_symbol('dev/wscons/wsdisplay_usl_io.h', 'VT_GETMODE', prefix: '#include <sys/param.h>')}
+
+ # macOS's pthread_setname_np is a special snowflake and differs from literally every other platform.
+ features += {'mac-thread-name': darwin}
Index: patches/patch-video_out_drm_common_c
===================================================================
RCS file: patches/patch-video_out_drm_common_c
diff -N patches/patch-video_out_drm_common_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-video_out_drm_common_c 21 Jul 2024 03:12:18 -0000
@@ -0,0 +1,12 @@
+Index: video/out/drm_common.c
+--- video/out/drm_common.c.orig
++++ video/out/drm_common.c
+@@ -30,7 +30,7 @@
+ #include "config.h"
+
+ #if HAVE_CONSIO_H
+-#include <sys/consio.h>
++#include <dev/wscons/wsdisplay_usl_io.h>
+ #else
+ #include <sys/vt.h>
+ #endif
