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

Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: x11-libs/libva-vdpau-driver/, x11-libs/libva-vdpau-driver/files/
Date: Fri, 27 May 2016 19:12:27
Message-Id: 1464376432.075847e763f1a97c3c90fa264acadcb0822cd1d5.blueness@gentoo
1 commit: 075847e763f1a97c3c90fa264acadcb0822cd1d5
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 27 19:13:52 2016 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Fri May 27 19:13:52 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=075847e7
7
8 x11-libs/libva-vdpau-driver: fix bug #584352
9
10 Package-Manager: portage-2.2.28
11 RepoMan-Options: --force
12
13 x11-libs/libva-vdpau-driver/Manifest | 8 ++++
14 ...vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch | 29 ++++++++++++++
15 ...pau-driver-0.7.4-glext-missing-definition.patch | 16 ++++++++
16 .../libva-vdpau-driver-0.7.4-libvdpau-0.8.patch | 13 ++++++
17 ...bva-vdpau-driver-0.7.4-missing-sys_time_h.patch | 11 ++++++
18 .../files/libva-vdpau-driver-0.7.4-nouveau.patch | 8 ++++
19 .../libva-vdpau-driver-0.7.4-r99.ebuild | 46 ++++++++++++++++++++++
20 x11-libs/libva-vdpau-driver/metadata.xml | 12 ++++++
21 8 files changed, 143 insertions(+)
22
23 diff --git a/x11-libs/libva-vdpau-driver/Manifest b/x11-libs/libva-vdpau-driver/Manifest
24 new file mode 100644
25 index 0000000..cc7a6d8
26 --- /dev/null
27 +++ b/x11-libs/libva-vdpau-driver/Manifest
28 @@ -0,0 +1,8 @@
29 +AUX libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch 892 SHA256 1ae32b8e5cca1717be4a63f09e8c6bd84a3e9b712b933816cdb32bb315dbda98 SHA512 f60e84f88eca17e762e3d5a53404d0215bca27051c02ff3e4441ad2c2897c0c04297b8e7b4693c37404bde95d7b5d7a6392b4c17ab1ece5f1bd78e6af376b301 WHIRLPOOL 801511b1d4d91ffc50f03c1ed53b5469db495fe62b88ea987857e2c109b53eb441aeabbd1043c0f265ff0bf020da090ff978239d3b8d4d2e89e5e2fff37ca591
30 +AUX libva-vdpau-driver-0.7.4-glext-missing-definition.patch 659 SHA256 031f1a6b43c20fc3ac2f9da841eff02f6950569cb34f0b4be9fc93642d2dd927 SHA512 bb86ef063eb695c77bbe0fd0c273f1c2a479d1803b8381ffaeac5917de8a7d6e11cef33569d75fbbc1d16e9b64913e8f4a60fbb1b80afc5e381033bf34a192de WHIRLPOOL 2a28f72863c6fa0b36f99d398dead39051d895dfdbf3929809d3f5185a121569da96148c2c49a7ccd17cd3ded058f71de0be18fd9ade6844d0989c0d02be6ca5
31 +AUX libva-vdpau-driver-0.7.4-libvdpau-0.8.patch 442 SHA256 74b9ccd36e7fb90655e0855cf62111fd555390d1a396983af5687b9e8af64cd8 SHA512 969fb8011408acb2bc78a52672cb5a227ae876a2beb5cf209ae558031d71cf255849d5aeb301479f420de97a69b0055990d4ecdd3e0c684f678845b08e6b6632 WHIRLPOOL 22ee9c6a5dbc9f62f28d6602ceaf9729753d45eb1b097005df1ab9cf4d4c06ea497dde8a6abeead13707a2c0412dc510a927bc44240771ff08adc82de74f96c1
32 +AUX libva-vdpau-driver-0.7.4-missing-sys_time_h.patch 390 SHA256 a25fc8d233a0b41116e28410ab134d6acc0974de736a1dbda18e050409871e5b SHA512 efaa0f849005b95ecd9afed34954167e8e02e1255946d5b0696731388287a6afa91c9399e949a41485faeffa4587512264525935cbed53ef564e26c980672fed WHIRLPOOL 6d5b4e5e3217cbe41c3bc8d608f61370ec346fac2c3367ffeb2203ca837371c22f24ba82c7dbf294aef887961eee500831c0831edd5f0d20f898954e6a826feb
33 +AUX libva-vdpau-driver-0.7.4-nouveau.patch 189 SHA256 75897391fdcec4cc28f176ed62184fe0042c4abb8f3c80d19d975050ffaa6072 SHA512 0eb5b3a1e6b077ad0ba350309cd64ab54fa8499c1c27d2789ee3bb433c59adbed3497e79e7870af38d82b91525376bf8116242570b9fdf4f1836ab8c76122330 WHIRLPOOL e028f2f2e5d1023fd1884776a08d67fcabe3d79cfcd3fccfa1182a2012b6f29a81a7b1328707199734443c01cbf9c800bcf38e21affa3ba83a3a1c2dc531b111
34 +DIST libva-vdpau-driver-0.7.4.tar.bz2 316729 SHA256 155c1982f0ac3f5435ba20b221bcaa11be212c37db548cd1f2a030ffa17e9bb9 SHA512 89f98dc1d7d590fb68f440dd1e37e025d64a621324e013e85dd1367681c07b09132fd2089539fc5b48934624648887a8a97539b4f07ddf9f56a8a456ad030094 WHIRLPOOL b6ba281a482dc944acff67d83d26d5a5ac7f15ea1de05c921383bdf0f6dae769d0389e6d15b607e01a8d4e18d3254f66391bbd497aa4e0eed2adbab54a13bce1
35 +EBUILD libva-vdpau-driver-0.7.4-r99.ebuild 1220 SHA256 d30c3e9e27dcd1d4fd2adfb8fe15a1a849b7fb9be6ed9ad9e94dca46201c7cbf SHA512 a071af42ab251293b6a9b3e10d416e7c77ef7b5e90d1c27b662e2b92c03cf0c234635c1f5b80139fb73e48d3d4a5be209891b2fd3f88d11265e4e48600eee5d6 WHIRLPOOL 0c6e613707c5309f7a721e9a264310667a86ccb36bbae7acb12c1cb48c1bdb73026a3873f7f3bb3ee95a0a24e5fd2fafe1df98c853e5f650fd519e4bbffd29a2
36 +MISC metadata.xml 354 SHA256 47431000bf27b89ea7fc385614736723629ffb54d9e4ab6936eaf3ccc943cd93 SHA512 99a9dd9651a16776c22ce528709e588a956d4b20d305392054b3c65e59bbd1ef855c2e916f2458cfda9797efa2570ac0ed706ca20d1df2f878435c6f4f6ca2cd WHIRLPOOL 83a91d522f07e16330fe3a42bc058cbf7981ab54038b033a9ebe3d97b6157ac800b0b32c8da2419b548107dcc80179b59691436074ce9c0be499802032d65484
37
38 diff --git a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch
39 new file mode 100644
40 index 0000000..74caee3
41 --- /dev/null
42 +++ b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch
43 @@ -0,0 +1,29 @@
44 +>From fda3706eb74ba5ad874853969f3df3e372739c8d Mon Sep 17 00:00:00 2001
45 +From: "Xiang, Haihao" <haihao.xiang@×××××.com>
46 +Date: Fri, 21 Jun 2013 12:55:30 +0800
47 +Subject: [PATCH] VAEncH264VUIBufferType and VAEncH264SEIBufferType are
48 + dropped from VA API
49 +
50 +The driver doesn't use them indeed
51 +
52 +Signed-off-by: Xiang, Haihao <haihao.xiang@×××××.com>
53 +---
54 + src/vdpau_dump.c | 2 --
55 + 1 file changed, 2 deletions(-)
56 +
57 +diff --git a/src/vdpau_dump.c b/src/vdpau_dump.c
58 +index 899888b..610e7cd 100644
59 +--- a/src/vdpau_dump.c
60 ++++ b/src/vdpau_dump.c
61 +@@ -59,8 +59,6 @@ const char *string_of_VABufferType(VABufferType type)
62 + _(VAEncSequenceParameterBufferType);
63 + _(VAEncPictureParameterBufferType);
64 + _(VAEncSliceParameterBufferType);
65 +- _(VAEncH264VUIBufferType);
66 +- _(VAEncH264SEIBufferType);
67 + #endif
68 + #if VA_CHECK_VERSION(0,31,1)
69 + _(VAQMatrixBufferType);
70 +--
71 +1.7.9.5
72 +
73
74 diff --git a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-glext-missing-definition.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-glext-missing-definition.patch
75 new file mode 100644
76 index 0000000..221b960
77 --- /dev/null
78 +++ b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-glext-missing-definition.patch
79 @@ -0,0 +1,16 @@
80 +--- ./src/utils_glx.h~ 2012-10-05 16:02:58.000000000 +0100
81 ++++ ./src/utils_glx.h 2012-10-19 08:44:12.469642440 +0100
82 +@@ -48,6 +48,13 @@
83 + typedef void (*PFNGLXRELEASETEXIMAGEEXTPROC)(Display *, GLXDrawable, int);
84 + #endif
85 +
86 ++#if GL_GLEXT_VERSION >= 85
87 ++/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED
88 ++ block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h>
89 ++ Redefine the type here as an interim solution */
90 ++typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
91 ++#endif
92 ++
93 + #ifndef GL_FRAMEBUFFER_BINDING
94 + #define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_EXT
95 + #endif
96
97 diff --git a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch
98 new file mode 100644
99 index 0000000..6d6d47a
100 --- /dev/null
101 +++ b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch
102 @@ -0,0 +1,13 @@
103 +http://bugs.gentoo.org/517778
104 +
105 +--- src/vdpau_decode.c
106 ++++ src/vdpau_decode.c
107 +@@ -1289,7 +1289,7 @@
108 + driver_data,
109 + obj_context->vdp_decoder,
110 + obj_surface->vdp_surface,
111 +- (VdpPictureInfo)&obj_context->vdp_picture_info,
112 ++ (VdpPictureInfo *)&obj_context->vdp_picture_info,
113 + obj_context->vdp_bitstream_buffers_count,
114 + obj_context->vdp_bitstream_buffers
115 + );
116
117 diff --git a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-missing-sys_time_h.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-missing-sys_time_h.patch
118 new file mode 100644
119 index 0000000..d37784a
120 --- /dev/null
121 +++ b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-missing-sys_time_h.patch
122 @@ -0,0 +1,11 @@
123 +diff -Naur libva-vdpau-driver-0.7.4.orig/src/utils.c libva-vdpau-driver-0.7.4/src/utils.c
124 +--- libva-vdpau-driver-0.7.4.orig/src/utils.c 2016-05-27 19:07:51.001006381 +0000
125 ++++ libva-vdpau-driver-0.7.4/src/utils.c 2016-05-27 18:23:39.534238312 +0000
126 +@@ -21,6 +21,7 @@
127 + #include "sysdeps.h"
128 + #include "utils.h"
129 + #include <time.h>
130 ++#include <sys/time.h>
131 + #include <errno.h>
132 +
133 + #define DEBUG 1
134
135 diff --git a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-nouveau.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-nouveau.patch
136 new file mode 100644
137 index 0000000..b697698
138 --- /dev/null
139 +++ b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-nouveau.patch
140 @@ -0,0 +1,8 @@
141 +--- a/src/Makefile.am
142 ++++ b/src/Makefile.am
143 +@@ -1,4 +1,5 @@
144 + DRIVERS = nvidia
145 ++DRIVERS += nouveau
146 + DRIVERS += s3g # native VA-API driver is too old, so use VDPAU based one
147 +
148 + INCLUDES = \
149
150 diff --git a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r99.ebuild b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r99.ebuild
151 new file mode 100644
152 index 0000000..b07a766
153 --- /dev/null
154 +++ b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r99.ebuild
155 @@ -0,0 +1,46 @@
156 +# Copyright 1999-2015 Gentoo Foundation
157 +# Distributed under the terms of the GNU General Public License v2
158 +# $Id$
159 +
160 +EAPI=5
161 +
162 +AUTOTOOLS_AUTORECONF="yes"
163 +inherit autotools-multilib eutils
164 +
165 +DESCRIPTION="VDPAU Backend for Video Acceleration (VA) API"
166 +HOMEPAGE="https://www.freedesktop.org/wiki/Software/vaapi"
167 +SRC_URI="https://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${P}.tar.bz2"
168 +
169 +LICENSE="GPL-2"
170 +SLOT="0"
171 +KEYWORDS="amd64 x86"
172 +IUSE="debug opengl"
173 +
174 +RDEPEND=">=x11-libs/libva-1.2.1-r1[X,opengl?,${MULTILIB_USEDEP}]
175 + opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
176 + >=x11-libs/libvdpau-0.8[${MULTILIB_USEDEP}]
177 + !x11-libs/vdpau-video"
178 +
179 +DEPEND="${DEPEND}
180 + virtual/pkgconfig"
181 +
182 +DOCS=( NEWS README AUTHORS )
183 +
184 +src_prepare() {
185 + epatch \
186 + "${FILESDIR}"/${P}-glext-missing-definition.patch \
187 + "${FILESDIR}"/${P}-VAEncH264VUIBufferType.patch \
188 + "${FILESDIR}"/${P}-libvdpau-0.8.patch \
189 + "${FILESDIR}"/${P}-nouveau.patch \
190 + "${FILESDIR}"/${P}-missing-sys_time_h.patch
191 + sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
192 + autotools-multilib_src_prepare
193 +}
194 +
195 +multilib_src_configure() {
196 + local myeconfargs=(
197 + $(use_enable debug)
198 + $(use_enable opengl glx)
199 + )
200 + autotools-utils_src_configure
201 +}
202
203 diff --git a/x11-libs/libva-vdpau-driver/metadata.xml b/x11-libs/libva-vdpau-driver/metadata.xml
204 new file mode 100644
205 index 0000000..e0c65e5
206 --- /dev/null
207 +++ b/x11-libs/libva-vdpau-driver/metadata.xml
208 @@ -0,0 +1,12 @@
209 +<?xml version="1.0" encoding="UTF-8"?>
210 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
211 +<pkgmetadata>
212 + <maintainer type="person">
213 + <email>aballier@g.o</email>
214 + <name>Alexis Ballier</name>
215 + </maintainer>
216 +<maintainer type="project">
217 + <email>x11@g.o</email>
218 + <name>X11</name>
219 + </maintainer>
220 +</pkgmetadata>
Report Message
Find on MARC Find on Google Groups