Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, x11-libs/libva-vdpau-driver/, x11-libs/libva-vdpau-driver/files/
Date: Tue, 01 Nov 2022 09:24:44
Message-Id: 1667294667.69f9b541579a2462e5b6552fd97bdc21f7610583.mattst88@gentoo
1 commit: 69f9b541579a2462e5b6552fd97bdc21f7610583
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 1 09:21:20 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 1 09:24:27 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69f9b541
7
8 x11-libs/libva-vdpau-driver: Delete
9
10 Closes: https://bugs.gentoo.org/584352
11 Closes: https://bugs.gentoo.org/833102
12 Closes: https://bugs.gentoo.org/852728
13 Closes: https://bugs.gentoo.org/866557
14 Closes: https://bugs.gentoo.org/875278
15 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
16
17 profiles/package.mask | 7 ----
18 x11-libs/libva-vdpau-driver/Manifest | 1 -
19 ...vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch | 29 -------------
20 ...pau-driver-0.7.4-glext-missing-definition.patch | 16 --------
21 ...au-driver-0.7.4-include-linux-videodev2.h.patch | 25 -----------
22 .../libva-vdpau-driver-0.7.4-libvdpau-0.8.patch | 13 ------
23 .../libva-vdpau-driver-0.7.4-sigfpe-crash.patch | 21 ----------
24 .../libva-vdpau-driver-0.7.4-r5.ebuild | 48 ----------------------
25 x11-libs/libva-vdpau-driver/metadata.xml | 12 ------
26 9 files changed, 172 deletions(-)
27
28 diff --git a/profiles/package.mask b/profiles/package.mask
29 index 1aeaca1a7f32..0917d69825d2 100644
30 --- a/profiles/package.mask
31 +++ b/profiles/package.mask
32 @@ -275,13 +275,6 @@ dev-python/kazoo
33 # Use media-sound/mpd if looking for a modern alternative. Removal on 2022-11-07.
34 media-sound/rplay
35
36 -# Matt Turner <mattst88@g.o> (2022-10-01)
37 -# Unmaintained upstream. Last commit was 10 years ago today.
38 -# Unclear if it does anything useful. Many open bugs: #584352, #833102,
39 -# #852728, #866557, #875278.
40 -# Removal on 2022-11-05
41 -x11-libs/libva-vdpau-driver
42 -
43 # Michał Górny <mgorny@g.o> (2022-10-05)
44 # Originally added for dev-python/rapidfuzz. Now the algorithm has been
45 # inlined into rapidfuzz, and the package is semi-deprecated.
46
47 diff --git a/x11-libs/libva-vdpau-driver/Manifest b/x11-libs/libva-vdpau-driver/Manifest
48 deleted file mode 100644
49 index 3c4075e12c5b..000000000000
50 --- a/x11-libs/libva-vdpau-driver/Manifest
51 +++ /dev/null
52 @@ -1 +0,0 @@
53 -DIST libva-vdpau-driver-0.7.4.tar.bz2 316729 BLAKE2B b9cd0bbbe1e638ad29363cd0d8c6452de222023017283ce81f138730c7ba3396f3ffca40478746cab4b93a8855e73de405aa783e44e6c1179c5e347bd7eff657 SHA512 89f98dc1d7d590fb68f440dd1e37e025d64a621324e013e85dd1367681c07b09132fd2089539fc5b48934624648887a8a97539b4f07ddf9f56a8a456ad030094
54
55 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
56 deleted file mode 100644
57 index 74caee3483df..000000000000
58 --- a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch
59 +++ /dev/null
60 @@ -1,29 +0,0 @@
61 ->From fda3706eb74ba5ad874853969f3df3e372739c8d Mon Sep 17 00:00:00 2001
62 -From: "Xiang, Haihao" <haihao.xiang@×××××.com>
63 -Date: Fri, 21 Jun 2013 12:55:30 +0800
64 -Subject: [PATCH] VAEncH264VUIBufferType and VAEncH264SEIBufferType are
65 - dropped from VA API
66 -
67 -The driver doesn't use them indeed
68 -
69 -Signed-off-by: Xiang, Haihao <haihao.xiang@×××××.com>
70 ----
71 - src/vdpau_dump.c | 2 --
72 - 1 file changed, 2 deletions(-)
73 -
74 -diff --git a/src/vdpau_dump.c b/src/vdpau_dump.c
75 -index 899888b..610e7cd 100644
76 ---- a/src/vdpau_dump.c
77 -+++ b/src/vdpau_dump.c
78 -@@ -59,8 +59,6 @@ const char *string_of_VABufferType(VABufferType type)
79 - _(VAEncSequenceParameterBufferType);
80 - _(VAEncPictureParameterBufferType);
81 - _(VAEncSliceParameterBufferType);
82 -- _(VAEncH264VUIBufferType);
83 -- _(VAEncH264SEIBufferType);
84 - #endif
85 - #if VA_CHECK_VERSION(0,31,1)
86 - _(VAQMatrixBufferType);
87 ---
88 -1.7.9.5
89 -
90
91 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
92 deleted file mode 100644
93 index 221b9608fe44..000000000000
94 --- a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-glext-missing-definition.patch
95 +++ /dev/null
96 @@ -1,16 +0,0 @@
97 ---- ./src/utils_glx.h~ 2012-10-05 16:02:58.000000000 +0100
98 -+++ ./src/utils_glx.h 2012-10-19 08:44:12.469642440 +0100
99 -@@ -48,6 +48,13 @@
100 - typedef void (*PFNGLXRELEASETEXIMAGEEXTPROC)(Display *, GLXDrawable, int);
101 - #endif
102 -
103 -+#if GL_GLEXT_VERSION >= 85
104 -+/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED
105 -+ block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h>
106 -+ Redefine the type here as an interim solution */
107 -+typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
108 -+#endif
109 -+
110 - #ifndef GL_FRAMEBUFFER_BINDING
111 - #define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_EXT
112 - #endif
113
114 diff --git a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch
115 deleted file mode 100644
116 index 0d92074ced93..000000000000
117 --- a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch
118 +++ /dev/null
119 @@ -1,25 +0,0 @@
120 -https://bugs.gentoo.org/689530
121 -
122 -libva commit 93c52a17b8d2 ("va_backend: remove unneeded
123 -linux/videodev2.h include") removed an include that provided the
124 -prototype of v4l2_format among other v4l2_* structs.
125 -
126 -Without this or a forward declaration of 'struct v4l2_format', the prototype
127 -and definition of vdpau_CreateSurfaceFromV4L2Buf() (which has a 'struct
128 -v4l2_format *' parameter) are seen as conflicting.
129 -
130 -Just include the removed header where we need it.
131 -
132 -diff --git a/src/vdpau_driver.h b/src/vdpau_driver.h
133 -index 6286d16..54d37fb 100644
134 ---- a/src/vdpau_driver.h
135 -+++ b/src/vdpau_driver.h
136 -@@ -21,6 +21,8 @@
137 - #ifndef VDPAU_DRIVER_H
138 - #define VDPAU_DRIVER_H
139 -
140 -+#include <linux/videodev2.h>
141 -+
142 - #include <va/va_backend.h>
143 - #include "vaapi_compat.h"
144 - #include "vdpau_gate.h"
145
146 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
147 deleted file mode 100644
148 index 412e9c308480..000000000000
149 --- a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch
150 +++ /dev/null
151 @@ -1,13 +0,0 @@
152 -http://bugs.gentoo.org/517778
153 -
154 ---- a/src/vdpau_decode.c
155 -+++ b/src/vdpau_decode.c
156 -@@ -1289,7 +1289,7 @@
157 - driver_data,
158 - obj_context->vdp_decoder,
159 - obj_surface->vdp_surface,
160 -- (VdpPictureInfo)&obj_context->vdp_picture_info,
161 -+ (VdpPictureInfo *)&obj_context->vdp_picture_info,
162 - obj_context->vdp_bitstream_buffers_count,
163 - obj_context->vdp_bitstream_buffers
164 - );
165
166 diff --git a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-sigfpe-crash.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-sigfpe-crash.patch
167 deleted file mode 100644
168 index e2fe02ccf320..000000000000
169 --- a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-sigfpe-crash.patch
170 +++ /dev/null
171 @@ -1,21 +0,0 @@
172 -Description: Fix a crash if a heap is destroyed before being initialized
173 -Author: Sebastian Ramacher <sramacher@××××××.org>
174 -Bug: https://bugs.freedesktop.org/show_bug.cgi?id=58836
175 -Bug-Debian: http://bugs.debian.org/748294
176 -Last-Update: 2014-06-02
177 -
178 ---- vdpau-video-0.7.4.orig/src/object_heap.c
179 -+++ vdpau-video-0.7.4/src/object_heap.c
180 -@@ -272,8 +272,10 @@ object_heap_destroy(object_heap_p heap)
181 - ASSERT(obj->next_free != ALLOCATED);
182 - }
183 -
184 -- for (i = 0; i < heap->heap_size / heap->heap_increment; i++) {
185 -- free(heap->bucket[i]);
186 -+ if (heap->bucket) {
187 -+ for (i = 0; i < heap->heap_size / heap->heap_increment; i++) {
188 -+ free(heap->bucket[i]);
189 -+ }
190 - }
191 -
192 - pthread_mutex_destroy(&heap->mutex);
193
194 diff --git a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild
195 deleted file mode 100644
196 index 58110c538e80..000000000000
197 --- a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild
198 +++ /dev/null
199 @@ -1,48 +0,0 @@
200 -# Copyright 1999-2021 Gentoo Authors
201 -# Distributed under the terms of the GNU General Public License v2
202 -
203 -EAPI=7
204 -
205 -inherit autotools multilib-minimal
206 -
207 -DESCRIPTION="VDPAU Backend for Video Acceleration (VA) API"
208 -HOMEPAGE="https://www.freedesktop.org/wiki/Software/vaapi"
209 -SRC_URI="https://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${P}.tar.bz2"
210 -
211 -LICENSE="GPL-2"
212 -SLOT="0"
213 -KEYWORDS="amd64 arm64 ~riscv x86"
214 -IUSE="debug opengl"
215 -
216 -RDEPEND="
217 - >=media-libs/libva-1.2.1-r1:=[X,opengl?,${MULTILIB_USEDEP}]
218 - >=x11-libs/libvdpau-0.8[${MULTILIB_USEDEP}]
219 - opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
220 -"
221 -DEPEND="${RDEPEND}"
222 -BDEPEND="virtual/pkgconfig"
223 -
224 -DOCS=( NEWS README AUTHORS )
225 -
226 -PATCHES=(
227 - "${FILESDIR}"/${P}-glext-missing-definition.patch
228 - "${FILESDIR}"/${P}-VAEncH264VUIBufferType.patch
229 - "${FILESDIR}"/${P}-libvdpau-0.8.patch
230 - "${FILESDIR}"/${P}-sigfpe-crash.patch
231 - "${FILESDIR}"/${P}-include-linux-videodev2.h.patch
232 -)
233 -
234 -src_prepare() {
235 - default
236 - sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
237 - eautoreconf
238 -}
239 -
240 -multilib_src_configure() {
241 - local myeconfargs=(
242 - $(use_enable debug)
243 - $(use_enable opengl glx)
244 - )
245 -
246 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
247 -}
248
249 diff --git a/x11-libs/libva-vdpau-driver/metadata.xml b/x11-libs/libva-vdpau-driver/metadata.xml
250 deleted file mode 100644
251 index 970c74a76a49..000000000000
252 --- a/x11-libs/libva-vdpau-driver/metadata.xml
253 +++ /dev/null
254 @@ -1,12 +0,0 @@
255 -<?xml version="1.0" encoding="UTF-8"?>
256 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
257 -<pkgmetadata>
258 - <maintainer type="person">
259 - <email>aballier@g.o</email>
260 - <name>Alexis Ballier</name>
261 - </maintainer>
262 -<maintainer type="project">
263 - <email>x11@g.o</email>
264 - <name>X11</name>
265 - </maintainer>
266 -</pkgmetadata>