| 1 |
commit: a691ff58f141b95596de85abad71471e8a427da8 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 29 08:59:18 2021 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 29 08:59:37 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a691ff58 |
| 7 |
|
| 8 |
x11-libs/libva: Use upstream fix for USE="wayland" build |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/libva-2.10.0-fix_wayland_build.patch | 29 ++++++++++++++++++++ |
| 14 |
.../libva/files/libva-2.10.0-unbreak_gnu_sed.patch | 31 ---------------------- |
| 15 |
x11-libs/libva/libva-2.10.0.ebuild | 2 +- |
| 16 |
3 files changed, 30 insertions(+), 32 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..cf799cd3d68 |
| 21 |
--- /dev/null |
| 22 |
+++ b/x11-libs/libva/files/libva-2.10.0-fix_wayland_build.patch |
| 23 |
@@ -0,0 +1,29 @@ |
| 24 |
+From 3a71a012b72480ffdf1e2361845036f3cc9d7154 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Jan Beich <jbeich@×××××××.org> |
| 26 |
+Date: Sat, 9 Jan 2021 13:17:38 +0000 |
| 27 |
+Subject: [PATCH] autotools: use shell grouping instead of sed to prepend a |
| 28 |
+ line |
| 29 |
+ |
| 30 |
+dash and pdksh don't support $'...' |
| 31 |
+ |
| 32 |
+/bin/sed: -e expression #1, char 2: unknown command: `1' |
| 33 |
+--- |
| 34 |
+ va/wayland/Makefile.am | 5 +++-- |
| 35 |
+ 1 file changed, 3 insertions(+), 2 deletions(-) |
| 36 |
+ |
| 37 |
+diff --git a/va/wayland/Makefile.am b/va/wayland/Makefile.am |
| 38 |
+index f48afb4d..40a54616 100644 |
| 39 |
+--- a/va/wayland/Makefile.am |
| 40 |
++++ b/va/wayland/Makefile.am |
| 41 |
+@@ -70,8 +70,9 @@ va_wayland_drm.c: $(protocol_source_h) |
| 42 |
+ %-client-protocol-export.c : %.xml |
| 43 |
+ $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@ |
| 44 |
+ %-client-protocol.c: %-client-protocol-export.c |
| 45 |
+- $(AM_V_GEN)$(SED) -e $$'1i\\\n#include "sysdeps.h"\n' \ |
| 46 |
+- -e 's@WL_EXPORT@DLL_HIDDEN@g' < $< > $@ |
| 47 |
++ $(AM_V_GEN){ echo '#include "sysdeps.h"'; $(SED) \ |
| 48 |
++ -e 's@WL_EXPORT@DLL_HIDDEN@g' \ |
| 49 |
++ < $<; } > $@ |
| 50 |
+ |
| 51 |
+ EXTRA_DIST = \ |
| 52 |
+ wayland-drm.xml \ |
| 53 |
|
| 54 |
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 |
| 55 |
deleted file mode 100644 |
| 56 |
index 411c6c47558..00000000000 |
| 57 |
--- a/x11-libs/libva/files/libva-2.10.0-unbreak_gnu_sed.patch |
| 58 |
+++ /dev/null |
| 59 |
@@ -1,31 +0,0 @@ |
| 60 |
-From 508cf475854c83b61a63d4c5f143b9a405fef77c Mon Sep 17 00:00:00 2001 |
| 61 |
-From: Lars Wendler <polynomial-c@g.o> |
| 62 |
-Date: Sat, 9 Jan 2021 01:21:55 +0100 |
| 63 |
-Subject: [PATCH] Revert "autotools: unbreak --enable-wayland with BSD sed" |
| 64 |
- |
| 65 |
-This reverts commit 78431a361bed0b6e9f1f3ebc0de8897b069b3848 |
| 66 |
-as it breaks GNU sed |
| 67 |
- |
| 68 |
-https://github.com/intel/libva/issues/489 |
| 69 |
- |
| 70 |
-Signed-off-by: Lars Wendler <polynomial-c@g.o> |
| 71 |
---- |
| 72 |
- va/wayland/Makefile.am | 2 +- |
| 73 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 74 |
- |
| 75 |
-diff --git a/va/wayland/Makefile.am b/va/wayland/Makefile.am |
| 76 |
-index f48afb4..705efa3 100644 |
| 77 |
---- a/va/wayland/Makefile.am |
| 78 |
-+++ b/va/wayland/Makefile.am |
| 79 |
-@@ -70,7 +70,7 @@ va_wayland_drm.c: $(protocol_source_h) |
| 80 |
- %-client-protocol-export.c : %.xml |
| 81 |
- $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@ |
| 82 |
- %-client-protocol.c: %-client-protocol-export.c |
| 83 |
-- $(AM_V_GEN)$(SED) -e $$'1i\\\n#include "sysdeps.h"\n' \ |
| 84 |
-+ $(AM_V_GEN)$(SED) -e '1i#include "sysdeps.h"' \ |
| 85 |
- -e 's@WL_EXPORT@DLL_HIDDEN@g' < $< > $@ |
| 86 |
- |
| 87 |
- EXTRA_DIST = \ |
| 88 |
--- |
| 89 |
-2.30.0 |
| 90 |
- |
| 91 |
|
| 92 |
diff --git a/x11-libs/libva/libva-2.10.0.ebuild b/x11-libs/libva/libva-2.10.0.ebuild |
| 93 |
index 8f6274df251..6dbd26cce39 100644 |
| 94 |
--- a/x11-libs/libva/libva-2.10.0.ebuild |
| 95 |
+++ b/x11-libs/libva/libva-2.10.0.ebuild |
| 96 |
@@ -62,7 +62,7 @@ MULTILIB_WRAPPED_HEADERS=( |
| 97 |
) |
| 98 |
|
| 99 |
PATCHES=( |
| 100 |
- "${FILESDIR}/${PN}-2.10.0-unbreak_gnu_sed.patch" |
| 101 |
+ "${FILESDIR}/${PN}-2.10.0-fix_wayland_build.patch" |
| 102 |
) |
| 103 |
|
| 104 |
src_prepare() { |
Archives