commit: 76011a9d9193706ee2a6a1be633b3c2bbcb51512 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Sat Jan 9 00:26:52 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Sat Jan 9 00:27:33 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76011a9d
x11-libs/libva: Fix build with USE="wayland" Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> x11-libs/libva/Manifest | 2 +- .../libva/files/libva-2.10.0-unbreak_gnu_sed.patch | 31 ++++++++++++++++++++++ x11-libs/libva/libva-2.10.0.ebuild | 11 +++++++- 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest index 5af1b6fb03a..1fd0cc02324 100644 --- a/x11-libs/libva/Manifest +++ b/x11-libs/libva/Manifest @@ -1,7 +1,7 @@ +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 DIST libva-2.7.1.tar.bz2 477933 BLAKE2B 261e608af3f1427bed0244d4ebbc0d3ffe5681669ecb3583a8910568bc96817b8da079ffe80915ecf1002f9ac247eea5e44f8f7ce305313719fc1a4f1c5892b3 SHA512 f4b88ca0216f0ea4d934edcd322b8f741833b5a50ee2f34a3ecf60d635082b29e2dd032734c2f9d2a680e3b9c98e61a8b9432ea639a9fd5389761e04782c1126 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 -DIST libva-2.10.0.tar.bz2 484741 BLAKE2B 9c3912d5337d3624af9ffc537a972479385285413712948159641d10b60a39b60754b3bc6467a0508a878df29be23c0e2bace488bdf9047f3e162ca0b573fa5f SHA512 9225120f17e0d935927cb0046c3a6086c776beac71a8ef7fd800d2c6a721d0e28a13be89221c5ef3cca1634317aaa2a513554ccf25a54f25b2a339603c4a11a1 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 new file mode 100644 index 00000000000..411c6c47558 --- /dev/null +++ b/x11-libs/libva/files/libva-2.10.0-unbreak_gnu_sed.patch @@ -0,0 +1,31 @@ +From 508cf475854c83b61a63d4c5f143b9a405fef77c Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomia...@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 <polynomia...@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 0060b4bbbad..8f6274df251 100644 --- a/x11-libs/libva/libva-2.10.0.ebuild +++ b/x11-libs/libva/libva-2.10.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit multilib-minimal +inherit autotools multilib-minimal DESCRIPTION="Video Acceleration (VA) API for Linux" HOMEPAGE="https://01.org/linuxmedia/vaapi"; @@ -61,6 +61,15 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/va/va_glx.h ) +PATCHES=( + "${FILESDIR}/${PN}-2.10.0-unbreak_gnu_sed.patch" +) + +src_prepare() { + default + eautoreconf +} + multilib_src_configure() { local myeconfargs=( --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
