summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <ionen@gentoo.org>2023-07-25 21:31:57 -0400
committerIonen Wolkens <ionen@gentoo.org>2023-07-25 21:44:20 -0400
commit0e264bc426f18f7f9076f9b4fe724aa445bc23a1 (patch)
treea22aa1028aab8e425e496a35a2c0cdd78aac69f8 /profiles/base
parentprofiles/base/package.use.mask: drop misplaced blank line (diff)
downloadgentoo-0e264bc426f18f7f9076f9b4fe724aa445bc23a1.tar.gz
gentoo-0e264bc426f18f7f9076f9b4fe724aa445bc23a1.tar.bz2
gentoo-0e264bc426f18f7f9076f9b4fe724aa445bc23a1.zip
profiles: have media-video/mpv use luajit more thoroughly
tl;dr fixes RequiredUseDefaults, and also uses luajit on non-desktop mpv currently no plans to ever support >=lua5-3, and with lua5-1 being essentially unmaintained it's preferred to use the actively maintained luajit when possible. Because of this, wanted to straight up remove lua5-1 from COMPAT, but then luajit is not available on as many arches as lua5-1. So to pick luajit by default (against's profile defaults), there is two options: (1). package.use in profile with -lua5-1 luajit (2). mask lua5-1, force luajit And fortunately we don't need to worry about LUA_TARGETS, just SINGLE. Old situation is sub-optimal: - (1) is used in desktop profile only (should be all) - arches which don't support luajit have bad REQUIRED_USE defaults (should be inverted where needed) (2) has a big advantage, if users set their own default e.g. */* LUA_SINGLE_TARGET: -* lua5-4 Then luajit will still be forced and they do not need a package.use entry to emerge mpv. Downside is that if a user really want to use old lua5-1, then they need to mess with /etc/portage/profile. But generally I feel (2) is still better for the general user experience, and this commit does that. wrt old "lua" default, not needed in profile given IUSE=+lua default is in all mpv ebulds already (-sdl still makes sense). Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'profiles/base')
-rw-r--r--profiles/base/package.use.force8
-rw-r--r--profiles/base/package.use.mask8
2 files changed, 16 insertions, 0 deletions
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 3396175ed2bd..cdffaf3b2059 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,14 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Ionen Wolkens <ionen@gentoo.org> (2023-07-26)
+# MPV currently[1] has no plans to support >=lua5-3 making luajit
+# the only choice for maintained lua. Apply mask/force to override
+# the profile's defaults, and invert on arches where not keyworded.
+# Done this way also avoids conflicts for users using another default.
+# [1] https://github.com/mpv-player/mpv/wiki/FAQ#why-does-mpv-not-support-lua-53-or-newer
+media-video/mpv lua_single_target_luajit
+
# Joonas Niilola <juippis@gentoo.org> (2023-07-21)
# -system-librnp is currently broken with upstream package.
>=mail-client/thunderbird-115.0 system-librnp
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index d650ded1043b..f9334180fdd1 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,14 @@
# This file is only for generic masks. For arch-specific masks (i.e.
# mask everywhere, unmask on arch/*) use arch/base.
+# Ionen Wolkens <ionen@gentoo.org> (2023-07-26)
+# MPV currently[1] has no plans to support >=lua5-3 making luajit
+# the only choice for maintained lua. Apply mask/force to override
+# the profile's defaults, and invert on arches where not keyworded.
+# Done this way also avoids conflicts for users using another default.
+# [1] https://github.com/mpv-player/mpv/wiki/FAQ#why-does-mpv-not-support-lua-53-or-newer
+media-video/mpv lua_single_target_lua5-1
+
# Hans de Graaff <graaff@gentoo.org> (2023-07-21)
# jemalloc has been a source of sometimes hard to track bugs in the
# past. It is now masked with the intention to remove it altogether at a