1 |
commit: 6c5374319debcf20472f938d7c3e55fa2d2ea742 |
2 |
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 2 16:35:09 2021 +0000 |
4 |
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 2 16:36:19 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c537431 |
7 |
|
8 |
media-plugins/vdr-mplayer: tc-directly call fixed |
9 |
|
10 |
some minor clang warnings fixed |
11 |
|
12 |
Closes: https://bugs.gentoo.org/787557 |
13 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
14 |
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org> |
15 |
|
16 |
.../files/vdr-mplayer-0.10.2_tc-directly.patch | 52 ++++++++++++++++++++++ |
17 |
...-0.10.2.ebuild => vdr-mplayer-0.10.2-r1.ebuild} | 3 ++ |
18 |
2 files changed, 55 insertions(+) |
19 |
|
20 |
diff --git a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.10.2_tc-directly.patch b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.10.2_tc-directly.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..67a97c7f6ac |
23 |
--- /dev/null |
24 |
+++ b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.10.2_tc-directly.patch |
25 |
@@ -0,0 +1,52 @@ |
26 |
+https://bugs.gentoo.org/787557 |
27 |
+ |
28 |
+fixed call g++ directly fixed |
29 |
+some minor clang warnings fixed |
30 |
+ |
31 |
+Signed-off-by: Joerg Bornkessel <hd_brummy@g.o> (02 Mar 2021) |
32 |
+diff -Naur mp3-0.10.2.orig/Makefile mp3-0.10.2/Makefile |
33 |
+--- mp3-0.10.2.orig/Makefile 2021-05-02 16:13:39.489653108 +0200 |
34 |
++++ mp3-0.10.2/Makefile 2021-05-02 16:13:55.695653108 +0200 |
35 |
+@@ -179,7 +179,7 @@ |
36 |
+ |
37 |
+ # Dependencies: |
38 |
+ |
39 |
+-MAKEDEP = g++ -MM -MG |
40 |
++MAKEDEP = $(CXX) -MM -MG |
41 |
+ DEPFILE = .dependencies |
42 |
+ DEPFILES = $(subst i18n.c,,$(subst version.c,,$(OBJS:%.o=%.c) $(OBJS2:%.o=%.c))) |
43 |
+ $(DEPFILE): Makefile $(DEPFILES) $(wildcard *.h) |
44 |
+diff -Naur mp3-0.10.2.orig/data-mp3.c mp3-0.10.2/data-mp3.c |
45 |
+--- mp3-0.10.2.orig/data-mp3.c 2021-05-02 16:13:39.490653108 +0200 |
46 |
++++ mp3-0.10.2/data-mp3.c 2021-05-02 16:14:18.543653108 +0200 |
47 |
+@@ -43,7 +43,7 @@ |
48 |
+ // image suffixes to search |
49 |
+ const char *img_suff[] = { "jpg","png","gif",0 }; |
50 |
+ // exclude list for instant playlist creation |
51 |
+-const char *excl_pl[] = { "*"PLAYLISTEXT,"*.jpg","*.gif","*.png",0 }; |
52 |
++const char *excl_pl[] = { "*" PLAYLISTEXT,"*.jpg","*.gif","*.png",0 }; |
53 |
+ // exclude list for song browser |
54 |
+ const char *excl_br[] = { ".*","*.jpg","*.gif","*.png",0 }; |
55 |
+ |
56 |
+@@ -550,7 +550,7 @@ |
57 |
+ |
58 |
+ bool cPlayLists::Load(cFileSource *Source) |
59 |
+ { |
60 |
+- static const char *spec[] = { "*"PLAYLISTEXT,0 }; |
61 |
++ static const char *spec[] = { "*" PLAYLISTEXT,0 }; |
62 |
+ Clear(); |
63 |
+ bool res=ScanDir(Source,0,stFile,spec,0,false); |
64 |
+ Sort(); |
65 |
+diff -Naur mp3-0.10.2.orig/data.c mp3-0.10.2/data.c |
66 |
+--- mp3-0.10.2.orig/data.c 2021-05-02 16:13:39.490653108 +0200 |
67 |
++++ mp3-0.10.2/data.c 2021-05-02 16:14:27.279653108 +0200 |
68 |
+@@ -89,7 +89,8 @@ |
69 |
+ va_list ap; |
70 |
+ va_start(ap,fmt); |
71 |
+ char *str=0; |
72 |
+- if(vasprintf(&str,fmt,ap)<0); |
73 |
++ if(vasprintf(&str,fmt,ap)<0) |
74 |
++ ; |
75 |
+ va_end(ap); |
76 |
+ return str; |
77 |
+ } |
78 |
|
79 |
diff --git a/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2.ebuild b/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2-r1.ebuild |
80 |
similarity index 96% |
81 |
rename from media-plugins/vdr-mplayer/vdr-mplayer-0.10.2.ebuild |
82 |
rename to media-plugins/vdr-mplayer/vdr-mplayer-0.10.2-r1.ebuild |
83 |
index 306995560a5..9f8ce981fa0 100644 |
84 |
--- a/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2.ebuild |
85 |
+++ b/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2-r1.ebuild |
86 |
@@ -35,6 +35,9 @@ src_prepare() { |
87 |
-i decoder.c \ |
88 |
-i player-mplayer.c |
89 |
fi |
90 |
+ |
91 |
+ # bug 787557 |
92 |
+ eapply "${FILESDIR}/${P}_tc-directly.patch" |
93 |
} |
94 |
|
95 |
src_install() { |