From nobody Sat Dec 11 09:31:44 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AD46F18E7BCC; Sat, 11 Dec 2021 09:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JB2bN39Psz3tnS; Sat, 11 Dec 2021 09:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4CE8D34E1; Sat, 11 Dec 2021 09:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BB9Vie3049780; Sat, 11 Dec 2021 09:31:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BB9ViSg049779; Sat, 11 Dec 2021 09:31:44 GMT (envelope-from git) Date: Sat, 11 Dec 2021 09:31:44 GMT Message-Id: <202112110931.1BB9ViSg049779@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: cd43b2526fd4 - main - multimedia/mpv: fix lua option handling List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd43b2526fd466e46532dad30cbf37e2296a845c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639215104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hDTIxWs9DFoCIdqZwDJzOPooC+buKCNK6XOPfYcdM3g=; b=caRWJ5uAGWh2KgWsDXjraKfnrWUdLxTbMBGqEIcq5kGi+vnB0zSKFCBa2z9WmXlNRgMnTu uo0DNNv2avTFD/l9eUR9E+aXuJvZSpXyoj2mmQTSqPyN0z0AVSYWCoI/oGX5dz1wIiscUW P1g4mHR8yjDIL42SvafyGagnxvkrVbmeJqcJqt/+f3PDcziAorXbtpccCh/lt4TNtz0Boi EIwWcJEOHVZcGI2fXfd8PGN6SvqPPYxFdJVITFjK2UsZX3+7IRUxVWhpu8OibLPkCsmTWF KuLzrijBU38NjaAujyP/dEIyt+Wx0Ij5BsXo1C6++zyI9IO5uGbdWuGlXBM8ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639215104; a=rsa-sha256; cv=none; b=GEY5Mm2wcfPaEl0SZxjo6abTuseSpP2mIqLITuqmYVSnEYTF8cJ+eISpHgXB0i5xPBla1i 82A+QHvoNqdnO+7RvFkoONZ0RVGB90D0SA+VOflsPadKrsY7sq7GR7rLFGjDjxUFwYsglP aJ2kMQ3ZpR35iKqeMMpFjDUwuAmo5M2tacx+2wO63JyQZ38Li4LBN3lQgTuJKS5wJQIpp8 FDjVFJnz7mUnofuUqzW1hPz52wEzxeasnQOojfxeXcxtMWVgfz8HVm/RYs+Y9AAolTWJ5s BrJukd58DYLaTNsba73yOVcfU1MYR1I4CW+vQXnRWeSeY2RGIdxH62COWqm+kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=cd43b2526fd466e46532dad30cbf37e2296a845c commit cd43b2526fd466e46532dad30cbf37e2296a845c Author: VVD AuthorDate: 2021-12-11 09:25:48 +0000 Commit: Tobias C. Berner 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