vendor/luajit is removed in the Debian package

Forwarded: not-needed
Last-Update: 2014-08-06


Gbp-Pq: Name remove-vendor-luajit-dependency.patch

6 files changed, 8 insertions, 11 deletions

diff --git a/Makefile.inc.in b/Makefile.inc.in
index c93b9dc..105943e 100644
--- a/Makefile.inc.in
+++ b/Makefile.inc.in
@@ -78,7 +78,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         = `pkg-config --silence-errors --cflags luajit` `pkg-config --silence-errors --cflags lua51`
 CFLAGS_OPENAL      = @OPENAL_CFLAGS@
 CFLAGS_OSS         = @OSS_CFLAGS@
 CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
@@ -96,7 +96,7 @@ 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           = `pkg-config --silence-errors --libs luajit` `pkg-config --silence-errors --libs lua51`
 LIBS_OPENAL        = @OPENAL_LIBS@
 LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
 LIBS_PTHREAD       = @PTHREAD_LIBS@
diff --git a/header.mk b/header.mk
index 61c8ba1..050472d 100644
--- a/header.mk
+++ b/header.mk
@@ -13,7 +13,6 @@ subdirs := \
 	tests \
 	tools \
 	vendor/luabins \
-	vendor/luajit \
 	vendor/universalchardet
 
 subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
diff --git a/src/Makefile b/src/Makefile
index 60d7101..1a76b36 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -192,10 +192,10 @@ $(d)subtitles_provider.o_FLAGS          := $(CFLAGS_LIBASS)
 $(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 --silence-errors --cflags luajit` `pkg-config --silence-errors --cflags lua51`
+$(d)auto4_lua_assfile.o_FLAGS           := `pkg-config --silence-errors --cflags luajit` `pkg-config --silence-errors --cflags lua51`
+$(d)auto4_lua_dialog.o_FLAGS            := `pkg-config --silence-errors --cflags luajit` `pkg-config --silence-errors --cflags lua51`
+$(d)auto4_lua_progresssink.o_FLAGS      := `pkg-config --silence-errors --cflags luajit` `pkg-config --silence-errors --cflags lua51`
 
 $(src_OBJ): $(d)libresrc/bitmap.h $(d)libresrc/default_config.h
 
diff --git a/src/libresrc/Makefile b/src/libresrc/Makefile
index 6441856..2575374 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)vendor/luajit/src/host/minilua $(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
diff --git a/tools/Makefile b/tools/Makefile
index 81bcef3..0834ac2 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -12,6 +12,4 @@ repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
 
 PROGRAM += $(d)repack-thes-dict
 
-$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
-
 include $(TOP)Makefile.target
diff --git a/tools/respack.lua b/tools/respack.lua
index 85955d1..0632d7f 100755
--- 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 <plorkyeran@aegisub.org>
 --
 -- Permission to use, copy, modify, and distribute this software for any