Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Ian Stakenvicius (axs)" <axs@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/libva: libva-1.2.1-r1.ebuild libva-1.1.1-r1.ebuild libva-9999.ebuild libva-1.2.0-r1.ebuild ChangeLog
Date: Sat, 01 Feb 2014 15:24:26
Message-Id: 20140201152422.3F0152004C@flycatcher.gentoo.org
1 axs 14/02/01 15:24:22
2
3 Modified: libva-9999.ebuild ChangeLog
4 Added: libva-1.2.1-r1.ebuild libva-1.1.1-r1.ebuild
5 libva-1.2.0-r1.ebuild
6 Log:
7 revbump ebuilds to support multilib-build, changes reviewed by aballier
8
9 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
10
11 Revision Changes Path
12 1.19 x11-libs/libva/libva-9999.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libva/libva-9999.ebuild?rev=1.19&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libva/libva-9999.ebuild?rev=1.19&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libva/libva-9999.ebuild?r1=1.18&r2=1.19
17
18 Index: libva-9999.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-9999.ebuild,v
21 retrieving revision 1.18
22 retrieving revision 1.19
23 diff -u -r1.18 -r1.19
24 --- libva-9999.ebuild 29 Jun 2013 03:43:38 -0000 1.18
25 +++ libva-9999.ebuild 1 Feb 2014 15:24:22 -0000 1.19
26 @@ -1,8 +1,8 @@
27 -# Copyright 1999-2013 Gentoo Foundation
28 +# Copyright 1999-2014 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-9999.ebuild,v 1.18 2013/06/29 03:43:38 aballier Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-9999.ebuild,v 1.19 2014/02/01 15:24:22 axs Exp $
32
33 -EAPI=4
34 +EAPI=5
35
36 SCM=""
37 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
38 @@ -11,7 +11,8 @@
39 EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
40 fi
41
42 -inherit autotools ${SCM} multilib
43 +AUTOTOOLS_AUTORECONF="yes"
44 +inherit autotools-multilib ${SCM} multilib
45
46 DESCRIPTION="Video Acceleration (VA) API for Linux"
47 HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
48 @@ -37,44 +38,46 @@
49 IUSE+=" video_cards_${x}"
50 done
51
52 -RDEPEND=">=x11-libs/libdrm-2.4
53 +RDEPEND=">=x11-libs/libdrm-2.4[${MULTILIB_USEDEP}]
54 X? (
55 - x11-libs/libX11
56 - x11-libs/libXext
57 - x11-libs/libXfixes
58 + x11-libs/libX11[${MULTILIB_USEDEP}]
59 + x11-libs/libXext[${MULTILIB_USEDEP}]
60 + x11-libs/libXfixes[${MULTILIB_USEDEP}]
61 )
62 - egl? ( media-libs/mesa[egl] )
63 + egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )
64 opengl? ( virtual/opengl )
65 - wayland? ( >=dev-libs/wayland-1 )"
66 + wayland? ( >=dev-libs/wayland-1[${MULTILIB_USEDEP}] )"
67
68 DEPEND="${RDEPEND}
69 virtual/pkgconfig"
70 -PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver )
71 - vdpau? ( x11-libs/libva-vdpau-driver )
72 - video_cards_fglrx? ( x11-libs/xvba-video )
73 - video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 )
74 +PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver[${MULTILIB_USEDEP}] )
75 + vdpau? ( x11-libs/libva-vdpau-driver[${MULTILIB_USEDEP}] )
76 + video_cards_fglrx? ( x11-libs/xvba-video[${MULTILIB_USEDEP}] )
77 + video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18[${MULTILIB_USEDEP}] )
78 "
79
80 REQUIRED_USE="opengl? ( X )"
81
82 -src_prepare() {
83 - eautoreconf
84 -}
85 +PATCHES=( "${FILESDIR}/${PN}-1.2.0-autotools-out-of-source-build.patch" )
86 +DOCS=( NEWS )
87
88 -src_configure() {
89 - econf \
90 - --disable-silent-rules \
91 - --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" \
92 - $(use_enable video_cards_dummy dummy-driver) \
93 - $(use_enable opengl glx) \
94 - $(use_enable X x11) \
95 - $(use_enable wayland) \
96 - $(use_enable egl) \
97 +MULTILIB_WRAPPED_HEADERS=(
98 +/usr/include/va/va_backend_glx.h
99 +/usr/include/va/va_x11.h
100 +/usr/include/va/va_dri2.h
101 +/usr/include/va/va_dricommon.h
102 +/usr/include/va/va_glx.h
103 +)
104 +
105 +multilib_src_configure() {
106 + local myeconfargs=(
107 + --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
108 + $(use_enable video_cards_dummy dummy-driver)
109 + $(use_enable opengl glx)
110 + $(use_enable X x11)
111 + $(use_enable wayland)
112 + $(use_enable egl)
113 $(use_enable drm)
114 -}
115 -
116 -src_install() {
117 - emake DESTDIR="${D}" install || die
118 - dodoc NEWS || die
119 - find "${D}" -name '*.la' -delete
120 + )
121 + autotools-utils_src_configure
122 }
123
124
125
126 1.55 x11-libs/libva/ChangeLog
127
128 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libva/ChangeLog?rev=1.55&view=markup
129 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libva/ChangeLog?rev=1.55&content-type=text/plain
130 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libva/ChangeLog?r1=1.54&r2=1.55
131
132 Index: ChangeLog
133 ===================================================================
134 RCS file: /var/cvsroot/gentoo-x86/x11-libs/libva/ChangeLog,v
135 retrieving revision 1.54
136 retrieving revision 1.55
137 diff -u -r1.54 -r1.55
138 --- ChangeLog 29 Jun 2013 03:43:38 -0000 1.54
139 +++ ChangeLog 1 Feb 2014 15:24:22 -0000 1.55
140 @@ -1,6 +1,16 @@
141 # ChangeLog for x11-libs/libva
142 -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
143 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/ChangeLog,v 1.54 2013/06/29 03:43:38 aballier Exp $
144 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
145 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/ChangeLog,v 1.55 2014/02/01 15:24:22 axs Exp $
146 +
147 +*libva-1.2.0-r1 (01 Feb 2014)
148 +*libva-1.2.1-r1 (01 Feb 2014)
149 +*libva-1.1.1-r1 (01 Feb 2014)
150 +
151 + 01 Feb 2014; Ian Stakenvicius (_AxS_) <axs@g.o>
152 + +files/libva-1.2.0-autotools-out-of-source-build.patch,
153 + +libva-1.1.1-r1.ebuild, +libva-1.2.0-r1.ebuild, +libva-1.2.1-r1.ebuild,
154 + libva-9999.ebuild:
155 + revbump ebuilds to support multilib-build, changes reviewed by aballier
156
157 *libva-1.2.1 (29 Jun 2013)
158
159
160
161
162 1.1 x11-libs/libva/libva-1.2.1-r1.ebuild
163
164 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libva/libva-1.2.1-r1.ebuild?rev=1.1&view=markup
165 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libva/libva-1.2.1-r1.ebuild?rev=1.1&content-type=text/plain
166
167 Index: libva-1.2.1-r1.ebuild
168 ===================================================================
169 # Copyright 1999-2014 Gentoo Foundation
170 # Distributed under the terms of the GNU General Public License v2
171 # $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.2.1-r1.ebuild,v 1.1 2014/02/01 15:24:22 axs Exp $
172
173 EAPI=5
174
175 SCM=""
176 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
177 SCM=git-2
178 EGIT_BRANCH=master
179 EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
180 fi
181
182 AUTOTOOLS_AUTORECONF="yes"
183 inherit autotools-multilib ${SCM} multilib
184
185 DESCRIPTION="Video Acceleration (VA) API for Linux"
186 HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
187 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
188 SRC_URI=""
189 S="${WORKDIR}/${PN}"
190 else
191 SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
192 fi
193
194 LICENSE="MIT"
195 SLOT="0"
196 if [ "${PV%9999}" = "${PV}" ] ; then
197 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
198 else
199 KEYWORDS=""
200 fi
201 IUSE="+drm egl opengl vdpau wayland X"
202 REQUIRED_USE="|| ( drm wayland X )"
203
204 VIDEO_CARDS="dummy nvidia intel fglrx"
205 for x in ${VIDEO_CARDS}; do
206 IUSE+=" video_cards_${x}"
207 done
208
209 RDEPEND=">=x11-libs/libdrm-2.4[${MULTILIB_USEDEP}]
210 X? (
211 x11-libs/libX11[${MULTILIB_USEDEP}]
212 x11-libs/libXext[${MULTILIB_USEDEP}]
213 x11-libs/libXfixes[${MULTILIB_USEDEP}]
214 )
215 egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )
216 opengl? ( virtual/opengl )
217 wayland? ( >=dev-libs/wayland-1[${MULTILIB_USEDEP}] )"
218
219 DEPEND="${RDEPEND}
220 virtual/pkgconfig"
221 PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver[${MULTILIB_USEDEP}] )
222 vdpau? ( x11-libs/libva-vdpau-driver[${MULTILIB_USEDEP}] )
223 video_cards_fglrx? ( x11-libs/xvba-video[${MULTILIB_USEDEP}] )
224 video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18[${MULTILIB_USEDEP}] )
225 "
226
227 REQUIRED_USE="opengl? ( X )"
228
229 PATCHES=( "${FILESDIR}/${PN}-1.2.0-autotools-out-of-source-build.patch" )
230 DOCS=( NEWS )
231
232 MULTILIB_WRAPPED_HEADERS=(
233 /usr/include/va/va_backend_glx.h
234 /usr/include/va/va_x11.h
235 /usr/include/va/va_dri2.h
236 /usr/include/va/va_dricommon.h
237 /usr/include/va/va_glx.h
238 )
239
240 multilib_src_configure() {
241 local myeconfargs=(
242 --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
243 $(use_enable video_cards_dummy dummy-driver)
244 $(use_enable opengl glx)
245 $(use_enable X x11)
246 $(use_enable wayland)
247 $(use_enable egl)
248 $(use_enable drm)
249 )
250 autotools-utils_src_configure
251 }
252
253
254
255 1.1 x11-libs/libva/libva-1.1.1-r1.ebuild
256
257 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libva/libva-1.1.1-r1.ebuild?rev=1.1&view=markup
258 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libva/libva-1.1.1-r1.ebuild?rev=1.1&content-type=text/plain
259
260 Index: libva-1.1.1-r1.ebuild
261 ===================================================================
262 # Copyright 1999-2014 Gentoo Foundation
263 # Distributed under the terms of the GNU General Public License v2
264 # $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.1.1-r1.ebuild,v 1.1 2014/02/01 15:24:22 axs Exp $
265
266 EAPI=5
267
268 SCM=""
269 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
270 SCM=git-2
271 EGIT_BRANCH=master
272 EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
273 fi
274
275 AUTOTOOLS_AUTORECONF="yes"
276 inherit autotools-multilib ${SCM} multilib
277
278 DESCRIPTION="Video Acceleration (VA) API for Linux"
279 HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
280 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
281 SRC_URI=""
282 S="${WORKDIR}/${PN}"
283 else
284 SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
285 fi
286
287 LICENSE="MIT"
288 SLOT="0"
289 if [ "${PV%9999}" = "${PV}" ] ; then
290 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
291 else
292 KEYWORDS=""
293 fi
294 IUSE="+drm egl opengl vdpau wayland X"
295 REQUIRED_USE="|| ( drm wayland X )"
296
297 VIDEO_CARDS="dummy nvidia intel fglrx"
298 for x in ${VIDEO_CARDS}; do
299 IUSE+=" video_cards_${x}"
300 done
301
302 RDEPEND=">=x11-libs/libdrm-2.4[${MULTILIB_USEDEP}]
303 X? (
304 x11-libs/libX11[${MULTILIB_USEDEP}]
305 x11-libs/libXext[${MULTILIB_USEDEP}]
306 x11-libs/libXfixes[${MULTILIB_USEDEP}]
307 )
308 egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )
309 opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
310 wayland? ( >=dev-libs/wayland-1[${MULTILIB_USEDEP}] )"
311
312 DEPEND="${RDEPEND}
313 virtual/pkgconfig"
314 PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver[${MULTILIB_USEDEP}] )
315 vdpau? ( x11-libs/libva-vdpau-driver[${MULTILIB_USEDEP}] )
316 video_cards_fglrx? ( x11-libs/xvba-video[${MULTILIB_USEDEP}] )
317 video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18[${MULTILIB_USEDEP}] )
318 "
319
320 REQUIRED_USE="opengl? ( X )"
321
322 DOCS=( NEWS )
323
324 MULTILIB_WRAPPED_HEADERS=(
325 /usr/include/va/va_backend_glx.h
326 /usr/include/va/va_x11.h
327 /usr/include/va/va_dri2.h
328 /usr/include/va/va_dricommon.h
329 /usr/include/va/va_glx.h
330 )
331
332 multilib_src_configure() {
333 local myeconfargs=(
334 --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
335 $(use_enable video_cards_dummy dummy-driver)
336 $(use_enable opengl glx)
337 $(use_enable X x11)
338 $(use_enable wayland)
339 $(use_enable egl)
340 $(use_enable drm)
341 )
342 autotools-utils_src_configure
343 }
344
345
346
347 1.1 x11-libs/libva/libva-1.2.0-r1.ebuild
348
349 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libva/libva-1.2.0-r1.ebuild?rev=1.1&view=markup
350 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libva/libva-1.2.0-r1.ebuild?rev=1.1&content-type=text/plain
351
352 Index: libva-1.2.0-r1.ebuild
353 ===================================================================
354 # Copyright 1999-2014 Gentoo Foundation
355 # Distributed under the terms of the GNU General Public License v2
356 # $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.2.0-r1.ebuild,v 1.1 2014/02/01 15:24:22 axs Exp $
357
358 EAPI=5
359
360 SCM=""
361 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
362 SCM=git-2
363 EGIT_BRANCH=master
364 EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
365 fi
366
367 AUTOTOOLS_AUTORECONF="yes"
368 inherit autotools-multilib ${SCM} multilib
369
370 DESCRIPTION="Video Acceleration (VA) API for Linux"
371 HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
372 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
373 SRC_URI=""
374 S="${WORKDIR}/${PN}"
375 else
376 SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
377 fi
378
379 LICENSE="MIT"
380 SLOT="0"
381 if [ "${PV%9999}" = "${PV}" ] ; then
382 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
383 else
384 KEYWORDS=""
385 fi
386 IUSE="+drm egl opengl vdpau wayland X"
387 REQUIRED_USE="|| ( drm wayland X )"
388
389 VIDEO_CARDS="dummy nvidia intel fglrx"
390 for x in ${VIDEO_CARDS}; do
391 IUSE+=" video_cards_${x}"
392 done
393
394 RDEPEND=">=x11-libs/libdrm-2.4[${MULTILIB_USEDEP}]
395 X? (
396 x11-libs/libX11[${MULTILIB_USEDEP}]
397 x11-libs/libXext[${MULTILIB_USEDEP}]
398 x11-libs/libXfixes[${MULTILIB_USEDEP}]
399 )
400 egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )
401 opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
402 wayland? ( >=dev-libs/wayland-1[${MULTILIB_USEDEP}] )"
403
404 DEPEND="${RDEPEND}
405 virtual/pkgconfig"
406 PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver[${MULTILIB_USEDEP}] )
407 vdpau? ( x11-libs/libva-vdpau-driver[${MULTILIB_USEDEP}] )
408 video_cards_fglrx? ( x11-libs/xvba-video[${MULTILIB_USEDEP}] )
409 video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18[${MULTILIB_USEDEP}] )
410 "
411
412 REQUIRED_USE="opengl? ( X )"
413
414 PATCHES=( "${FILESDIR}/${P}-autotools-out-of-source-build.patch" )
415 DOCS=( NEWS )
416
417 MULTILIB_WRAPPED_HEADERS=(
418 /usr/include/va/va_backend_glx.h
419 /usr/include/va/va_x11.h
420 /usr/include/va/va_dri2.h
421 /usr/include/va/va_dricommon.h
422 /usr/include/va/va_glx.h
423 )
424
425 multilib_src_configure() {
426 local myeconfargs=(
427 --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
428 $(use_enable video_cards_dummy dummy-driver)
429 $(use_enable opengl glx)
430 $(use_enable X x11)
431 $(use_enable wayland)
432 $(use_enable egl)
433 $(use_enable drm)
434 )
435 autotools-utils_src_configure
436 }
437
438 src_install() {
439 autotools-multilib_src_install
440 # collision with media-video/mjpegtools
441 mv "${ED}"/usr/bin/{mpeg2enc,mpeg2enc_libva} || die
442 }
Report Message
Find on MARC Find on Google Groups