diff options
| author | psykose <alice@ayaya.dev> | 2023-03-18 20:30:51 +0000 |
|---|---|---|
| committer | psykose <alice@ayaya.dev> | 2023-03-18 21:30:57 +0100 |
| commit | 713b7995e7b7aa668f47fb2d075b29d3c8e920ad (patch) | |
| tree | 69954ddac936b0f482d0abd3e5ae484c03d9fbc5 | |
| parent | 5eae77349a3c3ea1f85e0069ed64f39fb3df8668 (diff) | |
| download | aports-713b7995e7b7aa668f47fb2d075b29d3c8e920ad.tar.gz aports-713b7995e7b7aa668f47fb2d075b29d3c8e920ad.tar.bz2 aports-713b7995e7b7aa668f47fb2d075b29d3c8e920ad.tar.xz | |
community/libwpebackend-fdo: revert a reportedly broken commit
| -rw-r--r-- | community/libwpebackend-fdo/APKBUILD | 7 | ||||
| -rw-r--r-- | community/libwpebackend-fdo/revert-remove-image.patch | 59 |
2 files changed, 64 insertions, 2 deletions
diff --git a/community/libwpebackend-fdo/APKBUILD b/community/libwpebackend-fdo/APKBUILD index 0e62d50e581..98ca2cdf15a 100644 --- a/community/libwpebackend-fdo/APKBUILD +++ b/community/libwpebackend-fdo/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Rasmus Thomsen <oss@cogitri.dev> pkgname=libwpebackend-fdo pkgver=1.14.1 -pkgrel=0 +pkgrel=1 pkgdesc="freedesktop.org backend for WPE WebKit" url="https://wpewebkit.org/" arch="all" @@ -11,7 +11,9 @@ depends_dev="$pkgname" makedepends="mesa-dev meson glib-dev wayland-dev libwpe-dev libepoxy-dev" options="!check" # no tests subpackages="$pkgname-dbg $pkgname-dev" -source="https://github.com/Igalia/WPEBackend-fdo/releases/download/$pkgver/wpebackend-fdo-$pkgver.tar.xz" +source="https://github.com/Igalia/WPEBackend-fdo/releases/download/$pkgver/wpebackend-fdo-$pkgver.tar.xz + revert-remove-image.patch + " builddir="$srcdir/wpebackend-fdo-$pkgver" build() { @@ -36,4 +38,5 @@ dev() { sha512sums=" 711ffa968852818f080dbb2b222168b61d0d20584b6022e309be7f1a06128440c91d30e61673a30f89831aba4b30dbc0cdae560b3d5f6c8ac462b5445a4c9e8b wpebackend-fdo-1.14.1.tar.xz +f36341625970b1a04bb5e9ae3d60123411ffdaa3bb5d5875de2b50b651320abc54622c624d1526624f7075ba5c0acc6a60d99ffc6d5e84d9a17029ed346326eb revert-remove-image.patch " diff --git a/community/libwpebackend-fdo/revert-remove-image.patch b/community/libwpebackend-fdo/revert-remove-image.patch new file mode 100644 index 00000000000..6c89f578851 --- /dev/null +++ b/community/libwpebackend-fdo/revert-remove-image.patch @@ -0,0 +1,59 @@ +Patch-Source: https://github.com/chimera-linux/cports/commit/36f25dd44873468dac6eb070cca0af8efd8088e3 +-- +From 1cf9c5aec616076ecc1ed0e3b6e84f8311f292af Mon Sep 17 00:00:00 2001 +From: Daniel Kolesa <daniel@octaforge.org> +Date: Sat, 18 Mar 2023 21:25:23 +0100 +Subject: [PATCH] revert 0d6a75a61e8377d65130eeb59b752cac8e9c9fca + +https://github.com/Igalia/WPEBackend-fdo/commit/0d6a75a61e8377d65130eeb59b752cac8e9c9fca + +This is reported to potentially cause crashes, so reverting for +now. +--- + src/view-backend-exportable-fdo-egl-private.h | 1 + + src/view-backend-exportable-fdo-egl.cpp | 5 +++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/view-backend-exportable-fdo-egl-private.h b/src/view-backend-exportable-fdo-egl-private.h +index 0e6caba..e19c177 100644 +--- a/src/view-backend-exportable-fdo-egl-private.h ++++ b/src/view-backend-exportable-fdo-egl-private.h +@@ -33,6 +33,7 @@ struct wpe_fdo_egl_exported_image { + EGLImageKHR eglImage { nullptr }; + uint32_t width { 0 }; + uint32_t height { 0 }; ++ bool exported { false }; + struct wl_resource* bufferResource { nullptr }; + struct wl_listener bufferDestroyListener; + }; +diff --git a/src/view-backend-exportable-fdo-egl.cpp b/src/view-backend-exportable-fdo-egl.cpp +index 7e74dee..0031222 100644 +--- a/src/view-backend-exportable-fdo-egl.cpp ++++ b/src/view-backend-exportable-fdo-egl.cpp +@@ -249,6 +249,8 @@ public: + { + if (image->bufferResource) + viewBackend->releaseBuffer(image->bufferResource); ++ else ++ deleteImage(image); + } + + void releaseShmBuffer(struct wpe_fdo_shm_exported_buffer* buffer) +@@ -275,6 +277,7 @@ private: + + void exportImage(struct wpe_fdo_egl_exported_image* image) + { ++ image->exported = true; + client->export_fdo_egl_image(data, image); + } + +@@ -292,8 +295,6 @@ private: + image = wl_container_of(listener, image, bufferDestroyListener); + + image->bufferResource = nullptr; +- +- deleteImage(image); + } + }; + +-- |