diff options
| author | Martin Kemp | 2023-12-30 15:05:03 +0000 |
|---|---|---|
| committer | Martin Kemp | 2023-12-30 15:05:03 +0000 |
| commit | a9fc10c243bb9403adcf3c636a5ebc75cfdadcfd (patch) | |
| tree | d01986e49ff091aa6c1e8f6213d5dec39b8091ca | |
| parent | fed52e0503b84f6c532576e39d0f44fca9e1a761 (diff) | |
| download | aur-a9fc10c243bb9403adcf3c636a5ebc75cfdadcfd.tar.gz | |
Remove syncobj patch
As it is no longer needed
Signed-off-by: Martin Kemp <me@martinke.mp>
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 0000_syncobj.patch | 44 | ||||
| -rw-r--r-- | PKGBUILD | 7 |
3 files changed, 3 insertions, 52 deletions
@@ -1,6 +1,6 @@ pkgbase = xorg-xwayland-explicit-sync-git pkgdesc = Run X clients under Wayland with explicit sync patch - pkgver = 23.1.2.r175.g073b90ea5 + pkgver = 23.1.2.r199.gf59871587 pkgrel = 1 url = https://xorg.freedesktop.org arch = x86_64 @@ -37,9 +37,7 @@ pkgbase = xorg-xwayland-explicit-sync-git conflicts = xorg-server-xwayland-git source = xserver::git+https://gitlab.freedesktop.org/xorg/xserver.git source = https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/967.patch - source = 0000_syncobj.patch b2sums = SKIP b2sums = SKIP - b2sums = bec09ac6197fc4311a1cf3260af427b1f8dcb30dafac6813414bc1988f3ac494c22520ed779baa1e9f0068e3dfcc6515e6259003dbe3bdd61d79230523e3ae87 pkgname = xorg-xwayland-explicit-sync-git diff --git a/0000_syncobj.patch b/0000_syncobj.patch deleted file mode 100644 index 444d53b15eb0..000000000000 --- a/0000_syncobj.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c -index 70547295f..f9d9048fa 100644 ---- a/hw/xwayland/xwayland-glamor-gbm.c -+++ b/hw/xwayland/xwayland-glamor-gbm.c -@@ -600,7 +600,7 @@ xwl_screen_destroy_explicit_sync(struct xwl_screen *xwl_screen) - } - - if (xwl_screen->explicit_sync) { -- wp_linux_drm_syncobj_v1_destroy(xwl_screen->explicit_sync); -+ wp_linux_drm_syncobj_surface_v1_destroy(xwl_screen->explicit_sync); - xwl_screen->explicit_sync = NULL; - } - -@@ -938,7 +938,7 @@ xwl_glamor_gbm_dri3_syncobj_passthrough(WindowPtr window, - - if (!xwl_window->surface_sync) - xwl_window->surface_sync = -- wp_linux_drm_syncobj_v1_get_surface(xwl_screen->explicit_sync, -+ wp_linux_drm_syncobj_manager_v1_get_surface(xwl_screen->explicit_sync, - xwl_window->surface); - - wp_linux_drm_syncobj_surface_v1_set_acquire_point(xwl_window->surface_sync, -@@ -1071,7 +1071,7 @@ xwl_dri3_create_syncobj(struct xwl_screen *xwl_screen, uint32_t handle) - goto fail; - - syncobj->timeline = -- wp_linux_drm_syncobj_v1_import_timeline(xwl_screen->explicit_sync, -+ wp_linux_drm_syncobj_manager_v1_import_timeline(xwl_screen->explicit_sync, - syncobj_fd); - close(syncobj_fd); - if (!syncobj->timeline) -@@ -1329,10 +1329,10 @@ xwl_glamor_gbm_init_wl_registry(struct xwl_screen *xwl_screen, - } else if (strcmp(name, zwp_linux_dmabuf_v1_interface.name) == 0) { - xwl_screen_set_dmabuf_interface(xwl_screen, id, version); - return TRUE; -- } else if (strcmp(name, wp_linux_drm_syncobj_v1_interface.name) == 0) { -+ } else if (strcmp(name, wp_linux_drm_syncobj_surface_v1_interface.name) == 0) { - xwl_screen->explicit_sync = - wl_registry_bind(xwl_screen->registry, id, -- &wp_linux_drm_syncobj_v1_interface, -+ &wp_linux_drm_syncobj_surface_v1_interface, - version); - } - @@ -1,7 +1,7 @@ # Maintainer: martiuk <me at martinke dot mp> pkgname=xorg-xwayland-explicit-sync-git -pkgver=23.1.2.r175.g073b90ea5 +pkgver=23.1.2.r199.gf59871587 pkgrel=1 arch=('x86_64') license=('custom') @@ -24,11 +24,9 @@ makedepends=('meson' 'git' source=( "xserver::git+https://gitlab.freedesktop.org/xorg/xserver.git" "https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/967.patch" - "0000_syncobj.patch" ) b2sums=('SKIP' - 'SKIP' - 'bec09ac6197fc4311a1cf3260af427b1f8dcb30dafac6813414bc1988f3ac494c22520ed779baa1e9f0068e3dfcc6515e6259003dbe3bdd61d79230523e3ae87') + 'SKIP') provides=('xorg-xwayland' 'xorg-server-xwayland' 'xorg-server-xwayland-git') conflicts=('xorg-xwayland' 'xorg-server-xwayland' 'xorg-server-xwayland-git') @@ -44,7 +42,6 @@ pkgver() { prepare() { cd xserver patch -Np1 -i "${srcdir}/967.patch" - patch -Np1 -i "${srcdir}/0000_syncobj.patch" } build() { |