diff mbox series

[meta-oe,2/3] mpv: make buildable with lua-5.2

Message ID 20240122193109.3041355-2-f_l_k@t-online.de
State Accepted
Headers show
Series [meta-oe,1/3] lua: add recipe for lua-5.2 | expand

Commit Message

Markus Volk Jan. 22, 2024, 7:31 p.m. UTC 
mpv only supports lua-5.2, so it seems to primarily support luajit.
luajit is amazing and its performance compared to lua is outstanding
but since it uses specific asm code, there are some platforms that
are unsupported.

Add luajit for the buildable platforms and fallback to lua-5.2 to
unblock gui build for platforms that can't use luajit.

Add PACKAGECONFIG for luajit

Add LUA_DISABLE_FLAG to avoid having lua constantly disabled

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../recipes-multimedia/mplayer/mpv_0.35.1.bb  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
diff mbox series

Patch

diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb
index 0f50a6e8f..7ba6279aa 100644
--- a/meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb
+++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb
@@ -26,29 +26,29 @@  inherit waf pkgconfig mime-xdg
 
 LDFLAGS:append:riscv64 = " -latomic"
 
-LUA ?= "lua"
-LUA:mips64  = ""
-LUA:powerpc64  = ""
-LUA:powerpc64le  = ""
-LUA:riscv64  = ""
-LUA:riscv32  = ""
-LUA:powerpc  = ""
+LUA ?= "luajit"
+LUA:powerpc64  = "lua"
+LUA:powerpc64le  = "lua"
+LUA:riscv64  = "lua"
+LUA:riscv32  = "lua"
 
 # Note: lua is required to get on-screen-display (controls)
 PACKAGECONFIG ??= " \
     ${LUA} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \
-    ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \
-    ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'opengl x11', d)} \
 "
 
+LUA_DISABLE_FLAG = "${@bb.utils.contains_any('LUA', 'lua luajit', '', '--disable-lua', d)}"
+
 PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 xsp libxv libxscrnsaver libxinerama libxpresent libxext"
 PACKAGECONFIG[xv] = "--enable-xv,--disable-xv,libxv"
 PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl"
 PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl"
 PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm"
 PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgbm"
-PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua luajit"
+PACKAGECONFIG[lua] = "--enable-lua,${LUA_DISABLE_FLAG},lua-5.2"
+PACKAGECONFIG[luajit] = "--enable-lua,${LUA_DISABLE_FLAG},luajit"
 PACKAGECONFIG[libarchive] = "--enable-libarchive,--disable-libarchive,libarchive"
 PACKAGECONFIG[jack] = "--enable-jack, --disable-jack, jack"
 PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva"