| 1 |
commit: bf6592979744792bbad470b69c8003955df6bebb |
| 2 |
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Dec 27 23:08:00 2015 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 27 23:28:13 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf659297 |
| 7 |
|
| 8 |
media-video/aegisub: adjust LIBS_LUA placement in luajit unbundle patch |
| 9 |
|
| 10 |
LIBS_LUA (aka '-lluajit-5.x') is included in OBJ list in automation |
| 11 |
build. This is why linking to luajit works properly. |
| 12 |
|
| 13 |
However, the expected behaviour is to include LIBS_LUA in LIBS list. |
| 14 |
|
| 15 |
Package-Manager: portage-2.2.24 |
| 16 |
|
| 17 |
.../files/aegisub-3.2.2-unbundle-luajit.patch | 22 +++++++++++++++++++--- |
| 18 |
.../files/aegisub-9999-unbundle-luajit.patch | 22 +++++++++++++++++++--- |
| 19 |
2 files changed, 38 insertions(+), 6 deletions(-) |
| 20 |
|
| 21 |
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 |
| 22 |
index de09072..ff033cb 100644 |
| 23 |
--- a/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch |
| 24 |
+++ b/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch |
| 25 |
@@ -28,6 +28,22 @@ index c93b9dc..ae018c3 100644 |
| 26 |
FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@ |
| 27 |
|
| 28 |
##################### |
| 29 |
+diff --git a/automation/Makefile b/automation/Makefile |
| 30 |
+index 45a5ce2..db51a61 100644 |
| 31 |
+--- a/automation/Makefile |
| 32 |
++++ b/automation/Makefile |
| 33 |
+@@ -12,9 +12,9 @@ DATA_AUTOMATION_INSTALLED = $(addprefix $(DESTDIR)$(P_DATA)/automation/, $(DATA_ |
| 34 |
+ $(DESTDIR)$(P_DATA)/automation/%: $(d)% |
| 35 |
+ $(MKDIR_INSTALL) |
| 36 |
+ |
| 37 |
+-aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a $(LIBS_LUA) |
| 38 |
++aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a |
| 39 |
+ aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX) |
| 40 |
+-aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) |
| 41 |
++aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_LUA) |
| 42 |
+ |
| 43 |
+ PROGRAM += $(d)aegisub-lua |
| 44 |
+ |
| 45 |
diff --git a/configure.ac b/configure.ac |
| 46 |
index be657b0..de586d5 100644 |
| 47 |
--- a/configure.ac |
| 48 |
@@ -62,7 +78,7 @@ index 61c8ba1..050472d 100644 |
| 49 |
|
| 50 |
subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs))) |
| 51 |
diff --git a/src/Makefile b/src/Makefile |
| 52 |
-index 60d7101..757bdc6 100644 |
| 53 |
+index 60d7101..1d4779c 100644 |
| 54 |
--- a/src/Makefile |
| 55 |
+++ b/src/Makefile |
| 56 |
@@ -6,7 +6,8 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui |
| 57 |
@@ -70,8 +86,8 @@ index 60d7101..757bdc6 100644 |
| 58 |
src_CXXFLAGS := $(CXXFLAGS_WX) |
| 59 |
src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \ |
| 60 |
- $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) |
| 61 |
-+ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) \ |
| 62 |
-+ $(LIBS_LUA) |
| 63 |
++ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) \ |
| 64 |
++ $(LIBS_ICU) $(LIBS_LUA) |
| 65 |
src_PCH := $(d)agi_pre.h |
| 66 |
src_INSTALLNAME := $(AEGISUB_COMMAND) |
| 67 |
|
| 68 |
|
| 69 |
diff --git a/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch b/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch |
| 70 |
index 4eea654..cfae62a 100644 |
| 71 |
--- a/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch |
| 72 |
+++ b/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch |
| 73 |
@@ -28,6 +28,22 @@ index d1e1da4..aa26b81 100644 |
| 74 |
FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@ |
| 75 |
|
| 76 |
##################### |
| 77 |
+diff --git a/automation/Makefile b/automation/Makefile |
| 78 |
+index d5425b7..121aae7 100644 |
| 79 |
+--- a/automation/Makefile |
| 80 |
++++ b/automation/Makefile |
| 81 |
+@@ -12,9 +12,9 @@ DATA_AUTOMATION_INSTALLED = $(addprefix $(DESTDIR)$(P_DATA)/automation/, $(DATA_ |
| 82 |
+ $(DESTDIR)$(P_DATA)/automation/%: $(d)% |
| 83 |
+ $(MKDIR_INSTALL) |
| 84 |
+ |
| 85 |
+-aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a $(LIBS_LUA) |
| 86 |
++aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a |
| 87 |
+ aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX) |
| 88 |
+-aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) |
| 89 |
++aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_LUA) |
| 90 |
+ |
| 91 |
+ PROGRAM += $(d)aegisub-lua |
| 92 |
+ |
| 93 |
diff --git a/configure.ac b/configure.ac |
| 94 |
index d0b5152..ecec4de 100644 |
| 95 |
--- a/configure.ac |
| 96 |
@@ -62,7 +78,7 @@ index 61c8ba1..050472d 100644 |
| 97 |
|
| 98 |
subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs))) |
| 99 |
diff --git a/src/Makefile b/src/Makefile |
| 100 |
-index 08f9216..bb9233b 100644 |
| 101 |
+index 08f9216..53c60b6 100644 |
| 102 |
--- a/src/Makefile |
| 103 |
+++ b/src/Makefile |
| 104 |
@@ -6,7 +6,8 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui |
| 105 |
@@ -70,8 +86,8 @@ index 08f9216..bb9233b 100644 |
| 106 |
src_CXXFLAGS := $(CXXFLAGS_WX) |
| 107 |
src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \ |
| 108 |
- $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) |
| 109 |
-+ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) \ |
| 110 |
-+ $(LIBS_LUA) |
| 111 |
++ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) \ |
| 112 |
++ $(LIBS_ICU) $(LIBS_LUA) |
| 113 |
src_PCH := $(d)agi_pre.h |
| 114 |
src_INSTALLNAME := $(AEGISUB_COMMAND) |
Archives