commit: bf6592979744792bbad470b69c8003955df6bebb Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com> AuthorDate: Sun Dec 27 23:08:00 2015 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Sun Dec 27 23:28:13 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf659297
media-video/aegisub: adjust LIBS_LUA placement in luajit unbundle patch LIBS_LUA (aka '-lluajit-5.x') is included in OBJ list in automation build. This is why linking to luajit works properly. However, the expected behaviour is to include LIBS_LUA in LIBS list. Package-Manager: portage-2.2.24 .../files/aegisub-3.2.2-unbundle-luajit.patch | 22 +++++++++++++++++++--- .../files/aegisub-9999-unbundle-luajit.patch | 22 +++++++++++++++++++--- 2 files changed, 38 insertions(+), 6 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 de09072..ff033cb 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 @@ -28,6 +28,22 @@ index c93b9dc..ae018c3 100644 FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@ ##################### +diff --git a/automation/Makefile b/automation/Makefile +index 45a5ce2..db51a61 100644 +--- a/automation/Makefile ++++ b/automation/Makefile +@@ -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 @@ -62,7 +78,7 @@ index 61c8ba1..050472d 100644 subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs))) diff --git a/src/Makefile b/src/Makefile -index 60d7101..757bdc6 100644 +index 60d7101..1d4779c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -6,7 +6,8 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui @@ -70,8 +86,8 @@ index 60d7101..757bdc6 100644 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) \ -+ $(LIBS_LUA) ++ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) \ ++ $(LIBS_ICU) $(LIBS_LUA) src_PCH := $(d)agi_pre.h src_INSTALLNAME := $(AEGISUB_COMMAND) diff --git a/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch b/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch index 4eea654..cfae62a 100644 --- a/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch +++ b/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch @@ -28,6 +28,22 @@ index d1e1da4..aa26b81 100644 FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@ ##################### +diff --git a/automation/Makefile b/automation/Makefile +index d5425b7..121aae7 100644 +--- a/automation/Makefile ++++ b/automation/Makefile +@@ -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 d0b5152..ecec4de 100644 --- a/configure.ac @@ -62,7 +78,7 @@ index 61c8ba1..050472d 100644 subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs))) diff --git a/src/Makefile b/src/Makefile -index 08f9216..bb9233b 100644 +index 08f9216..53c60b6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -6,7 +6,8 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui @@ -70,8 +86,8 @@ index 08f9216..bb9233b 100644 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) \ -+ $(LIBS_LUA) ++ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) \ ++ $(LIBS_ICU) $(LIBS_LUA) src_PCH := $(d)agi_pre.h src_INSTALLNAME := $(AEGISUB_COMMAND)
