mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-08 16:00:32 +00:00
Code Issues Projects Releases Wiki Activity

mpv: cleanup and improvements

Browse Source 
- 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>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Markus Volk
2024-10-31 18:07:26 +01:00
committed by Khem Raj
parent b2a66eead1
commit 52c7dc2a2b
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-multimedia/mplayer/mpv_0.39.0.bb
+6 -7
View File
@@ -50,13 +50,14 @@ PACKAGECONFIG[drm] = "-Ddrm=enabled,-Ddrm=disabled,libdrm"
PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/libgbm" PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/libgbm"
PACKAGECONFIG[lua] = "-Dlua=luajit,-Dlua=disabled,luajit" PACKAGECONFIG[lua] = "-Dlua=luajit,-Dlua=disabled,luajit"
PACKAGECONFIG[libarchive] = "-Dlibarchive=enabled,-Dlibarchive=disabled,libarchive" PACKAGECONFIG[libarchive] = "-Dlibarchive=enabled,-Dlibarchive=disabled,libarchive"
PACKAGECONFIG[lcms2] = "-Dlcms2=enabled,-Dlcms2=disabled,lcms"
PACKAGECONFIG[libmpv] = "-Dlibmpv=true,-Dlibmpv=false" PACKAGECONFIG[libmpv] = "-Dlibmpv=true,-Dlibmpv=false"
PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack" PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack"
PACKAGECONFIG[pipewire] = "-Dpipewire=enabled,-Dpipewire=disabled,pipewire" PACKAGECONFIG[pipewire] = "-Dpipewire=enabled,-Dpipewire=disabled,pipewire"
PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio" PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio"
PACKAGECONFIG[vaapi] = "-Dvaapi=enabled,-Dvaapi=disabled,libva" PACKAGECONFIG[vaapi] = "-Dvaapi=enabled,-Dvaapi=disabled,libva"
PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,shaderc" PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-headers"
PACKAGECONFIG[vdpau] = "-Dvdpau=enabled,-Dvdpau=disabled,libvdpau" PACKAGECONFIG[vdpau] = "-Dvdpau=enabled,-Dvdpau=disabled,libvdpau nv-codec-headers"
PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland wayland-native libxkbcommon" PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland wayland-native libxkbcommon"
python __anonymous() { python __anonymous() {
@@ -72,16 +73,14 @@ python __anonymous() {
extras.append(" -Dvaapi-x11=enabled") extras.append(" -Dvaapi-x11=enabled")
if "vaapi" in packageconfig and "drm" in packageconfig: if "vaapi" in packageconfig and "drm" in packageconfig:
extras.append(" -Dvaapi-drm=enabled") 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: if "vdpau" in packageconfig and "opengl" in packageconfig and "x11" in packageconfig:
extras.append(" -Dvdpau-gl-x11=enabled") extras.append(" -Dvdpau-gl-x11=enabled")
if "wayland" in packageconfig and "opengl" in packageconfig: 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: if "wayland" in packageconfig and "vaapi" in packageconfig:
extras.append(" -Dvaapi-wayland=enabled") extras.append(" -Dvaapi-wayland=enabled")
if extras: if extras:
d.appendVar("EXTRA_OECONF", "".join(extras)) d.appendVar("EXTRA_OEMESON", "".join(extras))
} }
#SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}" #SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}"
@@ -93,8 +92,8 @@ EXTRA_OEMESON = " \
-Dcdda=disabled \ -Dcdda=disabled \
-Duchardet=disabled \ -Duchardet=disabled \
-Drubberband=disabled \ -Drubberband=disabled \
-Dlcms2=disabled \
-Dvapoursynth=disabled \ -Dvapoursynth=disabled \
-Dshaderc=disabled \
" "
do_configure:append() { do_configure:append() {