From 4a7588d0e2b60e5d75af0a1507634bed8f87ae71 Mon Sep 17 00:00:00 2001 From: Sam Day Date: Sun, 9 Feb 2025 16:13:36 +0100 Subject: [PATCH] {device,soc}-*: use cairo software GTK renderer on quirky devices (MR 6178) GTK shipped the ngl (new GL) renderer last year and deprecated the legacy gl renderer. In GTK 4.17 this renderer has been removed entirely, which means the devices that were forcing the use of this legacy renderer need to now fallback to software rendering instead. Fixes: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/3533 Signed-off-by: Sam Day [ci:skip-build]: already built successfully in CI --- device/community/soc-qcom-msm8916/APKBUILD | 6 +++--- device/community/soc-qcom-msm8916/adreno-a306-quirks.sh | 2 +- device/community/soc-qcom-msm8953/APKBUILD | 4 ++-- device/community/soc-qcom-msm8953/adreno-a506-quirks.sh | 9 +++------ device/testing/device-pine64-pinetab/APKBUILD | 6 +++--- device/testing/device-pine64-pinetab/gsk-renderer-gl.sh | 2 +- device/testing/soc-qcom-msm8226/APKBUILD | 4 ++-- device/testing/soc-qcom-msm8226/adreno-a305-quirks.sh | 6 +++--- device/testing/soc-qcom-msm8974/APKBUILD | 4 ++-- device/testing/soc-qcom-msm8974/adreno-a330-quirks.sh | 8 ++++---- device/testing/soc-qcom-msm89x7/APKBUILD | 6 +++--- device/testing/soc-qcom-msm89x7/adreno-quirks.sh | 7 ++++--- 12 files changed, 31 insertions(+), 33 deletions(-) diff --git a/device/community/soc-qcom-msm8916/APKBUILD b/device/community/soc-qcom-msm8916/APKBUILD index bb7500e15..d19d0ef1a 100644 --- a/device/community/soc-qcom-msm8916/APKBUILD +++ b/device/community/soc-qcom-msm8916/APKBUILD @@ -2,8 +2,8 @@ # Co-Maintainer: Nikita Travkin pkgname=soc-qcom-msm8916 pkgdesc="Common package for Qualcomm MSM8916 devices" -pkgver=21 -pkgrel=3 +pkgver=22 +pkgrel=0 url="https://postmarketos.org" license="BSD-3-Clause" arch="aarch64 armv7" @@ -106,5 +106,5 @@ eee73ae7895fb6772b35a190956d17642d08af47a0fa5dfd022052c5b30c99cf9649215aef161ddc 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98 q6voiced.conf bcebc36ec62140f4620d462be2b95858adae380e5d74f6b9c9b956fb76a6541f39749f4dcec6ac3c39b868dbfed6fac7a34ba357510532a3df2d39f7ea818d55 77-modem-samsung-msm8916.rules 90fca4a3291a2c84c0b20e41308c4698374ba896e9365ca80dbfd0c0c4f7dc08317f3dd865a3c7f6707c81b02f5bb24136d1172253d2e4fdd50039bbbf02a178 90-feedbackd-pm8916.rules -ff143f0f8654bba26087439e206b62c9f8e25f945fa299ba1b7504316f7398a0622404f2415e915ce1c96809ed9a5e93fc16ddcb2bafe410f35466510dc2d51d adreno-a306-quirks.sh +de35a32f697247e4a8419647b9c9fece9bc7f41c0e2377d01659ad0dc1ba21b08d3227193053d7cd1ec5006370db574472516f0d0061fb9d2d9509f27f6212d3 adreno-a306-quirks.sh " diff --git a/device/community/soc-qcom-msm8916/adreno-a306-quirks.sh b/device/community/soc-qcom-msm8916/adreno-a306-quirks.sh index 776bd3adf..e0af90c7f 100644 --- a/device/community/soc-qcom-msm8916/adreno-a306-quirks.sh +++ b/device/community/soc-qcom-msm8916/adreno-a306-quirks.sh @@ -1,4 +1,4 @@ #!/bin/sh # New GTK renderer crashes a306. -export GSK_RENDERER=gl +export GSK_RENDERER=cairo diff --git a/device/community/soc-qcom-msm8953/APKBUILD b/device/community/soc-qcom-msm8953/APKBUILD index dc1b2f35e..e9e6d96c1 100644 --- a/device/community/soc-qcom-msm8953/APKBUILD +++ b/device/community/soc-qcom-msm8953/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Barnabas Czeman pkgname=soc-qcom-msm8953 pkgdesc="Common package for Qualcomm MSM8953 devices" -pkgver=12 +pkgver=13 pkgrel=0 url="https://postmarketos.org" license="BSD-3-Clause" @@ -73,6 +73,6 @@ sha512sums=" 8aadc874c8a334e46c7bf630874c3035070aa7b9052deba1a28ae059ab9d63dd99dfb82c1a58d09da5063ad250de813e3974e040ce938a53347e390ce2e450eb soc-qcom-msm8953-f6dfc9b072e74b0ab2afcf452bc106242049ef28.tar.gz 90fca4a3291a2c84c0b20e41308c4698374ba896e9365ca80dbfd0c0c4f7dc08317f3dd865a3c7f6707c81b02f5bb24136d1172253d2e4fdd50039bbbf02a178 90-feedbackd-pm8xxx-vib.rules 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98 q6voiced.conf -d546c99ca8d406b4e2e3901a417e4e461314a38f2f01c48525e44ca524ad57af7bfc280f416bda90573b0bfb1cca27d45cb0a0ed44e999ef8d406a380d1fdbb2 adreno-a506-quirks.sh +4f9af3c582ae611d42fc058f949f60a96fc7cc884052e4c9f82e0292d57bba3b3cb8ace1d512b5a59535caa633be8558246a7519c2d067b7980f4088f452df6d adreno-a506-quirks.sh d4fd0f3406c9f004e9cae7bc500c5713aab75f102f8e3ea1af820865f01eb03def01cd9ed3e8a184c7dfc22ab419628fad17957a3782885d96eb36e94461e842 moto-modem-rfs-setup.openrc " diff --git a/device/community/soc-qcom-msm8953/adreno-a506-quirks.sh b/device/community/soc-qcom-msm8953/adreno-a506-quirks.sh index 1c3003cc1..5c30089f5 100644 --- a/device/community/soc-qcom-msm8953/adreno-a506-quirks.sh +++ b/device/community/soc-qcom-msm8953/adreno-a506-quirks.sh @@ -1,8 +1,5 @@ # Various GPU workarounds for Adreno a506 -# The 'ngl' GTK renderer, which is now used by default, has worse -# performance and is somewhat more prone to crashes. Use the 'gl' -# renderer until these issues have been sorted out. -# -# https://gitlab.gnome.org/GNOME/gtk/-/issues/6576 -export GSK_RENDERER=gl +# Use the 'ngl' GTK renderer, so we prepare for the removal of +# the legacy GL renderer +export GSK_RENDERER=ngl diff --git a/device/testing/device-pine64-pinetab/APKBUILD b/device/testing/device-pine64-pinetab/APKBUILD index 5f59aecc8..fd2c159e3 100644 --- a/device/testing/device-pine64-pinetab/APKBUILD +++ b/device/testing/device-pine64-pinetab/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Dylan Van Assche pkgname=device-pine64-pinetab pkgdesc="PINE64 PineTab" -pkgver=1 -pkgrel=4 +pkgver=2 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -161,7 +161,7 @@ upower() { sha512sums=" 8d1ef04911f1cfa7eda8185f4f4d807af23105a7c8f23d8c18f02afeccd8ab124de70c2e2760c154a3128fe3793447039fb0abf37aa496f597d27051e275033e 99-pinetab-keyboard.hwdb fb3b777fc4a592e730914716858788f6848f53aa7d4eb18f844087e5af3fb5f437210c7ece85c6866ba897fc151db05a5e21be9d2d24c8297662667f23e2a9d6 deviceinfo -9244687bfea20c78120f7c48388d141eff3e23a421e48504eac1479ec7f51197d9ca72468c9cc33c6e3d3fa32ee3514711545816e607d49870226e4a41a60a85 gsk-renderer-gl.sh +3f1422115c9a12f94b6fb7cc4e987f25ea331a9c7cbc34649470bc5557dfc85b79cbc4369e48f12f284ed1e20af6194d8bbb3c5e37227a7d9bc3e6670cd41aa9 gsk-renderer-gl.sh 6bc22b369b2d9058b702ac7a7862abaefaf8179b43491868bdb008d181b59104f1ded89db1da51a810e1ccdc803a579b924a438674283a65afc3a9c4d2894caf kirigami-lowpower.sh 5c683f2cf27b2f982c8581251688834634957143334011861400d3eed27b6590f37055fe61c8af632552435dba581fa990a44c1e5689a3c8fe642fd095b740ce phoc.ini 9e71c61bfa72b60e749c4dc04f17eb59d25de822765e81e65c937d6be5236d3951a652b69a1ab973abe6add9f34705be5dbaa98bbfa25daf7504dd50b28524c2 sway.conf diff --git a/device/testing/device-pine64-pinetab/gsk-renderer-gl.sh b/device/testing/device-pine64-pinetab/gsk-renderer-gl.sh index d54e7616f..ffb912125 100644 --- a/device/testing/device-pine64-pinetab/gsk-renderer-gl.sh +++ b/device/testing/device-pine64-pinetab/gsk-renderer-gl.sh @@ -1,2 +1,2 @@ #!/bin/sh -export GSK_RENDERER=gl +export GSK_RENDERER=cairo diff --git a/device/testing/soc-qcom-msm8226/APKBUILD b/device/testing/soc-qcom-msm8226/APKBUILD index 80526559e..dbde28e6b 100644 --- a/device/testing/soc-qcom-msm8226/APKBUILD +++ b/device/testing/soc-qcom-msm8226/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Barnabas Czeman pkgname=soc-qcom-msm8226 pkgdesc="Common package for Qualcomm MSM8226 devices" -pkgver=1 +pkgver=2 pkgrel=0 url="https://postmarketos.org" license="BSD-3-Clause" @@ -29,5 +29,5 @@ gpu() { } sha512sums=" -fc55aa63c6706758bc0cebf3cc9eb572a77b740cba9705875297170e819d27c83c44cef42924a9eb0e5cbfec95adaf515c64b9916140d15496f580acc4a18525 adreno-a305-quirks.sh +c204a145355da06b02500f915066cb16db256ebd860577acb9cd162990e08682d4569cc0c75bd40fb533ffeea8a3a96f77fc3cf121ab93c7c21af25b63d45e3a adreno-a305-quirks.sh " diff --git a/device/testing/soc-qcom-msm8226/adreno-a305-quirks.sh b/device/testing/soc-qcom-msm8226/adreno-a305-quirks.sh index b546b3564..0a7f108fc 100644 --- a/device/testing/soc-qcom-msm8226/adreno-a305-quirks.sh +++ b/device/testing/soc-qcom-msm8226/adreno-a305-quirks.sh @@ -1,6 +1,6 @@ # Various GPU workarounds for Adreno a305 # The 'ngl' GTK renderer, which is now used by default, has worse -# performance and is somewhat more prone to crashes. Use the 'gl' -# renderer until these issues have been sorted out. -export GSK_RENDERER=gl +# performance and is somewhat more prone to crashes. The legacy GL +# renderer has since been removed. Use software rendering fallback. +export GSK_RENDERER=cairo diff --git a/device/testing/soc-qcom-msm8974/APKBUILD b/device/testing/soc-qcom-msm8974/APKBUILD index d26da76f8..e180a67e4 100644 --- a/device/testing/soc-qcom-msm8974/APKBUILD +++ b/device/testing/soc-qcom-msm8974/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Barnabas Czeman pkgname=soc-qcom-msm8974 pkgdesc="Common package for Qualcomm MSM8974 devices" -pkgver=1 +pkgver=2 pkgrel=0 url="https://postmarketos.org" license="BSD-3-Clause" @@ -29,5 +29,5 @@ gpu() { } sha512sums=" -92393cb26b07e86bffed052ed2cb59ebd8096fa91173951b27f01efa92b8c9ef9a1bdc7fa054486a7e08048c4046badd3d295f6312bb209326bbf203c1112d1d adreno-a330-quirks.sh +c5a3fe3616cea7aa3e54a45d47ae741eb5e8528db4bf1b207ce7df6ff221ffc5126d5bbbffa630bc1dcedf6d2beeac253eb04b2167cdb7c2a21d342b13ba04c4 adreno-a330-quirks.sh " diff --git a/device/testing/soc-qcom-msm8974/adreno-a330-quirks.sh b/device/testing/soc-qcom-msm8974/adreno-a330-quirks.sh index 0fd0abfbe..8f0b7ce00 100644 --- a/device/testing/soc-qcom-msm8974/adreno-a330-quirks.sh +++ b/device/testing/soc-qcom-msm8974/adreno-a330-quirks.sh @@ -1,7 +1,7 @@ # Various GPU workarounds for Adreno a330 # The 'ngl' GTK renderer, which is now used by default, has worse -# performance and is somewhat more prone to crashes. Use the 'gl' -# renderer until these issues have been sorted out. -# -export GSK_RENDERER=gl +# performance and is somewhat more prone to crashes. The legacy GL +# renderer has since been removed. Use software rendering fallback. + +export GSK_RENDERER=cairo diff --git a/device/testing/soc-qcom-msm89x7/APKBUILD b/device/testing/soc-qcom-msm89x7/APKBUILD index a16a71f8c..05097d2df 100644 --- a/device/testing/soc-qcom-msm89x7/APKBUILD +++ b/device/testing/soc-qcom-msm89x7/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Barnabas Czeman pkgname=soc-qcom-msm89x7 pkgdesc="Common package for Qualcomm MSM89x7 devices" -pkgver=2 -pkgrel=1 +pkgver=3 +pkgrel=0 url="https://postmarketos.org" license="BSD-3-Clause" arch="aarch64" @@ -46,5 +46,5 @@ gpu() { sha512sums=" b3cc3ad65cf5d3fd956f4d24f36fc4324e4ee676a0cdda99f213f90c6a854b1eb9d3333402e05e1b861e404f31c72b4d5a219b6bcb6170bacedc938657e9a7c4 soc-qcom-msm89x7-6078de44affd1023c1ba4f71ef1e21468e3282e9.tar.gz -d54065bd6e069dd49349fc53960de42fa43438c4519e90a44d89ab6fdf74978301b1d3865bb4d51130806bf8680ce34532ad97b2729e78208745a1aa4bbac904 adreno-quirks.sh +1deebe2d0ecfd1022d3f068faf8412edd6c6cf309c0472788620778a04c274187d01204b0c39c6dd5fddd1d5beaa36f2ca693b7af0a8fb9d2c27ea1f6d696ef1 adreno-quirks.sh " diff --git a/device/testing/soc-qcom-msm89x7/adreno-quirks.sh b/device/testing/soc-qcom-msm89x7/adreno-quirks.sh index 9094ff311..532644a14 100644 --- a/device/testing/soc-qcom-msm89x7/adreno-quirks.sh +++ b/device/testing/soc-qcom-msm89x7/adreno-quirks.sh @@ -1,6 +1,7 @@ # Various GPU workarounds for Adreno 308 and 505 # The 'ngl' GTK renderer, which is now used by default, has worse -# performance and is somewhat more prone to crashes. Use the 'gl' -# renderer until these issues have been sorted out. -export GSK_RENDERER=gl +# performance and is somewhat more prone to crashes. The legacy GL +# renderer has since been removed. Use software rendering fallback. + +export GSK_RENDERER=cairo