1 |
commit: f1efe67d2c8cdc8ebbf688b587bd86146a054c60 |
2 |
Author: Jan Seeger <jan.seeger <AT> thenybble <DOT> de> |
3 |
AuthorDate: Mon Aug 3 13:00:08 2020 +0000 |
4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 5 16:09:33 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1efe67d |
7 |
|
8 |
media-video/aegisub-9999: Updated git ebuild. |
9 |
|
10 |
Closes: https://bugs.gentoo.org/734916 |
11 |
Signed-off-by: Jan Seeger <jan.seeger <AT> thenybble.de> |
12 |
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> |
13 |
|
14 |
media-video/aegisub/aegisub-9999.ebuild | 12 ++-- |
15 |
media-video/aegisub/files/aegisub-9999-git.patch | 78 ++++++++++++++++++++++++ |
16 |
2 files changed, 84 insertions(+), 6 deletions(-) |
17 |
|
18 |
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild |
19 |
index 1e6debce1e8..c1f73d3373a 100644 |
20 |
--- a/media-video/aegisub/aegisub-9999.ebuild |
21 |
+++ b/media-video/aegisub/aegisub-9999.ebuild |
22 |
@@ -1,10 +1,10 @@ |
23 |
-# Copyright 1999-2019 Gentoo Authors |
24 |
+# Copyright 1999-2020 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
EAPI=6 |
28 |
|
29 |
WX_GTK_VER=3.0 |
30 |
-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 sr_RS@latin uk_UA vi zh_CN zh_TW" |
31 |
+PLOCALES="ar be 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 sr_RS@latin uk_UA vi zh_CN zh_TW" |
32 |
|
33 |
inherit autotools gnome2-utils l10n wxwidgets xdg-utils git-r3 |
34 |
|
35 |
@@ -52,9 +52,7 @@ DEPEND="${RDEPEND} |
36 |
REQUIRED_USE="|| ( alsa openal oss portaudio pulseaudio )" |
37 |
|
38 |
PATCHES=( |
39 |
- "${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-system-luajit-build.patch" |
40 |
- "${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-respect-compiler-flags.patch" |
41 |
- "${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-boost170-build.patch" |
42 |
+ "${FILESDIR}/${P}-git.patch" |
43 |
) |
44 |
|
45 |
src_prepare() { |
46 |
@@ -94,12 +92,14 @@ src_configure() { |
47 |
$(use_with pulseaudio libpulse) |
48 |
$(use_with spell hunspell) |
49 |
$(use_with uchardet) |
50 |
+ --disable-compiler-flags |
51 |
) |
52 |
econf "${myeconfargs[@]}" |
53 |
} |
54 |
|
55 |
src_compile() { |
56 |
- emake |
57 |
+ # Concurrent builds seem to break the build process. |
58 |
+ emake -j1 |
59 |
} |
60 |
|
61 |
src_test() { |
62 |
|
63 |
diff --git a/media-video/aegisub/files/aegisub-9999-git.patch b/media-video/aegisub/files/aegisub-9999-git.patch |
64 |
new file mode 100644 |
65 |
index 00000000000..80fd243703b |
66 |
--- /dev/null |
67 |
+++ b/media-video/aegisub/files/aegisub-9999-git.patch |
68 |
@@ -0,0 +1,78 @@ |
69 |
+diff --git a/Makefile.target b/Makefile.target |
70 |
+index 516ef3c24..65de0e767 100644 |
71 |
+--- a/Makefile.target |
72 |
++++ b/Makefile.target |
73 |
+@@ -79,13 +79,13 @@ endif |
74 |
+ all: $(LIB_TARGETS) |
75 |
+ |
76 |
+ clean: |
77 |
+- $(BIN_RM) -f $(OBJ) $(CLEANFILES) $(LIB_TARGETS) |
78 |
++ $(BIN_RM) -f -- $(OBJ) $(CLEANFILES) $(LIB_TARGETS) |
79 |
+ |
80 |
+ distclean: clean |
81 |
+- $(BIN_RM) -rf $(DISTCLEANFILES) $(DEP) |
82 |
++ $(BIN_RM) -rf -- $(DISTCLEANFILES) $(DEP) |
83 |
+ |
84 |
+ depclean: clean |
85 |
+- $(BIN_RM) -rf $(DEP) |
86 |
++ $(BIN_RM) -rf -- $(DEP) |
87 |
+ |
88 |
+ install: |
89 |
+ |
90 |
+diff --git a/header.mk b/header.mk |
91 |
+index 613b38ff1..2c238e125 100644 |
92 |
+--- a/header.mk |
93 |
++++ b/header.mk |
94 |
+@@ -5,15 +5,13 @@ TOP := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))/ |
95 |
+ include $(TOP)Makefile.inc |
96 |
+ |
97 |
+ subdirs := \ |
98 |
+- automation \ |
99 |
+ libaegisub \ |
100 |
+ packages/desktop \ |
101 |
+ po \ |
102 |
+ src \ |
103 |
+ tests \ |
104 |
+- tools \ |
105 |
+ vendor/luabins \ |
106 |
+- vendor/luajit |
107 |
++ tools |
108 |
+ |
109 |
+ subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs))) |
110 |
+ |
111 |
+diff --git a/m4macros/ac_agi.m4 b/m4macros/ac_agi.m4 |
112 |
+index e45a54767..1bd0120ed 100644 |
113 |
+--- a/m4macros/ac_agi.m4 |
114 |
++++ b/m4macros/ac_agi.m4 |
115 |
+@@ -20,12 +20,14 @@ AC_DEFUN([AC_AGI_LINK],[ |
116 |
+ aegisub_save_CPPFLAGS="$CPPFLAGS" |
117 |
+ CPPFLAGS="$CPPFLAGS $4" |
118 |
+ LIBS="$LIBS $5" |
119 |
++ AC_LANG_PUSH(C++) |
120 |
+ AC_CHECK_HEADER([$3], [agi_cv_header="yes"], [agi_cv_header="no"]) |
121 |
+ AS_IF([test "x$agi_cv_header" = xyes], |
122 |
+ [AC_CACHE_CHECK( |
123 |
+ [whether $1 works], [agi_cv_with_$2], |
124 |
+ [AC_LINK_IFELSE([AC_LANG_SOURCE([$6])], [eval agi_cv_with_$2="yes"], [eval agi_cv_with_$2="no"])])] |
125 |
+ [eval agi_cv_with_$2="no"]) |
126 |
++ AC_LANG_POP(C++) |
127 |
+ CPPFLAGS="$aegisub_save_CPPFLAGS" |
128 |
+ LIBS="$aegisub_save_LIBS" |
129 |
+ ]) |
130 |
+diff --git a/src/libresrc/libresrc.cpp b/src/libresrc/libresrc.cpp |
131 |
+index 79dc0f16c..8648d2987 100644 |
132 |
+--- a/src/libresrc/libresrc.cpp |
133 |
++++ b/src/libresrc/libresrc.cpp |
134 |
+@@ -22,9 +22,10 @@ |
135 |
+ |
136 |
+ wxBitmap libresrc_getimage(const unsigned char *buff, size_t size, double scale, int dir) { |
137 |
+ wxMemoryInputStream mem(buff, size); |
138 |
++ auto img = wxImage(mem); |
139 |
+ if (dir != wxLayout_RightToLeft) |
140 |
+- return wxBitmap(wxImage(mem), -1, scale); |
141 |
+- return wxBitmap(wxImage(mem).Mirror(), -1, scale); |
142 |
++ return wxBitmap(img.Scale(img.GetHeight() * scale, img.GetWidth() * scale)); |
143 |
++ return wxBitmap(img.Mirror().Scale(img.GetHeight() * scale, img.GetWidth() * scale)); |
144 |
+ } |
145 |
+ |
146 |
+ wxIcon libresrc_geticon(const unsigned char *buff, size_t size) { |