rpm/aegisub
SHA256
1
0
Fork 0
forked from pool/aegisub
Code Pull Requests Activity

Accepting request 632309 from home:plater

Browse Source 
- Update to current git rev 524c6114a82157b143567240884de3a6d030b091
  named version 3.2.2+git20180710 which builds against boost
  version 1.68, fixes boo#1105217
- 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.
- For upstream changes see:
  /usr/share/doc/packages/aegisub/changelog.txt

OBS-URL: https://build.opensuse.org/request/show/632309
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=50
This commit is contained in:
Dave Plater 2018-08-30 13:06:57 +00:00 committed by Git OBS Bridge
parent 48c1b8e563
commit ff783b1dcc
12 changed files with 2029 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile.inc.in.patch
View File

@ -1,6 +1,8 @@
--- aegisub-3.2.2/Makefile.inc.in.orig 2015-06-29 14:44:02.998996223 +0100 Index: Makefile.inc.in
+++ aegisub-3.2.2/Makefile.inc.in 2015-06-29 14:44:37.957948716 +0100 ===================================================================
@@ -28,7 +28,7 @@ --- Makefile.inc.in.orig 2018-07-10 00:06:51.000000000 +0200
+++ Makefile.inc.in 2018-08-29 16:34:31.015394700 +0200
@@ -29,7 +29,7 @@ CXXFLAGS = @CXXFLAGS@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CFLAGS_DEP = -MMD -MP CFLAGS_DEP = -MMD -MP
LIBS = @LIBS@ LIBS = @LIBS@
@ -8,4 +10,17 @@
+LDFLAGS = @LDFLAGS@ -pthread +LDFLAGS = @LDFLAGS@ -pthread
INSTALL_FLAGS = -m 644 INSTALL_FLAGS = -m 644
LIB_SHARED_LINK = -shared -Wl,-soname -Wl,$(LIB_SHARED_FULL) 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: configure.ac
===================================================================
--- configure.ac.orig 2018-07-10 00:06:51.000000000 +0200
+++ configure.ac 2018-08-29 16:36:51.024739116 +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])

3
aegisub-3.2.2+git20180710.tar.gz Normal file
View File

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

3
aegisub-3.2.2.tar.xz
View File

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

8
aegisub-git-version.patch Normal file
View File

@ -0,0 +1,8 @@
Index: build/git_version.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ build/git_version.h 2018-08-29 16:47:48.929842452 +0200
@@ -0,0 +1,3 @@
+#define BUILD_GIT_VERSION_NUMBER 83736
+#define BUILD_GIT_VERSION_STRING "3.2.2+git20180710"
+#define TAGGED_RELEASE 0

58
aegisub-icu.patch
View File

@ -1,58 +0,0 @@
From: Dave Plater <davejplater@gmail.com>
Date: 2018-05-19 14:49:00 +0200
Subject: Factory build failure
References: icu4c-61_1
Upstream: Bug tracker not accessable.
It seems that icu 61.1 needs icu namespace specified for functions but
didn't in the past.
Index: libaegisub/common/character_count.cpp
===================================================================
--- libaegisub/common/character_count.cpp.orig 2014-12-08 02:07:09.000000000 +0200
+++ libaegisub/common/character_count.cpp 2018-06-08 09:19:09.591507615 +0200
@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(c
static std::once_flag token;
std::call_once(token, [&] {
UErrorCode status = U_ZERO_ERROR;
- bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
+ bi.reset(U_ICU_NAMESPACE::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
});
@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, It
size_t count = 0;
auto pos = character_bi.first();
- for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
+ for (auto end = character_bi.next(); end != U_ICU_NAMESPACE::BreakIterator::DONE; pos = end, end = character_bi.next()) {
if (!mask)
++count;
else {
@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string cons
auto& bi = get_break_iterator(&str[0], str.size());
for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
- if (end == BreakIterator::DONE)
+ if (end == U_ICU_NAMESPACE::BreakIterator::DONE)
return str.size();
if (n == 0)
return pos;
Index: src/utils.cpp
===================================================================
--- src/utils.cpp.orig 2018-05-19 12:35:15.069871773 +0200
+++ src/utils.cpp 2018-06-08 09:22:06.796104985 +0200
@@ -265,9 +265,9 @@ agi::fs::path SaveFileSelector(wxString
}
wxString LocalizedLanguageName(wxString const& lang) {
- Locale iculoc(lang.c_str());
+ U_ICU_NAMESPACE::Locale iculoc(lang.c_str());
if (!iculoc.isBogus()) {
- UnicodeString ustr;
+ U_ICU_NAMESPACE::UnicodeString ustr;
iculoc.getDisplayName(iculoc, ustr);
#ifdef _MSC_VER
return wxString(ustr.getBuffer());

22
aegisub-no-optimize.patch
View File

@ -1,23 +1,9 @@
Index: aegisub-3.2.2/configure
=================================================================== ===================================================================
--- aegisub-3.2.2.orig/configure Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/configure.ac
+++ 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
=================================================================== ===================================================================
--- aegisub-3.2.2.orig/configure.ac --- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/configure.ac 2018-08-29 16:36:51.024739116 +0200
+++ aegisub-3.2.2/configure.ac +++ Aegisub-524c6114a82157b143567240884de3a6d030b091/configure.ac 2018-08-29 16:46:24.326615179 +0200
@@ -151,8 +151,8 @@ AS_IF([test x$enable_compiler_flags != x @@ -145,8 +145,8 @@ AS_IF([test x$enable_compiler_flags != x
CFLAGS="$CFLAGS -O0" CFLAGS="$CFLAGS -O0"
CXXFLAGS="$CXXFLAGS -O0" CXXFLAGS="$CXXFLAGS -O0"
], [ ], [

87
aegisub.build-compare.patch
View File

@ -1,87 +0,0 @@
--- a/libaegisub/Makefile
+++ b/libaegisub/Makefile
@@ -4,12 +4,12 @@ aegisub_OBJ := \
$(d)common/parser.o \
$(d)ass/dialogue_parser.o \
$(d)ass/time.o \
- $(subst .cpp,.o,$(wildcard $(d)audio/*.cpp)) \
- $(subst .cpp,.o,$(wildcard $(d)common/cajun/*.cpp)) \
- $(subst .cpp,.o,$(wildcard $(d)lua/modules/*.cpp)) \
- $(subst .c,.o,$(wildcard $(d)lua/modules/*.c)) \
- $(subst .cpp,.o,$(wildcard $(d)lua/*.cpp)) \
- $(subst .cpp,.o,$(wildcard $(d)unix/*.cpp)) \
+ $(subst .cpp,.o,$(sort $(wildcard $(d)audio/*.cpp))) \
+ $(subst .cpp,.o,$(sort $(wildcard $(d)common/cajun/*.cpp))) \
+ $(subst .cpp,.o,$(sort $(wildcard $(d)lua/modules/*.cpp))) \
+ $(subst .c,.o,$(sort $(wildcard $(d)lua/modules/*.c))) \
+ $(subst .cpp,.o,$(sort $(wildcard $(d)lua/*.cpp))) \
+ $(subst .cpp,.o,$(sort $(wildcard $(d)unix/*.cpp))) \
$(d)common/calltip_provider.o \
$(d)common/character_count.o \
$(d)common/charset.o \
@@ -35,7 +35,7 @@ aegisub_OBJ := \
$(d)common/ycbcr_conv.o
ifeq (yes, $(BUILD_DARWIN))
-aegisub_OBJ += $(subst .mm,.o,$(wildcard $(d)osx/*.mm))
+aegisub_OBJ += $(subst .mm,.o,$(sort $(wildcard $(d)osx/*.mm)))
else
aegisub_OBJ += $(d)common/dispatch.o
endif
--- a/packages/desktop/Makefile
+++ b/packages/desktop/Makefile
@@ -1,7 +1,7 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../header.mk
DESKTOP_SRC := $(d)
-ICONS = $(wildcard $(d)*.png) $(wildcard $(d)*.svg)
+ICONS = $(sort $(wildcard $(d)*.png)) $(sort $(wildcard $(d)*.svg))
ICONS_INSTALLED = $(DESTDIR)$(P_ICON)/hicolor/%/apps/aegisub.
DESKTOP_FILE := $(d)aegisub.desktop
--- a/src/Makefile
+++ b/src/Makefile
@@ -11,10 +11,10 @@ src_PCH := $(d)agi_pre.h
src_INSTALLNAME := $(AEGISUB_COMMAND)
src_OBJ := \
- $(subst .cpp,.o,$(wildcard $(d)command/*.cpp)) \
- $(subst .cpp,.o,$(wildcard $(d)dialog_*.cpp)) \
- $(subst .cpp,.o,$(wildcard $(d)subtitle_format*.cpp)) \
- $(subst .cpp,.o,$(wildcard $(d)visual_tool*.cpp)) \
+ $(subst .cpp,.o,$(sort $(wildcard $(d)command/*.cpp))) \
+ $(subst .cpp,.o,$(sort $(wildcard $(d)dialog_*.cpp))) \
+ $(subst .cpp,.o,$(sort $(wildcard $(d)subtitle_format*.cpp))) \
+ $(subst .cpp,.o,$(sort $(wildcard $(d)visual_tool*.cpp))) \
$(d)MatroskaParser.o \
$(d)aegisublocale.o \
$(d)ass_attachment.o \
@@ -119,7 +119,7 @@ src_OBJ := \
$(TOP)lib/libuniversalchardet.a \
ifeq (yes, $(BUILD_DARWIN))
-src_OBJ += $(subst .mm,.o,$(wildcard $(d)osx/*.mm))
+src_OBJ += $(subst .mm,.o,$(sort $(wildcard $(d)osx/*.mm)))
endif
###############
--- a/vendor/luabins/Makefile
+++ b/vendor/luabins/Makefile
@@ -1,6 +1,6 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../header.mk
-luabins_OBJ := $(subst .c,.o,$(wildcard $(d)src/*.c))
+luabins_OBJ := $(subst .c,.o,$(sort $(wildcard $(d)src/*.c)))
luabins_CPPFLAGS := $(CFLAGS_LUA)
LIB += luabins
--- a/vendor/universalchardet/Makefile
+++ b/vendor/universalchardet/Makefile
@@ -1,6 +1,6 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../header.mk
-universalchardet_OBJ := $(subst .cpp,.o,$(wildcard $(d)*.cpp))
+universalchardet_OBJ := $(subst .cpp,.o,$(sort $(wildcard $(d)*.cpp)))
universalchardet_CPPFLAGS := -D_X86_
LIB += universalchardet

13
aegisub.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Aug 30 10:26:57 UTC 2018 - davejplater@gmail.com
- Update to current git rev 524c6114a82157b143567240884de3a6d030b091
named version 3.2.2+git20180710 which builds against boost
version 1.68, fixes boo#1105217
- 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.
- For upstream changes see:
/usr/share/doc/packages/aegisub/changelog.txt
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 8 07:40:37 UTC 2018 - davejplater@gmail.com Fri Jun 8 07:40:37 UTC 2018 - davejplater@gmail.com

37
aegisub.spec
View File

@ -16,22 +16,24 @@
# #
%define _rev 524c6114a82157b143567240884de3a6d030b091
%define gitname Aegisub
Name: aegisub Name: aegisub
Version: 3.2.2 Version: 3.2.2+git20180710
Release: 0 Release: 0
Summary: Subtitle editor Summary: Subtitle editor
License: BSD-3-Clause License: BSD-3-Clause
Group: Productivity/Multimedia/Video/Editors and Convertors Group: Productivity/Multimedia/Video/Editors and Convertors
Url: http://www.aegisub.org/ Url: http://www.aegisub.org/
Source0: http://ftp.aegisub.org/pub/releases/aegisub-%{version}.tar.xz Source0: https://github.com/Aegisub/Aegisub/archive/%{_rev}.tar.gz#/aegisub-%{version}.tar.gz
Source99: aegisub.changes Source99: changelog.txt
Patch0: aegisub.build-compare.patch
Patch1: Makefile.inc.in.patch Patch1: Makefile.inc.in.patch
Patch2: remove-vendor-luajit-dependency.patch Patch2: remove-vendor-luajit-dependency.patch
Patch3: icu59.patch
Patch4: aegisub-no-optimize.patch Patch4: aegisub-no-optimize.patch
Patch5: luabins.patch Patch5: luabins.patch
Patch6: aegisub-icu.patch #PATCH-FIX-OPENSUSE - davejplater@gmail.com - aegisub-git-version.patch - Create git_version.h which is missing in git.
Patch7: aegisub-git-version.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -65,21 +67,21 @@ from just basic timed text. Aegisub's goal is to support using these advanced
functions with ease. functions with ease.
%prep %prep
%setup -q %setup -q -n %{gitname}-%{_rev}
%patch0 -p1 %patch1 -p0
%patch1 -p1 %patch2 -p0
%patch2 -p1
%patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 %patch7
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/version.cpp sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/version.cpp
FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S') FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/version.cpp sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/version.cpp
cp %{SOURCE99} .
%build %build
autoreconf -fvi ./autogen.sh
#autoreconf -fvi
%configure \ %configure \
--disable-update-checker \ --disable-update-checker \
--with-player-audio=PulseAudio \ --with-player-audio=PulseAudio \
@ -88,12 +90,13 @@ make %{?_smp_mflags}
%install %install
%make_install %make_install
%find_lang %{name}-32 %find_lang %{name}
%files -f %{name}-32.lang %files -f %{name}.lang
%defattr(0644, root, root, 0755) %defattr(0644, root, root, 0755)
%doc LICENCE %license LICENCE
%attr(0755,root,root) %{_bindir}/aegisub-3.2 %doc README.md changelog.txt
%attr(0755,root,root) %{_bindir}/aegisub
%{_datadir}/aegisub/ %{_datadir}/aegisub/
%{_datadir}/applications/aegisub.desktop %{_datadir}/applications/aegisub.desktop
%{_datadir}/icons/hicolor/*/apps/aegisub.* %{_datadir}/icons/hicolor/*/apps/aegisub.*

1918
changelog.txt Normal file
View File

File diff suppressed because it is too large Load Diff

11
icu59.patch
View File

@ -1,11 +0,0 @@
diff -upr aegisub-3.2.2.orig/src/utils.cpp aegisub-3.2.2/src/utils.cpp
--- aegisub-3.2.2.orig/src/utils.cpp 2014-12-08 02:07:09.000000000 +0200
+++ aegisub-3.2.2/src/utils.cpp 2017-04-26 11:11:15.438239182 +0300
@@ -44,6 +44,7 @@
#include <boost/filesystem/path.hpp>
#include <map>
#include <unicode/locid.h>
+#include <unicode/unistr.h>
#include <wx/clipbrd.h>
#include <wx/filedlg.h>
#include <wx/stdpaths.h>

87
remove-vendor-luajit-dependency.patch
View File

@ -3,78 +3,79 @@ Author: Sebastian Reichel <sre@debian.org>
Forwarded: not-needed Forwarded: not-needed
Last-Update: 2014-08-06 Last-Update: 2014-08-06
--- a/header.mk Index: header.mk
+++ b/header.mk ===================================================================
@@ -13,7 +13,6 @@ --- header.mk.orig 2018-08-29 16:09:52.447078198 +0200
+++ header.mk 2018-08-29 16:13:15.670809749 +0200
@@ -13,7 +13,6 @@ subdirs := \
tests \ tests \
tools \ tools \
vendor/luabins \ vendor/luabins \
- vendor/luajit \ - vendor/luajit
vendor/universalchardet
subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs))) subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
--- a/Makefile.inc.in
+++ b/Makefile.inc.in Index: Makefile.inc.in
@@ -78,7 +78,7 @@ ===================================================================
--- Makefile.inc.in.orig 2018-08-29 16:10:05.587577013 +0200
+++ Makefile.inc.in 2018-08-29 16:14:01.836568832 +0200
@@ -79,7 +79,7 @@ CFLAGS_ICONV = @ICONV_CFLAGS@
CFLAGS_ICU = @ICU_I18N_CFLAGS@ CFLAGS_ICU = @ICU_I18N_CFLAGS@
CFLAGS_LIBASS = @LIBASS_CFLAGS@ CFLAGS_LIBASS = @LIBASS_CFLAGS@
CFLAGS_LIBPULSE = @LIBPULSE_CFLAGS@ CFLAGS_LIBPULSE = @LIBPULSE_CFLAGS@
-CFLAGS_LUA = -I$(TOP)vendor/luajit/include -CFLAGS_LUA = @LUAJIT_CFLAGS@
+CFLAGS_LUA = `pkg-config --cflags luajit` +CFLAGS_LUA = `pkg-config --cflags luajit`
CFLAGS_OPENAL = @OPENAL_CFLAGS@ CFLAGS_OPENAL = @OPENAL_CFLAGS@
CFLAGS_OSS = @OSS_CFLAGS@ CFLAGS_OSS = @OSS_CFLAGS@
CFLAGS_PORTAUDIO = @PORTAUDIO_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_ICU = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
LIBS_LIBASS = @LIBASS_LIBS@ LIBS_LIBASS = @LIBASS_LIBS@
LIBS_LIBPULSE = @LIBPULSE_LIBS@ LIBS_LIBPULSE = @LIBPULSE_LIBS@
-LIBS_LUA = $(TOP)vendor/luajit/src/libluajit.a -LIBS_LUA = @LUAJIT_LIBS@
+LIBS_LUA = `pkg-config --libs luajit` +LIBS_LUA = `pkg-config --libs luajit`
LIBS_OPENAL = @OPENAL_LIBS@ LIBS_OPENAL = @OPENAL_LIBS@
LIBS_PORTAUDIO = @PORTAUDIO_LIBS@ LIBS_PORTAUDIO = @PORTAUDIO_LIBS@
LIBS_PTHREAD = @PTHREAD_LIBS@ LIBS_PTHREAD = @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
--- a/src/Makefile LIBS_UCHARDET = @UCHARDET_LIBS@
+++ 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 ifeq (yes, $(BUILD_DARWIN))
-LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so
+LIBS_LUA = `pkg-config --libs luajit`
endif
--- a/tools/Makefile FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@
+++ b/tools/Makefile Index: tools/Makefile
@@ -12,6 +12,4 @@ ===================================================================
--- tools/Makefile.orig 2018-08-29 16:09:52.447078198 +0200
+++ tools/Makefile 2018-08-29 16:13:15.690810512 +0200
@@ -12,6 +12,4 @@ repack-thes-dict_CPPFLAGS := -I$(TOP) -I
PROGRAM += $(d)repack-thes-dict 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 include $(TOP)Makefile.target
--- a/tools/respack.lua Index: src/libresrc/Makefile
+++ b/tools/respack.lua ===================================================================
@@ -1,4 +1,4 @@ --- src/libresrc/Makefile.orig 2018-08-29 16:09:52.447078198 +0200
-#!../vendor/luajit/src/host/minilua +++ src/libresrc/Makefile 2018-08-29 16:13:15.690810512 +0200
+#!/usr/bin/lua @@ -10,7 +10,7 @@ resrc_OBJ := \
-- Copyright (c) 2014, Thomas Goyne <plorkyeran@aegisub.org>
--
-- Permission to use, copy, modify, and distribute this software for any
--- a/src/libresrc/Makefile
+++ b/src/libresrc/Makefile
@@ -10,7 +10,7 @@
$(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp $(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 +RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
$(d)bitmap.cpp: $(d)bitmap.h $(d)bitmap.cpp: $(d)bitmap.h
$(d)default_config.cpp: $(d)default_config.h $(d)default_config.cpp: $(d)default_config.h
Index: tools/respack.lua
===================================================================
--- tools/respack.lua.orig 2018-08-29 16:09:52.447078198 +0200
+++ tools/respack.lua 2018-08-29 16:13:15.690810512 +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