1 |
commit: 88dd32ed15fabd7a46dbfa06524620952b0b9200 |
2 |
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Jun 4 18:15:22 2016 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 28 17:38:38 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88dd32ed |
7 |
|
8 |
media-video/aegisub: remove old |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/1781 |
11 |
Package-Manager: portage-2.3.0_rc1 |
12 |
|
13 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
14 |
|
15 |
media-video/aegisub/Manifest | 1 - |
16 |
media-video/aegisub/aegisub-3.2.2_p20160306.ebuild | 126 -------------------- |
17 |
...sub-3.2.2_p20160306-fix-luajit-unbundling.patch | 127 --------------------- |
18 |
...2.2_p20160306-respect-user-compiler-flags.patch | 53 --------- |
19 |
4 files changed, 307 deletions(-) |
20 |
|
21 |
diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest |
22 |
index 2db679d..dc56fe5 100644 |
23 |
--- a/media-video/aegisub/Manifest |
24 |
+++ b/media-video/aegisub/Manifest |
25 |
@@ -1,3 +1,2 @@ |
26 |
DIST aegisub-3.2.2.tar.xz 5252052 SHA256 c55e33945b82d8513c02ea6e782f0d72c726adcd3707e95b8c0022f6151e6885 SHA512 54f825e52f238fef8d5cc31c37436e21355aee27883347f905271e5d2a8ff2a77e1b67d5aef38b0f8468bd0bad851fe944e02de27ec96310b902fbe5b1086722 WHIRLPOOL fe948edbb01f11385e14d1912b73942605df18325fcd95f4284a3c2edb73778d90d73038ac4a062e211fd56879590040e3c558fe1e361ec9fe2eee6a5c016448 |
27 |
-DIST aegisub-3.2.2_p20160306.tar.gz 7436713 SHA256 1b70f67c3b3d6ecce482bc1f4beb1ceffd4c523aa060556658e403ea98fcc58c SHA512 815775b64b1ad5cd09eda6106561a8a0d4dc129d4c2e08e057eab881289526a7b67bab2f4d2f48748ef2015ea21f2839ed8f84d168bf9127c62c9a35caa1abd5 WHIRLPOOL caaa6b1d69c7e4d1da4abfd0382d263585c5216d9ed5e63f515d8bce98b2e0dad2848552f3f097a8db9e39dad5d2c00d3b752f0407490d0d2c777aaa8fc6dc38 |
28 |
DIST aegisub-3.2.2_p20160518.tar.gz 7438734 SHA256 744318ce8be1afb21fbd6b0ce6d407a6f42c442db0df10c7cf89692a5bc8ca31 SHA512 8d8775ba0a12735a9756b9abfd65c89519dae4e21afcaedbd18985d1c1021975b1ae909b3bef1121b707c626e1711d56f1823f3b4746eab49e8386536a5e84e6 WHIRLPOOL 0d46799009c72cac1d6df89f4ffe5110d904e671175380e20605683b6a2f3ccdd46855cf98ebac8f0088c7a928b82547557afc8214b2fce85aed759aa5e9e4ab |
29 |
|
30 |
diff --git a/media-video/aegisub/aegisub-3.2.2_p20160306.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160306.ebuild |
31 |
deleted file mode 100644 |
32 |
index ef73e9d..0000000 |
33 |
--- a/media-video/aegisub/aegisub-3.2.2_p20160306.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,126 +0,0 @@ |
36 |
-# Copyright 1999-2016 Gentoo Foundation |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
-# $Id$ |
39 |
- |
40 |
-EAPI=5 |
41 |
- |
42 |
-AUTOTOOLS_AUTORECONF=1 |
43 |
-AUTOTOOLS_IN_SOURCE_BUILD=1 |
44 |
-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" |
45 |
-WX_GTK_VER="3.0" |
46 |
-COMMIT_ID="26fea0e123246b4f122beb54559c8dcd82925071" |
47 |
- |
48 |
-inherit autotools-utils fdo-mime flag-o-matic gnome2-utils l10n wxwidgets vcs-snapshot |
49 |
- |
50 |
-DESCRIPTION="Advanced subtitle editor" |
51 |
-HOMEPAGE="http://www.aegisub.org/" |
52 |
-SRC_URI="https://github.com/Aegisub/Aegisub/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" |
53 |
- |
54 |
-LICENSE="BSD" |
55 |
-SLOT="0" |
56 |
-KEYWORDS="~amd64 ~x86" |
57 |
-IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell +uchardet" |
58 |
- |
59 |
-# configure.ac specifies minimal versions for some of the dependencies below. |
60 |
-# However, most of these minimal versions date back to 2006-2012 yy. |
61 |
-# Such version specifiers are meaningless nowadays, so they are omitted. |
62 |
-# |
63 |
-# aegisub bundles luabins (https://github.com/agladysh/luabins). |
64 |
-# Unfortunately, luabins upstream is practically dead since 2010. |
65 |
-# Thus unbundling luabins is not worth the effort. |
66 |
-RDEPEND=" |
67 |
- dev-lang/luajit:2[lua52compat] |
68 |
- dev-libs/boost:=[icu,nls,threads] |
69 |
- dev-libs/icu:= |
70 |
- media-libs/fontconfig |
71 |
- media-libs/freetype |
72 |
- media-libs/libass:=[fontconfig] |
73 |
- virtual/libiconv |
74 |
- virtual/opengl |
75 |
- x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,debug?] |
76 |
- |
77 |
- alsa? ( media-libs/alsa-lib ) |
78 |
- openal? ( media-libs/openal ) |
79 |
- portaudio? ( =media-libs/portaudio-19* ) |
80 |
- pulseaudio? ( media-sound/pulseaudio ) |
81 |
- |
82 |
- ffmpeg? ( media-libs/ffmpegsource:= ) |
83 |
- fftw? ( >=sci-libs/fftw-3.3:= ) |
84 |
- |
85 |
- spell? ( app-text/hunspell ) |
86 |
- uchardet? ( dev-libs/uchardet ) |
87 |
-" |
88 |
-DEPEND="${RDEPEND} |
89 |
- oss? ( virtual/os-headers ) |
90 |
- dev-util/intltool |
91 |
- sys-devel/gettext |
92 |
- virtual/pkgconfig |
93 |
-" |
94 |
-REQUIRED_USE=" |
95 |
- || ( alsa openal oss portaudio pulseaudio ) |
96 |
-" |
97 |
- |
98 |
-PATCHES=( |
99 |
- "${FILESDIR}/${P}-fix-luajit-unbundling.patch" |
100 |
- "${FILESDIR}/${P}-respect-user-compiler-flags.patch" |
101 |
-) |
102 |
- |
103 |
-pkg_pretend() { |
104 |
- if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then |
105 |
- die "Your compiler lacks C++11 support. Use GCC>=4.7.0 or Clang>=3.3." |
106 |
- fi |
107 |
-} |
108 |
- |
109 |
-src_prepare() { |
110 |
- remove_locale() { |
111 |
- rm "po/${1}.po" || die |
112 |
- } |
113 |
- |
114 |
- l10n_find_plocales_changes 'po' '' '.po' |
115 |
- l10n_for_each_disabled_locale_do remove_locale |
116 |
- |
117 |
- # See http://devel.aegisub.org/ticket/1914 |
118 |
- config_rpath_update "${S}/config.rpath" |
119 |
- |
120 |
- autotools-utils_src_prepare |
121 |
- |
122 |
- cat <<- EOF > "${S}/build/git_version.h" || die |
123 |
- #define BUILD_GIT_VERSION_NUMBER 8880 |
124 |
- #define BUILD_GIT_VERSION_STRING "${PV}" |
125 |
- #define TAGGED_RELEASE 0 |
126 |
- EOF |
127 |
-} |
128 |
- |
129 |
-src_configure() { |
130 |
- # Prevent sandbox violation from OpenAL detection. Gentoo bug #508184. |
131 |
- use openal && export agi_cv_with_openal="yes" |
132 |
- local myeconfargs=( |
133 |
- --disable-update-checker |
134 |
- --with-system-luajit |
135 |
- $(use_enable debug) |
136 |
- $(use_with alsa) |
137 |
- $(use_with ffmpeg ffms2) |
138 |
- $(use_with fftw fftw3) |
139 |
- $(use_with openal) |
140 |
- $(use_with oss) |
141 |
- $(use_with portaudio) |
142 |
- $(use_with pulseaudio libpulse) |
143 |
- $(use_with spell hunspell) |
144 |
- $(use_with uchardet) |
145 |
- ) |
146 |
- autotools-utils_src_configure |
147 |
-} |
148 |
- |
149 |
-pkg_preinst() { |
150 |
- gnome2_icon_savelist |
151 |
-} |
152 |
- |
153 |
-pkg_postinst() { |
154 |
- fdo-mime_desktop_database_update |
155 |
- gnome2_icon_cache_update |
156 |
-} |
157 |
- |
158 |
-pkg_postrm() { |
159 |
- fdo-mime_desktop_database_update |
160 |
- gnome2_icon_cache_update |
161 |
-} |
162 |
|
163 |
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 |
164 |
deleted file mode 100644 |
165 |
index a3649c7..0000000 |
166 |
--- a/media-video/aegisub/files/aegisub-3.2.2_p20160306-fix-luajit-unbundling.patch |
167 |
+++ /dev/null |
168 |
@@ -1,127 +0,0 @@ |
169 |
-From 11bd157747ebb855d56d2bc59952a1093cfd9ddc Mon Sep 17 00:00:00 2001 |
170 |
-From: Ilya Tumaykin <itumaykin@×××××.com> |
171 |
-Date: Mon, 7 Mar 2016 11:21:10 +0300 |
172 |
-Subject: Properly separate bundled and system luajit builds |
173 |
- |
174 |
-Build bundled luajit bits only when using bundled luajit. |
175 |
-Properly set up linker flags when using system luajit. |
176 |
- |
177 |
-Closes #1904. |
178 |
- |
179 |
-Bug: http://devel.aegisub.org/ticket/1904 |
180 |
---- |
181 |
- Makefile.inc.in | 1 + |
182 |
- automation/Makefile | 8 +++++++- |
183 |
- configure.ac | 2 ++ |
184 |
- header.mk | 5 ++++- |
185 |
- src/Makefile | 9 +++++++-- |
186 |
- tools/Makefile | 2 ++ |
187 |
- 6 files changed, 23 insertions(+), 4 deletions(-) |
188 |
- |
189 |
-diff --git a/Makefile.inc.in b/Makefile.inc.in |
190 |
-index d8b3f4a..52e4cf6 100644 |
191 |
---- a/Makefile.inc.in |
192 |
-+++ b/Makefile.inc.in |
193 |
-@@ -9,6 +9,7 @@ HAVE_OPENAL = @with_openal@ |
194 |
- HAVE_OSS = @with_oss@ |
195 |
- HAVE_PORTAUDIO = @with_portaudio@ |
196 |
- HAVE_UCHARDET = @with_uchardet@ |
197 |
-+SYSTEM_LUAJIT = @with_system_luajit@ |
198 |
- |
199 |
- ############## |
200 |
- # BUILD OUTPUT |
201 |
-diff --git a/automation/Makefile b/automation/Makefile |
202 |
-index 5483dbd..1231aab 100644 |
203 |
---- a/automation/Makefile |
204 |
-+++ b/automation/Makefile |
205 |
-@@ -12,10 +12,16 @@ DATA_AUTOMATION_INSTALLED = $(addprefix $(DESTDIR)$(P_DATA)/automation/, $(DATA_ |
206 |
- $(DESTDIR)$(P_DATA)/automation/%: $(d)% |
207 |
- $(MKDIR_INSTALL) |
208 |
- |
209 |
--aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a $(LIBS_LUA) |
210 |
-+aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a |
211 |
- aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX) |
212 |
- aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD) |
213 |
- |
214 |
-+ifeq (no, $(SYSTEM_LUAJIT)) |
215 |
-+aegisub-lua_OBJ += $(LIBS_LUA) |
216 |
-+else |
217 |
-+aegisub-lua_LIBS += $(LIBS_LUA) |
218 |
-+endif |
219 |
-+ |
220 |
- PROGRAM += $(d)aegisub-lua |
221 |
- |
222 |
- test-automation: $(PROGRAM) |
223 |
-diff --git a/configure.ac b/configure.ac |
224 |
-index 1649efc..7ebe9d8 100644 |
225 |
---- a/configure.ac |
226 |
-+++ b/configure.ac |
227 |
-@@ -429,6 +429,8 @@ AS_IF([test $with_system_luajit = no], |
228 |
- [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include']) |
229 |
- AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])]) |
230 |
- |
231 |
-+AC_SUBST(with_system_luajit) |
232 |
-+ |
233 |
- # We also need a Lua binary to run part of the build system |
234 |
- # Which version doesn't matter as the scripts are portable between them |
235 |
- AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1]) |
236 |
-diff --git a/header.mk b/header.mk |
237 |
-index 613b38f..a9ce1d7 100644 |
238 |
---- a/header.mk |
239 |
-+++ b/header.mk |
240 |
-@@ -13,7 +13,10 @@ subdirs := \ |
241 |
- tests \ |
242 |
- tools \ |
243 |
- vendor/luabins \ |
244 |
-- vendor/luajit |
245 |
-+ |
246 |
-+ifeq (no, $(SYSTEM_LUAJIT)) |
247 |
-+subdirs += vendor/luajit |
248 |
-+endif |
249 |
- |
250 |
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs))) |
251 |
- |
252 |
-diff --git a/src/Makefile b/src/Makefile |
253 |
-index 0ee6c84..1a6f015 100644 |
254 |
---- a/src/Makefile |
255 |
-+++ b/src/Makefile |
256 |
-@@ -6,7 +6,7 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui |
257 |
- $(CFLAGS_PTHREAD) $(CFLAGS_FFTW3) $(CFLAGS_ICU) $(CPPFLAGS_BOOST) |
258 |
- src_CXXFLAGS := $(CXXFLAGS_WX) |
259 |
- src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \ |
260 |
-- $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) |
261 |
-+ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) |
262 |
- src_PCH := $(d)agi_pre.h |
263 |
- src_INSTALLNAME := $(AEGISUB_COMMAND) |
264 |
- |
265 |
-@@ -111,11 +111,16 @@ src_OBJ := \ |
266 |
- $(d)video_provider_yuv4mpeg.o \ |
267 |
- $(d)video_slider.o \ |
268 |
- $(d)visual_feature.o \ |
269 |
-- $(LIBS_LUA) \ |
270 |
- $(TOP)lib/libaegisub.a \ |
271 |
- $(TOP)lib/libluabins.a \ |
272 |
- $(TOP)lib/libresrc.a \ |
273 |
- |
274 |
-+ifeq (no, $(SYSTEM_LUAJIT)) |
275 |
-+src_OBJ += $(LIBS_LUA) |
276 |
-+else |
277 |
-+src_LIBS += $(LIBS_LUA) |
278 |
-+endif |
279 |
-+ |
280 |
- ifeq (yes, $(BUILD_DARWIN)) |
281 |
- src_OBJ += $(d)font_file_lister_coretext.o |
282 |
- src_OBJ += $(subst .mm,.o,$(wildcard $(d)osx/*.mm)) |
283 |
-diff --git a/tools/Makefile b/tools/Makefile |
284 |
-index de6166a..e17eaa2 100644 |
285 |
---- a/tools/Makefile |
286 |
-+++ b/tools/Makefile |
287 |
-@@ -12,6 +12,8 @@ repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU) |
288 |
- |
289 |
- PROGRAM += $(d)repack-thes-dict |
290 |
- |
291 |
-+ifeq (no, $(SYSTEM_LUAJIT)) |
292 |
- $(TOP)tools/respack.lua: $(shell command -v "$(BIN_LUA)") |
293 |
-+endif |
294 |
- |
295 |
- include $(TOP)Makefile.target |
296 |
|
297 |
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 |
298 |
deleted file mode 100644 |
299 |
index 4cd4790..0000000 |
300 |
--- a/media-video/aegisub/files/aegisub-3.2.2_p20160306-respect-user-compiler-flags.patch |
301 |
+++ /dev/null |
302 |
@@ -1,53 +0,0 @@ |
303 |
-http://devel.aegisub.org/ticket/1899 |
304 |
-http://devel.aegisub.org/ticket/1900 |
305 |
- |
306 |
-diff --git a/configure.ac b/configure.ac |
307 |
-index 1649efc..2f4470b 100644 |
308 |
---- a/configure.ac |
309 |
-+++ b/configure.ac |
310 |
-@@ -133,20 +133,17 @@ AS_IF([test x$build_darwin != xyes], [ |
311 |
- AC_ARG_ENABLE(compiler-flags, AS_HELP_STRING([--disable-compiler-flags],[Disable *all* additional compiler flags. [no]])) |
312 |
- |
313 |
- AS_IF([test x$enable_compiler_flags != xno], [ |
314 |
-- CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g" |
315 |
-- CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g" |
316 |
-+ CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter" |
317 |
-+ CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing" |
318 |
-+ AC_C_FLAG([-std=gnu99]) |
319 |
- AC_CXX_FLAG([-std=c++11]) |
320 |
-- AC_CXX_FLAG([-Wno-c++11-narrowing]) |
321 |
- AC_C_FLAG([-Wno-unused-local-typedefs]) |
322 |
- AC_CXX_FLAG([-Wno-unused-local-typedefs]) |
323 |
- |
324 |
- # -O* messes with debugging. |
325 |
- AS_IF([test x$enable_debug = xyes], [ |
326 |
-- CFLAGS="$CFLAGS -O0" |
327 |
-- CXXFLAGS="$CXXFLAGS -O0" |
328 |
-- ], [ |
329 |
-- CFLAGS="$CFLAGS -O3" |
330 |
-- CXXFLAGS="$CXXFLAGS -O3" |
331 |
-+ CFLAGS="$CFLAGS -O0 -g" |
332 |
-+ CXXFLAGS="$CXXFLAGS -O0 -g" |
333 |
- ]) |
334 |
- ]) |
335 |
- |
336 |
-diff --git a/src/Makefile b/src/Makefile |
337 |
-index 0ee6c84..cad213b 100644 |
338 |
---- a/src/Makefile |
339 |
-+++ b/src/Makefile |
340 |
-@@ -188,14 +188,13 @@ endif |
341 |
- ##################### |
342 |
- # SOURCE-LEVEL CFLAGS |
343 |
- ##################### |
344 |
--$(d)MatroskaParser.o_FLAGS := -Wno-sometimes-uninitialized |
345 |
- $(d)audio_player.o_FLAGS := $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL) |
346 |
- $(d)audio_provider_factory.o_FLAGS := $(CFLAGS_FFMS2) |
347 |
- $(d)auto4_base.o_FLAGS := $(CFLAGS_FREETYPE) |
348 |
- $(d)charset_detect.o_FLAGS := -D_X86_ |
349 |
- $(d)font_file_lister_fontconfig.o_FLAGS := $(CFLAGS_FONTCONFIG) |
350 |
- $(d)subtitles_provider.o_FLAGS := $(CFLAGS_LIBASS) |
351 |
--$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) -Wno-c++11-narrowing |
352 |
-+$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) |
353 |
- $(d)text_file_reader.o_FLAGS := -D_X86_ |
354 |
- $(d)video_provider_manager.o_FLAGS := $(CFLAGS_FFMS2) |
355 |
- $(d)auto4_lua.o_FLAGS := $(CFLAGS_LUA) |