diff mbox series

[meta-multimedia] mpv: cleanup and improvements

Message ID 20241031170726.486250-1-f_l_k@t-online.de
State Under Review
Headers show
Series [meta-multimedia] mpv: cleanup and improvements | expand

Commit Message

Markus Volk Oct. 31, 2024, 5:07 p.m. UTC 
- add PACKAGECONFIG for lcms2
- fix dependencies for vulkan and vdpau
- replace leftover from autotools EXTRA_OECONF -> EXTRA_OEMESON
- vaapi-x-egl option has been removed
- gl-wayland option has been renamed to egl-wayland
- explicitly disable shaderc which is only required for windows builds

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 meta-oe/recipes-multimedia/mplayer/mpv_0.39.0.bb | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.39.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.39.0.bb
index c97252bd3..c699e73ef 100644
--- a/meta-oe/recipes-multimedia/mplayer/mpv_0.39.0.bb
+++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.39.0.bb
@@ -50,13 +50,14 @@  PACKAGECONFIG[drm] = "-Ddrm=enabled,-Ddrm=disabled,libdrm"
 PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/libgbm"
 PACKAGECONFIG[lua] = "-Dlua=luajit,-Dlua=disabled,luajit"
 PACKAGECONFIG[libarchive] = "-Dlibarchive=enabled,-Dlibarchive=disabled,libarchive"
+PACKAGECONFIG[lcms2] = "-Dlcms2=enabled,-Dlcms2=disabled,lcms"
 PACKAGECONFIG[libmpv] = "-Dlibmpv=true,-Dlibmpv=false"
 PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack"
 PACKAGECONFIG[pipewire] = "-Dpipewire=enabled,-Dpipewire=disabled,pipewire"
 PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio"
 PACKAGECONFIG[vaapi] = "-Dvaapi=enabled,-Dvaapi=disabled,libva"
-PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,shaderc"
-PACKAGECONFIG[vdpau] = "-Dvdpau=enabled,-Dvdpau=disabled,libvdpau"
+PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-headers"
+PACKAGECONFIG[vdpau] = "-Dvdpau=enabled,-Dvdpau=disabled,libvdpau nv-codec-headers"
 PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland wayland-native libxkbcommon"
 
 python __anonymous() {
@@ -72,16 +73,14 @@  python __anonymous() {
         extras.append(" -Dvaapi-x11=enabled")
     if "vaapi" in packageconfig and "drm" in packageconfig:
         extras.append(" -Dvaapi-drm=enabled")
-    if "vaapi" in packageconfig and "x11" in packageconfig and "egl" in packageconfig:
-        extras.append(" -Dvaapi-x-egl=enabled")
     if "vdpau" in packageconfig and "opengl" in packageconfig and "x11" in packageconfig:
         extras.append(" -Dvdpau-gl-x11=enabled")
     if "wayland" in packageconfig and "opengl" in packageconfig:
-        extras.append(" -Dgl-wayland=enabled")
+        extras.append(" -Degl-wayland=enabled")
     if "wayland" in packageconfig and "vaapi" in packageconfig:
         extras.append(" -Dvaapi-wayland=enabled")
     if extras:
-        d.appendVar("EXTRA_OECONF", "".join(extras))
+        d.appendVar("EXTRA_OEMESON", "".join(extras))
 }
 
 #SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}"
@@ -93,8 +92,8 @@  EXTRA_OEMESON = " \
     -Dcdda=disabled \
     -Duchardet=disabled \
     -Drubberband=disabled \
-    -Dlcms2=disabled \
     -Dvapoursynth=disabled \
+    -Dshaderc=disabled \
 "
 
 do_configure:append() {