forked from pool/aegisub
81 lines
2.8 KiB
Diff
81 lines
2.8 KiB
Diff
|
Subject: vendor/luajit is removed in the Debian package
|
||
|
|
Author: Sebastian Reichel <sre@debian.org>
|
||
|
|
Forwarded: not-needed
|
||
|
|
Last-Update: 2014-08-06
|
||
|
|
|
||
|
|
--- a/header.mk
|
||
|
|
+++ b/header.mk
|
||
|
|
@@ -13,7 +13,6 @@
|
||
|
|
tests \
|
||
|
|
tools \
|
||
|
|
vendor/luabins \
|
||
|
|
- vendor/luajit \
|
||
|
|
vendor/universalchardet
|
||
|
|
|
||
|
|
subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
|
||
|
|
--- a/Makefile.inc.in
|
||
|
|
+++ b/Makefile.inc.in
|
||
|
|
@@ -78,7 +78,7 @@
|
||
|
|
CFLAGS_ICU = @ICU_I18N_CFLAGS@
|
||
|
|
CFLAGS_LIBASS = @LIBASS_CFLAGS@
|
||
|
|
CFLAGS_LIBPULSE = @LIBPULSE_CFLAGS@
|
||
|
|
-CFLAGS_LUA = -I$(TOP)vendor/luajit/include
|
||
|
|
+CFLAGS_LUA = `pkg-config --cflags luajit`
|
||
|
|
CFLAGS_OPENAL = @OPENAL_CFLAGS@
|
||
|
|
CFLAGS_OSS = @OSS_CFLAGS@
|
||
|
|
CFLAGS_PORTAUDIO = @PORTAUDIO_CFLAGS@
|
||
|
|
@@ -96,7 +96,7 @@
|
||
|
|
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 --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 @@
|
||
|
|
|
||
|
|
PROGRAM += $(d)repack-thes-dict
|
||
|
|
|
||
|
|
-$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
|
||
|
|
-
|
||
|
|
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 <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
|
||
|
|
|
||
|
|
-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
|