Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/dvdauthor/files: dvdauthor-0.7.1-glibc220.patch
Date: Fri, 06 Feb 2015 10:09:23
Message-Id: 20150206100920.299A5112BE@oystercatcher.gentoo.org
1 aballier 15/02/06 10:09:20
2
3 Added: dvdauthor-0.7.1-glibc220.patch
4 Log:
5 fix build with glibc 2.20, patch from upstream, bug #529162
6
7 Signed-off-by: aballier@g.o
8 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
9
10 Revision Changes Path
11 1.1 media-video/dvdauthor/files/dvdauthor-0.7.1-glibc220.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/dvdauthor/files/dvdauthor-0.7.1-glibc220.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/dvdauthor/files/dvdauthor-0.7.1-glibc220.patch?rev=1.1&content-type=text/plain
15
16 Index: dvdauthor-0.7.1-glibc220.patch
17 ===================================================================
18 From 5b890b47aaf6f692c876faf435e6bf8990e7a45d Mon Sep 17 00:00:00 2001
19 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@×××.fi>
20 Date: Sat, 19 Jul 2014 21:06:58 +0300
21 Subject: [PATCH] compat.h needs stuff from config.h so include it there
22
23 This was brought up by dvdvml.* not including it and thus causing a
24 build failure on Fedora (22) devel. While at it, uninclude config.h
25 from files where it was included just for compat.h reasons.
26 ---
27 src/compat.h | 2 ++
28 src/conffile.c | 1 -
29 src/dvdauthor.c | 2 --
30 src/dvdcompile.c | 2 --
31 src/dvdpgc.c | 1 -
32 src/dvdunauthor.c | 2 --
33 src/dvduncompile.c | 1 -
34 src/dvdvob.c | 2 --
35 src/readxml.c | 2 --
36 src/spuunmux.c | 1 -
37 src/subgen-encode.c | 2 --
38 11 files changed, 2 insertions(+), 16 deletions(-)
39
40 diff --git a/src/compat.h b/src/compat.h
41 index 126dcd7..93de081 100644
42 --- a/src/compat.h
43 +++ b/src/compat.h
44 @@ -1,6 +1,8 @@
45 // basic headers
46 #define _GNU_SOURCE /* really just for strndup */
47
48 +#include "config.h"
49 +
50 #ifdef HAVE_STDBOOL_H
51 # include <stdbool.h>
52 #else
53 diff --git a/src/conffile.c b/src/conffile.c
54 index cab661a..36ded07 100644
55 --- a/src/conffile.c
56 +++ b/src/conffile.c
57 @@ -21,7 +21,6 @@
58 * MA 02110-1301 USA.
59 */
60
61 -#include "config.h"
62 #include "compat.h"
63 #include <errno.h>
64 #include "conffile.h"
65 diff --git a/src/dvdauthor.c b/src/dvdauthor.c
66 index d591d68..4860258 100644
67 --- a/src/dvdauthor.c
68 +++ b/src/dvdauthor.c
69 @@ -20,8 +20,6 @@
70 * MA 02110-1301 USA.
71 */
72
73 -#include "config.h"
74 -
75 #include "compat.h"
76
77 #include <sys/types.h>
78 diff --git a/src/dvdcompile.c b/src/dvdcompile.c
79 index fd232b6..47f13e5 100644
80 --- a/src/dvdcompile.c
81 +++ b/src/dvdcompile.c
82 @@ -20,8 +20,6 @@
83 * MA 02110-1301 USA.
84 */
85
86 -#include "config.h"
87 -
88 #include "compat.h"
89 #include <assert.h>
90
91 diff --git a/src/dvdpgc.c b/src/dvdpgc.c
92 index e0adc61..cf6eb04 100644
93 --- a/src/dvdpgc.c
94 +++ b/src/dvdpgc.c
95 @@ -20,7 +20,6 @@
96 * MA 02110-1301 USA.
97 */
98
99 -#include "config.h"
100 #include "compat.h"
101 #include <errno.h>
102 #include <assert.h>
103 diff --git a/src/dvdunauthor.c b/src/dvdunauthor.c
104 index ccd422f..f988cdf 100644
105 --- a/src/dvdunauthor.c
106 +++ b/src/dvdunauthor.c
107 @@ -23,8 +23,6 @@
108 * MA 02110-1301 USA.
109 */
110
111 -#include "config.h"
112 -
113 #include "compat.h"
114
115 #include <ctype.h>
116 diff --git a/src/dvduncompile.c b/src/dvduncompile.c
117 index 0c5eaf1..a064011 100644
118 --- a/src/dvduncompile.c
119 +++ b/src/dvduncompile.c
120 @@ -22,7 +22,6 @@
121 * MA 02110-1301 USA.
122 */
123
124 -#include "config.h"
125 #include "compat.h"
126
127 #include <stdio.h>
128 diff --git a/src/dvdvob.c b/src/dvdvob.c
129 index 2d7e2b8..2146689 100644
130 --- a/src/dvdvob.c
131 +++ b/src/dvdvob.c
132 @@ -20,8 +20,6 @@
133 * MA 02110-1301 USA.
134 */
135
136 -#include "config.h"
137 -
138 #include "compat.h"
139
140 #include <assert.h>
141 diff --git a/src/readxml.c b/src/readxml.c
142 index 61ff0a1..3b83f07 100644
143 --- a/src/readxml.c
144 +++ b/src/readxml.c
145 @@ -20,8 +20,6 @@
146 * MA 02110-1301 USA.
147 */
148
149 -#include "config.h"
150 -
151 #include "compat.h"
152
153 #include <assert.h>
154 diff --git a/src/spuunmux.c b/src/spuunmux.c
155 index 1981e41..94fcb10 100644
156 --- a/src/spuunmux.c
157 +++ b/src/spuunmux.c
158 @@ -31,7 +31,6 @@
159 * MA 02110-1301 USA.
160 */
161
162 -#include "config.h"
163 #include "compat.h"
164
165 #include <fcntl.h>
166 diff --git a/src/subgen-encode.c b/src/subgen-encode.c
167 index 53ed4b2..962e902 100644
168 --- a/src/subgen-encode.c
169 +++ b/src/subgen-encode.c
170 @@ -21,8 +21,6 @@
171 * MA 02110-1301 USA.
172 */
173
174 -#include "config.h"
175 -
176 #include "compat.h"
177
178 #include <assert.h>