git: cd43b2526fd4 - main - multimedia/mpv: fix lua option handling
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 11 Dec 2021 09:31:44 UTC
The branch main has been updated by tcberner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=cd43b2526fd466e46532dad30cbf37e2296a845c
commit cd43b2526fd466e46532dad30cbf37e2296a845c
Author: VVD <vvd@unislabs.com>
AuthorDate: 2021-12-11 09:25:48 +0000
Commit: Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2021-12-11 09:30:00 +0000
multimedia/mpv: fix lua option handling
mpv supports
- no lua
- luajit
- lua51-52
The new options added support to select between these.
- LUA_NONE
- LUAJIT (previous OFF by default)
- LUA (previously on when LUAJIT=OFF)
So the default remains to use lang/lua5[12].
PR: 259598
---
multimedia/mpv/Makefile | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index b6b81c5fc016..874a70451630 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -45,8 +45,8 @@ CONFIGURE_ARGS= --docdir="${EXAMPLESDIR}" \
--disable-vapoursynth \
--enable-libmpv-shared
-OPTIONS_DEFINE= ARCHIVE DOCS LCMS2 LUAJIT MANPAGES MUJS TEST UCHARDET EXAMPLES ZIMG
-OPTIONS_DEFAULT= ARCHIVE DVDNAV MANPAGES OPENGL UCHARDET \
+OPTIONS_DEFINE= ARCHIVE DOCS LCMS2 MANPAGES MUJS TEST UCHARDET EXAMPLES ZIMG
+OPTIONS_DEFAULT= ARCHIVE DVDNAV LUA MANPAGES OPENGL UCHARDET \
V4L VAAPI VDPAU VULKAN WAYLAND X11 YTDLP
OPTIONS_GROUP= IN VO AO
OPTIONS_GROUP_IN= CDIO DVDNAV LIBBLURAY V4L
@@ -54,9 +54,12 @@ OPTIONS_GROUP_VO= CACA OPENGL SIXEL VAAPI VDPAU VULKAN WAYLAND X11
OPTIONS_GROUP_AO= ALSA JACK OPENAL PULSEAUDIO SDL
OPTIONS_RADIO= YOUTUBE
OPTIONS_RADIO_YOUTUBE= YTDL YTDLP
+OPTIONS_SINGLE= LUA
+OPTIONS_SINGLE_LUA= LUA LUAJIT LUA_NONE
OPTIONS_SUB= yes
DVDNAV_DESC= DVD menu navigation
+LUA_NONE_DESC= Disable Lua scripting language support
LUAJIT_DESC= Use LuaJIT instead of Lua scripting language support
MUJS_DESC= Use MuJS for Javascript language support
SIXEL_DESC= Sixel graphics support
@@ -98,10 +101,13 @@ LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray
LIBBLURAY_CONFIGURE_ON= --enable-libbluray
LIBBLURAY_CONFIGURE_OFF= --disable-libbluray
+LUA_USES= lua:51-52
+LUA_CONFIGURE_ON= --lua=${LUA_VER_STR}fbsd
+
LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit
-LUAJIT_USES_OFF= lua:51-52
LUAJIT_CONFIGURE_ON= --lua=luajit
-LUAJIT_CONFIGURE_OFF= --lua=${LUA_VER_STR}fbsd
+
+LUA_NONE_CONFIGURE_ON= --disable-lua
MANPAGES_BUILD_DEPENDS= rst2man:textproc/py-docutils
MANPAGES_CONFIGURE_OFF= --disable-manpage