summaryrefslogtreecommitdiff
path: root/x11-libs/libva
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-01-29 18:03:51 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-01-29 18:03:51 +0000
commitd7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (patch)
tree1814dd2b5bbf2e7639fdafbeef48d228cfaf5e9b /x11-libs/libva
parentabaa75b10f899ada8dd05b23cc03205064394bc6 (diff)
gentoo resync : 29.01.2021
Diffstat (limited to 'x11-libs/libva')
-rw-r--r--x11-libs/libva/Manifest4
-rw-r--r--x11-libs/libva/files/libva-2.10.0-fix_wayland_build.patch29
-rw-r--r--x11-libs/libva/files/libva-2.10.0-unbreak_gnu_sed.patch31
-rw-r--r--x11-libs/libva/libva-2.10.0.ebuild2
4 files changed, 32 insertions, 34 deletions
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index f3b95a054705..93e98e9d510d 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -1,4 +1,4 @@
-AUX libva-2.10.0-unbreak_gnu_sed.patch 1029 BLAKE2B 205fdb43e85631f8213da70f136e5c6cc2ca3b31a02c829141cc6080455ad98b946438e345e147403e0e0f545e0e0915605fb2fb52108f70b9e4133663b0b376 SHA512 7c1cfed2dba5adb8c38fb9b95d824531ea18b74fd6b7d23bce6012285fa56ecaff3baa977461a1ccc41e4e858af02fe4a00628ddcd3e33c43829d6199a3e1b56
+AUX libva-2.10.0-fix_wayland_build.patch 1018 BLAKE2B fac2b0f159fcd6ab671f36e0ce41a6fed7714a0d50dac8058d5858814fc06d330a111a96a810bb81709286f498a1cb6550987171badbcf4a1abacf9c99403d21 SHA512 51b1252e5923dcbd94d498048905400f0241302af5d52b6fdff8f0d62f8bfcadf05c36cf8f1acd222dbf9f3a11e2938d8fc9969fd66d4ef0aa77b001bd069f39
DIST libva-2.10.0.tar.bz2 484741 BLAKE2B 9c3912d5337d3624af9ffc537a972479385285413712948159641d10b60a39b60754b3bc6467a0508a878df29be23c0e2bace488bdf9047f3e162ca0b573fa5f SHA512 9225120f17e0d935927cb0046c3a6086c776beac71a8ef7fd800d2c6a721d0e28a13be89221c5ef3cca1634317aaa2a513554ccf25a54f25b2a339603c4a11a1
DIST libva-2.5.0.tar.bz2 459677 BLAKE2B d6e5bf94bcbda0a724634164bd8cf91efbdbe36120e62e7e7eefcd749afffec1950d8904318b472c81ae07490c559c68b0853725c654a08592457118cd5d6a83 SHA512 ffaeb9cf8ed1f93073c1cb3e58f5b3d3612e81622d02f8e428c089f625d4370b496b7681ac2fc2823c48670c9fd3da50893b1db51de768cf0f5d866e2ee78106
DIST libva-2.6.1.tar.bz2 466497 BLAKE2B d4ea6e6d0102722206d94725932f0b3cf650bab3f02235f4c627dc83e5417b786f9524430d793f1067d002a0c9d7cbc92a7c740383c698d225a14946e1bb90ba SHA512 b57f0c0dda5ebadc92f56bc7fb835c2931cafffca9413fb4d244ea1dd47b603376323e6bebf144ccb2d2cf3499c64b101f8e03ff1809bd81242718d224d2d17d
@@ -6,7 +6,7 @@ DIST libva-2.7.1.tar.bz2 477933 BLAKE2B 261e608af3f1427bed0244d4ebbc0d3ffe568166
DIST libva-2.8.0.tar.bz2 478734 BLAKE2B b11393a9b9ec7ef4cf91d20d4005d42ad3d0e6a4a8e4d8cda67816bc5b9d3b23900754b5e8af92386dcf99a11e53af70fc4723ffecc715328c8fbf3d40486098 SHA512 329c5fc2262a6f4fddfcb13bd9644589248be6ae18fa1481cccc6b33874b91b60ad3f16a1777712f7a4817ba576db984834aa8735e6ad13d99b2f5aa13e9ddfa
DIST libva-2.9.0.tar.bz2 481556 BLAKE2B 5509f3d7df11a11602331a3b6bb78d3a5d3dfbeff024eaa77594918c49cd48ec9e8ee017d8ac7b4aa1dbd3252a23caecce9a10a8a9e12ef4c483a8a34e028b20 SHA512 496358b73cd525d8c9dc1fcf3dbf992ec997ecc8f7be31f0e226ded173aecf29d8d4b60cc7cc5ee7beac538061659841145f67f449a03a04236a6ee7ae6f8323
DIST libva-2.9.1.tar.gz 240934 BLAKE2B 76333a9ce78783c3d94798a19ea6a52d95768ca7e5a547094290313d4f5c610841787d4420d19e0553174933beaf5fbf68e7e849ad38682173f670de0d9a76e5 SHA512 79fd0b41795ac5de68bdd6470389fad6caf016fa4a44f2cd775c0a65d6d8f270a7e237d3b2e42a90376c103d2d2e2c010fe47835c7a15d79b94beaced02a2884
-EBUILD libva-2.10.0.ebuild 2234 BLAKE2B 482b441d1e3da0f051b8b5f75540a151dc11b77bc8fb85085f53eba0420399b85135618f96efe075aaab0fcbd8b8233dff8416ffd24b5b07c3caacd75c2d3584 SHA512 134a84329f891f8e3f84930ba62c2ad0b7f9d74a712878a5233ffb6ec570ecbe699dd7967a2f1eabf2af9872c82e1406f0f4b47c26b82737b8101a2e5dfcc175
+EBUILD libva-2.10.0.ebuild 2236 BLAKE2B 78342bcc6f5907a1ddb079220e5dea1303ba14061a2175bd252dedc51d3d0f6eb974a81323138a0bd83feca36934eefa55c474c86a399b600954b0767d6cf265 SHA512 c6ceb43f829ebd618f78c74b2513df8ccc9def9be95fef17a6e98991b6433bf8132ba519d97028185cc4c55ba51507b0ced0461a3d98707b9bbe246a4e949d54
EBUILD libva-2.5.0-r1.ebuild 2186 BLAKE2B 7c9a9dc3f979909e02812398551197938bce437f0092940361853613fff9813e2d06af44f4e09130cb27ac4313722eba8b869ec0a8681532f07c6449ee4c0078 SHA512 2d8f8705c68d3a1bda268a18e8e65dc3e8d8f0d73fdcea6f6e8e5908028598f1a0e3865818ef37643bc6843af9dcb3f4fa9a167d021dbf67772937af2df721ed
EBUILD libva-2.6.1.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
EBUILD libva-2.7.1.ebuild 2193 BLAKE2B 331542be784f71417c51fda406846e3613976a5639492e3715f02dbcd1ffb2e1236700c164cc519fec7b14112c5aa150905a2b680d5810a9211897a4ed854a43 SHA512 bb0aa7dfac518d3b1c60fa99315de482840d8b5840652576977d10065f41cab3df44db4e78a33c65ac932e4a3e4317896abcb2ccbaefcaaab31feccc6978c57b
diff --git a/x11-libs/libva/files/libva-2.10.0-fix_wayland_build.patch b/x11-libs/libva/files/libva-2.10.0-fix_wayland_build.patch
new file mode 100644
index 000000000000..cf799cd3d686
--- /dev/null
+++ b/x11-libs/libva/files/libva-2.10.0-fix_wayland_build.patch
@@ -0,0 +1,29 @@
+From 3a71a012b72480ffdf1e2361845036f3cc9d7154 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Sat, 9 Jan 2021 13:17:38 +0000
+Subject: [PATCH] autotools: use shell grouping instead of sed to prepend a
+ line
+
+dash and pdksh don't support $'...'
+
+/bin/sed: -e expression #1, char 2: unknown command: `1'
+---
+ va/wayland/Makefile.am | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/va/wayland/Makefile.am b/va/wayland/Makefile.am
+index f48afb4d..40a54616 100644
+--- a/va/wayland/Makefile.am
++++ b/va/wayland/Makefile.am
+@@ -70,8 +70,9 @@ va_wayland_drm.c: $(protocol_source_h)
+ %-client-protocol-export.c : %.xml
+ $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
+ %-client-protocol.c: %-client-protocol-export.c
+- $(AM_V_GEN)$(SED) -e $$'1i\\\n#include "sysdeps.h"\n' \
+- -e 's@WL_EXPORT@DLL_HIDDEN@g' < $< > $@
++ $(AM_V_GEN){ echo '#include "sysdeps.h"'; $(SED) \
++ -e 's@WL_EXPORT@DLL_HIDDEN@g' \
++ < $<; } > $@
+
+ EXTRA_DIST = \
+ wayland-drm.xml \
diff --git a/x11-libs/libva/files/libva-2.10.0-unbreak_gnu_sed.patch b/x11-libs/libva/files/libva-2.10.0-unbreak_gnu_sed.patch
deleted file mode 100644
index 411c6c475589..000000000000
--- a/x11-libs/libva/files/libva-2.10.0-unbreak_gnu_sed.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 508cf475854c83b61a63d4c5f143b9a405fef77c Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sat, 9 Jan 2021 01:21:55 +0100
-Subject: [PATCH] Revert "autotools: unbreak --enable-wayland with BSD sed"
-
-This reverts commit 78431a361bed0b6e9f1f3ebc0de8897b069b3848
-as it breaks GNU sed
-
-https://github.com/intel/libva/issues/489
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- va/wayland/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/va/wayland/Makefile.am b/va/wayland/Makefile.am
-index f48afb4..705efa3 100644
---- a/va/wayland/Makefile.am
-+++ b/va/wayland/Makefile.am
-@@ -70,7 +70,7 @@ va_wayland_drm.c: $(protocol_source_h)
- %-client-protocol-export.c : %.xml
- $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
- %-client-protocol.c: %-client-protocol-export.c
-- $(AM_V_GEN)$(SED) -e $$'1i\\\n#include "sysdeps.h"\n' \
-+ $(AM_V_GEN)$(SED) -e '1i#include "sysdeps.h"' \
- -e 's@WL_EXPORT@DLL_HIDDEN@g' < $< > $@
-
- EXTRA_DIST = \
---
-2.30.0
-
diff --git a/x11-libs/libva/libva-2.10.0.ebuild b/x11-libs/libva/libva-2.10.0.ebuild
index 8f6274df2517..6dbd26cce39f 100644
--- a/x11-libs/libva/libva-2.10.0.ebuild
+++ b/x11-libs/libva/libva-2.10.0.ebuild
@@ -62,7 +62,7 @@ MULTILIB_WRAPPED_HEADERS=(
)
PATCHES=(
- "${FILESDIR}/${PN}-2.10.0-unbreak_gnu_sed.patch"
+ "${FILESDIR}/${PN}-2.10.0-fix_wayland_build.patch"
)
src_prepare() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 21:11:07 +0000