Robin Candau pushed to branch main at Arch Linux / Packaging / Packages / picom
Commits:
530a8878 by Robin Candau at 2024-01-29T11:14:31+01:00
upgpkg: 11.1-1: New upstream release
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- − xrender-rollback-pixmap-region.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = picom
pkgdesc = X compositor that may fix tearing issues
- pkgver = 11
- pkgrel = 4
+ pkgver = 11.1
+ pkgrel = 1
url = https://github.com/yshui/picom
arch = x86_64
license = MPL-2.0 AND MIT
@@ -26,10 +26,8 @@ pkgbase = picom
optdepends = xorg-xprop: for picom-trans
optdepends = xorg-xwininfo: for picom-trans
backup = etc/xdg/picom.conf
- source =
git+https://github.com/yshui/picom?signed#commit=197b4bd396590cb5df61eb54ec6a1dadf1115a5d
- source = xrender-rollback-pixmap-region.patch
+ source =
git+https://github.com/yshui/picom#commit=fc1d1d40e5ffe73cb35a6b09b3cd713a14d242f6
validpgpkeys = A22F5C0F4FCF9C7C89A167462C965E9E5D45D730
b2sums = SKIP
- b2sums =
c35ac19b1931697ba5f2fac36afba74712af3534c9e534e48fd11a8bd26b70e2a8a49075e2aec6043618ad806ad5dc79556c053b810e6b0da6bf43f762b3258e
pkgname = picom
=====================================
PKGBUILD
=====================================
@@ -5,8 +5,8 @@
# Contributor: Valère Monseur <valere.mons...@ymail.com>
pkgname=picom
-pkgver=11
-pkgrel=4
+pkgver=11.1
+pkgrel=1
pkgdesc='X compositor that may fix tearing issues'
arch=(x86_64)
url='https://github.com/yshui/picom'
@@ -19,11 +19,11 @@ optdepends=('dbus: for controlling picom via D-Bus'
'python: for running picom-convgen.py'
'xorg-xprop: for picom-trans'
'xorg-xwininfo: for picom-trans')
-source=("git+$url?signed#commit=197b4bd396590cb5df61eb54ec6a1dadf1115a5d"
- "xrender-rollback-pixmap-region.patch")
+#source=("git+$url?signed#commit=fc1d1d40e5ffe73cb35a6b09b3cd713a14d242f6") #
tag: v11.1
+# Temporarily disable signed commit as the commit for tag v11.1 is signed with
GitHub's key instead of upstream one
+source=("git+$url#commit=fc1d1d40e5ffe73cb35a6b09b3cd713a14d242f6") # tag:
v11.1
validpgpkeys=('A22F5C0F4FCF9C7C89A167462C965E9E5D45D730') # Yuxuan Shui
<yshu...@gmail.com>
-b2sums=('SKIP'
-
'c35ac19b1931697ba5f2fac36afba74712af3534c9e534e48fd11a8bd26b70e2a8a49075e2aec6043618ad806ad5dc79556c053b810e6b0da6bf43f762b3258e')
+b2sums=('SKIP')
prepare() {
cd $pkgname
@@ -32,10 +32,6 @@ prepare() {
setconf picom.sample.conf 'inactive-opacity=0.95;'
# Improve performance (recommended option)
setconf -u picom.sample.conf 'glx-no-stencil=true;'
-
- # Temporary patch to rollback this upstream commit which produces freezes
with the xrender backend when vsync is enabled:
https://github.com/yshui/picom/commit/23a29470e50ef1d68b9c99186b069659a793184c
- # See https://github.com/yshui/picom/issues/1166
- patch -Np1 <${srcdir}/xrender-rollback-pixmap-region.patch
}
build() {
=====================================
xrender-rollback-pixmap-region.patch deleted
=====================================
@@ -1,22 +0,0 @@
-diff --git a/src/backend/xrender/xrender.c b/src/backend/xrender/xrender.c
-index b2ec3f2..d7b41c8 100644
---- a/src/backend/xrender/xrender.c
-+++ b/src/backend/xrender/xrender.c
-@@ -624,16 +624,13 @@ static void present(backend_t *base, const region_t
*region) {
- XCB_NONE, xd->back[xd->curr_back], orig_x,
orig_y, 0,
- 0, orig_x, orig_y, region_width,
region_height);
-
-- auto xregion = x_create_region(base->c, region);
--
- // Make sure we got reply from PresentPixmap before waiting for
events,
- // to avoid deadlock
- auto e = xcb_request_check(
- base->c->c, xcb_present_pixmap_checked(
- xd->base.c->c, xd->target_win,
-- xd->back_pixmap[xd->curr_back], 0,
XCB_NONE, xregion, 0,
-+ xd->back_pixmap[xd->curr_back], 0,
XCB_NONE, XCB_NONE, 0,
- 0, XCB_NONE, XCB_NONE, XCB_NONE, 0, 0, 0,
0, 0, NULL));
-- x_destroy_region(base->c, xregion);
- if (e) {
- log_error("Failed to present pixmap");
- free(e);
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/picom/-/commit/530a887849c714255a5388b7dc8a7a4f266b6a69
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/picom/-/commit/530a887849c714255a5388b7dc8a7a4f266b6a69
You're receiving this email because of your account on gitlab.archlinux.org.
