1 |
commit: 878010e4b5fca1db2520cefa2e40ae16d110b3c1 |
2 |
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Mar 7 15:40:24 2016 +0000 |
4 |
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 7 18:35:00 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=878010e4 |
7 |
|
8 |
media-video/aegisub: verbump to 3.2.2_p20160306 |
9 |
|
10 |
New snapshot release with most of our Gentoo patches merged upstream. |
11 |
|
12 |
Package-Manager: portage-2.2.27 |
13 |
|
14 |
media-video/aegisub/Manifest | 1 + |
15 |
...-9999.ebuild => aegisub-3.2.2_p20160306.ebuild} | 10 +- |
16 |
media-video/aegisub/aegisub-9999.ebuild | 3 +- |
17 |
...sub-3.2.2_p20160306-fix-luajit-unbundling.patch | 127 +++++++++++++++++++++ |
18 |
...2.2_p20160306-respect-user-compiler-flags.patch | 53 +++++++++ |
19 |
5 files changed, 189 insertions(+), 5 deletions(-) |
20 |
|
21 |
diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest |
22 |
index e696d2d..9589891 100644 |
23 |
--- a/media-video/aegisub/Manifest |
24 |
+++ b/media-video/aegisub/Manifest |
25 |
@@ -1,2 +1,3 @@ |
26 |
DIST aegisub-3.0.4.tar.xz 4155728 SHA256 7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a SHA512 2917195a61d16578a83ce0b69006dd0269c086c6eff2f622c47d9880697e4e531a7c0c0232c187f9023635c9d3857a1d6a0cee4f6251e49d22e2b625ac5dda7f WHIRLPOOL 60bd3e0374a60f6af62fe450488e8c68e18957283fff59d704f40e192da624bdf90d68c3cea41122e5b9ca440d218c3bd6d9d8091ed5226a2e9d1b9fdc2ce689 |
27 |
DIST aegisub-3.2.2.tar.xz 5252052 SHA256 c55e33945b82d8513c02ea6e782f0d72c726adcd3707e95b8c0022f6151e6885 SHA512 54f825e52f238fef8d5cc31c37436e21355aee27883347f905271e5d2a8ff2a77e1b67d5aef38b0f8468bd0bad851fe944e02de27ec96310b902fbe5b1086722 WHIRLPOOL fe948edbb01f11385e14d1912b73942605df18325fcd95f4284a3c2edb73778d90d73038ac4a062e211fd56879590040e3c558fe1e361ec9fe2eee6a5c016448 |
28 |
+DIST aegisub-3.2.2_p20160306.tar.gz 7436713 SHA256 1b70f67c3b3d6ecce482bc1f4beb1ceffd4c523aa060556658e403ea98fcc58c SHA512 815775b64b1ad5cd09eda6106561a8a0d4dc129d4c2e08e057eab881289526a7b67bab2f4d2f48748ef2015ea21f2839ed8f84d168bf9127c62c9a35caa1abd5 WHIRLPOOL caaa6b1d69c7e4d1da4abfd0382d263585c5216d9ed5e63f515d8bce98b2e0dad2848552f3f097a8db9e39dad5d2c00d3b752f0407490d0d2c777aaa8fc6dc38 |
29 |
|
30 |
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160306.ebuild |
31 |
similarity index 90% |
32 |
copy from media-video/aegisub/aegisub-9999.ebuild |
33 |
copy to media-video/aegisub/aegisub-3.2.2_p20160306.ebuild |
34 |
index 09c7389..1c21ae6 100644 |
35 |
--- a/media-video/aegisub/aegisub-9999.ebuild |
36 |
+++ b/media-video/aegisub/aegisub-3.2.2_p20160306.ebuild |
37 |
@@ -8,16 +8,17 @@ AUTOTOOLS_AUTORECONF=1 |
38 |
AUTOTOOLS_IN_SOURCE_BUILD=1 |
39 |
PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS uk_UA vi zh_CN zh_TW" |
40 |
WX_GTK_VER="3.0" |
41 |
+COMMIT_ID="26fea0e123246b4f122beb54559c8dcd82925071" |
42 |
|
43 |
-inherit autotools-utils fdo-mime flag-o-matic gnome2-utils l10n wxwidgets git-2 |
44 |
+inherit autotools-utils fdo-mime flag-o-matic gnome2-utils l10n wxwidgets vcs-snapshot |
45 |
|
46 |
DESCRIPTION="Advanced subtitle editor" |
47 |
HOMEPAGE="http://www.aegisub.org/" |
48 |
-EGIT_REPO_URI="git://github.com/Aegisub/Aegisub.git" |
49 |
+SRC_URI="https://github.com/Aegisub/Aegisub/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" |
50 |
|
51 |
LICENSE="BSD" |
52 |
SLOT="0" |
53 |
-KEYWORDS="" |
54 |
+KEYWORDS="~amd64 ~x86" |
55 |
IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell +uchardet" |
56 |
|
57 |
# configure.ac specifies minimal versions for some of the dependencies below. |
58 |
@@ -59,7 +60,8 @@ REQUIRED_USE=" |
59 |
# Unfortunately, luabins upstream is dead since 2011. |
60 |
# Thus unbundling luabins is not worth the effort. |
61 |
PATCHES=( |
62 |
- "${FILESDIR}/${PN}-3.2.2-r1-respect-user-compiler-flags.patch" |
63 |
+ "${FILESDIR}/${P}-fix-luajit-unbundling.patch" |
64 |
+ "${FILESDIR}/${P}-respect-user-compiler-flags.patch" |
65 |
) |
66 |
|
67 |
pkg_pretend() { |
68 |
|
69 |
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild |
70 |
index 09c7389..a356fa8 100644 |
71 |
--- a/media-video/aegisub/aegisub-9999.ebuild |
72 |
+++ b/media-video/aegisub/aegisub-9999.ebuild |
73 |
@@ -59,7 +59,8 @@ REQUIRED_USE=" |
74 |
# Unfortunately, luabins upstream is dead since 2011. |
75 |
# Thus unbundling luabins is not worth the effort. |
76 |
PATCHES=( |
77 |
- "${FILESDIR}/${PN}-3.2.2-r1-respect-user-compiler-flags.patch" |
78 |
+ "${FILESDIR}/${PN}-3.2.2_p20160306-fix-luajit-unbundling.patch" |
79 |
+ "${FILESDIR}/${PN}-3.2.2_p20160306-respect-user-compiler-flags.patch" |
80 |
) |
81 |
|
82 |
pkg_pretend() { |
83 |
|
84 |
diff --git a/media-video/aegisub/files/aegisub-3.2.2_p20160306-fix-luajit-unbundling.patch b/media-video/aegisub/files/aegisub-3.2.2_p20160306-fix-luajit-unbundling.patch |
85 |
new file mode 100644 |
86 |
index 0000000..a3649c7 |
87 |
--- /dev/null |
88 |
+++ b/media-video/aegisub/files/aegisub-3.2.2_p20160306-fix-luajit-unbundling.patch |
89 |
@@ -0,0 +1,127 @@ |
90 |
+From 11bd157747ebb855d56d2bc59952a1093cfd9ddc Mon Sep 17 00:00:00 2001 |
91 |
+From: Ilya Tumaykin <itumaykin@×××××.com> |
92 |
+Date: Mon, 7 Mar 2016 11:21:10 +0300 |
93 |
+Subject: Properly separate bundled and system luajit builds |
94 |
+ |
95 |
+Build bundled luajit bits only when using bundled luajit. |
96 |
+Properly set up linker flags when using system luajit. |
97 |
+ |
98 |
+Closes #1904. |
99 |
+ |
100 |
+Bug: http://devel.aegisub.org/ticket/1904 |
101 |
+--- |
102 |
+ Makefile.inc.in | 1 + |
103 |
+ automation/Makefile | 8 +++++++- |
104 |
+ configure.ac | 2 ++ |
105 |
+ header.mk | 5 ++++- |
106 |
+ src/Makefile | 9 +++++++-- |
107 |
+ tools/Makefile | 2 ++ |
108 |
+ 6 files changed, 23 insertions(+), 4 deletions(-) |
109 |
+ |
110 |
+diff --git a/Makefile.inc.in b/Makefile.inc.in |
111 |
+index d8b3f4a..52e4cf6 100644 |
112 |
+--- a/Makefile.inc.in |
113 |
++++ b/Makefile.inc.in |
114 |
+@@ -9,6 +9,7 @@ HAVE_OPENAL = @with_openal@ |
115 |
+ HAVE_OSS = @with_oss@ |
116 |
+ HAVE_PORTAUDIO = @with_portaudio@ |
117 |
+ HAVE_UCHARDET = @with_uchardet@ |
118 |
++SYSTEM_LUAJIT = @with_system_luajit@ |
119 |
+ |
120 |
+ ############## |
121 |
+ # BUILD OUTPUT |
122 |
+diff --git a/automation/Makefile b/automation/Makefile |
123 |
+index 5483dbd..1231aab 100644 |
124 |
+--- a/automation/Makefile |
125 |
++++ b/automation/Makefile |
126 |
+@@ -12,10 +12,16 @@ DATA_AUTOMATION_INSTALLED = $(addprefix $(DESTDIR)$(P_DATA)/automation/, $(DATA_ |
127 |
+ $(DESTDIR)$(P_DATA)/automation/%: $(d)% |
128 |
+ $(MKDIR_INSTALL) |
129 |
+ |
130 |
+-aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a $(LIBS_LUA) |
131 |
++aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a |
132 |
+ aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX) |
133 |
+ aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD) |
134 |
+ |
135 |
++ifeq (no, $(SYSTEM_LUAJIT)) |
136 |
++aegisub-lua_OBJ += $(LIBS_LUA) |
137 |
++else |
138 |
++aegisub-lua_LIBS += $(LIBS_LUA) |
139 |
++endif |
140 |
++ |
141 |
+ PROGRAM += $(d)aegisub-lua |
142 |
+ |
143 |
+ test-automation: $(PROGRAM) |
144 |
+diff --git a/configure.ac b/configure.ac |
145 |
+index 1649efc..7ebe9d8 100644 |
146 |
+--- a/configure.ac |
147 |
++++ b/configure.ac |
148 |
+@@ -429,6 +429,8 @@ AS_IF([test $with_system_luajit = no], |
149 |
+ [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include']) |
150 |
+ AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])]) |
151 |
+ |
152 |
++AC_SUBST(with_system_luajit) |
153 |
++ |
154 |
+ # We also need a Lua binary to run part of the build system |
155 |
+ # Which version doesn't matter as the scripts are portable between them |
156 |
+ AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1]) |
157 |
+diff --git a/header.mk b/header.mk |
158 |
+index 613b38f..a9ce1d7 100644 |
159 |
+--- a/header.mk |
160 |
++++ b/header.mk |
161 |
+@@ -13,7 +13,10 @@ subdirs := \ |
162 |
+ tests \ |
163 |
+ tools \ |
164 |
+ vendor/luabins \ |
165 |
+- vendor/luajit |
166 |
++ |
167 |
++ifeq (no, $(SYSTEM_LUAJIT)) |
168 |
++subdirs += vendor/luajit |
169 |
++endif |
170 |
+ |
171 |
+ subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs))) |
172 |
+ |
173 |
+diff --git a/src/Makefile b/src/Makefile |
174 |
+index 0ee6c84..1a6f015 100644 |
175 |
+--- a/src/Makefile |
176 |
++++ b/src/Makefile |
177 |
+@@ -6,7 +6,7 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui |
178 |
+ $(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_ICU) $(CPPFLAGS_BOOST) |
179 |
+ src_CXXFLAGS := $(CXXFLAGS_WX) |
180 |
+ src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \ |
181 |
+- $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) |
182 |
++ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) |
183 |
+ src_PCH := $(d)agi_pre.h |
184 |
+ src_INSTALLNAME := $(AEGISUB_COMMAND) |
185 |
+ |
186 |
+@@ -111,11 +111,16 @@ src_OBJ := \ |
187 |
+ $(d)video_provider_yuv4mpeg.o \ |
188 |
+ $(d)video_slider.o \ |
189 |
+ $(d)visual_feature.o \ |
190 |
+- $(LIBS_LUA) \ |
191 |
+ $(TOP)lib/libaegisub.a \ |
192 |
+ $(TOP)lib/libluabins.a \ |
193 |
+ $(TOP)lib/libresrc.a \ |
194 |
+ |
195 |
++ifeq (no, $(SYSTEM_LUAJIT)) |
196 |
++src_OBJ += $(LIBS_LUA) |
197 |
++else |
198 |
++src_LIBS += $(LIBS_LUA) |
199 |
++endif |
200 |
++ |
201 |
+ ifeq (yes, $(BUILD_DARWIN)) |
202 |
+ src_OBJ += $(d)font_file_lister_coretext.o |
203 |
+ src_OBJ += $(subst .mm,.o,$(wildcard $(d)osx/*.mm)) |
204 |
+diff --git a/tools/Makefile b/tools/Makefile |
205 |
+index de6166a..e17eaa2 100644 |
206 |
+--- a/tools/Makefile |
207 |
++++ b/tools/Makefile |
208 |
+@@ -12,6 +12,8 @@ repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU) |
209 |
+ |
210 |
+ PROGRAM += $(d)repack-thes-dict |
211 |
+ |
212 |
++ifeq (no, $(SYSTEM_LUAJIT)) |
213 |
+ $(TOP)tools/respack.lua: $(shell command -v "$(BIN_LUA)") |
214 |
++endif |
215 |
+ |
216 |
+ include $(TOP)Makefile.target |
217 |
|
218 |
diff --git a/media-video/aegisub/files/aegisub-3.2.2_p20160306-respect-user-compiler-flags.patch b/media-video/aegisub/files/aegisub-3.2.2_p20160306-respect-user-compiler-flags.patch |
219 |
new file mode 100644 |
220 |
index 0000000..4cd4790 |
221 |
--- /dev/null |
222 |
+++ b/media-video/aegisub/files/aegisub-3.2.2_p20160306-respect-user-compiler-flags.patch |
223 |
@@ -0,0 +1,53 @@ |
224 |
+http://devel.aegisub.org/ticket/1899 |
225 |
+http://devel.aegisub.org/ticket/1900 |
226 |
+ |
227 |
+diff --git a/configure.ac b/configure.ac |
228 |
+index 1649efc..2f4470b 100644 |
229 |
+--- a/configure.ac |
230 |
++++ b/configure.ac |
231 |
+@@ -133,20 +133,17 @@ AS_IF([test x$build_darwin != xyes], [ |
232 |
+ AC_ARG_ENABLE(compiler-flags, AS_HELP_STRING([--disable-compiler-flags],[Disable *all* additional compiler flags. [no]])) |
233 |
+ |
234 |
+ AS_IF([test x$enable_compiler_flags != xno], [ |
235 |
+- CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g" |
236 |
+- CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g" |
237 |
++ CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter" |
238 |
++ CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing" |
239 |
++ AC_C_FLAG([-std=gnu99]) |
240 |
+ AC_CXX_FLAG([-std=c++11]) |
241 |
+- AC_CXX_FLAG([-Wno-c++11-narrowing]) |
242 |
+ AC_C_FLAG([-Wno-unused-local-typedefs]) |
243 |
+ AC_CXX_FLAG([-Wno-unused-local-typedefs]) |
244 |
+ |
245 |
+ # -O* messes with debugging. |
246 |
+ AS_IF([test x$enable_debug = xyes], [ |
247 |
+- CFLAGS="$CFLAGS -O0" |
248 |
+- CXXFLAGS="$CXXFLAGS -O0" |
249 |
+- ], [ |
250 |
+- CFLAGS="$CFLAGS -O3" |
251 |
+- CXXFLAGS="$CXXFLAGS -O3" |
252 |
++ CFLAGS="$CFLAGS -O0 -g" |
253 |
++ CXXFLAGS="$CXXFLAGS -O0 -g" |
254 |
+ ]) |
255 |
+ ]) |
256 |
+ |
257 |
+diff --git a/src/Makefile b/src/Makefile |
258 |
+index 0ee6c84..cad213b 100644 |
259 |
+--- a/src/Makefile |
260 |
++++ b/src/Makefile |
261 |
+@@ -188,14 +188,13 @@ endif |
262 |
+ ##################### |
263 |
+ # SOURCE-LEVEL CFLAGS |
264 |
+ ##################### |
265 |
+-$(d)MatroskaParser.o_FLAGS := -Wno-sometimes-uninitialized |
266 |
+ $(d)audio_player.o_FLAGS := $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL) |
267 |
+ $(d)audio_provider_factory.o_FLAGS := $(CFLAGS_FFMS2) |
268 |
+ $(d)auto4_base.o_FLAGS := $(CFLAGS_FREETYPE) |
269 |
+ $(d)charset_detect.o_FLAGS := -D_X86_ |
270 |
+ $(d)font_file_lister_fontconfig.o_FLAGS := $(CFLAGS_FONTCONFIG) |
271 |
+ $(d)subtitles_provider.o_FLAGS := $(CFLAGS_LIBASS) |
272 |
+-$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) -Wno-c++11-narrowing |
273 |
++$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) |
274 |
+ $(d)text_file_reader.o_FLAGS := -D_X86_ |
275 |
+ $(d)video_provider_manager.o_FLAGS := $(CFLAGS_FFMS2) |
276 |
+ $(d)auto4_lua.o_FLAGS := $(CFLAGS_LUA) |