diff options
Diffstat (limited to 'media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch')
| -rw-r--r-- | media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch b/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch index ff033cb969e7..ec561b23ce46 100644 --- a/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch +++ b/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch @@ -20,13 +20,13 @@ index c93b9dc..ae018c3 100644 LIBS_OPENAL = @OPENAL_LIBS@ LIBS_PORTAUDIO = @PORTAUDIO_LIBS@ LIBS_PTHREAD = @PTHREAD_LIBS@ - + -ifeq (yes, $(BUILD_DARWIN)) -LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so -endif - FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@ - + ##################### diff --git a/automation/Makefile b/automation/Makefile index 45a5ce2..db51a61 100644 @@ -35,15 +35,15 @@ index 45a5ce2..db51a61 100644 @@ -12,9 +12,9 @@ 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) +aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_LUA) - + PROGRAM += $(d)aegisub-lua - + diff --git a/configure.ac b/configure.ac index be657b0..de586d5 100644 --- a/configure.ac @@ -54,7 +54,7 @@ index be657b0..de586d5 100644 m4_define([wx_required_version], [3.0.0]) +# Same version as the bundled one +m4_define([luajit_required_version], [2.0.3]) - + ####### # Setup @@ -205,6 +207,7 @@ AC_SUBST(GL_LIBS) @@ -62,7 +62,7 @@ index be657b0..de586d5 100644 PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= fontconfig_required_version) PKG_CHECK_MODULES(LIBASS, libass >= libass_required_version) +PKG_CHECK_MODULES(LUAJIT, luajit >= luajit_required_version) - + FONTCONFIG_CONF_DIR=$($PKG_CONFIG --variable=confdir fontconfig) AC_SUBST(FONTCONFIG_CONF_DIR) diff --git a/header.mk b/header.mk @@ -75,7 +75,7 @@ index 61c8ba1..050472d 100644 vendor/luabins \ - vendor/luajit \ vendor/universalchardet - + subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs))) diff --git a/src/Makefile b/src/Makefile index 60d7101..1d4779c 100644 @@ -90,7 +90,7 @@ index 60d7101..1d4779c 100644 + $(LIBS_ICU) $(LIBS_LUA) src_PCH := $(d)agi_pre.h src_INSTALLNAME := $(AEGISUB_COMMAND) - + @@ -112,7 +113,6 @@ src_OBJ := \ $(d)video_provider_yuv4mpeg.o \ $(d)video_slider.o \ @@ -111,20 +111,20 @@ index 60d7101..1d4779c 100644 +$(d)auto4_lua_assfile.o_FLAGS := $(CFLAGS_LUA) +$(d)auto4_lua_dialog.o_FLAGS := $(CFLAGS_LUA) +$(d)auto4_lua_progresssink.o_FLAGS := $(CFLAGS_LUA) - + $(src_OBJ): $(d)libresrc/bitmap.h $(d)libresrc/default_config.h - + diff --git a/src/libresrc/Makefile b/src/libresrc/Makefile index 6441856..0562eb1 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; luajit $(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 @@ -132,9 +132,9 @@ 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 |