gentoo resync : 16.06.2019

4 files changed, 73 insertions, 3 deletions

diff --git a/x11-libs/libva-vdpau-driver/Manifest b/x11-libs/libva-vdpau-driver/Manifest
index d58eba0e34fd..865bdc65cef0 100644
--- a/x11-libs/libva-vdpau-driver/Manifest
+++ b/x11-libs/libva-vdpau-driver/Manifest
@@ -1,6 +1,8 @@
 AUX libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch 892 BLAKE2B 5a5a12aff1f93769d480525140e7a0d61f4db64e57f1f956d778d1ab8be881b209779030ce14b8fee53dd4cbb6a7c59a0c9297ad0c92548268c840ea0f5910b0 SHA512 f60e84f88eca17e762e3d5a53404d0215bca27051c02ff3e4441ad2c2897c0c04297b8e7b4693c37404bde95d7b5d7a6392b4c17ab1ece5f1bd78e6af376b301
 AUX libva-vdpau-driver-0.7.4-glext-missing-definition.patch 659 BLAKE2B 2729caf9edaaf2826d1f74de4594522323c5bf15ec0b40e7fbeef71d9b193d5cdfa5786bebc81bc6cda721717f9abf61a50c13003434f5838057cd923a8fc5b2 SHA512 bb86ef063eb695c77bbe0fd0c273f1c2a479d1803b8381ffaeac5917de8a7d6e11cef33569d75fbbc1d16e9b64913e8f4a60fbb1b80afc5e381033bf34a192de
-AUX libva-vdpau-driver-0.7.4-libvdpau-0.8.patch 442 BLAKE2B c32509511f6d51b2b614b19576ac6802200262c505ad457bd2add5db1203954e0aa4d5968e05cb9be1c3d84c5c7f973ef65014ac260f5af7d5f294f35daea6ae SHA512 969fb8011408acb2bc78a52672cb5a227ae876a2beb5cf209ae558031d71cf255849d5aeb301479f420de97a69b0055990d4ecdd3e0c684f678845b08e6b6632
+AUX libva-vdpau-driver-0.7.4-libvdpau-0.8.patch 446 BLAKE2B 3fd96d388be5d55541a3c15a7eac4248d4dd4601a0d116abc09dd1383b407f926a86e448e470617f65ba3f303a4f8421efee97fd6593419e60e3960a5bb6598a SHA512 49555a2efb0b8a49e2dcf942d97c4b862f67e22947adcad2694bc3ee7f94d2e784dddba474e097e0c2f6575afb7ecf5041d2c95ebc8573ca9e3f5bb641fb6cab
+AUX libva-vdpau-driver-0.7.4-sigfpe-crash.patch 742 BLAKE2B c1e3a3af09c0c121747b0da28cb256ab4f9783254349be6accad512b7c4872065909bb6701ff0bee07c04e8c7ed34b93a7f6e50b964a1207501209d75f70d26b SHA512 f56d7e64bfc36f0c54eb5bef8fec3ce0b3efcbcec3fbb4dcda599fb4d553f2ee494a87b8b8a7a1c642598dcca385872b68b612b31f965eb1c943123e75630ccc
 DIST libva-vdpau-driver-0.7.4.tar.bz2 316729 BLAKE2B b9cd0bbbe1e638ad29363cd0d8c6452de222023017283ce81f138730c7ba3396f3ffca40478746cab4b93a8855e73de405aa783e44e6c1179c5e347bd7eff657 SHA512 89f98dc1d7d590fb68f440dd1e37e025d64a621324e013e85dd1367681c07b09132fd2089539fc5b48934624648887a8a97539b4f07ddf9f56a8a456ad030094
 EBUILD libva-vdpau-driver-0.7.4-r4.ebuild 1131 BLAKE2B 4e07ca091e60a04ebf2d3dbfdf4adf572f37fd8c990814e939ed6ed62f986fada773947a0ed9fe8fa0e35034a2f08ef89965bf08208b3cdfae4496012cfd9b17 SHA512 869c76363f55138f35f01e9ce2c051d4f46d53263a759cac286dbd3a1028457793c5c234eefbb7909f7af9b4eb5e36ad2d6c6f4cb3fef32ba8bffd86dad881b3
+EBUILD libva-vdpau-driver-0.7.4-r5.ebuild 1153 BLAKE2B f2a457e9e66a3f9cd41811b732075b2be57f187b4fc290fece6c17095293b678b986adb9af8e8e72cdb903c71b994f3c341bb84d5071cb93ccc8604cdecceb4b SHA512 acdd83d8eaba4dbda5b6fb40edbf931d52f87c1d7940f3b707293b47eb47b5aef719f355404d0a923b05e9dd23366ba0ccc4f650cd9b9b54eee1c704fc185cfd
 MISC metadata.xml 354 BLAKE2B d83783f14cc4b4e0c43c6fc50fc3324a8b1fc19af5457bfdaa48ce3ade989764d06a4a12702aaaddbf292900903896813beb30fe4506e3e8029d966c446880fd SHA512 99a9dd9651a16776c22ce528709e588a956d4b20d305392054b3c65e59bbd1ef855c2e916f2458cfda9797efa2570ac0ed706ca20d1df2f878435c6f4f6ca2cd
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
index 6d6d47ad0b06..412e9c308480 100644
--- 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
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/517778
 
---- src/vdpau_decode.c
-+++ src/vdpau_decode.c
+--- a/src/vdpau_decode.c
++++ b/src/vdpau_decode.c
 @@ -1289,7 +1289,7 @@
              driver_data,
              obj_context->vdp_decoder,
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
new file mode 100644
index 000000000000..e2fe02ccf320
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-sigfpe-crash.patch
@@ -0,0 +1,21 @@
+Description: Fix a crash if a heap is destroyed before being initialized
+Author: Sebastian Ramacher <sramacher@debian.org>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=58836
+Bug-Debian: http://bugs.debian.org/748294
+Last-Update: 2014-06-02
+
+--- vdpau-video-0.7.4.orig/src/object_heap.c
++++ vdpau-video-0.7.4/src/object_heap.c
+@@ -272,8 +272,10 @@ object_heap_destroy(object_heap_p heap)
+         ASSERT(obj->next_free != ALLOCATED);
+     }
+ 
+-    for (i = 0; i < heap->heap_size / heap->heap_increment; i++) {
+-        free(heap->bucket[i]);
++    if (heap->bucket) {
++        for (i = 0; i < heap->heap_size / heap->heap_increment; i++) {
++            free(heap->bucket[i]);
++        }
+     }
+ 
+     pthread_mutex_destroy(&heap->mutex);
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
new file mode 100644
index 000000000000..35a25d844b00
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+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 ~arm64 ~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="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( NEWS README AUTHORS )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-glext-missing-definition.patch
+	"${FILESDIR}"/${P}-VAEncH264VUIBufferType.patch
+	"${FILESDIR}"/${P}-libvdpau-0.8.patch
+	"${FILESDIR}"/${P}-sigfpe-crash.patch
+)
+
+src_prepare() {
+	default
+	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable opengl glx)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}