commit 6bbe68dc0bbc86bb725197a5d6b73edb759bfa75 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Wed Jul 10 00:58:31 2019 +0100 Update to git20180710 ( commit 524c6114a82157b143567240884de3a6d030b091 ) (#5275) .gitignore | 1 + Makefile.inc.in.patch | 26 +++ ...lockCache-Fix-crash-in-cache-invalidation.patch | 25 +++ aegisub-boost169.patch | 82 ++++++++++ aegisub-git-version.patch | 8 + aegisub-no-optimize.patch | 16 ++ aegisub-pthread.patch | 11 -- aegisub.spec | 57 ++++--- icu_59_buildfix.patch | 21 --- icu_61_buildfix.patch | 58 ------- luabins.patch | 182 +++++++++++++++++++++ remove-vendor-luajit-dependency.patch | 81 +++++++++ sources | 2 +- 13 files changed, 455 insertions(+), 115 deletions(-) --- diff --git a/.gitignore b/.gitignore index 206c2ff..031ec09 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /aegisub-3.2.2.tar.gz +/aegisub-524c611.tar.gz diff --git a/Makefile.inc.in.patch b/Makefile.inc.in.patch new file mode 100644 index 0000000..d731fd8 --- /dev/null +++ b/Makefile.inc.in.patch @@ -0,0 +1,26 @@ +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]) + diff --git a/aegisub-DataBlockCache-Fix-crash-in-cache-invalidation.patch b/aegisub-DataBlockCache-Fix-crash-in-cache-invalidation.patch new file mode 100644 index 0000000..749e435 --- /dev/null +++ b/aegisub-DataBlockCache-Fix-crash-in-cache-invalidation.patch @@ -0,0 +1,25 @@ +From 7479ffbd6d9cc9bf9786d1f1d9f0e6307198681f Mon Sep 17 00:00:00 2001 +From: Martin Herkt <lachs0r(a)srsfckn.biz&gt; +Date: Thu, 14 Feb 2019 14:52:27 +0100 +Subject: [PATCH] DataBlockCache: Fix crash in cache invalidation + +Fixes #33 +--- + src/block_cache.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/block_cache.h +=================================================================== +--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/block_cache.h 2018-07-10 00:06:51.000000000 +0200 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/block_cache.h 2019-03-29 13:17:48.209456221 +0200 +@@ -150,8 +150,8 @@ public: + } + + // Remove old entries until we're under the max size +- for (auto it = age.rbegin(); size > max_size && it != age.rend(); ) +- KillMacroBlock(**it++); ++ for (auto it = age.rbegin(); size > max_size && it != age.rend(); it++) ++ KillMacroBlock(**it); + } + + /// @brief Obtain a data block from the cache diff --git a/aegisub-boost169.patch b/aegisub-boost169.patch new file mode 100644 index 0000000..60611ce --- /dev/null +++ b/aegisub-boost169.patch @@ -0,0 +1,82 @@ +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/colour_button.cpp +=================================================================== +--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/colour_button.cpp 2018-07-10 00:06:51.000000000 +0200 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/colour_button.cpp 2019-03-29 13:05:42.776195551 +0200 +@@ -18,8 +18,16 @@ + + #include "dialogs.h" + ++#if BOOST_VERSION >= 106900 ++ ++#include <boost/gil.hpp> ++ ++#else ++ + #include <boost/gil/gil_all.hpp> + ++#endif ++ + AGI_DEFINE_EVENT(EVT_COLOR, agi::Color); + + ColourButton::ColourButton(wxWindow *parent, wxSize const& size, bool alpha, agi::Color col, wxValidator const& validator) +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/video_provider_dummy.cpp +=================================================================== +--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/video_provider_dummy.cpp 2018-07-10 00:06:51.000000000 +0200 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/video_provider_dummy.cpp 2019-03-29 13:07:20.480135858 +0200 +@@ -45,8 +45,16 @@ + #include <boost/algorithm/string/predicate.hpp> + #include <boost/filesystem/path.hpp> + #include <libaegisub/format.h> ++#if BOOST_VERSION >= 106900 ++ ++#include <boost/gil.hpp> ++ ++#else ++ + #include <boost/gil/gil_all.hpp> + ++#endif ++ + DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern) + : framecount(frames) + , fps(fps) +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/video_frame.cpp +=================================================================== +--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/video_frame.cpp 2018-07-10 00:06:51.000000000 +0200 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/video_frame.cpp 2019-03-29 13:08:04.509911568 +0200 +@@ -16,7 +16,15 @@ + + #include "video_frame.h" + ++#if BOOST_VERSION >= 106900 ++ ++#include <boost/gil.hpp> ++ ++#else ++ + #include <boost/gil/gil_all.hpp> ++ ++#endif + #include <wx/image.h> + + namespace { +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/subtitles_provider_libass.cpp +=================================================================== +--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/subtitles_provider_libass.cpp 2018-07-10 00:06:51.000000000 +0200 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/subtitles_provider_libass.cpp 2019-03-29 13:08:57.240038186 +0200 +@@ -46,7 +46,15 @@ + #include <libaegisub/util.h> + + #include <atomic> ++#if BOOST_VERSION >= 106900 ++ ++#include <boost/gil.hpp> ++ ++#else ++ + #include <boost/gil/gil_all.hpp> ++ ++#endif + #include <memory> + #include <mutex> + diff --git a/aegisub-git-version.patch b/aegisub-git-version.patch new file mode 100644 index 0000000..c6a4008 --- /dev/null +++ b/aegisub-git-version.patch @@ -0,0 +1,8 @@ +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/build/git_version.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/build/git_version.h 2019-03-29 13:17:45.073329657 +0200 +@@ -0,0 +1,3 @@ ++#define BUILD_GIT_VERSION_NUMBER 83736 ++#define BUILD_GIT_VERSION_STRING "3.2.2+git20180710" ++#define TAGGED_RELEASE 0 diff --git a/aegisub-no-optimize.patch b/aegisub-no-optimize.patch new file mode 100644 index 0000000..34aa60c --- /dev/null +++ b/aegisub-no-optimize.patch @@ -0,0 +1,16 @@ +=================================================================== +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" + ]) + ]) + diff --git a/aegisub.spec b/aegisub.spec index 5631a92..01d47cd 100644 --- a/aegisub.spec +++ b/aegisub.spec @@ -1,12 +1,13 @@ %global gituser Aegisub %global gitname Aegisub -%global commit f743d1411e09cbb2bd34ddd2d4b6738101fab710 +%global commit 524c6114a82157b143567240884de3a6d030b091 %global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global gitdate 20180710 Name: aegisub Version: 3.2.2 -Release: 12%{?dist} +Release: 13.%{gitdate}.git%{shortcommit}%{?dist} Summary: Tool for creating and modifying subtitles #src/gl/ - MIT license. See src/gl/glext.h @@ -15,26 +16,27 @@ Summary: Tool for creating and modifying subtitles License: BSD and MIT and MPLv1.1 URL: http://www.aegisub.org # https://github.com/Aegisub/Aegisub -Source0: https://github.com/%{gituser}/%{gitname}/archive/v%{version}.tar.gz#/%{na... -Patch0: %{name}-pthread.patch -# Fix compilation against icu 59.1 -# https://github.com/Aegisub/Aegisub/commit/dd67db47cb2203e7a14058e52549721... -%if 0%{?fedora} > 27 -Patch1: https://github.com/%{gituser}/%{gitname}/commit/dd67db47cb2203e7a14058e52... -%endif -%if 0%{?fedora} > 28 -Patch2: https://github.com/%{gituser}/%{gitname}/commit/d4461f65be5aa440506bd23e9... -%endif +Source0: https://github.com/%{gituser}/%{gitname}/archive/%{commit}/%{name}-%{shor... +Patch1: Makefile.inc.in.patch +Patch2: remove-vendor-luajit-dependency.patch +Patch3: aegisub-no-optimize.patch +Patch4: luabins.patch +#PATCH-FIX-OPENSUSE - davejplater(a)gmail.com - aegisub-git-version.patch - Create git_version.h which is missing in git. +Patch5: aegisub-git-version.patch +#PATCH-FIX-UPSTREAM - 9(a)cirno.systems - aegisub-DataBlockCache-Fix-crash-in-cache-invalidation.patch - Fixes undefined behavior e.g. when scrolling the audio view in spectrogram mode. +Patch6: aegisub-DataBlockCache-Fix-crash-in-cache-invalidation.patch +#PATCH-FIX-UPSTREAM - davejplater(a)gmail.com - aegisub-boost169.patch - Fixes build with boost 1.69 where boost/gil/gil_all.hpp is moved to -boost169.patch +Patch7: aegisub-boost169.patch ExclusiveArch: i686 x86_64 armv7hl Requires: hicolor-icon-theme -BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: automake +BuildRequires: intltool BuildRequires: wxWidgets-devel -BuildRequires: openal-devel +#BuildRequires: openal-devel BuildRequires: portaudio-devel BuildRequires: pulseaudio-libs-devel BuildRequires: libass-devel @@ -48,10 +50,10 @@ BuildRequires: lua-devel BuildRequires: zlib-devel BuildRequires: libX11-devel BuildRequires: valgrind-devel -BuildRequires: intltool BuildRequires: desktop-file-utils +BuildRequires: luajit-devel #Used for OpenAL tests during configure -BuildRequires: libcxx-devel +#BuildRequires: libcxx-devel #needed for the perl script downloading the additional documentation from wiki #for offline reading @@ -65,17 +67,20 @@ subtitles to audio, and features many powerful tools for styling them, including a built-in real-time video preview. %prep -%autosetup -p1 -n %{gitname}-%{version} -for file in subtitles_provider_libass video_provider_dummy video_frame colour_button -do - sed -i 's|boost/gil/gil_all.hpp|boost/gil.hpp|' src/${file}.cpp -done +%autosetup -p1 -n %{gitname}-%{commit} +#for file in subtitles_provider_libass video_provider_dummy video_frame colour_button +#do +# sed -i 's|boost/gil/gil_all.hpp|boost/gil.hpp|' src/${file}.cpp +#done %build -#remove version postfix -sed -i -e 's/aegisub-[0-9.]*/aegisub/g' configure -%configure --with-wx-config=wx-config-3.0 +./autogen.sh +%configure \ + --disable-update-checker \ + --with-player-audio=PulseAudio \ + --without-oss \ + --with-wx-config=wx-config-3.0 %make_build @@ -96,6 +101,10 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %changelog +* Tue Jul 09 2019 Sérgio Basto <sergio(a)serjux.com&gt; - 3.2.2-13.20180710.git524c611 +- Update to git20180710 ( commit 524c6114a82157b143567240884de3a6d030b091 ) + (#5275) + * Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 3.2.2-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/luabins.patch b/luabins.patch new file mode 100644 index 0000000..381b3b5 --- /dev/null +++ b/luabins.patch @@ -0,0 +1,182 @@ +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/libaegisub/lua/modules/lpeg.c +=================================================================== +--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/libaegisub/lua/modules/lpeg.c 2018-07-10 00:06:51.000000000 +0200 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/libaegisub/lua/modules/lpeg.c 2019-03-29 13:17:41.817198250 +0200 +@@ -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}, +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/AUTHORS +=================================================================== +--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/vendor/luabins/AUTHORS 2018-07-10 00:06:51.000000000 +0200 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/AUTHORS 2019-03-29 13:17:41.817198250 +0200 +@@ -2,3 +2,4 @@ Luabins authors: + ---------------- + + Alexander Gladysh <agladysh(a)gmail.com&gt; ++hanxi <hanxi(a)gmail.com&gt; +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/README.md +=================================================================== +--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/vendor/luabins/README.md 2018-07-10 00:06:51.000000000 +0200 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/README.md 2019-03-29 13:17:41.817198250 +0200 +@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib + Allows to save tuples of primitive Lua types into binary chunks + and to load saved data back. + ++NB: You may be better off with luatexts: https://github.com/agladysh/luatexts. ++ + On serialization + ---------------- + +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/luabins.c +=================================================================== +--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/vendor/luabins/src/luabins.c 2018-07-10 00:06:51.000000000 +0200 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/luabins.c 2019-03-29 13:17:41.817198250 +0200 +@@ -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 }, +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/luaheaders.h +=================================================================== +--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/vendor/luabins/src/luaheaders.h 2018-07-10 00:06:51.000000000 +0200 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/luaheaders.h 2019-03-29 13:17:41.817198250 +0200 +@@ -7,6 +7,16 @@ extern "C" { + + #include <lua.h> + #include <lauxlib.h> ++ ++#if !defined LUA_VERSION_NUM ++#define luaL_Reg luaL_reg ++#endif ++ ++#if LUA_VERSION_NUM > 501 ++#define luaL_register(L,n,R) (luaL_newlib(L,R)) ++#define lua_objlen(L,i) lua_rawlen(L, (i)) ++#endif ++ + #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP) + } + #endif +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/luainternals.h +=================================================================== +--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/vendor/luabins/src/luainternals.h 2018-07-10 00:06:51.000000000 +0200 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/luainternals.h 2019-03-29 13:17:41.817198250 +0200 +@@ -7,6 +7,24 @@ + #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_ + #define LUABINS_LUAINTERNALS_H_INCLUDED_ + ++#ifndef LUAI_BITSINT ++/* ++* LUAI_BITSINT defines the number of bits in an int. ++* CHANGE here if Lua cannot automatically detect the number of bits of ++* your machine. Probably you do not need to change this. ++* ++* avoid overflows in comparison */ ++#if INT_MAX-20 < 32760 ++#define LUAI_BITSINT 16 ++#elif INT_MAX > 2147483640L ++/* int has at least 32 bits */ ++#define LUAI_BITSINT 32 ++#else ++#error "you must define LUA_BITSINT with number of bits in an integer" ++#endif ++ ++#endif // ifndef LUAI_BITSINT ++ + /* + * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h + * WARNING: If your Lua config differs, fix this! +@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x); + /* + ** max size of array part is 2^MAXBITS + */ +-#define LUAI_BITSINT 32 + #if LUAI_BITSINT > 26 + #define MAXBITS 26 + #else +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/lualess.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/lualess.c 2019-03-29 13:17:41.817198250 +0200 +@@ -0,0 +1,32 @@ ++/* ++* lualess.h ++* Lua-related definitions for lua-less builds (based on Lua manual) ++* See copyright notice in luabins.h ++*/ ++ ++#include <stdlib.h> ++ ++/* ++* lua_Alloc-compatible allocator to use in Lua-less applications ++* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual. ++*/ ++void * lbs_simplealloc( ++ void * ud, ++ void * ptr, ++ size_t osize, ++ size_t nsize ++ ) ++{ ++ (void) ud; ++ (void) osize; /* not used */ ++ ++ if (nsize == 0) ++ { ++ free(ptr); ++ return NULL; ++ } ++ else ++ { ++ return realloc(ptr, nsize); ++ } ++} +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/test/test.lua +=================================================================== +--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/vendor/luabins/test/test.lua 2018-07-10 00:06:51.000000000 +0200 ++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/test/test.lua 2019-03-29 13:17:41.817198250 +0200 +@@ -6,6 +6,8 @@ + + package.cpath = "./?.so;"..package.cpath + ++local pack = pack or table.pack ++local unpack = unpack or table.unpack + local randomseed = 1235134892 + --local randomseed = os.time() + +@@ -145,6 +147,7 @@ end + -- Test helper functions + -- ---------------------------------------------------------------------------- + ++luabins = require 'luabins' + local luabins_local = require 'luabins' + assert(luabins_local == luabins) + +@@ -281,7 +284,7 @@ check_fail_save( + "can't save: unsupported type detected", + coroutine.create(function() end) + ) +-check_fail_save("can't save: unsupported type detected", newproxy()) ++check_fail_save("can't save: unsupported type detected", function()end) + + print("---> basic table tests") + diff --git a/remove-vendor-luajit-dependency.patch b/remove-vendor-luajit-dependency.patch new file mode 100644 index 0000000..574e815 --- /dev/null +++ b/remove-vendor-luajit-dependency.patch @@ -0,0 +1,81 @@ +Subject: vendor/luajit is removed in the Debian package +Author: Sebastian Reichel <sre(a)debian.org&gt; +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(a)aegisub.org&gt; + -- + -- Permission to use, copy, modify, and distribute this software for any diff --git a/sources b/sources index d477e87..d4e1541 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9857e606da76c3d7c2fef540da055357 aegisub-3.2.2.tar.gz +f092f888824316e023f1e7cf4f04dd41 aegisub-524c611.tar.gz