commit: 075847e763f1a97c3c90fa264acadcb0822cd1d5 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Fri May 27 19:13:52 2016 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Fri May 27 19:13:52 2016 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=075847e7
x11-libs/libva-vdpau-driver: fix bug #584352 Package-Manager: portage-2.2.28 RepoMan-Options: --force x11-libs/libva-vdpau-driver/Manifest | 8 ++++ ...vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch | 29 ++++++++++++++ ...pau-driver-0.7.4-glext-missing-definition.patch | 16 ++++++++ .../libva-vdpau-driver-0.7.4-libvdpau-0.8.patch | 13 ++++++ ...bva-vdpau-driver-0.7.4-missing-sys_time_h.patch | 11 ++++++ .../files/libva-vdpau-driver-0.7.4-nouveau.patch | 8 ++++ .../libva-vdpau-driver-0.7.4-r99.ebuild | 46 ++++++++++++++++++++++ x11-libs/libva-vdpau-driver/metadata.xml | 12 ++++++ 8 files changed, 143 insertions(+) diff --git a/x11-libs/libva-vdpau-driver/Manifest b/x11-libs/libva-vdpau-driver/Manifest new file mode 100644 index 0000000..cc7a6d8 --- /dev/null +++ b/x11-libs/libva-vdpau-driver/Manifest @@ -0,0 +1,8 @@ +AUX libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch 892 SHA256 1ae32b8e5cca1717be4a63f09e8c6bd84a3e9b712b933816cdb32bb315dbda98 SHA512 f60e84f88eca17e762e3d5a53404d0215bca27051c02ff3e4441ad2c2897c0c04297b8e7b4693c37404bde95d7b5d7a6392b4c17ab1ece5f1bd78e6af376b301 WHIRLPOOL 801511b1d4d91ffc50f03c1ed53b5469db495fe62b88ea987857e2c109b53eb441aeabbd1043c0f265ff0bf020da090ff978239d3b8d4d2e89e5e2fff37ca591 +AUX libva-vdpau-driver-0.7.4-glext-missing-definition.patch 659 SHA256 031f1a6b43c20fc3ac2f9da841eff02f6950569cb34f0b4be9fc93642d2dd927 SHA512 bb86ef063eb695c77bbe0fd0c273f1c2a479d1803b8381ffaeac5917de8a7d6e11cef33569d75fbbc1d16e9b64913e8f4a60fbb1b80afc5e381033bf34a192de WHIRLPOOL 2a28f72863c6fa0b36f99d398dead39051d895dfdbf3929809d3f5185a121569da96148c2c49a7ccd17cd3ded058f71de0be18fd9ade6844d0989c0d02be6ca5 +AUX libva-vdpau-driver-0.7.4-libvdpau-0.8.patch 442 SHA256 74b9ccd36e7fb90655e0855cf62111fd555390d1a396983af5687b9e8af64cd8 SHA512 969fb8011408acb2bc78a52672cb5a227ae876a2beb5cf209ae558031d71cf255849d5aeb301479f420de97a69b0055990d4ecdd3e0c684f678845b08e6b6632 WHIRLPOOL 22ee9c6a5dbc9f62f28d6602ceaf9729753d45eb1b097005df1ab9cf4d4c06ea497dde8a6abeead13707a2c0412dc510a927bc44240771ff08adc82de74f96c1 +AUX libva-vdpau-driver-0.7.4-missing-sys_time_h.patch 390 SHA256 a25fc8d233a0b41116e28410ab134d6acc0974de736a1dbda18e050409871e5b SHA512 efaa0f849005b95ecd9afed34954167e8e02e1255946d5b0696731388287a6afa91c9399e949a41485faeffa4587512264525935cbed53ef564e26c980672fed WHIRLPOOL 6d5b4e5e3217cbe41c3bc8d608f61370ec346fac2c3367ffeb2203ca837371c22f24ba82c7dbf294aef887961eee500831c0831edd5f0d20f898954e6a826feb +AUX libva-vdpau-driver-0.7.4-nouveau.patch 189 SHA256 75897391fdcec4cc28f176ed62184fe0042c4abb8f3c80d19d975050ffaa6072 SHA512 0eb5b3a1e6b077ad0ba350309cd64ab54fa8499c1c27d2789ee3bb433c59adbed3497e79e7870af38d82b91525376bf8116242570b9fdf4f1836ab8c76122330 WHIRLPOOL e028f2f2e5d1023fd1884776a08d67fcabe3d79cfcd3fccfa1182a2012b6f29a81a7b1328707199734443c01cbf9c800bcf38e21affa3ba83a3a1c2dc531b111 +DIST libva-vdpau-driver-0.7.4.tar.bz2 316729 SHA256 155c1982f0ac3f5435ba20b221bcaa11be212c37db548cd1f2a030ffa17e9bb9 SHA512 89f98dc1d7d590fb68f440dd1e37e025d64a621324e013e85dd1367681c07b09132fd2089539fc5b48934624648887a8a97539b4f07ddf9f56a8a456ad030094 WHIRLPOOL b6ba281a482dc944acff67d83d26d5a5ac7f15ea1de05c921383bdf0f6dae769d0389e6d15b607e01a8d4e18d3254f66391bbd497aa4e0eed2adbab54a13bce1 +EBUILD libva-vdpau-driver-0.7.4-r99.ebuild 1220 SHA256 d30c3e9e27dcd1d4fd2adfb8fe15a1a849b7fb9be6ed9ad9e94dca46201c7cbf SHA512 a071af42ab251293b6a9b3e10d416e7c77ef7b5e90d1c27b662e2b92c03cf0c234635c1f5b80139fb73e48d3d4a5be209891b2fd3f88d11265e4e48600eee5d6 WHIRLPOOL 0c6e613707c5309f7a721e9a264310667a86ccb36bbae7acb12c1cb48c1bdb73026a3873f7f3bb3ee95a0a24e5fd2fafe1df98c853e5f650fd519e4bbffd29a2 +MISC metadata.xml 354 SHA256 47431000bf27b89ea7fc385614736723629ffb54d9e4ab6936eaf3ccc943cd93 SHA512 99a9dd9651a16776c22ce528709e588a956d4b20d305392054b3c65e59bbd1ef855c2e916f2458cfda9797efa2570ac0ed706ca20d1df2f878435c6f4f6ca2cd WHIRLPOOL 83a91d522f07e16330fe3a42bc058cbf7981ab54038b033a9ebe3d97b6157ac800b0b32c8da2419b548107dcc80179b59691436074ce9c0be499802032d65484 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 new file mode 100644 index 0000000..74caee3 --- /dev/null +++ b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch @@ -0,0 +1,29 @@ +>From fda3706eb74ba5ad874853969f3df3e372739c8d Mon Sep 17 00:00:00 2001 +From: "Xiang, Haihao" <[email protected]> +Date: Fri, 21 Jun 2013 12:55:30 +0800 +Subject: [PATCH] VAEncH264VUIBufferType and VAEncH264SEIBufferType are + dropped from VA API + +The driver doesn't use them indeed + +Signed-off-by: Xiang, Haihao <[email protected]> +--- + src/vdpau_dump.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/vdpau_dump.c b/src/vdpau_dump.c +index 899888b..610e7cd 100644 +--- a/src/vdpau_dump.c ++++ b/src/vdpau_dump.c +@@ -59,8 +59,6 @@ const char *string_of_VABufferType(VABufferType type) + _(VAEncSequenceParameterBufferType); + _(VAEncPictureParameterBufferType); + _(VAEncSliceParameterBufferType); +- _(VAEncH264VUIBufferType); +- _(VAEncH264SEIBufferType); + #endif + #if VA_CHECK_VERSION(0,31,1) + _(VAQMatrixBufferType); +-- +1.7.9.5 + 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 new file mode 100644 index 0000000..221b960 --- /dev/null +++ b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-glext-missing-definition.patch @@ -0,0 +1,16 @@ +--- ./src/utils_glx.h~ 2012-10-05 16:02:58.000000000 +0100 ++++ ./src/utils_glx.h 2012-10-19 08:44:12.469642440 +0100 +@@ -48,6 +48,13 @@ + typedef void (*PFNGLXRELEASETEXIMAGEEXTPROC)(Display *, GLXDrawable, int); + #endif + ++#if GL_GLEXT_VERSION >= 85 ++/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED ++ block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h> ++ Redefine the type here as an interim solution */ ++typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t); ++#endif ++ + #ifndef GL_FRAMEBUFFER_BINDING + #define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_EXT + #endif 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 new file mode 100644 index 0000000..6d6d47a --- /dev/null +++ b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch @@ -0,0 +1,13 @@ +http://bugs.gentoo.org/517778 + +--- src/vdpau_decode.c ++++ src/vdpau_decode.c +@@ -1289,7 +1289,7 @@ + driver_data, + obj_context->vdp_decoder, + obj_surface->vdp_surface, +- (VdpPictureInfo)&obj_context->vdp_picture_info, ++ (VdpPictureInfo *)&obj_context->vdp_picture_info, + obj_context->vdp_bitstream_buffers_count, + obj_context->vdp_bitstream_buffers + ); 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 new file mode 100644 index 0000000..d37784a --- /dev/null +++ b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-missing-sys_time_h.patch @@ -0,0 +1,11 @@ +diff -Naur libva-vdpau-driver-0.7.4.orig/src/utils.c libva-vdpau-driver-0.7.4/src/utils.c +--- libva-vdpau-driver-0.7.4.orig/src/utils.c 2016-05-27 19:07:51.001006381 +0000 ++++ libva-vdpau-driver-0.7.4/src/utils.c 2016-05-27 18:23:39.534238312 +0000 +@@ -21,6 +21,7 @@ + #include "sysdeps.h" + #include "utils.h" + #include <time.h> ++#include <sys/time.h> + #include <errno.h> + + #define DEBUG 1 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 new file mode 100644 index 0000000..b697698 --- /dev/null +++ b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-nouveau.patch @@ -0,0 +1,8 @@ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,4 +1,5 @@ + DRIVERS = nvidia ++DRIVERS += nouveau + DRIVERS += s3g # native VA-API driver is too old, so use VDPAU based one + + INCLUDES = \ 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 new file mode 100644 index 0000000..b07a766 --- /dev/null +++ b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r99.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF="yes" +inherit autotools-multilib eutils + +DESCRIPTION="VDPAU Backend for Video Acceleration (VA) API" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/vaapi"; +SRC_URI="https://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${P}.tar.bz2"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="debug opengl" + +RDEPEND=">=x11-libs/libva-1.2.1-r1[X,opengl?,${MULTILIB_USEDEP}] + opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) + >=x11-libs/libvdpau-0.8[${MULTILIB_USEDEP}] + !x11-libs/vdpau-video" + +DEPEND="${DEPEND} + virtual/pkgconfig" + +DOCS=( NEWS README AUTHORS ) + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-glext-missing-definition.patch \ + "${FILESDIR}"/${P}-VAEncH264VUIBufferType.patch \ + "${FILESDIR}"/${P}-libvdpau-0.8.patch \ + "${FILESDIR}"/${P}-nouveau.patch \ + "${FILESDIR}"/${P}-missing-sys_time_h.patch + sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die + autotools-multilib_src_prepare +} + +multilib_src_configure() { + local myeconfargs=( + $(use_enable debug) + $(use_enable opengl glx) + ) + autotools-utils_src_configure +} diff --git a/x11-libs/libva-vdpau-driver/metadata.xml b/x11-libs/libva-vdpau-driver/metadata.xml new file mode 100644 index 0000000..e0c65e5 --- /dev/null +++ b/x11-libs/libva-vdpau-driver/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> + <maintainer type="person"> + <email>[email protected]</email> + <name>Alexis Ballier</name> + </maintainer> +<maintainer type="project"> + <email>[email protected]</email> + <name>X11</name> + </maintainer> +</pkgmetadata>
