From 00275fe28831fe5bf652468fa614c696a33a8104 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 8 Apr 2022 13:19:36 +0900 Subject: [PATCH] vlc: Enable Lua support --- packages/vlc/build.sh | 5 +++-- packages/vlc/configure.ac.patch | 15 +++++++++++++++ scripts/setup-ubuntu.sh | 3 +++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/packages/vlc/build.sh b/packages/vlc/build.sh index f26a9114f..c20df2407 100644 --- a/packages/vlc/build.sh +++ b/packages/vlc/build.sh @@ -3,13 +3,13 @@ TERMUX_PKG_DESCRIPTION="A popular libre and open source media player and multime TERMUX_PKG_LICENSE="GPL-2.0, LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.0.17.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://download.videolan.org/pub/videolan/vlc/${TERMUX_PKG_VERSION}/vlc-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=6f7e90ef8973d31d96de64db817173e345150829717a94084b1bb8321cde2014 -TERMUX_PKG_DEPENDS="avahi, chromaprint, dbus, ffmpeg, fluidsynth, fontconfig, freetype, fribidi, gdk-pixbuf, glib, gst-plugins-base, harfbuzz, liba52, libandroid-shmem, libandroid-spawn, libaom, libarchive, libass, libbluray, libc++, libcaca, libcairo, libcddb, libdav1d, libdvdread, libflac, libgcrypt, libgnutls, libiconv, libidn, libjpeg-turbo, libmad, libnfs, libogg, libopus, libpng, librsvg, libsecret, libsoxr, libssh2, libtheora, libtwolame, libvorbis, libvpx, libx11, libx264, libx265, libxcb, libxml2, mpg123, ncurses, pulseaudio, samba, taglib, zlib" +TERMUX_PKG_DEPENDS="avahi, chromaprint, dbus, ffmpeg, fluidsynth, fontconfig, freetype, fribidi, gdk-pixbuf, glib, gst-plugins-base, harfbuzz, liba52, libandroid-shmem, libandroid-spawn, libaom, libarchive, libass, libbluray, libc++, libcaca, libcairo, libcddb, libdav1d, libdvdread, libflac, libgcrypt, libgnutls, libiconv, libidn, libjpeg-turbo, liblua52, libmad, libnfs, libogg, libopus, libpng, librsvg, libsecret, libsoxr, libssh2, libtheora, libtwolame, libvorbis, libvpx, libx11, libx264, libx265, libxcb, libxml2, mpg123, ncurses, pulseaudio, samba, taglib, zlib" TERMUX_PKG_BUILD_DEPENDS="libebml, libmatroska, xorgproto" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-static ---disable-lua --disable-live555 --disable-dc1394 --disable-dv1394 @@ -72,6 +72,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-libplacebo ac_cv_func_ffsll=yes ac_cv_func_swab=yes +ac_cv_prog_LUAC=luac5.2 " termux_step_pre_configure() { diff --git a/packages/vlc/configure.ac.patch b/packages/vlc/configure.ac.patch index 6bb50dcfa..c61b293d8 100644 --- a/packages/vlc/configure.ac.patch +++ b/packages/vlc/configure.ac.patch @@ -8,3 +8,18 @@ dnl Tizen (minimum SDK version: 2.3) AS_IF([test "$SYS" = linux],[ +@@ -1676,12 +1677,12 @@ + [disable LUA scripting support (default enabled)])]) + if test "${enable_lua}" != "no" + then +- PKG_CHECK_MODULES(LUA, lua5.2, ++ PKG_CHECK_MODULES(LUA, lua52, + [ have_lua=yes ], + [ + AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua 5.1 instead]) + +- PKG_CHECK_MODULES(LUA, lua5.1, ++ PKG_CHECK_MODULES(LUA, lua51, + [ have_lua=yes ], + [ + AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua >= 5.1 instead]) diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh index 9c3503316..53903f2e1 100755 --- a/scripts/setup-ubuntu.sh +++ b/scripts/setup-ubuntu.sh @@ -90,6 +90,9 @@ PACKAGES+=" libdbus-1-dev" PACKAGES+=" libexpat1-dev" PACKAGES+=" libjpeg-dev" +# Needed by package vlc. +PACKAGES+=" lua5.2" + # Needed by package luarocks. PACKAGES+=" lua5.3"