* [gentoo-commits] proj/musl:master commit in: x11-libs/libva-vdpau-driver/files/, x11-libs/libva-vdpau-driver/
@ 2019-08-18 23:59 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2019-08-18 23:59 UTC (permalink / raw
To: gentoo-commits
commit: 57a61bd634fbd53e799719d31c3d960fbf1747ce
Author: g3ngr33n <gengreen <AT> tutanota <DOT> com>
AuthorDate: Sun Aug 11 06:53:37 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Aug 18 23:58:39 2019 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=57a61bd6
x11-libs/libva-vdpau-driver:
Bump 0.7.4-r5
- Fix headers time.h
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
x11-libs/libva-vdpau-driver/Manifest | 2 +-
| 10 +++++++
.../libva-vdpau-driver-0.7.4-r4.ebuild | 2 +-
...4.ebuild => libva-vdpau-driver-0.7.4-r5.ebuild} | 33 +++++++++++++---------
4 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/x11-libs/libva-vdpau-driver/Manifest b/x11-libs/libva-vdpau-driver/Manifest
index b79becd..3c4075e 100644
--- a/x11-libs/libva-vdpau-driver/Manifest
+++ b/x11-libs/libva-vdpau-driver/Manifest
@@ -1 +1 @@
-DIST libva-vdpau-driver-0.7.4.tar.bz2 316729 SHA256 155c1982f0ac3f5435ba20b221bcaa11be212c37db548cd1f2a030ffa17e9bb9 SHA512 89f98dc1d7d590fb68f440dd1e37e025d64a621324e013e85dd1367681c07b09132fd2089539fc5b48934624648887a8a97539b4f07ddf9f56a8a456ad030094 WHIRLPOOL b6ba281a482dc944acff67d83d26d5a5ac7f15ea1de05c921383bdf0f6dae769d0389e6d15b607e01a8d4e18d3254f66391bbd497aa4e0eed2adbab54a13bce1
+DIST libva-vdpau-driver-0.7.4.tar.bz2 316729 BLAKE2B b9cd0bbbe1e638ad29363cd0d8c6452de222023017283ce81f138730c7ba3396f3ffca40478746cab4b93a8855e73de405aa783e44e6c1179c5e347bd7eff657 SHA512 89f98dc1d7d590fb68f440dd1e37e025d64a621324e013e85dd1367681c07b09132fd2089539fc5b48934624648887a8a97539b4f07ddf9f56a8a456ad030094
--git a/x11-libs/libva-vdpau-driver/files/0001-fix-headers-musl.patch b/x11-libs/libva-vdpau-driver/files/0001-fix-headers-musl.patch
new file mode 100644
index 0000000..2529fb2
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/files/0001-fix-headers-musl.patch
@@ -0,0 +1,10 @@
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -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/libva-vdpau-driver-0.7.4-r4.ebuild b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r4.ebuild
index c7a8a2e..cb8f67d 100644
--- a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r4.ebuild
+++ b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
diff --git a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r4.ebuild b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild
similarity index 55%
copy from x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r4.ebuild
copy to x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild
index c7a8a2e..23e613e 100644
--- a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r4.ebuild
+++ b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib eutils
+inherit autotools multilib-minimal
DESCRIPTION="VDPAU Backend for Video Acceleration (VA) API"
HOMEPAGE="https://www.freedesktop.org/wiki/Software/vaapi"
@@ -12,27 +11,32 @@ SRC_URI="https://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="debug opengl"
-RDEPEND=">=x11-libs/libva-1.2.1-r1[X,opengl?,${MULTILIB_USEDEP}]
+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}
+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
+ "${FILESDIR}"/${P}-include-linux-videodev2.h.patch
+ "${FILESDIR}"/0001-fix-headers-musl.patch
+)
+
src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-glext-missing-definition.patch \
- "${FILESDIR}"/${P}-VAEncH264VUIBufferType.patch \
- "${FILESDIR}"/${P}-libvdpau-0.8.patch \
- "${FILESDIR}"/${P}-missing-sys_time_h.patch
+ default
sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
- autotools-multilib_src_prepare
+ eautoreconf
}
multilib_src_configure() {
@@ -40,5 +44,6 @@ multilib_src_configure() {
$(use_enable debug)
$(use_enable opengl glx)
)
- autotools-utils_src_configure
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/musl:master commit in: x11-libs/libva-vdpau-driver/files/, x11-libs/libva-vdpau-driver/
@ 2019-12-25 19:24 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2019-12-25 19:24 UTC (permalink / raw
To: gentoo-commits
commit: 67277b88c7b5fa08205cffa49b10472b78a10137
Author: g3ngr33n <gengreen <AT> tutanota <DOT> com>
AuthorDate: Thu Dec 19 15:32:16 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Dec 25 19:24:16 2019 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=67277b88
x11-libs/libva-vdpau-driver: Fix ebuild
Fix incorrect patch files
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
| 10 ---------
...au-driver-0.7.4-include-linux-videodev2.h.patch | 25 ++++++++++++++++++++++
.../libva-vdpau-driver-0.7.4-libvdpau-0.8.patch | 4 ++--
...bva-vdpau-driver-0.7.4-missing-sys_time_h.patch | 5 ++---
.../libva-vdpau-driver-0.7.4-sigfpe-crash.patch | 21 ++++++++++++++++++
.../libva-vdpau-driver-0.7.4-r5.ebuild | 3 ++-
6 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/x11-libs/libva-vdpau-driver/files/0001-fix-headers-musl.patch b/x11-libs/libva-vdpau-driver/files/0001-fix-headers-musl.patch
deleted file mode 100644
index 2529fb2..0000000
--- a/x11-libs/libva-vdpau-driver/files/0001-fix-headers-musl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/utils.c
-+++ b/src/utils.c
-@@ -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-include-linux-videodev2.h.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch
new file mode 100644
index 0000000..0d92074
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/689530
+
+libva commit 93c52a17b8d2 ("va_backend: remove unneeded
+linux/videodev2.h include") removed an include that provided the
+prototype of v4l2_format among other v4l2_* structs.
+
+Without this or a forward declaration of 'struct v4l2_format', the prototype
+and definition of vdpau_CreateSurfaceFromV4L2Buf() (which has a 'struct
+v4l2_format *' parameter) are seen as conflicting.
+
+Just include the removed header where we need it.
+
+diff --git a/src/vdpau_driver.h b/src/vdpau_driver.h
+index 6286d16..54d37fb 100644
+--- a/src/vdpau_driver.h
++++ b/src/vdpau_driver.h
+@@ -21,6 +21,8 @@
+ #ifndef VDPAU_DRIVER_H
+ #define VDPAU_DRIVER_H
+
++#include <linux/videodev2.h>
++
+ #include <va/va_backend.h>
+ #include "vaapi_compat.h"
+ #include "vdpau_gate.h"
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 6d6d47a..412e9c3 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-missing-sys_time_h.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-missing-sys_time_h.patch
index d37784a..2529fb2 100644
--- 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
@@ -1,6 +1,5 @@
-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
+--- a/src/utils.c
++++ b/src/utils.c
@@ -21,6 +21,7 @@
#include "sysdeps.h"
#include "utils.h"
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 0000000..e2fe02c
--- /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
index 23e613e..15a4cc7 100644
--- 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
@@ -30,7 +30,8 @@ PATCHES=(
"${FILESDIR}"/${P}-libvdpau-0.8.patch
"${FILESDIR}"/${P}-sigfpe-crash.patch
"${FILESDIR}"/${P}-include-linux-videodev2.h.patch
- "${FILESDIR}"/0001-fix-headers-musl.patch
+ "${FILESDIR}"/${P}-missing-sys_time_h.patch
+
)
src_prepare() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-12-25 19:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-25 19:24 [gentoo-commits] proj/musl:master commit in: x11-libs/libva-vdpau-driver/files/, x11-libs/libva-vdpau-driver/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2019-08-18 23:59 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox