1 |
commit: f87f590afbffa3eb8d347eab9ddb12891197579e |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 19 09:12:52 2021 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 19 22:43:48 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f87f590a |
7 |
|
8 |
media-sound/xmms2: tidy patches, remove unused perl patch |
9 |
|
10 |
Only tidying patches that will still be using, others |
11 |
are due for cleanup. |
12 |
|
13 |
Perl patch was kept in a "need porting" state but |
14 |
perl-core/ExtUtils-ParseXS is gone from the tree and |
15 |
so should the issues it was causing. |
16 |
|
17 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
18 |
|
19 |
media-sound/xmms2/files/xmms2-0.8-rtvg.patch | 5 --- |
20 |
.../files/xmms2-0.8DrO_o-waflib-fix-perl.patch | 27 ----------- |
21 |
.../files/xmms2-0.8_p20161122-cpp-client.patch | 52 ---------------------- |
22 |
.../xmms2/files/xmms2-0.8_p20161122-faad.patch | 2 - |
23 |
.../xmms2/files/xmms2-0.8_p20161122-mac-4.patch | 18 ++------ |
24 |
5 files changed, 3 insertions(+), 101 deletions(-) |
25 |
|
26 |
diff --git a/media-sound/xmms2/files/xmms2-0.8-rtvg.patch b/media-sound/xmms2/files/xmms2-0.8-rtvg.patch |
27 |
index 20be3427388..e0a970c9186 100644 |
28 |
--- a/media-sound/xmms2/files/xmms2-0.8-rtvg.patch |
29 |
+++ b/media-sound/xmms2/files/xmms2-0.8-rtvg.patch |
30 |
@@ -3,10 +3,7 @@ Add knob to disable valgrind at test runtime. |
31 |
When valgrind is installed in system but is not |
32 |
working we should still be able to run tests. |
33 |
|
34 |
-Reported-by: Diego Elio Pettenò |
35 |
Bug: https://bugs.gentoo.org/424377 |
36 |
-diff --git a/waftools/unittest.py b/waftools/unittest.py |
37 |
-index 4317287..6179dfd 100644 |
38 |
--- a/waftools/unittest.py |
39 |
+++ b/waftools/unittest.py |
40 |
@@ -64,7 +64,8 @@ def generate_coverage(bld): |
41 |
@@ -19,8 +16,6 @@ index 4317287..6179dfd 100644 |
42 |
conf.find_program("lcov", var="LCOV", mandatory=False) |
43 |
conf.find_program("genhtml", var="GENHTML", mandatory=False) |
44 |
|
45 |
-diff --git a/wscript b/wscript |
46 |
-index 99c1fa3..a98d5e3 100644 |
47 |
--- a/wscript |
48 |
+++ b/wscript |
49 |
@@ -501,6 +501,10 @@ def options(opt): |
50 |
|
51 |
diff --git a/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch b/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch |
52 |
deleted file mode 100644 |
53 |
index 220e91e6813..00000000000 |
54 |
--- a/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch |
55 |
+++ /dev/null |
56 |
@@ -1,27 +0,0 @@ |
57 |
-Fix build failure when user has non-core xsubpp. |
58 |
- |
59 |
-> Could not find a typemap for C type 'xmmsv_t *' in XMMSClientPlaylist.xs, line 132 |
60 |
-> Undefined subroutine &ExtUtils::ParseXS::errors called at /usr/lib/perl5/5.12.4/ExtUtils/xsubpp line 41. |
61 |
-> Undefined subroutine &ExtUtils::ParseXS::errors called at /usr/lib/perl5/5.12.4/ExtUtils/xsubpp line 41. |
62 |
-> Could not find a typemap for C type 'const unsigned char *' in XMMSClient.xs, line 1179 |
63 |
- |
64 |
-Use xsubpp from @INC instead of bundled one with perl. |
65 |
- |
66 |
-Original bug: https://bugs.gentoo.org/380469 |
67 |
-Related: https://bugs.gentoo.org/378783 |
68 |
-Updated for perl-5.20.2: https://bugs.gentoo.org/578778 |
69 |
-diff --git a/waflib/Tools/perl.py b/waflib/Tools/perl.py |
70 |
-index 2c69fe5..a75b069 100644 |
71 |
---- a/waflib/Tools/perl.py |
72 |
-+++ b/waflib/Tools/perl.py |
73 |
-@@ -60,8 +60,8 @@ def check_perl_ext_devel(self): |
74 |
- env['LINKFLAGS_PERLEXT']=read_out(" -MConfig -e'print $Config{lddlflags}'") |
75 |
- env['INCLUDES_PERLEXT']=read_out(" -MConfig -e'print \"$Config{archlib}/CORE\"'") |
76 |
- env['CFLAGS_PERLEXT']=read_out(" -MConfig -e'print \"$Config{ccflags} $Config{cccdlflags}\"'") |
77 |
-- env['XSUBPP']=read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/xsubpp$Config{exe_ext}\"'") |
78 |
-- env['EXTUTILS_TYPEMAP']=read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/typemap\"'") |
79 |
-+ env["XSUBPP"] = read_out(" -MModule::Metadata -e'print Module::Metadata->find_module_by_name(\"ExtUtils::xsubpp\")'") |
80 |
-+ env["EXTUTILS_TYPEMAP"] = read_out(" -MModule::Metadata -e'print Module::Metadata->find_module_by_name(\"ExtUtils::typemap\")'") |
81 |
- if not getattr(Options.options,'perlarchdir',None): |
82 |
- env['ARCHDIR_PERL']=self.cmd_and_log(perl+" -MConfig -e'print $Config{sitearch}'") |
83 |
- else: |
84 |
|
85 |
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch |
86 |
index cedc87fcc46..df1d1c61657 100644 |
87 |
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch |
88 |
+++ b/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch |
89 |
@@ -1,57 +1,8 @@ |
90 |
https://github.com/xmms2/xmms2-devel/pull/5 |
91 |
|
92 |
-From 82741bf3094c8e0bca8eb1b7f3bc147eeb51ea06 Mon Sep 17 00:00:00 2001 |
93 |
From: Sergei Trofimovich <slyfox@g.o> |
94 |
Date: Thu, 6 Dec 2018 07:19:08 +0000 |
95 |
Subject: [PATCH] OTHER: fix c++ client dangling reference |
96 |
- |
97 |
-On #xmm2 Chewi reported c++/tut7 to be broken at start: |
98 |
- |
99 |
-``` |
100 |
-GLib-WARNING **: glib-2.56.2/glib/giounix.c:410 |
101 |
-Error while getting flags for FD: Bad file descriptor (9) |
102 |
-``` |
103 |
- |
104 |
-valgrind shows the problem as read of uninitialized data: |
105 |
- |
106 |
-``` |
107 |
-$ valgrind ./tut7 |
108 |
- |
109 |
-==32268== Conditional jump or move depends on uninitialised value(s) |
110 |
-==32268== at 0x49DC36B: xmmsc_mainloop_gmain_init (xmmsclient-glib.c:80) |
111 |
-==32268== by 0x49E11BE: Xmms::GMainloop::GMainloop(xmmsc_connection_St*) (xmmsclient++-glib.cpp:11) |
112 |
-==32268== by 0x10C64D: main (in /home/slyfox/dev/git/xmms2-devel/doc/tutorial/c++/tut7) |
113 |
-==32268== Uninitialised value was created by a stack allocation |
114 |
-==32268== at 0x49E119A: Xmms::GMainloop::GMainloop(xmmsc_connection_St*) (xmmsclient++-glib.cpp:8) |
115 |
-``` |
116 |
- |
117 |
-This happens due to use of dangling C++ reference to stack variable: |
118 |
- |
119 |
-``` |
120 |
-// somewhere in src/include/xmmsclient/xmmsclient++/mainloop.h |
121 |
-class MainloopInterface { |
122 |
- MainloopInterface( xmmsc_connection_t* conn ) : |
123 |
- running_( false ), conn_( conn ) { } |
124 |
- protected: |
125 |
- bool running_; |
126 |
- xmmsc_connection_t*& conn_; |
127 |
-} |
128 |
-``` |
129 |
- |
130 |
-Note: `conn_` refers to dangling local variable of |
131 |
-`MainloopInterface::MainloopInterface` constructor. |
132 |
- |
133 |
-The fix is to pass through pointer reference. |
134 |
-`MainLoop::MainLoop()` already does it. |
135 |
- |
136 |
-Reported-by: James Le Cuirot |
137 |
-Signed-off-by: Sergei Trofimovich <slyfox@g.o> |
138 |
---- |
139 |
- src/include/xmmsclient/xmmsclient++/mainloop.h | 2 +- |
140 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
141 |
- |
142 |
-diff --git a/src/include/xmmsclient/xmmsclient++/mainloop.h b/src/include/xmmsclient/xmmsclient++/mainloop.h |
143 |
-index de97e20d..268ca6f7 100644 |
144 |
--- a/src/include/xmmsclient/xmmsclient++/mainloop.h |
145 |
+++ b/src/include/xmmsclient/xmmsclient++/mainloop.h |
146 |
@@ -41,7 +41,7 @@ namespace Xmms |
147 |
@@ -63,6 +14,3 @@ index de97e20d..268ca6f7 100644 |
148 |
running_( false ), conn_( conn ) { } |
149 |
|
150 |
/** Destructor. Should also stop the loop. |
151 |
--- |
152 |
-2.19.2 |
153 |
- |
154 |
|
155 |
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch |
156 |
index 00aa5d77082..2a206b913fe 100644 |
157 |
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch |
158 |
+++ b/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch |
159 |
@@ -4,8 +4,6 @@ it. I've run XMMS2 with this patch for months without issue. |
160 |
|
161 |
-- Chewi |
162 |
|
163 |
-diff --git a/src/plugins/faad/faad.c b/src/plugins/faad/faad.c |
164 |
-index 50835d27..7074e1b5 100644 |
165 |
--- a/src/plugins/faad/faad.c |
166 |
+++ b/src/plugins/faad/faad.c |
167 |
@@ -242,7 +242,6 @@ xmms_faad_init (xmms_xform_t *xform) |
168 |
|
169 |
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch |
170 |
index df3e4d2af85..9785b4198d5 100644 |
171 |
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch |
172 |
+++ b/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch |
173 |
@@ -1,15 +1,8 @@ |
174 |
-From e87745721deaf46d7054ac40cc55838561c9f552 Mon Sep 17 00:00:00 2001 |
175 |
-From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Carretero?= <cJ@××××××××.eu> |
176 |
+https://github.com/xmms2/xmms2-devel/pull/2 |
177 |
+ |
178 |
+From: Jérôme Carretero <cJ@××××××××.eu> |
179 |
Date: Tue, 24 Oct 2017 18:43:26 -0400 |
180 |
Subject: [PATCH] plugins: mac: support newer mac API version |
181 |
- |
182 |
---- |
183 |
- src/plugins/mac/mac.cpp | 6 +++++- |
184 |
- src/plugins/mac/source_adapter.h | 8 +++++++- |
185 |
- 2 files changed, 12 insertions(+), 2 deletions(-) |
186 |
- |
187 |
-diff --git a/src/plugins/mac/mac.cpp b/src/plugins/mac/mac.cpp |
188 |
-index cec43e52..d8d3d1b9 100644 |
189 |
--- a/src/plugins/mac/mac.cpp |
190 |
+++ b/src/plugins/mac/mac.cpp |
191 |
@@ -210,8 +210,12 @@ xmms_mac_get_media_info (xmms_xform_t *xform) |
192 |
@@ -26,8 +19,6 @@ index cec43e52..d8d3d1b9 100644 |
193 |
memset (field_value, 0, 255); |
194 |
int size = 255; |
195 |
p_ape_tag->GetFieldString (field_name, (char *)field_value, &size, TRUE); |
196 |
-diff --git a/src/plugins/mac/source_adapter.h b/src/plugins/mac/source_adapter.h |
197 |
-index 94f75359..70617514 100644 |
198 |
--- a/src/plugins/mac/source_adapter.h |
199 |
+++ b/src/plugins/mac/source_adapter.h |
200 |
@@ -38,7 +38,13 @@ public: |
201 |
@@ -45,6 +36,3 @@ index 94f75359..70617514 100644 |
202 |
int Close () { return ERROR_SUCCESS; } |
203 |
|
204 |
// read / write |
205 |
--- |
206 |
-2.15.0 |
207 |
- |