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/ffmpeg: ffmpeg-9999.ebuild ffmpeg-2.2.15.ebuild ChangeLog ffmpeg-2.2.14.ebuild ffmpeg-2.6.3.ebuild
Date: Fri, 29 May 2015 09:45:20
Message-Id: 20150529094515.7E4D0A04@oystercatcher.gentoo.org
1 aballier 15/05/29 09:45:15
2
3 Modified: ffmpeg-9999.ebuild ffmpeg-2.2.15.ebuild ChangeLog
4 ffmpeg-2.2.14.ebuild ffmpeg-2.6.3.ebuild
5 Log:
6 Do not pass extra-cflags/cxxflags to configure as those default to CFLAGS/CXXFLAGS respectively. Just disable optflags instead of passing complete CFLAGS to avoid forced -O3 build: This duplicated CFLAGS on the compile line and overridden important ones set by configure script; fixes bug #550554.
7
8 Signed-off-by: Alexis Ballier <aballier@g.o>
9 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
10
11 Revision Changes Path
12 1.190 media-video/ffmpeg/ffmpeg-9999.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.190&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.190&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?r1=1.189&r2=1.190
17
18 Index: ffmpeg-9999.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v
21 retrieving revision 1.189
22 retrieving revision 1.190
23 diff -u -r1.189 -r1.190
24 --- ffmpeg-9999.ebuild 19 May 2015 09:24:10 -0000 1.189
25 +++ ffmpeg-9999.ebuild 29 May 2015 09:45:15 -0000 1.190
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2015 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.189 2015/05/19 09:24:10 aballier Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.190 2015/05/29 09:45:15 aballier Exp $
31
32 EAPI="5"
33
34 @@ -403,9 +403,7 @@
35 --cc="$(tc-getCC)" \
36 --cxx="$(tc-getCXX)" \
37 --ar="$(tc-getAR)" \
38 - --optflags="${CFLAGS}" \
39 - --extra-cflags="${CFLAGS}" \
40 - --extra-cxxflags="${CXXFLAGS}" \
41 + --optflags=" " \
42 $(use_enable static-libs static) \
43 "${myconf[@]}"
44 echo "${@}"
45
46
47
48 1.2 media-video/ffmpeg/ffmpeg-2.2.15.ebuild
49
50 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.15.ebuild?rev=1.2&view=markup
51 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.15.ebuild?rev=1.2&content-type=text/plain
52 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.15.ebuild?r1=1.1&r2=1.2
53
54 Index: ffmpeg-2.2.15.ebuild
55 ===================================================================
56 RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.15.ebuild,v
57 retrieving revision 1.1
58 retrieving revision 1.2
59 diff -u -r1.1 -r1.2
60 --- ffmpeg-2.2.15.ebuild 18 Apr 2015 10:45:51 -0000 1.1
61 +++ ffmpeg-2.2.15.ebuild 29 May 2015 09:45:15 -0000 1.2
62 @@ -1,6 +1,6 @@
63 # Copyright 1999-2015 Gentoo Foundation
64 # Distributed under the terms of the GNU General Public License v2
65 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.15.ebuild,v 1.1 2015/04/18 10:45:51 aballier Exp $
66 +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.15.ebuild,v 1.2 2015/05/29 09:45:15 aballier Exp $
67
68 EAPI="5"
69
70 @@ -326,9 +326,7 @@
71 --cc="$(tc-getCC)" \
72 --cxx="$(tc-getCXX)" \
73 --ar="$(tc-getAR)" \
74 - --optflags="${CFLAGS}" \
75 - --extra-cflags="${CFLAGS}" \
76 - --extra-cxxflags="${CXXFLAGS}" \
77 + --optflags=" " \
78 $(use_enable static-libs static) \
79 "${myconf[@]}"
80 echo "${@}"
81
82
83
84 1.861 media-video/ffmpeg/ChangeLog
85
86 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.861&view=markup
87 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.861&content-type=text/plain
88 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.860&r2=1.861
89
90 Index: ChangeLog
91 ===================================================================
92 RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
93 retrieving revision 1.860
94 retrieving revision 1.861
95 diff -u -r1.860 -r1.861
96 --- ChangeLog 29 May 2015 09:22:34 -0000 1.860
97 +++ ChangeLog 29 May 2015 09:45:15 -0000 1.861
98 @@ -1,6 +1,14 @@
99 # ChangeLog for media-video/ffmpeg
100 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
101 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.860 2015/05/29 09:22:34 aballier Exp $
102 +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.861 2015/05/29 09:45:15 aballier Exp $
103 +
104 + 29 May 2015; Alexis Ballier <aballier@g.o> ffmpeg-2.2.14.ebuild,
105 + ffmpeg-2.2.15.ebuild, ffmpeg-2.6.3.ebuild, ffmpeg-9999.ebuild:
106 + Do not pass extra-cflags/cxxflags to configure as those default to
107 + CFLAGS/CXXFLAGS respectively. Just disable optflags instead of passing
108 + complete CFLAGS to avoid forced -O3 build: This duplicated CFLAGS on the
109 + compile line and overridden important ones set by configure script; fixes bug
110 + #550554.
111
112 29 May 2015; Alexis Ballier <aballier@g.o> -ffmpeg-2.6.1.ebuild,
113 -ffmpeg-2.6.2.ebuild:
114
115
116
117 1.8 media-video/ffmpeg/ffmpeg-2.2.14.ebuild
118
119 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild?rev=1.8&view=markup
120 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild?rev=1.8&content-type=text/plain
121 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild?r1=1.7&r2=1.8
122
123 Index: ffmpeg-2.2.14.ebuild
124 ===================================================================
125 RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild,v
126 retrieving revision 1.7
127 retrieving revision 1.8
128 diff -u -r1.7 -r1.8
129 --- ffmpeg-2.2.14.ebuild 29 May 2015 07:37:45 -0000 1.7
130 +++ ffmpeg-2.2.14.ebuild 29 May 2015 09:45:15 -0000 1.8
131 @@ -1,6 +1,6 @@
132 # Copyright 1999-2015 Gentoo Foundation
133 # Distributed under the terms of the GNU General Public License v2
134 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild,v 1.7 2015/05/29 07:37:45 jmorgan Exp $
135 +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild,v 1.8 2015/05/29 09:45:15 aballier Exp $
136
137 EAPI="5"
138
139 @@ -326,9 +326,7 @@
140 --cc="$(tc-getCC)" \
141 --cxx="$(tc-getCXX)" \
142 --ar="$(tc-getAR)" \
143 - --optflags="${CFLAGS}" \
144 - --extra-cflags="${CFLAGS}" \
145 - --extra-cxxflags="${CXXFLAGS}" \
146 + --optflags=" " \
147 $(use_enable static-libs static) \
148 "${myconf[@]}"
149 echo "${@}"
150
151
152
153 1.2 media-video/ffmpeg/ffmpeg-2.6.3.ebuild
154
155 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.3.ebuild?rev=1.2&view=markup
156 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.3.ebuild?rev=1.2&content-type=text/plain
157 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.3.ebuild?r1=1.1&r2=1.2
158
159 Index: ffmpeg-2.6.3.ebuild
160 ===================================================================
161 RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.3.ebuild,v
162 retrieving revision 1.1
163 retrieving revision 1.2
164 diff -u -r1.1 -r1.2
165 --- ffmpeg-2.6.3.ebuild 18 May 2015 13:45:39 -0000 1.1
166 +++ ffmpeg-2.6.3.ebuild 29 May 2015 09:45:15 -0000 1.2
167 @@ -1,6 +1,6 @@
168 # Copyright 1999-2015 Gentoo Foundation
169 # Distributed under the terms of the GNU General Public License v2
170 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.3.ebuild,v 1.1 2015/05/18 13:45:39 aballier Exp $
171 +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.3.ebuild,v 1.2 2015/05/29 09:45:15 aballier Exp $
172
173 EAPI="5"
174
175 @@ -403,9 +403,7 @@
176 --cc="$(tc-getCC)" \
177 --cxx="$(tc-getCXX)" \
178 --ar="$(tc-getAR)" \
179 - --optflags="${CFLAGS}" \
180 - --extra-cflags="${CFLAGS}" \
181 - --extra-cxxflags="${CXXFLAGS}" \
182 + --optflags=" " \
183 $(use_enable static-libs static) \
184 "${myconf[@]}"
185 echo "${@}"