Hello community, here is the log from the commit of package aegisub for openSUSE:Leap:15.2 checked in at 2020-03-15 07:14:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/aegisub (Old) and /work/SRC/openSUSE:Leap:15.2/.aegisub.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aegisub" Sun Mar 15 07:14:05 2020 rev:10 rq:785174 version:3.2.2+git20180710 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/aegisub/aegisub.changes 2020-01-15 14:46:34.325259176 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.aegisub.new.3160/aegisub.changes 2020-03-15 07:15:12.533092746 +0100 @@ -1,0 +2,55 @@ +Thu Oct 17 12:57:19 UTC 2019 - Richard Brown <[email protected]> + +- Remove obsolete Groups tag (fate#326485) + +------------------------------------------------------------------- +Sat Jul 20 18:44:11 UTC 2019 - [email protected] + +- Fix build by keeping non-patch work out of %prep section + +------------------------------------------------------------------- +Fri Mar 29 13:25:07 UTC 2019 - plater <[email protected]> + +- Fix boo#1130889 by fixing aegisub's build against boost 1.69 with + aegisub-boost169.patch, reported upstream with patch in issue: + https://github.com/Aegisub/Aegisub/issues/93 + +------------------------------------------------------------------- +Thu Feb 14 16:09:23 UTC 2019 - Martin Herkt <[email protected]> + +- Add aegisub-DataBlockCache-Fix-crash-in-cache-invalidation.patch + Fixes undefined behavior e.g. when scrolling the audio view in + spectrogram mode. + +------------------------------------------------------------------- +Fri Aug 31 11:55:30 UTC 2018 - Jan Engelhardt <[email protected]> + +- Edit description: trim other OS mentions, trim redundant + licensing info, trim future visions/goals. + +------------------------------------------------------------------- +Thu Aug 30 10:26:57 UTC 2018 - [email protected] + +- Update to current git rev 524c6114a82157b143567240884de3a6d030b091 + named version 3.2.2+git20180710 which builds against boost + version 1.68, fixes boo#1105217 +- Added aegisub-git-version.patch for git. +- Removed the following patches that are fixed upstream: + aegisub.build-compare.patch, icu59.patch and aegisub-icu.patch. +- Rebased Makefile.inc.in.patch, aegisub-no-optimize.patch and + remove-vendor-luajit-dependency.patch. +- Exclude i586 from build due to unexplainable missing library. +- For upstream changes see: + /usr/share/doc/packages/aegisub/changelog.txt + +------------------------------------------------------------------- +Fri Jun 8 07:40:37 UTC 2018 - [email protected] + +- Use portable namespace in aegisub-icu.patch. + +------------------------------------------------------------------- +Sat May 19 13:07:22 UTC 2018 - [email protected] + +- Created aegisub-icu.patch to fix build failure against icu4c-61_1 + +------------------------------------------------------------------- Old: ---- aegisub-3.2.2.tar.xz aegisub.build-compare.patch icu59.patch New: ---- aegisub-3.2.2+git20180710.tar.gz aegisub-DataBlockCache-Fix-crash-in-cache-invalidation.patch aegisub-boost169.patch aegisub-git-version.patch changelog.txt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aegisub.spec ++++++ --- /var/tmp/diff_new_pack.kDyOnm/_old 2020-03-15 07:15:13.137093063 +0100 +++ /var/tmp/diff_new_pack.kDyOnm/_new 2020-03-15 07:15:13.137093063 +0100 @@ -1,7 +1,7 @@ # # spec file for package aegisub # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,35 +12,45 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%define _rev 524c6114a82157b143567240884de3a6d030b091 +%define gitname Aegisub + Name: aegisub -Version: 3.2.2 +Version: 3.2.2+git20180710 Release: 0 Summary: Subtitle editor License: BSD-3-Clause -Group: Productivity/Multimedia/Video/Editors and Convertors -Url: http://www.aegisub.net/ -Source0: http://ftp.aegisub.org/pub/releases/aegisub-%{version}.tar.xz -Source99: aegisub.changes -Patch0: aegisub.build-compare.patch +Url: http://www.aegisub.org/ +Source0: https://github.com/Aegisub/Aegisub/archive/%{_rev}.tar.gz#/aegisub-%{version}.tar.gz +Source99: changelog.txt Patch1: Makefile.inc.in.patch Patch2: remove-vendor-luajit-dependency.patch -Patch3: icu59.patch -Patch4: aegisub-no-optimize.patch -Patch5: luabins.patch +Patch3: aegisub-no-optimize.patch +Patch4: luabins.patch +#PATCH-FIX-OPENSUSE - [email protected] - aegisub-git-version.patch - Create git_version.h which is missing in git. +Patch5: aegisub-git-version.patch +#PATCH-FIX-UPSTREAM - [email protected] - 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 - [email protected] - aegisub-boost169.patch - Fixes build with boost 1.69 where boost/gil/gil_all.hpp is moved to -boost169.patch +Patch7: aegisub-boost169.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: intltool +BuildRequires: libboost_chrono-devel BuildRequires: libboost_filesystem-devel +BuildRequires: libboost_headers-devel BuildRequires: libboost_locale-devel BuildRequires: libboost_regex-devel +BuildRequires: libboost_system-devel BuildRequires: libboost_thread-devel BuildRequires: lua51 BuildRequires: pkgconfig >= 0.20 +BuildRequires: wxWidgets-devel >= 3 BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(ffms2) BuildRequires: pkgconfig(fftw3) >= 3.3 @@ -51,33 +61,26 @@ BuildRequires: pkgconfig(libpulse) >= 0.5 BuildRequires: pkgconfig(luajit) BuildRequires: pkgconfig(zlib) -BuildRequires: wxWidgets-devel >= 3 -ExcludeArch: ppc ppc64 ppc64le +ExcludeArch: ppc ppc64 ppc64le i586 %description -Aegisub is an advanced subtitle editor for Windows, and UNIX-like systems, such -as Linux, Mac OS X and BSD. It is open source software and free for any use. - -Aegisub natively 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. Aegisub's goal is to support using these advanced -functions with ease. +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. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%setup -q -n %{gitname}-%{_rev} +%autopatch -p1 + +%build FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/version.cpp FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S') sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/version.cpp +cp %{SOURCE99} . -%build -autoreconf -fvi +./autogen.sh +#autoreconf -fvi %configure \ --disable-update-checker \ --with-player-audio=PulseAudio \ @@ -86,12 +89,13 @@ %install %make_install -%find_lang %{name}-32 +%find_lang %{name} -%files -f %{name}-32.lang +%files -f %{name}.lang %defattr(0644, root, root, 0755) -%doc LICENCE -%attr(0755,root,root) %{_bindir}/aegisub-3.2 +%license LICENCE +%doc README.md changelog.txt +%attr(0755,root,root) %{_bindir}/aegisub %{_datadir}/aegisub/ %{_datadir}/applications/aegisub.desktop %{_datadir}/icons/hicolor/*/apps/aegisub.* ++++++ Makefile.inc.in.patch ++++++ --- /var/tmp/diff_new_pack.kDyOnm/_old 2020-03-15 07:15:13.157093073 +0100 +++ /var/tmp/diff_new_pack.kDyOnm/_new 2020-03-15 07:15:13.157093073 +0100 @@ -1,6 +1,8 @@ ---- aegisub-3.2.2/Makefile.inc.in.orig 2015-06-29 14:44:02.998996223 +0100 -+++ aegisub-3.2.2/Makefile.inc.in 2015-06-29 14:44:37.957948716 +0100 -@@ -28,7 +28,7 @@ +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@ @@ -8,4 +10,17 @@ +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.7 -install_name ${CURDIR}/$(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]) + ++++++ aegisub-DataBlockCache-Fix-crash-in-cache-invalidation.patch ++++++ >From 7479ffbd6d9cc9bf9786d1f1d9f0e6307198681f Mon Sep 17 00:00:00 2001 From: Martin Herkt <[email protected]> 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 ++++++ aegisub-boost169.patch ++++++ 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> ++++++ aegisub-git-version.patch ++++++ 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 ++++++ aegisub-no-optimize.patch ++++++ --- /var/tmp/diff_new_pack.kDyOnm/_old 2020-03-15 07:15:13.201093096 +0100 +++ /var/tmp/diff_new_pack.kDyOnm/_new 2020-03-15 07:15:13.201093096 +0100 @@ -1,23 +1,9 @@ -Index: aegisub-3.2.2/configure =================================================================== ---- aegisub-3.2.2.orig/configure -+++ aegisub-3.2.2/configure -@@ -5949,8 +5949,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - else - -- CFLAGS="$CFLAGS -O3" -- CXXFLAGS="$CXXFLAGS -O3" -+ CFLAGS="$CFLAGS" -+ CXXFLAGS="$CXXFLAGS" - - fi - -Index: aegisub-3.2.2/configure.ac +Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/configure.ac =================================================================== ---- aegisub-3.2.2.orig/configure.ac -+++ aegisub-3.2.2/configure.ac -@@ -151,8 +151,8 @@ AS_IF([test x$enable_compiler_flags != x +--- 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" ], [ ++++++ changelog.txt ++++++ ++++ 1918 lines (skipped) ++++++ luabins.patch ++++++ --- /var/tmp/diff_new_pack.kDyOnm/_old 2020-03-15 07:15:13.225093108 +0100 +++ /var/tmp/diff_new_pack.kDyOnm/_new 2020-03-15 07:15:13.225093108 +0100 @@ -1,7 +1,8 @@ -diff -Nur aegisub-3.2.2/libaegisub/lua/modules/lpeg.c new/libaegisub/lua/modules/lpeg.c ---- aegisub-3.2.2/libaegisub/lua/modules/lpeg.c 2014-12-08 01:07:09.000000000 +0100 -+++ new/libaegisub/lua/modules/lpeg.c 2017-06-19 12:33:03.929957005 +0200 -@@ -2334,7 +2334,7 @@ +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) { } @@ -10,7 +11,7 @@ {"match", matchl}, {"print", printpat_l}, {"locale", locale_l}, -@@ -2360,7 +2360,7 @@ +@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = { }; @@ -19,18 +20,20 @@ {"__add", union_l}, {"__pow", star_l}, {"__sub", diff_l}, -diff -Nur aegisub-3.2.2/vendor/luabins/AUTHORS new/vendor/luabins/AUTHORS ---- aegisub-3.2.2/vendor/luabins/AUTHORS 2014-12-08 01:07:09.000000000 +0100 -+++ new/vendor/luabins/AUTHORS 2016-12-17 08:09:13.000000000 +0100 -@@ -2,3 +2,4 @@ +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 <[email protected]> +hanxi <[email protected]> -diff -Nur aegisub-3.2.2/vendor/luabins/README.md new/vendor/luabins/README.md ---- aegisub-3.2.2/vendor/luabins/README.md 2014-12-08 01:07:09.000000000 +0100 -+++ new/vendor/luabins/README.md 2016-12-17 08:09:13.000000000 +0100 -@@ -4,6 +4,8 @@ +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. @@ -39,10 +42,11 @@ On serialization ---------------- -diff -Nur aegisub-3.2.2/vendor/luabins/src/luabins.c new/vendor/luabins/src/luabins.c ---- aegisub-3.2.2/vendor/luabins/src/luabins.c 2014-12-08 01:07:09.000000000 +0100 -+++ new/vendor/luabins/src/luabins.c 2016-12-17 08:09:13.000000000 +0100 -@@ -54,7 +54,7 @@ +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 */ @@ -51,10 +55,11 @@ { { "save", l_save }, { "load", l_load }, -diff -Nur aegisub-3.2.2/vendor/luabins/src/luaheaders.h new/vendor/luabins/src/luaheaders.h ---- aegisub-3.2.2/vendor/luabins/src/luaheaders.h 2014-12-08 01:07:09.000000000 +0100 -+++ new/vendor/luabins/src/luaheaders.h 2016-12-17 08:09:13.000000000 +0100 -@@ -7,6 +7,16 @@ +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> @@ -71,9 +76,10 @@ #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP) } #endif -diff -Nur aegisub-3.2.2/vendor/luabins/src/luainternals.h new/vendor/luabins/src/luainternals.h ---- aegisub-3.2.2/vendor/luabins/src/luainternals.h 2014-12-08 01:07:09.000000000 +0100 -+++ new/vendor/luabins/src/luainternals.h 2017-06-19 12:26:34.402690003 +0200 +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_ @@ -99,7 +105,7 @@ /* * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h * WARNING: If your Lua config differs, fix this! -@@ -38,7 +56,6 @@ +@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x); /* ** max size of array part is 2^MAXBITS */ @@ -107,9 +113,10 @@ #if LUAI_BITSINT > 26 #define MAXBITS 26 #else -diff -Nur aegisub-3.2.2/vendor/luabins/src/lualess.c new/vendor/luabins/src/lualess.c ---- aegisub-3.2.2/vendor/luabins/src/lualess.c 1970-01-01 01:00:00.000000000 +0100 -+++ new/vendor/luabins/src/lualess.c 2016-12-17 08:09:13.000000000 +0100 +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 @@ -143,9 +150,10 @@ + return realloc(ptr, nsize); + } +} -diff -Nur aegisub-3.2.2/vendor/luabins/test/test.lua new/vendor/luabins/test/test.lua ---- aegisub-3.2.2/vendor/luabins/test/test.lua 2014-12-08 01:07:09.000000000 +0100 -+++ new/vendor/luabins/test/test.lua 2016-12-17 08:09:13.000000000 +0100 +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 @@ -155,7 +163,7 @@ local randomseed = 1235134892 --local randomseed = os.time() -@@ -145,6 +147,7 @@ +@@ -145,6 +147,7 @@ end -- Test helper functions -- ---------------------------------------------------------------------------- @@ -163,7 +171,7 @@ local luabins_local = require 'luabins' assert(luabins_local == luabins) -@@ -281,7 +284,7 @@ +@@ -281,7 +284,7 @@ check_fail_save( "can't save: unsupported type detected", coroutine.create(function() end) ) ++++++ remove-vendor-luajit-dependency.patch ++++++ --- /var/tmp/diff_new_pack.kDyOnm/_old 2020-03-15 07:15:13.233093113 +0100 +++ /var/tmp/diff_new_pack.kDyOnm/_new 2020-03-15 07:15:13.233093113 +0100 @@ -3,78 +3,79 @@ Forwarded: not-needed Last-Update: 2014-08-06 ---- a/header.mk -+++ b/header.mk -@@ -13,7 +13,6 @@ +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 \ - vendor/universalchardet +- vendor/luajit subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs))) ---- a/Makefile.inc.in -+++ b/Makefile.inc.in -@@ -78,7 +78,7 @@ + +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 = -I$(TOP)vendor/luajit/include +-CFLAGS_LUA = @LUAJIT_CFLAGS@ +CFLAGS_LUA = `pkg-config --cflags luajit` CFLAGS_OPENAL = @OPENAL_CFLAGS@ CFLAGS_OSS = @OSS_CFLAGS@ CFLAGS_PORTAUDIO = @PORTAUDIO_CFLAGS@ -@@ -96,7 +96,7 @@ +@@ -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 = $(TOP)vendor/luajit/src/libluajit.a +-LIBS_LUA = @LUAJIT_LIBS@ +LIBS_LUA = `pkg-config --libs luajit` LIBS_OPENAL = @OPENAL_LIBS@ LIBS_PORTAUDIO = @PORTAUDIO_LIBS@ - LIBS_PTHREAD = @PTHREAD_LIBS@ ---- a/src/Makefile -+++ b/src/Makefile -@@ -192,10 +192,10 @@ - $(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) -Wno-c++11-narrowing - $(d)text_file_reader.o_FLAGS := -D_X86_ - $(d)video_provider_manager.o_FLAGS := $(CFLAGS_FFMS2) --$(d)auto4_lua.o_FLAGS := -I$(TOP)vendor/luajit/include --$(d)auto4_lua_assfile.o_FLAGS := -I$(TOP)vendor/luajit/include --$(d)auto4_lua_dialog.o_FLAGS := -I$(TOP)vendor/luajit/include --$(d)auto4_lua_progresssink.o_FLAGS := -I$(TOP)vendor/luajit/include -+$(d)auto4_lua.o_FLAGS := `pkg-config --cflags luajit` -+$(d)auto4_lua_assfile.o_FLAGS := `pkg-config --cflags luajit` -+$(d)auto4_lua_dialog.o_FLAGS := `pkg-config --cflags luajit` -+$(d)auto4_lua_progresssink.o_FLAGS := `pkg-config --cflags luajit` - - $(src_OBJ): $(d)libresrc/bitmap.h $(d)libresrc/default_config.h - ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -12,6 +12,4 @@ + 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: $(TOP)vendor/luajit/src/host/minilua +-$(TOP)tools/respack.lua: $(shell command -v "$(BIN_LUA)") - include $(TOP)Makefile.target ---- a/tools/respack.lua -+++ b/tools/respack.lua -@@ -1,4 +1,4 @@ --#!../vendor/luajit/src/host/minilua -+#!/usr/bin/lua - -- Copyright (c) 2014, Thomas Goyne <[email protected]> - -- - -- Permission to use, copy, modify, and distribute this software for any ---- a/src/libresrc/Makefile -+++ b/src/libresrc/Makefile -@@ -10,7 +10,7 @@ +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; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua +-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 <[email protected]> + -- + -- Permission to use, copy, modify, and distribute this software for any
