From e7b7d53cfe2fb7a5d0d341746837d2f41157edc5 Mon Sep 17 00:00:00 2001 From: "Aleksandr V. Piskunov" Date: Thu, 27 Jan 2022 16:06:38 +0200 Subject: [PATCH 1/2] lua52: Added Lua 5.2 package Lua 5.2 is required to enable mpv player support of builtin stats OSD. MPV doesn't support later Lua versions, newer versions aren't backwards compatible, thus including version in a package name. Upstream Lua doesn't include pkg-config file, including one from ArchLinux. See https://github.com/mpv-player/mpv/wiki/FAQ#Why_does_mpv_not_support_Lua_53_or_newer --- packages/lang/lua52/config/lua52.pc | 10 ++++++++++ packages/lang/lua52/package.mk | 29 +++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 packages/lang/lua52/config/lua52.pc create mode 100644 packages/lang/lua52/package.mk diff --git a/packages/lang/lua52/config/lua52.pc b/packages/lang/lua52/config/lua52.pc new file mode 100644 index 0000000000..6645003e62 --- /dev/null +++ b/packages/lang/lua52/config/lua52.pc @@ -0,0 +1,10 @@ +prefix=/usr +libdir=${prefix}/lib +includedir=${prefix}/include/lua@@VERSION_MM@@ + +Name: Lua +Description: An Extensible Extension Language +Version: @@VERSION@@ +Requires: +Libs: -L${libdir} -llua@@VERSION_MM@@ -lm +Cflags: -I${includedir} diff --git a/packages/lang/lua52/package.mk b/packages/lang/lua52/package.mk new file mode 100644 index 0000000000..6d3c6ac665 --- /dev/null +++ b/packages/lang/lua52/package.mk @@ -0,0 +1,29 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv) + +PKG_NAME="lua52" +PKG_VERSION="5.2.4" +PKG_SHA256="b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b" +PKG_LICENSE="MIT" +PKG_SITE="https://www.lua.org" +PKG_URL="http://www.lua.org/ftp/lua-${PKG_VERSION}.tar.gz" +PKG_DEPENDS_TARGET="toolchain" +PKG_LONGDESC="Lua is a powerful, efficient, lightweight, embeddable scripting language." + +make_target() { + make CC=${CC} AR="${AR} rcu" posix +} + +makeinstall_target() { + mkdir -p ${SYSROOT_PREFIX}/usr/include/lua$(get_pkg_version_maj_min) + cp src/lua.h src/luaconf.h src/lualib.h src/lauxlib.h ${SYSROOT_PREFIX}/usr/include/lua$(get_pkg_version_maj_min) + + mkdir -p ${SYSROOT_PREFIX}/usr/lib + cp src/liblua.a ${SYSROOT_PREFIX}/usr/lib/liblua$(get_pkg_version_maj_min).a + + mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig + cp ${PKG_DIR}/config/lua52.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig + sed -e "s/@@VERSION@@/${PKG_VERSION}/g" \ + -e "s/@@VERSION_MM@@/$(get_pkg_version_maj_min)/g" \ + -i ${SYSROOT_PREFIX}/usr/lib/pkgconfig/lua52.pc +} From 144daba22a548ef3d75af23b9f321a14a89b53b3 Mon Sep 17 00:00:00 2001 From: "Aleksandr V. Piskunov" Date: Fri, 28 Jan 2022 13:35:11 +0200 Subject: [PATCH 2/2] mpv-drmprime: enable Lua support Building with Lua 5.2 library enables mpv support of builtin stats OSD. --- .../multimedia-tools-depends/mpv-drmprime/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk index 2bc7cd5468..c9dd4ae939 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk @@ -7,14 +7,14 @@ PKG_SHA256="32ded8c13b6398310fa27767378193dc1db6d78b006b70dbcbd3123a1445e746" PKG_LICENSE="GPL" PKG_SITE="https://mpv.io/" PKG_URL="https://github.com/mpv-player/mpv/archive/v${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain waf:host alsa ffmpeg libass libdrm" +PKG_DEPENDS_TARGET="toolchain waf:host alsa ffmpeg libass libdrm lua52" PKG_LONGDESC="A media player based on MPlayer and mplayer2. It supports a wide variety of video file formats, audio and video codecs, and subtitle types." PKG_TOOLCHAIN="manual" PKG_BUILD_FLAGS="-sysroot" PKG_MANUAL_OPTS_TARGET="--prefix=/usr \ --disable-libarchive \ - --disable-lua \ + --enable-lua \ --disable-javascript \ --disable-uchardet \ --disable-rubberband \