[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/ - gentoo-commits

From:	James Le Cuirot <chewi@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
Date:	Sun, 02 Dec 2018 21:43:16
Message-Id:	`1543786879.f348b5c168a446787b6b1abba235b520705f7fce.chewi@gentoo`

1

commit:     f348b5c168a446787b6b1abba235b520705f7fce

2

Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>

3

AuthorDate: Sun Dec  2 21:38:57 2018 +0000

4

Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>

5

CommitDate: Sun Dec  2 21:41:19 2018 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f348b5c1

7

8

media-video/ffmpeg: Use main build for Chromium where possible in v4+

9

10

The main build is now compatible with Chromium, except when OpenCL is

11

enabled. I thought about keeping the build separate or adding to

12

REQUIRED_USE but in the end, I decided to let it work both ways. The

13

precise compatibility requirements may change over time so I have

14

added a build_separate_libffmpeg function.

15

16

Package-Manager: Portage-2.3.52, Repoman-2.3.12

17

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

18

19

 media-video/ffmpeg/ffmpeg-4.0.2.ebuild | 30 +++++++++++++++++++++---------

20

 media-video/ffmpeg/ffmpeg-4.0.3.ebuild | 30 +++++++++++++++++++++---------

21

 media-video/ffmpeg/ffmpeg-4.1.ebuild   | 30 +++++++++++++++++++++---------

22

 media-video/ffmpeg/ffmpeg-9999.ebuild  | 30 +++++++++++++++++++++---------

23

 4 files changed, 84 insertions(+), 36 deletions(-)

24

25

diff --git a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild b/media-video/ffmpeg/ffmpeg-4.0.2.ebuild

26

index 3a5a70b3e2b..4cb26fd9047 100644

27

--- a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild

28

+++ b/media-video/ffmpeg/ffmpeg-4.0.2.ebuild

29

@@ -310,6 +310,10 @@ MULTILIB_WRAPPED_HEADERS=(

30

 	/usr/include/libavutil/avconfig.h

31

)

32

33

+build_separate_libffmpeg() {

34

+	use opencl

35

+}

36

+

37

 src_prepare() {

38

 	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot

39

 		export revision=git-N-${FFMPEG_REVISION}

40

@@ -446,7 +450,7 @@ multilib_src_configure() {

41

 	echo "${@}"

42

 	"${@}" || die

43

44

-	if multilib_is_native_abi && use chromium; then

45

+	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then

46

 		einfo "Configuring for Chromium"

47

 		mkdir -p ../chromium || die

48

 		pushd ../chromium >/dev/null || die

49

@@ -472,10 +476,14 @@ multilib_src_compile() {

50

 		done

51

52

 		if use chromium; then

53

-			einfo "Compiling for Chromium"

54

-			pushd ../chromium >/dev/null || die

55

-			emake V=1 libffmpeg

56

-			popd >/dev/null || die

57

+			if build_separate_libffmpeg; then

58

+				einfo "Compiling for Chromium"

59

+				pushd ../chromium >/dev/null || die

60

+				emake V=1 libffmpeg

61

+				popd >/dev/null || die

62

+			else

63

+				emake V=1 libffmpeg

64

+			fi

65

fi

66

fi

67

}

68

@@ -491,10 +499,14 @@ multilib_src_install() {

69

 		done

70

71

 		if use chromium; then

72

-			einfo "Installing for Chromium"

73

-			pushd ../chromium >/dev/null || die

74

-			emake V=1 DESTDIR="${D}" install-libffmpeg

75

-			popd >/dev/null || die

76

+			if build_separate_libffmpeg; then

77

+				einfo "Installing for Chromium"

78

+				pushd ../chromium >/dev/null || die

79

+				emake V=1 DESTDIR="${D}" install-libffmpeg

80

+				popd >/dev/null || die

81

+			else

82

+				emake V=1 DESTDIR="${D}" install-libffmpeg

83

+			fi

84

fi

85

fi

86

}

87

88

diff --git a/media-video/ffmpeg/ffmpeg-4.0.3.ebuild b/media-video/ffmpeg/ffmpeg-4.0.3.ebuild

89

index 0e284c3f051..8e011cb6e0b 100644

90

--- a/media-video/ffmpeg/ffmpeg-4.0.3.ebuild

91

+++ b/media-video/ffmpeg/ffmpeg-4.0.3.ebuild

92

@@ -311,6 +311,10 @@ MULTILIB_WRAPPED_HEADERS=(

93

 	/usr/include/libavutil/avconfig.h

94

)

95

96

+build_separate_libffmpeg() {

97

+	use opencl

98

+}

99

+

100

 src_prepare() {

101

 	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot

102

 		export revision=git-N-${FFMPEG_REVISION}

103

@@ -447,7 +451,7 @@ multilib_src_configure() {

104

 	echo "${@}"

105

 	"${@}" || die

106

107

-	if multilib_is_native_abi && use chromium; then

108

+	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then

109

 		einfo "Configuring for Chromium"

110

 		mkdir -p ../chromium || die

111

 		pushd ../chromium >/dev/null || die

112

@@ -473,10 +477,14 @@ multilib_src_compile() {

113

 		done

114

115

 		if use chromium; then

116

-			einfo "Compiling for Chromium"

117

-			pushd ../chromium >/dev/null || die

118

-			emake V=1 libffmpeg

119

-			popd >/dev/null || die

120

+			if build_separate_libffmpeg; then

121

+				einfo "Compiling for Chromium"

122

+				pushd ../chromium >/dev/null || die

123

+				emake V=1 libffmpeg

124

+				popd >/dev/null || die

125

+			else

126

+				emake V=1 libffmpeg

127

+			fi

128

fi

129

fi

130

}

131

@@ -492,10 +500,14 @@ multilib_src_install() {

132

 		done

133

134

 		if use chromium; then

135

-			einfo "Installing for Chromium"

136

-			pushd ../chromium >/dev/null || die

137

-			emake V=1 DESTDIR="${D}" install-libffmpeg

138

-			popd >/dev/null || die

139

+			if build_separate_libffmpeg; then

140

+				einfo "Installing for Chromium"

141

+				pushd ../chromium >/dev/null || die

142

+				emake V=1 DESTDIR="${D}" install-libffmpeg

143

+				popd >/dev/null || die

144

+			else

145

+				emake V=1 DESTDIR="${D}" install-libffmpeg

146

+			fi

147

fi

148

fi

149

}

150

151

diff --git a/media-video/ffmpeg/ffmpeg-4.1.ebuild b/media-video/ffmpeg/ffmpeg-4.1.ebuild

152

index 1b1172dce71..f9bb47a5c71 100644

153

--- a/media-video/ffmpeg/ffmpeg-4.1.ebuild

154

+++ b/media-video/ffmpeg/ffmpeg-4.1.ebuild

155

@@ -312,6 +312,10 @@ MULTILIB_WRAPPED_HEADERS=(

156

 	/usr/include/libavutil/avconfig.h

157

)

158

159

+build_separate_libffmpeg() {

160

+	use opencl

161

+}

162

+

163

 src_prepare() {

164

 	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot

165

 		export revision=git-N-${FFMPEG_REVISION}

166

@@ -452,7 +456,7 @@ multilib_src_configure() {

167

 	echo "${@}"

168

 	"${@}" || die

169

170

-	if multilib_is_native_abi && use chromium; then

171

+	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then

172

 		einfo "Configuring for Chromium"

173

 		mkdir -p ../chromium || die

174

 		pushd ../chromium >/dev/null || die

175

@@ -478,10 +482,14 @@ multilib_src_compile() {

176

 		done

177

178

 		if use chromium; then

179

-			einfo "Compiling for Chromium"

180

-			pushd ../chromium >/dev/null || die

181

-			emake V=1 libffmpeg

182

-			popd >/dev/null || die

183

+			if build_separate_libffmpeg; then

184

+				einfo "Compiling for Chromium"

185

+				pushd ../chromium >/dev/null || die

186

+				emake V=1 libffmpeg

187

+				popd >/dev/null || die

188

+			else

189

+				emake V=1 libffmpeg

190

+			fi

191

fi

192

fi

193

}

194

@@ -497,10 +505,14 @@ multilib_src_install() {

195

 		done

196

197

 		if use chromium; then

198

-			einfo "Installing for Chromium"

199

-			pushd ../chromium >/dev/null || die

200

-			emake V=1 DESTDIR="${D}" install-libffmpeg

201

-			popd >/dev/null || die

202

+			if build_separate_libffmpeg; then

203

+				einfo "Installing for Chromium"

204

+				pushd ../chromium >/dev/null || die

205

+				emake V=1 DESTDIR="${D}" install-libffmpeg

206

+				popd >/dev/null || die

207

+			else

208

+				emake V=1 DESTDIR="${D}" install-libffmpeg

209

+			fi

210

fi

211

fi

212

}

213

214

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild

215

index b3739eb76f8..1e84ce79862 100644

216

--- a/media-video/ffmpeg/ffmpeg-9999.ebuild

217

+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild

218

@@ -311,6 +311,10 @@ MULTILIB_WRAPPED_HEADERS=(

219

 	/usr/include/libavutil/avconfig.h

220

)

221

222

+build_separate_libffmpeg() {

223

+	use opencl

224

+}

225

+

226

 src_prepare() {

227

 	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot

228

 		export revision=git-N-${FFMPEG_REVISION}

229

@@ -451,7 +455,7 @@ multilib_src_configure() {

230

 	echo "${@}"

231

 	"${@}" || die

232

233

-	if multilib_is_native_abi && use chromium; then

234

+	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then

235

 		einfo "Configuring for Chromium"

236

 		mkdir -p ../chromium || die

237

 		pushd ../chromium >/dev/null || die

238

@@ -477,10 +481,14 @@ multilib_src_compile() {

239

 		done

240

241

 		if use chromium; then

242

-			einfo "Compiling for Chromium"

243

-			pushd ../chromium >/dev/null || die

244

-			emake V=1 libffmpeg

245

-			popd >/dev/null || die

246

+			if build_separate_libffmpeg; then

247

+				einfo "Compiling for Chromium"

248

+				pushd ../chromium >/dev/null || die

249

+				emake V=1 libffmpeg

250

+				popd >/dev/null || die

251

+			else

252

+				emake V=1 libffmpeg

253

+			fi

254

fi

255

fi

256

}

257

@@ -496,10 +504,14 @@ multilib_src_install() {

258

 		done

259

260

 		if use chromium; then

261

-			einfo "Installing for Chromium"

262

-			pushd ../chromium >/dev/null || die

263

-			emake V=1 DESTDIR="${D}" install-libffmpeg

264

-			popd >/dev/null || die

265

+			if build_separate_libffmpeg; then

266

+				einfo "Installing for Chromium"

267

+				pushd ../chromium >/dev/null || die

268

+				emake V=1 DESTDIR="${D}" install-libffmpeg

269

+				popd >/dev/null || die

270

+			else

271

+				emake V=1 DESTDIR="${D}" install-libffmpeg

272

+			fi

273

fi

274

fi

275

}

1	commit: f348b5c168a446787b6b1abba235b520705f7fce
2	Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3	AuthorDate: Sun Dec 2 21:38:57 2018 +0000
4	Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5	CommitDate: Sun Dec 2 21:41:19 2018 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f348b5c1
7
8	media-video/ffmpeg: Use main build for Chromium where possible in v4+
9
10	The main build is now compatible with Chromium, except when OpenCL is
11	enabled. I thought about keeping the build separate or adding to
12	REQUIRED_USE but in the end, I decided to let it work both ways. The
13	precise compatibility requirements may change over time so I have
14	added a build_separate_libffmpeg function.
15
16	Package-Manager: Portage-2.3.52, Repoman-2.3.12
17	Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
18
19	media-video/ffmpeg/ffmpeg-4.0.2.ebuild \| 30 +++++++++++++++++++++---------
20	media-video/ffmpeg/ffmpeg-4.0.3.ebuild \| 30 +++++++++++++++++++++---------
21	media-video/ffmpeg/ffmpeg-4.1.ebuild \| 30 +++++++++++++++++++++---------
22	media-video/ffmpeg/ffmpeg-9999.ebuild \| 30 +++++++++++++++++++++---------
23	4 files changed, 84 insertions(+), 36 deletions(-)
24
25	diff --git a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild b/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
26	index 3a5a70b3e2b..4cb26fd9047 100644
27	--- a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
28	+++ b/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
29	@@ -310,6 +310,10 @@ MULTILIB_WRAPPED_HEADERS=(
30	/usr/include/libavutil/avconfig.h
31	)
32
33	+build_separate_libffmpeg() {
34	+ use opencl
35	+}
36	+
37	src_prepare() {
38	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
39	export revision=git-N-${FFMPEG_REVISION}
40	@@ -446,7 +450,7 @@ multilib_src_configure() {
41	echo "${@}"
42	"${@}" \|\| die
43
44	- if multilib_is_native_abi && use chromium; then
45	+ if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
46	einfo "Configuring for Chromium"
47	mkdir -p ../chromium \|\| die
48	pushd ../chromium >/dev/null \|\| die
49	@@ -472,10 +476,14 @@ multilib_src_compile() {
50	done
51
52	if use chromium; then
53	- einfo "Compiling for Chromium"
54	- pushd ../chromium >/dev/null \|\| die
55	- emake V=1 libffmpeg
56	- popd >/dev/null \|\| die
57	+ if build_separate_libffmpeg; then
58	+ einfo "Compiling for Chromium"
59	+ pushd ../chromium >/dev/null \|\| die
60	+ emake V=1 libffmpeg
61	+ popd >/dev/null \|\| die
62	+ else
63	+ emake V=1 libffmpeg
64	+ fi
65	fi
66	fi
67	}
68	@@ -491,10 +499,14 @@ multilib_src_install() {
69	done
70
71	if use chromium; then
72	- einfo "Installing for Chromium"
73	- pushd ../chromium >/dev/null \|\| die
74	- emake V=1 DESTDIR="${D}" install-libffmpeg
75	- popd >/dev/null \|\| die
76	+ if build_separate_libffmpeg; then
77	+ einfo "Installing for Chromium"
78	+ pushd ../chromium >/dev/null \|\| die
79	+ emake V=1 DESTDIR="${D}" install-libffmpeg
80	+ popd >/dev/null \|\| die
81	+ else
82	+ emake V=1 DESTDIR="${D}" install-libffmpeg
83	+ fi
84	fi
85	fi
86	}
87
88	diff --git a/media-video/ffmpeg/ffmpeg-4.0.3.ebuild b/media-video/ffmpeg/ffmpeg-4.0.3.ebuild
89	index 0e284c3f051..8e011cb6e0b 100644
90	--- a/media-video/ffmpeg/ffmpeg-4.0.3.ebuild
91	+++ b/media-video/ffmpeg/ffmpeg-4.0.3.ebuild
92	@@ -311,6 +311,10 @@ MULTILIB_WRAPPED_HEADERS=(
93	/usr/include/libavutil/avconfig.h
94	)
95
96	+build_separate_libffmpeg() {
97	+ use opencl
98	+}
99	+
100	src_prepare() {
101	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
102	export revision=git-N-${FFMPEG_REVISION}
103	@@ -447,7 +451,7 @@ multilib_src_configure() {
104	echo "${@}"
105	"${@}" \|\| die
106
107	- if multilib_is_native_abi && use chromium; then
108	+ if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
109	einfo "Configuring for Chromium"
110	mkdir -p ../chromium \|\| die
111	pushd ../chromium >/dev/null \|\| die
112	@@ -473,10 +477,14 @@ multilib_src_compile() {
113	done
114
115	if use chromium; then
116	- einfo "Compiling for Chromium"
117	- pushd ../chromium >/dev/null \|\| die
118	- emake V=1 libffmpeg
119	- popd >/dev/null \|\| die
120	+ if build_separate_libffmpeg; then
121	+ einfo "Compiling for Chromium"
122	+ pushd ../chromium >/dev/null \|\| die
123	+ emake V=1 libffmpeg
124	+ popd >/dev/null \|\| die
125	+ else
126	+ emake V=1 libffmpeg
127	+ fi
128	fi
129	fi
130	}
131	@@ -492,10 +500,14 @@ multilib_src_install() {
132	done
133
134	if use chromium; then
135	- einfo "Installing for Chromium"
136	- pushd ../chromium >/dev/null \|\| die
137	- emake V=1 DESTDIR="${D}" install-libffmpeg
138	- popd >/dev/null \|\| die
139	+ if build_separate_libffmpeg; then
140	+ einfo "Installing for Chromium"
141	+ pushd ../chromium >/dev/null \|\| die
142	+ emake V=1 DESTDIR="${D}" install-libffmpeg
143	+ popd >/dev/null \|\| die
144	+ else
145	+ emake V=1 DESTDIR="${D}" install-libffmpeg
146	+ fi
147	fi
148	fi
149	}
150
151	diff --git a/media-video/ffmpeg/ffmpeg-4.1.ebuild b/media-video/ffmpeg/ffmpeg-4.1.ebuild
152	index 1b1172dce71..f9bb47a5c71 100644
153	--- a/media-video/ffmpeg/ffmpeg-4.1.ebuild
154	+++ b/media-video/ffmpeg/ffmpeg-4.1.ebuild
155	@@ -312,6 +312,10 @@ MULTILIB_WRAPPED_HEADERS=(
156	/usr/include/libavutil/avconfig.h
157	)
158
159	+build_separate_libffmpeg() {
160	+ use opencl
161	+}
162	+
163	src_prepare() {
164	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
165	export revision=git-N-${FFMPEG_REVISION}
166	@@ -452,7 +456,7 @@ multilib_src_configure() {
167	echo "${@}"
168	"${@}" \|\| die
169
170	- if multilib_is_native_abi && use chromium; then
171	+ if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
172	einfo "Configuring for Chromium"
173	mkdir -p ../chromium \|\| die
174	pushd ../chromium >/dev/null \|\| die
175	@@ -478,10 +482,14 @@ multilib_src_compile() {
176	done
177
178	if use chromium; then
179	- einfo "Compiling for Chromium"
180	- pushd ../chromium >/dev/null \|\| die
181	- emake V=1 libffmpeg
182	- popd >/dev/null \|\| die
183	+ if build_separate_libffmpeg; then
184	+ einfo "Compiling for Chromium"
185	+ pushd ../chromium >/dev/null \|\| die
186	+ emake V=1 libffmpeg
187	+ popd >/dev/null \|\| die
188	+ else
189	+ emake V=1 libffmpeg
190	+ fi
191	fi
192	fi
193	}
194	@@ -497,10 +505,14 @@ multilib_src_install() {
195	done
196
197	if use chromium; then
198	- einfo "Installing for Chromium"
199	- pushd ../chromium >/dev/null \|\| die
200	- emake V=1 DESTDIR="${D}" install-libffmpeg
201	- popd >/dev/null \|\| die
202	+ if build_separate_libffmpeg; then
203	+ einfo "Installing for Chromium"
204	+ pushd ../chromium >/dev/null \|\| die
205	+ emake V=1 DESTDIR="${D}" install-libffmpeg
206	+ popd >/dev/null \|\| die
207	+ else
208	+ emake V=1 DESTDIR="${D}" install-libffmpeg
209	+ fi
210	fi
211	fi
212	}
213
214	diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
215	index b3739eb76f8..1e84ce79862 100644
216	--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
217	+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
218	@@ -311,6 +311,10 @@ MULTILIB_WRAPPED_HEADERS=(
219	/usr/include/libavutil/avconfig.h
220	)
221
222	+build_separate_libffmpeg() {
223	+ use opencl
224	+}
225	+
226	src_prepare() {
227	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
228	export revision=git-N-${FFMPEG_REVISION}
229	@@ -451,7 +455,7 @@ multilib_src_configure() {
230	echo "${@}"
231	"${@}" \|\| die
232
233	- if multilib_is_native_abi && use chromium; then
234	+ if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
235	einfo "Configuring for Chromium"
236	mkdir -p ../chromium \|\| die
237	pushd ../chromium >/dev/null \|\| die
238	@@ -477,10 +481,14 @@ multilib_src_compile() {
239	done
240
241	if use chromium; then
242	- einfo "Compiling for Chromium"
243	- pushd ../chromium >/dev/null \|\| die
244	- emake V=1 libffmpeg
245	- popd >/dev/null \|\| die
246	+ if build_separate_libffmpeg; then
247	+ einfo "Compiling for Chromium"
248	+ pushd ../chromium >/dev/null \|\| die
249	+ emake V=1 libffmpeg
250	+ popd >/dev/null \|\| die
251	+ else
252	+ emake V=1 libffmpeg
253	+ fi
254	fi
255	fi
256	}
257	@@ -496,10 +504,14 @@ multilib_src_install() {
258	done
259
260	if use chromium; then
261	- einfo "Installing for Chromium"
262	- pushd ../chromium >/dev/null \|\| die
263	- emake V=1 DESTDIR="${D}" install-libffmpeg
264	- popd >/dev/null \|\| die
265	+ if build_separate_libffmpeg; then
266	+ einfo "Installing for Chromium"
267	+ pushd ../chromium >/dev/null \|\| die
268	+ emake V=1 DESTDIR="${D}" install-libffmpeg
269	+ popd >/dev/null \|\| die
270	+ else
271	+ emake V=1 DESTDIR="${D}" install-libffmpeg
272	+ fi
273	fi
274	fi
275	}

Gentoo Archives: gentoo-commits