Accepting request 885165 from home:susnux:branches:multimedia:apps

Upstream orphaned (or at least inactive), use active wangqr fork

OBS-URL: https://build.opensuse.org/request/show/885165
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=72

Aegisub-3.3.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9aaab8e66cef2a72368c6b7f79b2f99700321a7b9a1ca623c5e6be0e65418db5
+size 6574289

Makefile.inc.in.patch

@@ -1,26 +0,0 @@
-Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/Makefile.inc.in
-===================================================================
---- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/Makefile.inc.in	2018-07-10 00:06:51.000000000 +0200
-+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/Makefile.inc.in	2019-03-29 13:17:21.692386078 +0200
-@@ -29,7 +29,7 @@ CXXFLAGS            = @CXXFLAGS@
- CPPFLAGS            = @CPPFLAGS@
- CFLAGS_DEP          = -MMD -MP
- LIBS                = @LIBS@
--LDFLAGS             = @LDFLAGS@
-+LDFLAGS             = @LDFLAGS@ -pthread
- INSTALL_FLAGS       = -m 644
- LIB_SHARED_LINK     = -shared -Wl,-soname -Wl,$(LIB_SHARED_FULL)
- LIB_SHARED_LINK_OSX = -dynamiclib -Wl,-undefined -Wl,dynamic_lookup -compatibility_version $(LIB_VERSION) -current_version $(LIB_VERSION) -Wl,-single_module -mmacosx-version-min=10.8 -install_name ${CURDIR}/$(LIB_SHARED_FULL)
-Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/configure.ac
-===================================================================
---- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/configure.ac	2018-07-10 00:06:51.000000000 +0200
-+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/configure.ac	2019-03-29 13:17:21.692386078 +0200
-@@ -136,7 +136,7 @@ AS_IF([test x$enable_compiler_flags != x
-   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-+  AC_CXX_FLAG([-Wno-narrowing])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 

_service

@@ -1,29 +0,0 @@
-<!-- Downloads master with .git to allow aegisub to create git_version.h -->
-<services>
-  <service name="tar_scm" mode="disabled">
-    <param name="url">https://github.com/Aegisub/Aegisub.git</param>
-    <param name="scm">git</param>
-    <param name="submodules">disable</param>
-    <param name="package-meta">yes</param>
-    <param name="changesgenerate">enable</param>
-    <param name="exclude">.git/objects</param>
-    <param name="exclude">vendor/boost</param>
-    <param name="exclude">vendor/ffmpeg</param>
-    <param name="exclude">vendor/ffms2</param>
-    <param name="exclude">vendor/fftw</param>
-    <param name="exclude">vendor/freetype2</param>
-    <param name="exclude">vendor/googletest</param>
-    <param name="exclude">vendor/hunspell</param>
-    <param name="exclude">vendor/icu</param>
-    <param name="exclude">vendor/libass</param>
-    <param name="exclude">vendor/uchardet</param>
-    <param name="exclude">vendor/wxWidgets</param>
-    <param name="versionformat">3.2.2+git%cd</param>
-    <param name="filename">aegisub</param>
-  </service>
-  <service name="recompress" mode="disabled">
-    <param name="file">*.tar</param>
-    <param name="compression">xz</param>
-  </service>
-  <service name="set_version" mode="disabled"/>
-</services>

aegisub-3.2.2+git20191006.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:054eb7cb867e559b65ef2843aab9d538362960381e8eb3da7fe3daf73ef5751c
-size 5087992

aegisub-fix_build_with_make4.3.patch

@@ -1,23 +0,0 @@
-From 6bd3f4c26b8fc1f76a8b797fcee11e7611d59a39 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Mon, 17 Feb 2020 14:42:07 +0800
-Subject: [PATCH] Use target name without directory in $*_OBJ macro
-
-Fix Aegisub/Aegisub#171
----
- Makefile.target | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..5c4c5d259 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
- # Libraries contain all object files they depend on (but they may depend on other files)
- # Not using libtool on OS X because it has an unsilenceable warning about a
- # compatibility issue with BSD 4.3 (wtf)
--lib%.a: $$($$*_OBJ)
-+lib%.a: $$($$(*F)_OBJ)
- 	@$(BIN_MKDIR_P) $(dir $@)
- 	$(BIN_AR) cru $@ $(filter %.o,$^)
- 	$(BIN_RANLIB) $@

aegisub-no-optimize.patch

@@ -1,16 +0,0 @@
-===================================================================
-Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/configure.ac
-===================================================================
---- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/configure.ac	2019-03-29 13:17:21.692386078 +0200
-+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/configure.ac	2019-03-29 13:17:38.925081533 +0200
-@@ -145,8 +145,8 @@ AS_IF([test x$enable_compiler_flags != x
-     CFLAGS="$CFLAGS -O0"
-     CXXFLAGS="$CXXFLAGS -O0"
-   ], [
--    CFLAGS="$CFLAGS -O3"
--    CXXFLAGS="$CXXFLAGS -O3"
-+    CFLAGS="$CFLAGS"
-+    CXXFLAGS="$CXXFLAGS"
-   ])
- ])
- 

aegisub.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Tue Apr 13 19:13:10 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Upstream orphaned (or at least inactive), use active wangqr fork
+- Updated to fork version 3.3.2
+  * Show a notice when reaching 32bit memory limit instead of crash
+  * Fix OpenGL color depth issue with some GPU drivers
+  * Fix eyedropper not working
+  * Fix alt-drag behavior in audio window
+  * Fix saving audio clip with float samples
+  * Added support for AviSynth+ on linux
+  * Fix video rendering performance issue with visual tools
+  * Added the "align to hardsub in video" function
+  * Allow user change color for visual typesetting tool
+  * Bug fixes about HiDPI display issues
+  * Bug fixes about timing calculation for video frame and audio FFT
+- Added ax_boost-files.patch for fix build with boost >= 1.70
+- Dropped outdated patches Makefile.inc.in.patch,
+  remove-vendor-luajit-dependency.patch, aegisub-no-optimize.patch,
+  luaL_Reg-not-luaL_reg.patch, aegisub-fix_build_with_make4.3.patch
+
 -------------------------------------------------------------------
 Mon Aug 10 06:38:17 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 

aegisub.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package aegisub
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,23 +16,19 @@
 #
 
 
+%define version_split 3,3,2
 Name:           aegisub
-Version:        3.2.2+git20191006
+Version:        3.3.2
 Release:        0
 Summary:        Subtitle editor
 License:        BSD-3-Clause
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 URL:            http://www.aegisub.org/
-Source0:        %{name}-%{version}.tar.xz
+Source0:        https://github.com/wangqr/Aegisub/archive/refs/tags/v3.3.2.tar.gz#/Aegisub-%{version}.tar.gz
-Source99:       changelog.txt
+Source99:       %{name}-rpmlintrc
-Source100:      %{name}-rpmlintrc
+# PATCH-FIX-UPSTREAM ax_boost-files.patch -- https://github.com/wangqr/Aegisub/pull/102
-Patch1:         Makefile.inc.in.patch
+Patch0:         ax_boost-files.patch
-Patch2:         remove-vendor-luajit-dependency.patch
+BuildRequires:  autoconf
-Patch3:         aegisub-no-optimize.patch
-Patch4:         luaL_Reg-not-luaL_reg.patch
-#luabins.patch
-# PATCH-FIX-UPSTREAM aegisub-fix_build_with_make4.3.patch
-Patch8:         aegisub-fix_build_with_make4.3.patch
 BuildRequires:  automake
 BuildRequires:  gcc-c++
 BuildRequires:  intltool
@@ -56,16 +52,25 @@ BuildRequires:  pkgconfig(libass)
 BuildRequires:  pkgconfig(libpulse) >= 0.5
 BuildRequires:  pkgconfig(luajit)
 BuildRequires:  pkgconfig(zlib)
-ExcludeArch:    ppc ppc64 ppc64le i586
+ExcludeArch:    ppc ppc64 ppc64le
 
 %description
 Aegisub is a subtitle editor. It works with the Advanced SubStation
 Alpha format (aptly abbreviated ASS) which allows for many advanced
 effects in the subtitles, apart from just basic timed text.
 
+As upstream is orphaned, this version is the wangqr fork.
+
 %prep
-%autosetup -p1
+%autosetup -p1 -n Aegisub-%{version}
-cp %{SOURCE99} .
+# Add "cached" version (as we do not build from git)
+[ -f "build/version.h" ] || cat > build/git_version.h << EOF
+#define BUILD_GIT_VERSION_NUMBER 0
+#define BUILD_GIT_VERSION_STRING "%{version}"
+#define TAGGED_RELEASE 1
+#define INSTALLER_VERSION "%{version}"
+#define RESOURCE_BASE_VERSION %{version_split}
+EOF
 
 %build
 autoreconf -fiv
@@ -80,10 +85,9 @@ autoreconf -fiv
 %find_lang %{name}
 
 %files -f %{name}.lang
-%defattr(0644, root, root, 0755)
 %license LICENCE
-%doc README.md changelog.txt
+%doc README.md
-%attr(0755,root,root) %{_bindir}/aegisub
+%{_bindir}/aegisub
 %{_datadir}/aegisub/
 %{_datadir}/applications/aegisub.desktop
 %{_datadir}/icons/hicolor/*/apps/aegisub.*

ax_boost-files.patch

@@ -0,0 +1,217 @@
+diff -Nur Aegisub-3.3.2/m4macros/ax_boost_base.m4 new/m4macros/ax_boost_base.m4
+--- Aegisub-3.3.2/m4macros/ax_boost_base.m4	2020-12-19 15:20:15.000000000 +0100
++++ new/m4macros/ax_boost_base.m4	2021-04-13 22:19:25.017774629 +0200
+@@ -33,7 +33,7 @@
+ #   and this notice are preserved. This file is offered as-is, without any
+ #   warranty.
+ 
+-#serial 42
++#serial 49
+ 
+ # example boost program (need to pass version)
+ m4_define([_AX_BOOST_BASE_PROGRAM],
+@@ -113,8 +113,9 @@
+     dnl are found, e.g. when only header-only libraries are installed!
+     AS_CASE([${host_cpu}],
+       [x86_64],[libsubdirs="lib64 libx32 lib lib64"],
+-      [ppc64|s390x|sparc64|aarch64|ppc64le],[libsubdirs="lib64 lib lib64"],
+-      [libsubdirs="lib"],
++      [mips*64*],[libsubdirs="lib64 lib32 lib lib64"],
++      [ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64|e2k],[libsubdirs="lib64 lib lib64"],
++      [libsubdirs="lib"]
+     )
+ 
+     dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give
+@@ -122,6 +123,7 @@
+     dnl are almost assuredly the ones desired.
+     AS_CASE([${host_cpu}],
+       [i?86],[multiarch_libsubdir="lib/i386-${host_os}"],
++      [armv7l],[multiarch_libsubdir="lib/arm-${host_os}"],
+       [multiarch_libsubdir="lib/${host_cpu}-${host_os}"]
+     )
+ 
+@@ -298,4 +300,4 @@
+     CPPFLAGS="$CPPFLAGS_SAVED"
+     LDFLAGS="$LDFLAGS_SAVED"
+ 
+-])
+\ Kein Zeilenumbruch am Dateiende.
++])
+diff -Nur Aegisub-3.3.2/m4macros/ax_boost_chrono.m4 new/m4macros/ax_boost_chrono.m4
+--- Aegisub-3.3.2/m4macros/ax_boost_chrono.m4	2020-12-19 15:20:15.000000000 +0100
++++ new/m4macros/ax_boost_chrono.m4	2021-04-13 22:19:25.877782628 +0200
+@@ -29,7 +29,7 @@
+ #   and this notice are preserved. This file is offered as-is, without any
+ #   warranty.
+ 
+-#serial 4
++#serial 5
+ 
+ AC_DEFUN([AX_BOOST_CHRONO],
+ [
+@@ -105,7 +105,7 @@
+ 
+             fi
+             if test "x$ax_lib" = "x"; then
+-                AC_MSG_ERROR(Could not find a version of the library!)
++                AC_MSG_ERROR(Could not find a version of the Boost::Chrono library!)
+             fi
+ 			if test "x$link_chrono" = "xno"; then
+ 				AC_MSG_ERROR(Could not link against $ax_lib !)
+diff -Nur Aegisub-3.3.2/m4macros/ax_boost_filesystem.m4 new/m4macros/ax_boost_filesystem.m4
+--- Aegisub-3.3.2/m4macros/ax_boost_filesystem.m4	2020-12-19 15:20:15.000000000 +0100
++++ new/m4macros/ax_boost_filesystem.m4	2021-04-13 22:19:26.849791671 +0200
+@@ -31,7 +31,7 @@
+ #   and this notice are preserved. This file is offered as-is, without any
+ #   warranty.
+ 
+-#serial 27
++#serial 28
+ 
+ AC_DEFUN([AX_BOOST_FILESYSTEM],
+ [
+@@ -104,7 +104,7 @@
+ 
+             fi
+             if test "x$ax_lib" = "x"; then
+-                AC_MSG_ERROR(Could not find a version of the library!)
++                AC_MSG_ERROR(Could not find a version of the Boost::Filesystem library!)
+             fi
+ 			if test "x$link_filesystem" != "xyes"; then
+ 				AC_MSG_ERROR(Could not link against $ax_lib !)
+diff -Nur Aegisub-3.3.2/m4macros/ax_boost_locale.m4 new/m4macros/ax_boost_locale.m4
+--- Aegisub-3.3.2/m4macros/ax_boost_locale.m4	2020-12-19 15:20:15.000000000 +0100
++++ new/m4macros/ax_boost_locale.m4	2021-04-13 22:19:27.869801159 +0200
+@@ -29,7 +29,7 @@
+ #   and this notice are preserved. This file is offered as-is, without any
+ #   warranty.
+ 
+-#serial 2
++#serial 3
+ 
+ AC_DEFUN([AX_BOOST_LOCALE],
+ [
+@@ -106,7 +106,7 @@
+ 
+             fi
+             if test "x$ax_lib" = "x"; then
+-                AC_MSG_ERROR(Could not find a version of the library!)
++                AC_MSG_ERROR(Could not find a version of the Boost::Locale library!)
+             fi
+ 			if test "x$link_locale" = "xno"; then
+ 				AC_MSG_ERROR(Could not link against $ax_lib !)
+diff -Nur Aegisub-3.3.2/m4macros/ax_boost_system.m4 new/m4macros/ax_boost_system.m4
+--- Aegisub-3.3.2/m4macros/ax_boost_system.m4	2020-12-19 15:20:15.000000000 +0100
++++ new/m4macros/ax_boost_system.m4	2021-04-13 22:19:30.397824673 +0200
+@@ -31,7 +31,7 @@
+ #   and this notice are preserved. This file is offered as-is, without any
+ #   warranty.
+ 
+-#serial 19
++#serial 20
+ 
+ AC_DEFUN([AX_BOOST_SYSTEM],
+ [
+@@ -108,7 +108,7 @@
+ 
+             fi
+             if test "x$ax_lib" = "x"; then
+-                AC_MSG_ERROR(Could not find a version of the library!)
++                AC_MSG_ERROR(Could not find a version of the Boost::System library!)
+             fi
+ 			if test "x$link_system" = "xno"; then
+ 				AC_MSG_ERROR(Could not link against $ax_lib !)
+diff -Nur Aegisub-3.3.2/m4macros/ax_boost_thread.m4 new/m4macros/ax_boost_thread.m4
+--- Aegisub-3.3.2/m4macros/ax_boost_thread.m4	2020-12-19 15:20:15.000000000 +0100
++++ new/m4macros/ax_boost_thread.m4	2021-04-13 22:19:31.365833679 +0200
+@@ -30,7 +30,7 @@
+ #   and this notice are preserved. This file is offered as-is, without any
+ #   warranty.
+ 
+-#serial 31
++#serial 33
+ 
+ AC_DEFUN([AX_BOOST_THREAD],
+ [
+@@ -67,13 +67,24 @@
+         [AC_LANG_PUSH([C++])
+              CXXFLAGS_SAVE=$CXXFLAGS
+ 
+-             if test "x$host_os" = "xsolaris" ; then
+-                 CXXFLAGS="-pthreads $CXXFLAGS"
+-             elif test "x$host_os" = "xmingw32" ; then
+-                 CXXFLAGS="-mthreads $CXXFLAGS"
+-             else
+-                CXXFLAGS="-pthread $CXXFLAGS"
+-             fi
++             case "x$host_os" in
++                 xsolaris )
++                     CXXFLAGS="-pthreads $CXXFLAGS"
++                     break;
++                     ;;
++                 xmingw32 )
++                     CXXFLAGS="-mthreads $CXXFLAGS"
++                     break;
++                     ;;
++                 *android* )
++                     break;
++                     ;;
++                 * )
++                     CXXFLAGS="-pthread $CXXFLAGS"
++                     break;
++                     ;;
++             esac
++
+              AC_COMPILE_IFELSE([
+                  AC_LANG_PROGRAM(
+                      [[@%:@include <boost/thread/thread.hpp>]],
+@@ -84,13 +95,23 @@
+              AC_LANG_POP([C++])
+         ])
+         if test "x$ax_cv_boost_thread" = "xyes"; then
+-           if test "x$host_os" = "xsolaris" ; then
+-              BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS"
+-           elif test "x$host_os" = "xmingw32" ; then
+-              BOOST_CPPFLAGS="-mthreads $BOOST_CPPFLAGS"
+-           else
+-              BOOST_CPPFLAGS="-pthread $BOOST_CPPFLAGS"
+-           fi
++            case "x$host_os" in
++                xsolaris )
++                    BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS"
++                    break;
++                    ;;
++                xmingw32 )
++                    BOOST_CPPFLAGS="-mthreads $BOOST_CPPFLAGS"
++                    break;
++                    ;;
++                *android* )
++                    break;
++                    ;;
++                * )
++                    BOOST_CPPFLAGS="-pthread $BOOST_CPPFLAGS"
++                    break;
++                    ;;
++            esac
+ 
+             AC_SUBST(BOOST_CPPFLAGS)
+ 
+@@ -130,7 +151,7 @@
+ 
+             fi
+             if test "x$ax_lib" = "x"; then
+-                AC_MSG_ERROR(Could not find a version of the library!)
++                AC_MSG_ERROR(Could not find a version of the Boost::Thread library!)
+             fi
+             if test "x$link_thread" = "xno"; then
+                 AC_MSG_ERROR(Could not link against $ax_lib !)
+@@ -148,6 +169,9 @@
+                     xmingw32 )
+                         break;
+                         ;;
++                    *android* )
++                        break;
++                        ;;
+                     * )
+                         BOOST_THREAD_LIB="$BOOST_THREAD_LIB -lpthread"
+                         break;

luaL_Reg-not-luaL_reg.patch

@@ -1,35 +0,0 @@
-diff --git a/libaegisub/lua/modules/lpeg.c b/libaegisub/lua/modules/lpeg.c
-index 8d67335ab..5261c2061 100644
---- a/libaegisub/lua/modules/lpeg.c
-+++ b/libaegisub/lua/modules/lpeg.c
-@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
- }
- 
- 
--static struct luaL_reg pattreg[] = {
-+static struct luaL_Reg pattreg[] = {
-   {"match", matchl},
-   {"print", printpat_l},
-   {"locale", locale_l},
-@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
- };
- 
- 
--static struct luaL_reg metapattreg[] = {
-+static struct luaL_Reg metapattreg[] = {
-   {"__add", union_l},
-   {"__pow", star_l},
-   {"__sub", diff_l},
-diff --git a/vendor/luabins/src/luabins.c b/vendor/luabins/src/luabins.c
-index 60668213f..35b177629 100644
---- a/vendor/luabins/src/luabins.c
-+++ b/vendor/luabins/src/luabins.c
-@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
- }
- 
- /* luabins Lua module API */
--static const struct luaL_reg R[] =
-+static const struct luaL_Reg R[] =
- {
-   { "save", l_save },
-   { "load", l_load },

remove-vendor-luajit-dependency.patch

@@ -1,81 +0,0 @@
-Subject: vendor/luajit is removed in the Debian package
-Author: Sebastian Reichel <sre@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-08-06
-
-Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/header.mk
-===================================================================
---- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/header.mk	2018-07-10 00:06:51.000000000 +0200
-+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/header.mk	2019-03-29 13:17:35.252933339 +0200
-@@ -13,7 +13,6 @@ subdirs := \
- 	tests \
- 	tools \
- 	vendor/luabins \
--	vendor/luajit
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
- 
-Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/Makefile.inc.in
-===================================================================
---- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/Makefile.inc.in	2019-03-29 13:17:21.692386078 +0200
-+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/Makefile.inc.in	2019-03-29 13:17:35.252933339 +0200
-@@ -79,7 +79,7 @@ CFLAGS_ICONV       = @ICONV_CFLAGS@
- CFLAGS_ICU         = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS      = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
--CFLAGS_LUA         = @LUAJIT_CFLAGS@
-+CFLAGS_LUA         = `pkg-config --cflags luajit`
- CFLAGS_OPENAL      = @OPENAL_CFLAGS@
- CFLAGS_OSS         = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -97,14 +97,14 @@ LIBS_ICONV         = @ICONV_LIBS@
- LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS        = @LIBASS_LIBS@
- LIBS_LIBPULSE      = @LIBPULSE_LIBS@
--LIBS_LUA           = @LUAJIT_LIBS@
-+LIBS_LUA           = `pkg-config --libs luajit`
- LIBS_OPENAL        = @OPENAL_LIBS@
- LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
- LIBS_PTHREAD       = @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
- LIBS_UCHARDET      = @UCHARDET_LIBS@
- 
- ifeq (yes, $(BUILD_DARWIN))
--LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit-aegisub.so
-+LIBS_LUA           = `pkg-config --libs luajit`
- endif
- 
- FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@
-Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/tools/Makefile
-===================================================================
---- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/tools/Makefile	2018-07-10 00:06:51.000000000 +0200
-+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/tools/Makefile	2019-03-29 13:17:35.252933339 +0200
-@@ -12,6 +12,4 @@ repack-thes-dict_CPPFLAGS := -I$(TOP) -I
- 
- PROGRAM += $(d)repack-thes-dict
- 
--$(TOP)tools/respack.lua: $(shell command -v "$(BIN_LUA)")
--
- include $(TOP)Makefile.target
-Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/libresrc/Makefile
-===================================================================
---- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/libresrc/Makefile	2018-07-10 00:06:51.000000000 +0200
-+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/libresrc/Makefile	2019-03-29 13:17:35.252933339 +0200
-@@ -10,7 +10,7 @@ resrc_OBJ := \
- 
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
- 
--RESPACK := cd $(TOP)src/libresrc; $(BIN_LUA) $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
- 
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
-Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/tools/respack.lua
-===================================================================
---- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/tools/respack.lua	2018-07-10 00:06:51.000000000 +0200
-+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/tools/respack.lua	2019-03-29 13:17:35.252933339 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env luajit
-+#!/usr/bin/lua
- -- Copyright (c) 2014, Thomas Goyne <plorkyeran@aegisub.org>
- --
- -- Permission to use, copy, modify, and distribute this software for any