From 0dd72462bcfc68778b003d0fcd2c65f153221bfc Mon Sep 17 00:00:00 2001 From: odrling Date: Tue, 20 Aug 2019 01:59:14 +0200 Subject: [PATCH] [aegisub] remove luajit patch --- media-video/aegisub/aegisub-9999.ebuild | 1 - ....2_p20160518-fix-system-luajit-build.patch | 134 ------------------ 2 files changed, 135 deletions(-) delete mode 100644 media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-system-luajit-build.patch diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild index 18fd667..7b6a0ef 100644 --- a/media-video/aegisub/aegisub-9999.ebuild +++ b/media-video/aegisub/aegisub-9999.ebuild @@ -52,7 +52,6 @@ DEPEND="${RDEPEND} REQUIRED_USE="|| ( alsa openal oss portaudio pulseaudio )" PATCHES=( - "${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-system-luajit-build.patch" "${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-respect-compiler-flags.patch" ) diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-system-luajit-build.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-system-luajit-build.patch deleted file mode 100644 index 0f0ad2a..0000000 --- a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-system-luajit-build.patch +++ /dev/null @@ -1,134 +0,0 @@ -See http://devel.aegisub.org/ticket/1904 -and http://devel.aegisub.org/ticket/1913 -and http://devel.aegisub.org/ticket/1922 - -diff --git a/Makefile.inc.in b/Makefile.inc.in -index d8b3f4a..52e4cf6 100644 ---- a/Makefile.inc.in -+++ b/Makefile.inc.in -@@ -9,6 +9,7 @@ HAVE_OPENAL = @with_openal@ - HAVE_OSS = @with_oss@ - HAVE_PORTAUDIO = @with_portaudio@ - HAVE_UCHARDET = @with_uchardet@ -+SYSTEM_LUAJIT = @with_system_luajit@ - - ############## - # BUILD OUTPUT -diff --git a/automation/Makefile b/automation/Makefile -index 5483dbd..1231aab 100644 ---- a/automation/Makefile -+++ b/automation/Makefile -@@ -12,10 +12,16 @@ DATA_AUTOMATION_INSTALLED = $(addprefix $(DESTDIR)$(P_DATA)/automation/, $(DATA_ - $(DESTDIR)$(P_DATA)/automation/%: $(d)% - $(MKDIR_INSTALL) - --aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a $(LIBS_LUA) -+aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a - aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX) - aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD) - -+ifeq (no, $(SYSTEM_LUAJIT)) -+aegisub-lua_OBJ += $(LIBS_LUA) -+else -+aegisub-lua_LIBS += $(LIBS_LUA) -+endif -+ - PROGRAM += $(d)aegisub-lua - - test-automation: $(PROGRAM) -diff --git a/configure.ac b/configure.ac -index 1649efc..81b1413 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -429,13 +429,15 @@ AS_IF([test $with_system_luajit = no], - [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include']) - AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])]) - -+AC_SUBST(with_system_luajit) -+ - # We also need a Lua binary to run part of the build system - # Which version doesn't matter as the scripts are portable between them --AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1]) -+AC_PATH_PROGS([LUA], [luajit lua lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1]) - - # If the user doesn't have an installed copy of Lua, just use the one built - # as part of building LuaJIT --AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"]) -+AS_IF([test -z $LUA], [LUA='$(TOP)vendor/luajit/src/host/minilua']) - - ###################################################### - # Debugging support -diff --git a/header.mk b/header.mk -index 613b38f..a9ce1d7 100644 ---- a/header.mk -+++ b/header.mk -@@ -13,7 +13,10 @@ subdirs := \ - tests \ - tools \ - vendor/luabins \ -- vendor/luajit -+ -+ifeq (no, $(SYSTEM_LUAJIT)) -+subdirs += vendor/luajit -+endif - - subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs))) - -diff --git a/src/Makefile b/src/Makefile -index 0ee6c84..1a6f015 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -6,7 +6,7 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui - $(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_ICU) $(CPPFLAGS_BOOST) - src_CXXFLAGS := $(CXXFLAGS_WX) - src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \ -- $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) -+ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) - src_PCH := $(d)agi_pre.h - src_INSTALLNAME := $(AEGISUB_COMMAND) - -@@ -111,11 +111,16 @@ src_OBJ := \ - $(d)video_provider_yuv4mpeg.o \ - $(d)video_slider.o \ - $(d)visual_feature.o \ -- $(LIBS_LUA) \ - $(TOP)lib/libaegisub.a \ - $(TOP)lib/libluabins.a \ - $(TOP)lib/libresrc.a \ - -+ifeq (no, $(SYSTEM_LUAJIT)) -+src_OBJ += $(LIBS_LUA) -+else -+src_LIBS += $(LIBS_LUA) -+endif -+ - ifeq (yes, $(BUILD_DARWIN)) - src_OBJ += $(d)font_file_lister_coretext.o - src_OBJ += $(subst .mm,.o,$(wildcard $(d)osx/*.mm)) -diff --git a/tools/Makefile b/tools/Makefile -index de6166a..e3d108a 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -12,6 +12,8 @@ repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU) - - PROGRAM += $(d)repack-thes-dict - --$(TOP)tools/respack.lua: $(shell command -v "$(BIN_LUA)") -+ifeq (no, $(SYSTEM_LUAJIT)) -+$(TOP)tools/respack.lua: $(BIN_LUA) -+endif - - include $(TOP)Makefile.target -diff --git a/src/libresrc/Makefile b/src/libresrc/Makefile -index 6058ff9a3..8b6d19595 100644 ---- a/src/libresrc/Makefile -+++ b/src/libresrc/Makefile -@@ -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)$(BIN_LUA) $(TOP)tools/respack.lua -+RESPACK := cd $(TOP)src/libresrc; $(BIN_LUA) $(TOP)tools/respack.lua - - $(d)bitmap.cpp: $(d)bitmap.h - $(d)default_config.cpp: $(d)default_config.h