summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel A. Vico2019-01-16 14:36:29 -0800
committerMiguel A. Vico2019-01-16 14:45:52 -0800
commitcd1bff61273f522fa5195b85cc1530e5d7eebcd0 (patch)
treee96790ebdd62d60c41a779594eefd3747908d6fc
parenta59387e4ff4176886ed14711d793228c1db7cce8 (diff)
downloadaur-cd1bff61273f522fa5195b85cc1530e5d7eebcd0.tar.gz
Include recent fixes
-rw-r--r--.SRCINFO4
-rw-r--r--0008-gl-renderer-Use-mailbox-streams-for-scanout.patch34
-rw-r--r--PKGBUILD9
3 files changed, 43 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9f99ced8677..064dfaa9360 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = weston-eglstream
pkgdesc = Reference implementation of a Wayland compositor with EGLStream support
pkgver = 5.0.0
- pkgrel = 3
+ pkgrel = 4
url = https://wayland.freedesktop.org/
arch = i686
arch = x86_64
@@ -44,6 +44,7 @@ pkgbase = weston-eglstream
source = 0005-compositor-drm-Add-support-for-EGLDevice-EGLOutput.patch
source = 0006-compositor-Process-stream-attach-requests-with-wl_eg.patch
source = 0007-simple-egl-Do-not-set-EGL-up-until-XDG-setup-is-comp.patch
+ source = 0008-gl-renderer-Use-mailbox-streams-for-scanout.patch
sha256sums = 15a23423bcfa45e31e1dedc0cd524ba71e2930df174fde9c99b71a537c4e4caf
sha256sums = 467c25f7158e54736ed7e9d071c8524e0f83509defcea49a7b053b11be1e9f93
sha256sums = b60522d00263f1e67e4d4ca823550c1c90f30be450facd9a95fca7a91376b160
@@ -52,6 +53,7 @@ pkgbase = weston-eglstream
sha256sums = 037632c607638d98cf04cb5f1d5754842b77670671358ef34629c8c9dc2d9d19
sha256sums = d1197824dda263bdde19312095125295a87d773e46fae62d68297d38a810e7f6
sha256sums = 7d756c6e091eb6933aa49d7bb822e3a10abfdab5466f7c3763e7bff3ce60090f
+ sha256sums = ca1af82fddca20ed2256bff8abad2c726380f0c244c0d7bd75cc1def8e07493b
pkgname = weston-eglstream
diff --git a/0008-gl-renderer-Use-mailbox-streams-for-scanout.patch b/0008-gl-renderer-Use-mailbox-streams-for-scanout.patch
new file mode 100644
index 00000000000..c7f1e08bb3a
--- /dev/null
+++ b/0008-gl-renderer-Use-mailbox-streams-for-scanout.patch
@@ -0,0 +1,34 @@
+From db3147b5446334d69d1ffdb07234babc292dec2e Mon Sep 17 00:00:00 2001
+From: "Miguel A. Vico" <mvicomoya@nvidia.com>
+Date: Wed, 16 Jan 2019 14:16:30 -0800
+Subject: [PATCH 8/8] gl-renderer: Use mailbox streams for scanout
+X-NVConfidentiality: public
+
+Ever since flip-event-based output repaints have been used, FIFO mode
+for EGLOutput streams was not necessary.
+
+Make the streams operate in mailbox mode. This also fixes certain
+interaction issues when recovering from power-saving mode or
+vt-switches.
+
+Signed-off-by: Miguel A Vico Moya <mvicomoya@nvidia.com>
+---
+ libweston/gl-renderer.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c
+index c89c7965..95690108 100644
+--- a/libweston/gl-renderer.c
++++ b/libweston/gl-renderer.c
+@@ -3272,7 +3272,7 @@ gl_renderer_create_stream_surface(struct gl_renderer *gr,
+ EGLStreamKHR *egl_stream)
+ {
+ EGLint stream_attribs[] = {
+- EGL_STREAM_FIFO_LENGTH_KHR, 1,
++ EGL_STREAM_FIFO_LENGTH_KHR, 0, /* Mailbox mode */
+ #ifdef EGL_EXT_stream_acquire_mode
+ EGL_CONSUMER_AUTO_ACQUIRE_EXT, EGL_FALSE,
+ #endif
+--
+2.18.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 1005742a48c..b5bdb60f7a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=weston-eglstream
pkgver=5.0.0
-pkgrel=3
+pkgrel=4
pkgdesc='Reference implementation of a Wayland compositor with EGLStream support'
arch=('i686' 'x86_64')
url='https://wayland.freedesktop.org/'
@@ -24,7 +24,8 @@ source=("https://wayland.freedesktop.org/releases/weston-$pkgver.tar.xz"
'0004-compositor-drm-Gracefully-handle-vblank-and-flip-inv.patch'
'0005-compositor-drm-Add-support-for-EGLDevice-EGLOutput.patch'
'0006-compositor-Process-stream-attach-requests-with-wl_eg.patch'
- '0007-simple-egl-Do-not-set-EGL-up-until-XDG-setup-is-comp.patch')
+ '0007-simple-egl-Do-not-set-EGL-up-until-XDG-setup-is-comp.patch'
+ '0008-gl-renderer-Use-mailbox-streams-for-scanout.patch')
sha256sums=('15a23423bcfa45e31e1dedc0cd524ba71e2930df174fde9c99b71a537c4e4caf'
'467c25f7158e54736ed7e9d071c8524e0f83509defcea49a7b053b11be1e9f93'
'b60522d00263f1e67e4d4ca823550c1c90f30be450facd9a95fca7a91376b160'
@@ -32,7 +33,8 @@ sha256sums=('15a23423bcfa45e31e1dedc0cd524ba71e2930df174fde9c99b71a537c4e4caf'
'4845734de15fa99dbfc7e58b364996a72f63cf3632793d57eca7f696d3d6186e'
'037632c607638d98cf04cb5f1d5754842b77670671358ef34629c8c9dc2d9d19'
'd1197824dda263bdde19312095125295a87d773e46fae62d68297d38a810e7f6'
- '7d756c6e091eb6933aa49d7bb822e3a10abfdab5466f7c3763e7bff3ce60090f')
+ '7d756c6e091eb6933aa49d7bb822e3a10abfdab5466f7c3763e7bff3ce60090f'
+ 'ca1af82fddca20ed2256bff8abad2c726380f0c244c0d7bd75cc1def8e07493b')
prepare() {
cd weston-$pkgver
@@ -43,6 +45,7 @@ prepare() {
patch -Np1 -i "${srcdir}/0005-compositor-drm-Add-support-for-EGLDevice-EGLOutput.patch"
patch -Np1 -i "${srcdir}/0006-compositor-Process-stream-attach-requests-with-wl_eg.patch"
patch -Np1 -i "${srcdir}/0007-simple-egl-Do-not-set-EGL-up-until-XDG-setup-is-comp.patch"
+ patch -Np1 -i "${srcdir}/0008-gl-renderer-Use-mailbox-streams-for-scanout.patch"
}
build() {