mirror of
https://github.com/ublue-os/bazzite.git
synced 2025-03-12 04:14:06 +00:00
Merge branch 'main' into testing
This commit is contained in:
commit
d8e500c2f7
8
.github/workflows/build.yml
vendored
8
.github/workflows/build.yml
vendored
@ -183,14 +183,18 @@ jobs:
|
||||
|
||||
- name: Get Current Fedora Version
|
||||
id: labels
|
||||
shell: bash
|
||||
run: |
|
||||
set -eo pipefail
|
||||
if [[ "${{ matrix.base_name }}" == "bazzite-nvidia" ]]; then
|
||||
ver=$(skopeo inspect docker://ghcr.io/ublue-os/bazzite-${{ env.IMAGE_FLAVOR }}:${{ matrix.major_version }} | jq -r '.Labels["org.opencontainers.image.version"]')
|
||||
elif [[ "${{ env.IMAGE_FLAVOR}}" == "main" ]]; then
|
||||
ver=$(skopeo inspect docker://ghcr.io/ublue-os/${{ matrix.base_image_name }}:${{ matrix.major_version }} | jq -r '.Labels["org.opencontainers.image.version"]')
|
||||
else
|
||||
ver=$(skopeo inspect docker://ghcr.io/ublue-os/${{ matrix.base_image_name }}-${{ env.IMAGE_FLAVOR }}:${{ matrix.major_version }} | jq -r '.Labels["org.opencontainers.image.version"]')
|
||||
fi
|
||||
if [ -z "$ver" ] || [ "null" = "$ver" ]; then
|
||||
echo "inspected image version must not be empty or null"
|
||||
exit 1
|
||||
fi
|
||||
echo "VERSION=$ver" >> $GITHUB_OUTPUT
|
||||
|
||||
# Build metadata
|
||||
|
@ -108,7 +108,7 @@ RUN rpm-ostree override replace \
|
||||
rpm-ostree override replace \
|
||||
--experimental \
|
||||
--from repo=updates \
|
||||
alsa-libs \
|
||||
alsa-lib \
|
||||
|| true && \
|
||||
rpm-ostree override replace \
|
||||
--experimental \
|
||||
@ -333,11 +333,13 @@ RUN rpm-ostree install \
|
||||
sed -i '0,/enabled=0/s//enabled=1/' /etc/yum.repos.d/rpmfusion-nonfree-steam.repo && \
|
||||
sed -i '0,/enabled=1/s//enabled=0/' /etc/yum.repos.d/rpmfusion-nonfree.repo && \
|
||||
sed -i '0,/enabled=1/s//enabled=0/' /etc/yum.repos.d/rpmfusion-nonfree-updates.repo && \
|
||||
sed -i '0,/enabled=1/s//enabled=0/' /etc/yum.repos.d/rpmfusion-nonfree-updates-testing.repo && \
|
||||
rpm-ostree install \
|
||||
steam && \
|
||||
sed -i '0,/enabled=1/s//enabled=0/' /etc/yum.repos.d/rpmfusion-nonfree-steam.repo && \
|
||||
sed -i '0,/enabled=0/s//enabled=1/' /etc/yum.repos.d/rpmfusion-nonfree.repo && \
|
||||
sed -i '0,/enabled=0/s//enabled=1/' /etc/yum.repos.d/rpmfusion-nonfree-updates.repo && \
|
||||
sed -i '0,/enabled=0/s//enabled=1/' /etc/yum.repos.d/rpmfusion-nonfree-updates-testing.repo && \
|
||||
sed -i '0,/enabled=0/s//enabled=1/' /etc/yum.repos.d/fedora-updates.repo && \
|
||||
rpm-ostree install \
|
||||
lutris \
|
||||
@ -530,6 +532,7 @@ RUN /tmp/image-info.sh && \
|
||||
systemctl enable joycond && \
|
||||
systemctl --global enable bazzite-user-setup.service && \
|
||||
systemctl --global enable podman.socket && \
|
||||
systemctl --global enable systemd-tmpfiles-setup.service && \
|
||||
if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
|
||||
sed -i '/^PRETTY_NAME/s/Kinoite/Bazzite/' /usr/lib/os-release && \
|
||||
systemctl --global enable com.system76.Scheduler.dbusproxy.service \
|
||||
@ -758,8 +761,8 @@ RUN rm -f /usr/bin/waydroid-choose-gpu && \
|
||||
# Install NVIDIA driver
|
||||
RUN wget https://raw.githubusercontent.com/ublue-os/nvidia/main/install.sh -O /tmp/nvidia-install.sh && \
|
||||
wget https://raw.githubusercontent.com/ublue-os/nvidia/main/post-install.sh -O /tmp/nvidia-post-install.sh && \
|
||||
chmod +x /tmp/nvidia-install.sh && IMAGE_NAME="${BASE_IMAGE_NAME}" /tmp/nvidia-install.sh && \
|
||||
chmod +x /tmp/nvidia-post-install.sh && IMAGE_NAME="${BASE_IMAGE_NAME}" /tmp/nvidia-post-install.sh
|
||||
chmod +x /tmp/nvidia-install.sh && IMAGE_NAME="${BASE_IMAGE_NAME}" RPMFUSION_MIRROR="" /tmp/nvidia-install.sh && \
|
||||
chmod +x /tmp/nvidia-post-install.sh && IMAGE_NAME="${BASE_IMAGE_NAME}" RPMFUSION_MIRROR="" /tmp/nvidia-post-install.sh
|
||||
|
||||
# Cleanup & Finalize
|
||||
RUN rm -rf \
|
||||
|
@ -214,7 +214,7 @@ Baca [FAQ](https://universal-blue.discourse.group/docs?topic=33) untuk tahu apa
|
||||
- [Panduan dual booting](https://universal-blue.discourse.group/docs?topic=129)
|
||||
- [Dokumentasi yang lain](https://universal-blue.discourse.group/docs?topic=287)
|
||||
|
||||
Temukan dokumentasi tambahan project ini [disini](https://universal-blue.discourse.group/docs).
|
||||
Temukan dokumentasi tambahan project ini [disini](http://docs.bazzite.gg/).
|
||||
|
||||
Cek [buletin](https://universal-blue.discourse.group/tag/bazzite-buzz) kami yang selalu update secara regular tentang proyek ini.
|
||||
|
||||
@ -326,7 +326,7 @@ Bazzite dibuat secara penuh di Github dan membuat versi anda sendiri sangat muda
|
||||
Kami juga membawakan konfigurasi untuk [pull app](https://github.com/apps/pull) jika anda ingin fork anda selalu up to date dengan upstream. Aktifkan ini di repo anda untuk melacak perubahan dari Bazzite ketika anda membuat modifikasi anda sendiri.
|
||||
|
||||
## Bergabung Dengan Komunitas
|
||||
Anda bisa menemukan kami di [Discord Universal Blue](https://discord.gg/f8MUghG5PB) dan melihat arsip dari utas bantuan di [Answer Overflow](https://www.answeroverflow.com/c/1072614816579063828/1087140957096517672).
|
||||
Anda bisa menemukan kami di [Discord Universal Blue](https://discord.gg/f8MUghG5PB) dan melihat arsip dari utas bantuan di [Answer Overflow](https://www.answeroverflow.com/c/1072614816579063828/1143023993041993769).
|
||||
|
||||
Berdiskusi dan membuat panduan untuk pengguna di [Forum Discourse Universal Blue](https://universal-blue.discourse.group/c/bazzite/5).
|
||||
|
||||
|
@ -60,7 +60,6 @@ Bazzite es creado con [ublue-os/main](https://github.com/ublue-os/main) y [ublue
|
||||
- Uso del [control de congestión TCP BBR hecho por Google](https://github.com/google/bbr) por defecto.
|
||||
- [Input Remapper](https://github.com/sezanzeb/input-remapper) pre-instalado y habilitado. <sub><sup>(Disponible pero desactivado por defecto en la variante Deck, puede ser habilitado ejecutando el siguiente comando en una terminal: `ujust restore-input-remapper`)</sup></sub>
|
||||
- El portal de Bazzite (Bazzite Portal) provee una manera fácil de instalar un sin fin de aplicaciones y ajustes, incluyendo la instalación de [LACT](https://github.com/ilya-zlobintsev/LACT) (para mejor controlar tu GPU de AMD) y [GreenWithEnvy](https://gitlab.com/leinardi/gwe) (para mejor controlar tu GPU de NVIDIA).
|
||||
- Opción para instalar el gestor de paquetes [Brew](https://brew.sh/) usando el Bazzite Portal.
|
||||
- [Waydroid](https://waydro.id/) pre-instalado para correr aplicaciones de Android. Para configurarlo, usa esta [guía rápida (en inglés)](https://universal-blue.discourse.group/docs?topic=32).
|
||||
- Administra tus aplicaciones usando [Flatseal](https://github.com/tchx84/Flatseal), [Warehouse](https://github.com/flattool/warehouse), y [Gear Lever](https://github.com/mijorus/gearlever).
|
||||
- Drivers i2c-piix4 y i2c-nct6775 de [OpenRGB](https://gitlab.com/CalcProgrammer1/OpenRGB) incluidos para controlar las luces RGB de ciertas tarjetas madre (motherboards).
|
||||
@ -101,7 +100,7 @@ rpm-ostree rebase ostree-unverified-registry:ghcr.io/ublue-os/bazzite-nvidia:sta
|
||||
### Steam Deck/Computadoras para Cine en Casa (HTPCs)
|
||||
|
||||
> \[!IMPORTANT\]\
|
||||
> Los dispositivos que **NO** son una Steam Deck también pueden utilizar las imágenes bazzite-deck, sin embargo tienen que usar una GPU de AMD o Intel, GPUs de NVIDIA no son compatibles por el momento con esta variante.
|
||||
> Los dispositivos que **NO** son una Steam Deck también pueden utilizar las imágenes `bazzite-deck`, sin embargo tienen que usar una GPU de AMD moderna, se ha confirmado que las GPUs Intel ARC tambien funcionan.
|
||||
|
||||
Esta variante esta diseñada para usarse como una alternativa de SteamOS en la Steam Deck, e igualmente para proporcionar una experiencia como de consola de videojuegos en HTPCs y otros dispositivos portátiles, disponible como `bazzite-deck`:
|
||||
|
||||
@ -111,7 +110,7 @@ Esta variante esta diseñada para usarse como una alternativa de SteamOS en la S
|
||||
- **Habilidad de arrancar el sistema incluso si el disco esta lleno.**
|
||||
- **Soporte para cada uno de los lenguajes directamente soportados por Fedora (upstream).**
|
||||
- **Uso del servidor gráfico Wayland en el escritorio con [soporte para Steam input](https://github.com/Supreeeme/extest).**
|
||||
- Se incluye [HHD](https://github.com/hhd-dev/hhd) y [HandyGCCS](https://github.com/ShadowBlip/HandyGCCS) para expander el soporte de los mandos de videojuegos integrados en otras computadoras handheld que no sean de Valve
|
||||
- Se incluye [HHD](https://github.com/hhd-dev/hhd) para expander el soporte de los mandos de videojuegos integrados en otras computadoras handheld que no sean de Valve
|
||||
- Incluye versiones portadas de la mayoría de los paquetes de SteamOS, incluyendo drivers, actualizadores de firmware y controladores de ventiladores [del repositorio de evlaV](https://gitlab.com/evlaV).
|
||||
- Version parchada de Mesa para controlar correctamente la tasa de fotogramas (framerate) usando Gamescope.
|
||||
- Incluye los parches de [SteamOS BTRFS](https://gitlab.com/popsulfr/steamos-btrfs) por defecto, los cuales proveen soporte completo del sistema de archivos BTRFS para tarjetas SD.
|
||||
@ -234,7 +233,7 @@ rpm-ostree rebase ostree-unverified-registry:ghcr.io/ublue-os/bazzite-gnome-nvid
|
||||
> \[!WARNING\]\
|
||||
> **Debido a un bug en upstream, Bazzite no puede ser utilizado por el momento en Steam Decks con solo 64 GB de almacenamiento eMMC. Ampliar tu almacenamiento cambiando el disco interno soluciona este problema.**
|
||||
|
||||
Si necesitas realizar un rebase a la imagen **para Steam Deck/HTPC con GPUs AMD ó Intel**, ejecuta el siguiente comando en una terminal:
|
||||
Si necesitas realizar un rebase a la imagen **para Steam Deck/HTPC con GPUs AMD modernas ó Intel ARC**, ejecuta el siguiente comando en una terminal:
|
||||
|
||||
```bash
|
||||
rpm-ostree rebase ostree-unverified-registry:ghcr.io/ublue-os/bazzite-deck-gnome:stable
|
||||
@ -293,7 +292,7 @@ Lee nuestras [preguntas frecuentes](https://universal-blue.discourse.group/docs?
|
||||
- [Guía para Configurar el Arranque Dual con Windows (Dual Boot)](https://universal-blue.discourse.group/docs?topic=129)
|
||||
- [Documentación Miscelánea](https://universal-blue.discourse.group/docs?topic=287)
|
||||
|
||||
Puedes encontrar documentación adicional relacionada al proyecto [aquí](https://universal-blue.discourse.group/docs?category=5).
|
||||
Puedes encontrar documentación adicional relacionada al proyecto [aquí](http://docs.bazzite.gg/).
|
||||
|
||||
Checa nuestros [boletines informativos (disponibles en español](https://universal-blue.discourse.group/tag/bazzite-buzz), estos son publicados regularmente y los cuales hablan de las últimas actualizaciones del proyecto.
|
||||
|
||||
@ -421,7 +420,7 @@ También incluimos una configuración para la popular app de GitHub [Pull](https
|
||||
|
||||
## Únete a la Comunidad
|
||||
|
||||
Puedes encontrarnos en el [Discord de Universal Blue (en inglés)](https://discord.gg/f8MUghG5PB) y puedes ver todo el archivo de los hilos de ayuda en nuestro [Answer Overflow](https://www.answeroverflow.com/c/1072614816579063828/1087140957096517672).
|
||||
Puedes encontrarnos en el [Discord de Universal Blue (en inglés)](https://discord.gg/f8MUghG5PB) y puedes ver todo el archivo de los hilos de ayuda en nuestro [Answer Overflow](https://www.answeroverflow.com/c/1072614816579063828/1143023993041993769).
|
||||
|
||||
Discute y crea guias para los usuarios en nuestro [foro de Discourse de Universal Blue Discourse (en inglés)](https://universal-blue.discourse.group/c/bazzite/5).
|
||||
|
||||
|
@ -238,7 +238,7 @@ rpm-ostree rebase ostree-unverified-registry:ghcr.io/ublue-os/bazzite-deck-gnome
|
||||
- System packages stay relatively up to date.
|
||||
- Can layer Fedora packages to the image without losing them between updates.
|
||||
- Security focused with [SELinux](https://github.com/SELinuxProject/selinux) preinstalled and configured out of the box.
|
||||
- The ability to rebase to different Fedora libostree images, if desired, without losing user data.
|
||||
- The ability to rebase to different Fedora Atomic images, if desired, without losing user data.
|
||||
- Printing support thanks to [CUPS](https://www.cups.org/) being preinstalled.
|
||||
|
||||
## Why
|
||||
@ -267,9 +267,8 @@ Read the [FAQ](https://universal-blue.discourse.group/docs?topic=33) for details
|
||||
- [Updates, Rollbacks, and Rebasing](https://universal-blue.discourse.group/docs?topic=36)
|
||||
- [Gaming Guide](https://universal-blue.discourse.group/docs?topic=31)
|
||||
- [Dual Booting Guide](https://universal-blue.discourse.group/docs?topic=129)
|
||||
- [Miscellaneous Documentation](https://universal-blue.discourse.group/docs?topic=287)
|
||||
|
||||
Find additional documentation surrounding the project [here](https://universal-blue.discourse.group/docs?category=5).
|
||||
View [additional documentation](http://docs.bazzite.gg/) surrounding the project.
|
||||
|
||||
Check out our [newsletters](https://universal-blue.discourse.group/tag/bazzite-buzz) that get published on a regular basis for updates on the project.
|
||||
|
||||
@ -401,7 +400,7 @@ We also ship a config for the popular [pull app](https://github.com/apps/pull) i
|
||||
|
||||
## Join The Community
|
||||
|
||||
You can find us on the [Universal Blue Discord](https://discord.gg/f8MUghG5PB) and view the archive of support threads on our [Answer Overflow](https://www.answeroverflow.com/c/1072614816579063828/1087140957096517672).
|
||||
You can find us on the [Universal Blue Discord](https://discord.gg/f8MUghG5PB) and view the [archive](https://www.answeroverflow.com/c/1072614816579063828/1143023993041993769) of support threads without an account.
|
||||
|
||||
Discuss and create user guides over at the [Universal Blue Discourse Forums](https://universal-blue.discourse.group/c/bazzite/5).
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
width="1764"
|
||||
height="707"
|
||||
viewBox="0 0 1764 707"
|
||||
width="1763.67"
|
||||
height="706.97595"
|
||||
viewBox="0 0 1763.67 706.97595"
|
||||
fill="none"
|
||||
version="1.1"
|
||||
id="svg75"
|
||||
@ -166,10 +166,6 @@
|
||||
d="m 1555.2,594.496 c -4.1,0 -8.02,-0.512 -11.78,-1.536 -3.75,-0.939 -7.21,-2.475 -10.36,-4.608 -3.08,-2.048 -5.64,-4.651 -7.68,-7.808 -1.97,-3.072 -3.25,-6.784 -3.84,-11.136 h 15.23 c 0.59,2.389 1.7,4.437 3.33,6.144 1.7,1.792 3.79,3.157 6.27,4.096 2.56,1.024 5.37,1.536 8.45,1.536 3.49,0 6.61,-0.725 9.34,-2.176 2.82,-1.365 5.03,-3.499 6.66,-6.4 1.7,-2.901 2.56,-6.571 2.56,-11.008 v -8.192 c -1.28,2.133 -2.95,4.096 -5,5.888 -2.04,1.707 -4.52,3.115 -7.42,4.224 -2.82,1.024 -6.06,1.536 -9.73,1.536 -6.06,0 -11.48,-1.451 -16.25,-4.352 -4.78,-2.901 -8.54,-6.827 -11.27,-11.776 -2.73,-5.035 -4.09,-10.709 -4.09,-17.024 0,-6.4 1.36,-12.075 4.09,-17.024 2.73,-4.949 6.49,-8.875 11.27,-11.776 4.86,-2.901 10.28,-4.352 16.25,-4.352 3.33,0 6.4,0.512 9.22,1.536 2.81,0.939 5.29,2.219 7.42,3.84 2.22,1.621 4.05,3.456 5.51,5.504 l 1.53,-9.344 h 13.83 v 60.672 c 0,5.461 -0.9,10.283 -2.69,14.464 -1.71,4.181 -4.1,7.68 -7.17,10.496 -2.99,2.816 -6.53,4.949 -10.62,6.4 -4.02,1.451 -8.37,2.176 -13.06,2.176 z m -1.02,-42.752 c 3.75,0 7.04,-0.853 9.85,-2.56 2.9,-1.792 5.12,-4.181 6.66,-7.168 1.62,-2.987 2.43,-6.357 2.43,-10.112 0,-3.84 -0.81,-7.253 -2.43,-10.24 -1.54,-2.987 -3.76,-5.291 -6.66,-6.912 -2.81,-1.707 -6.1,-2.56 -9.85,-2.56 -3.67,0 -6.96,0.853 -9.86,2.56 -2.9,1.621 -5.16,3.925 -6.78,6.912 -1.54,2.901 -2.31,6.315 -2.31,10.24 0,3.755 0.77,7.125 2.31,10.112 1.62,2.987 3.88,5.376 6.78,7.168 2.9,1.707 6.19,2.56 9.86,2.56 z"
|
||||
fill="#ffffff"
|
||||
id="path37" />
|
||||
<path
|
||||
d="m 1607.45,565.44 c -2.9,0 -5.25,-0.896 -7.04,-2.688 -1.79,-1.792 -2.69,-3.925 -2.69,-6.4 0,-2.645 0.9,-4.864 2.69,-6.656 1.79,-1.792 4.14,-2.688 7.04,-2.688 2.82,0 5.12,0.896 6.91,2.688 1.8,1.792 2.69,4.011 2.69,6.656 0,2.475 -0.89,4.608 -2.69,6.4 -1.79,1.792 -4.09,2.688 -6.91,2.688 z"
|
||||
fill="#ffffff"
|
||||
id="path38" />
|
||||
<rect
|
||||
x="142.45399"
|
||||
y="606.49597"
|
||||
@ -303,10 +299,6 @@
|
||||
d="m 1422.65,678.664 c -2.69,0 -5.03,-0.597 -7.04,-1.792 -1.96,-1.195 -3.45,-2.88 -4.48,-5.056 -0.98,-2.176 -1.41,-4.715 -1.28,-7.616 0.13,-2.773 0.68,-5.312 1.67,-7.616 0.98,-2.347 2.3,-4.395 3.96,-6.144 1.71,-1.749 3.67,-3.115 5.89,-4.096 2.22,-0.981 4.63,-1.472 7.23,-1.472 2.9,0 5.29,0.597 7.17,1.792 1.92,1.195 3.33,2.795 4.23,4.8 0.89,1.963 1.28,4.139 1.15,6.528 -0.05,0.725 -0.15,1.557 -0.32,2.496 -0.13,0.896 -0.28,1.728 -0.45,2.496 h -26.37 l 0.71,-4.16 h 21.12 c 0.29,-2.005 0.12,-3.691 -0.52,-5.056 -0.64,-1.408 -1.6,-2.475 -2.88,-3.2 -1.28,-0.768 -2.81,-1.152 -4.6,-1.152 -1.84,0 -3.61,0.427 -5.32,1.28 -1.66,0.811 -3.11,2.027 -4.35,3.648 -1.24,1.579 -2.07,3.563 -2.49,5.952 l -0.32,1.792 c -0.47,2.389 -0.43,4.501 0.12,6.336 0.56,1.835 1.52,3.243 2.88,4.224 1.41,0.981 3.12,1.472 5.12,1.472 2.26,0 4.21,-0.491 5.83,-1.472 1.66,-1.024 2.96,-2.389 3.9,-4.096 h 5.31 c -0.89,1.92 -2.11,3.648 -3.64,5.184 -1.5,1.536 -3.29,2.752 -5.38,3.648 -2.05,0.853 -4.33,1.28 -6.85,1.28 z"
|
||||
fill="#ffffff"
|
||||
id="path69" />
|
||||
<path
|
||||
d="m 1447.57,678.216 c -1.07,0 -1.97,-0.341 -2.69,-1.024 -0.68,-0.725 -1.02,-1.6 -1.02,-2.624 0,-1.024 0.34,-1.877 1.02,-2.56 0.72,-0.725 1.62,-1.088 2.69,-1.088 1.06,0 1.94,0.363 2.62,1.088 0.68,0.683 1.03,1.536 1.03,2.56 0,1.024 -0.35,1.899 -1.03,2.624 -0.68,0.683 -1.56,1.024 -2.62,1.024 z"
|
||||
fill="#ffffff"
|
||||
id="path70" />
|
||||
<defs
|
||||
id="defs75">
|
||||
<linearGradient
|
||||
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 48 KiB |
@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
width="1764"
|
||||
height="707"
|
||||
viewBox="0 0 1764 707"
|
||||
width="1763.67"
|
||||
height="706.97595"
|
||||
viewBox="0 0 1763.67 706.97595"
|
||||
fill="none"
|
||||
version="1.1"
|
||||
id="svg75"
|
||||
@ -195,11 +195,6 @@
|
||||
fill="white"
|
||||
id="path37"
|
||||
style="fill:#5835ce;fill-opacity:1" />
|
||||
<path
|
||||
d="m 1607.45,565.44 c -2.9,0 -5.25,-0.896 -7.04,-2.688 -1.79,-1.792 -2.69,-3.925 -2.69,-6.4 0,-2.645 0.9,-4.864 2.69,-6.656 1.79,-1.792 4.14,-2.688 7.04,-2.688 2.82,0 5.12,0.896 6.91,2.688 1.8,1.792 2.69,4.011 2.69,6.656 0,2.475 -0.89,4.608 -2.69,6.4 -1.79,1.792 -4.09,2.688 -6.91,2.688 z"
|
||||
fill="white"
|
||||
id="path38"
|
||||
style="fill:#5835ce;fill-opacity:1" />
|
||||
<rect
|
||||
x="142.45399"
|
||||
y="606.49597"
|
||||
@ -333,10 +328,6 @@
|
||||
d="m 1422.65,678.664 c -2.69,0 -5.03,-0.597 -7.04,-1.792 -1.96,-1.195 -3.45,-2.88 -4.48,-5.056 -0.98,-2.176 -1.41,-4.715 -1.28,-7.616 0.13,-2.773 0.68,-5.312 1.67,-7.616 0.98,-2.347 2.3,-4.395 3.96,-6.144 1.71,-1.749 3.67,-3.115 5.89,-4.096 2.22,-0.981 4.63,-1.472 7.23,-1.472 2.9,0 5.29,0.597 7.17,1.792 1.92,1.195 3.33,2.795 4.23,4.8 0.89,1.963 1.28,4.139 1.15,6.528 -0.05,0.725 -0.15,1.557 -0.32,2.496 -0.13,0.896 -0.28,1.728 -0.45,2.496 h -26.37 l 0.71,-4.16 h 21.12 c 0.29,-2.005 0.12,-3.691 -0.52,-5.056 -0.64,-1.408 -1.6,-2.475 -2.88,-3.2 -1.28,-0.768 -2.81,-1.152 -4.6,-1.152 -1.84,0 -3.61,0.427 -5.32,1.28 -1.66,0.811 -3.11,2.027 -4.35,3.648 -1.24,1.579 -2.07,3.563 -2.49,5.952 l -0.32,1.792 c -0.47,2.389 -0.43,4.501 0.12,6.336 0.56,1.835 1.52,3.243 2.88,4.224 1.41,0.981 3.12,1.472 5.12,1.472 2.26,0 4.21,-0.491 5.83,-1.472 1.66,-1.024 2.96,-2.389 3.9,-4.096 h 5.31 c -0.89,1.92 -2.11,3.648 -3.64,5.184 -1.5,1.536 -3.29,2.752 -5.38,3.648 -2.05,0.853 -4.33,1.28 -6.85,1.28 z"
|
||||
fill="#ffffff"
|
||||
id="path69" />
|
||||
<path
|
||||
d="m 1447.57,678.216 c -1.07,0 -1.97,-0.341 -2.69,-1.024 -0.68,-0.725 -1.02,-1.6 -1.02,-2.624 0,-1.024 0.34,-1.877 1.02,-2.56 0.72,-0.725 1.62,-1.088 2.69,-1.088 1.06,0 1.94,0.363 2.62,1.088 0.68,0.683 1.03,1.536 1.03,2.56 0,1.024 -0.35,1.899 -1.03,2.624 -0.68,0.683 -1.56,1.024 -2.62,1.024 z"
|
||||
fill="#ffffff"
|
||||
id="path70" />
|
||||
<defs
|
||||
id="defs75">
|
||||
<linearGradient
|
||||
|
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 49 KiB |
@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
width="2400"
|
||||
height="800"
|
||||
viewBox="0 0 2400 800"
|
||||
width="1763.67"
|
||||
height="706.97595"
|
||||
viewBox="0 0 1763.67 706.97595"
|
||||
fill="none"
|
||||
version="1.1"
|
||||
id="svg75"
|
||||
@ -10,7 +10,7 @@
|
||||
xmlns:svg="http://www.w3.org/2000/svg">
|
||||
<g
|
||||
id="g1"
|
||||
transform="translate(250)">
|
||||
transform="translate(-68.165009,-46.512012)">
|
||||
<g
|
||||
clip-path="url(#clip0_1019_206)"
|
||||
id="g15"
|
||||
@ -199,11 +199,6 @@
|
||||
fill="white"
|
||||
id="path37"
|
||||
style="fill:#5835ce;fill-opacity:1" />
|
||||
<path
|
||||
d="m 1675.615,611.95201 c -2.9,0 -5.25,-0.896 -7.04,-2.688 -1.79,-1.792 -2.69,-3.925 -2.69,-6.4 0,-2.645 0.9,-4.864 2.69,-6.656 1.79,-1.792 4.14,-2.688 7.04,-2.688 2.82,0 5.12,0.896 6.91,2.688 1.8,1.792 2.69,4.011 2.69,6.656 0,2.475 -0.89,4.608 -2.69,6.4 -1.79,1.792 -4.09,2.688 -6.91,2.688 z"
|
||||
fill="white"
|
||||
id="path38"
|
||||
style="fill:#5835ce;fill-opacity:1" />
|
||||
<rect
|
||||
x="210.61899"
|
||||
y="653.008"
|
||||
@ -337,10 +332,6 @@
|
||||
d="m 1490.815,725.17601 c -2.69,0 -5.03,-0.597 -7.04,-1.792 -1.96,-1.195 -3.45,-2.88 -4.48,-5.056 -0.98,-2.176 -1.41,-4.715 -1.28,-7.616 0.13,-2.773 0.68,-5.312 1.67,-7.616 0.98,-2.347 2.3,-4.395 3.96,-6.144 1.71,-1.749 3.67,-3.115 5.89,-4.096 2.22,-0.981 4.63,-1.472 7.23,-1.472 2.9,0 5.29,0.597 7.17,1.792 1.92,1.195 3.33,2.795 4.23,4.8 0.89,1.963 1.28,4.139 1.15,6.528 -0.05,0.725 -0.15,1.557 -0.32,2.496 -0.13,0.896 -0.28,1.728 -0.45,2.496 h -26.37 l 0.71,-4.16 h 21.12 c 0.29,-2.005 0.12,-3.691 -0.52,-5.056 -0.64,-1.408 -1.6,-2.475 -2.88,-3.2 -1.28,-0.768 -2.81,-1.152 -4.6,-1.152 -1.84,0 -3.61,0.427 -5.32,1.28 -1.66,0.811 -3.11,2.027 -4.35,3.648 -1.24,1.579 -2.07,3.563 -2.49,5.952 l -0.32,1.792 c -0.47,2.389 -0.43,4.501 0.12,6.336 0.56,1.835 1.52,3.243 2.88,4.224 1.41,0.981 3.12,1.472 5.12,1.472 2.26,0 4.21,-0.491 5.83,-1.472 1.66,-1.024 2.96,-2.389 3.9,-4.096 h 5.31 c -0.89,1.92 -2.11,3.648 -3.64,5.184 -1.5,1.536 -3.29,2.752 -5.38,3.648 -2.05,0.853 -4.33,1.28 -6.85,1.28 z"
|
||||
fill="#ffffff"
|
||||
id="path69" />
|
||||
<path
|
||||
d="m 1515.735,724.72801 c -1.07,0 -1.97,-0.341 -2.69,-1.024 -0.68,-0.725 -1.02,-1.6 -1.02,-2.624 0,-1.024 0.34,-1.877 1.02,-2.56 0.72,-0.725 1.62,-1.088 2.69,-1.088 1.06,0 1.94,0.363 2.62,1.088 0.68,0.683 1.03,1.536 1.03,2.56 0,1.024 -0.35,1.899 -1.03,2.624 -0.68,0.683 -1.56,1.024 -2.62,1.024 z"
|
||||
fill="#ffffff"
|
||||
id="path70" />
|
||||
</g>
|
||||
<defs
|
||||
id="defs75">
|
||||
|
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 50 KiB |
@ -1,5 +1,5 @@
|
||||
diff --git a/src/main.conf b/src/main.conf
|
||||
index 085c81a..ca2abcd 100644
|
||||
index 2796f155e..f7b032b9f 100644
|
||||
--- a/src/main.conf
|
||||
+++ b/src/main.conf
|
||||
@@ -60,7 +60,7 @@
|
||||
@ -11,7 +11,7 @@ index 085c81a..ca2abcd 100644
|
||||
|
||||
# Permanently enables the Fast Connectable setting for adapters that
|
||||
# support it. When enabled other devices can connect faster to us,
|
||||
@@ -193,8 +193,8 @@
|
||||
@@ -182,8 +182,8 @@
|
||||
|
||||
# LE scanning parameters used for passive scanning supporting wake from suspend
|
||||
# scenarios
|
||||
|
@ -1,5 +1,27 @@
|
||||
From d1ef0be0d84b909a88dccf28af52d5a1c0e49992 Mon Sep 17 00:00:00 2001
|
||||
From: Vicki Pfau <vi@endrift.com>
|
||||
Date: Fri, 8 Sep 2023 16:53:02 -0700
|
||||
Subject: [PATCH 2/2] Experimental patch to enable alternate Bluetooth
|
||||
connection modes
|
||||
|
||||
This should improve Bluetooth connectivity, especially with multiple controllers and while docked.
|
||||
|
||||
Testing:
|
||||
sudo btmgmt
|
||||
[mgmt]# phy
|
||||
Verify that LE2MRX, LE2MTX, LECODEDRX, LECODEDTX are in the selected phys list.
|
||||
Verify that multiple controllers can connect and work well.
|
||||
|
||||
Co-Authored-By: Rachel Blackman <rachel.blackman@synapse.com>
|
||||
---
|
||||
src/adapter.c | 46 ++++++++++++++++++++++++++++
|
||||
src/btd.h | 2 ++
|
||||
src/main.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
src/main.conf | 5 +++
|
||||
4 files changed, 138 insertions(+)
|
||||
|
||||
diff --git a/src/adapter.c b/src/adapter.c
|
||||
index 8a7c53a..b941559 100644
|
||||
index 5ebfc4752..bc1e1d418 100644
|
||||
--- a/src/adapter.c
|
||||
+++ b/src/adapter.c
|
||||
@@ -86,6 +86,18 @@
|
||||
@ -58,7 +80,7 @@ index 8a7c53a..b941559 100644
|
||||
static bool pairable_timeout_handler(gpointer user_data)
|
||||
{
|
||||
struct btd_adapter *adapter = user_data;
|
||||
@@ -10389,6 +10431,10 @@ static void read_info_complete(uint8_t status, uint16_t length,
|
||||
@@ -10387,6 +10429,10 @@ static void read_info_complete(uint8_t status, uint16_t length,
|
||||
if (btd_adapter_get_powered(adapter))
|
||||
adapter_start(adapter);
|
||||
|
||||
@ -70,7 +92,7 @@ index 8a7c53a..b941559 100644
|
||||
|
||||
failed:
|
||||
diff --git a/src/btd.h b/src/btd.h
|
||||
index b7e7ebd..2b84f7a 100644
|
||||
index b7e7ebd61..2b84f7a51 100644
|
||||
--- a/src/btd.h
|
||||
+++ b/src/btd.h
|
||||
@@ -151,6 +151,8 @@ struct btd_opts {
|
||||
@ -83,10 +105,10 @@ index b7e7ebd..2b84f7a 100644
|
||||
|
||||
extern struct btd_opts btd_opts;
|
||||
diff --git a/src/main.c b/src/main.c
|
||||
index cddf139..1f3301b 100644
|
||||
index 2134fcf75..700c83c78 100644
|
||||
--- a/src/main.c
|
||||
+++ b/src/main.c
|
||||
@@ -128,6 +128,7 @@ static const char *le_options[] = {
|
||||
@@ -127,6 +127,7 @@ static const char *le_options[] = {
|
||||
"AdvMonAllowlistScanDuration",
|
||||
"AdvMonNoFilterScanDuration",
|
||||
"EnableAdvMonInterleaveScan",
|
||||
@ -94,7 +116,7 @@ index cddf139..1f3301b 100644
|
||||
NULL
|
||||
};
|
||||
|
||||
@@ -182,10 +183,32 @@ static const struct group_table {
|
||||
@@ -180,10 +181,32 @@ static const struct group_table {
|
||||
{ }
|
||||
};
|
||||
|
||||
@ -127,7 +149,7 @@ index cddf139..1f3301b 100644
|
||||
static int8_t check_sirk_alpha_numeric(char *str)
|
||||
{
|
||||
int8_t val = 0;
|
||||
@@ -226,6 +249,54 @@ static size_t hex2bin(const char *hexstr, uint8_t *buf, size_t buflen)
|
||||
@@ -224,6 +247,54 @@ static size_t hex2bin(const char *hexstr, uint8_t *buf, size_t buflen)
|
||||
return len;
|
||||
}
|
||||
|
||||
@ -182,7 +204,7 @@ index cddf139..1f3301b 100644
|
||||
GKeyFile *btd_get_main_conf(void)
|
||||
{
|
||||
return main_conf;
|
||||
@@ -678,6 +749,20 @@ static void parse_le_config(GKeyFile *config)
|
||||
@@ -674,6 +745,20 @@ static void parse_le_config(GKeyFile *config)
|
||||
return;
|
||||
|
||||
parse_mode_config(config, "LE", params, ARRAY_SIZE(params));
|
||||
@ -204,10 +226,10 @@ index cddf139..1f3301b 100644
|
||||
|
||||
static bool match_experimental(const void *data, const void *match_data)
|
||||
diff --git a/src/main.conf b/src/main.conf
|
||||
index ca2abcd..cd535e1 100644
|
||||
index cb9b241df..c086a17d0 100644
|
||||
--- a/src/main.conf
|
||||
+++ b/src/main.conf
|
||||
@@ -231,6 +231,11 @@ ScanWindowSuspend=224
|
||||
@@ -231,6 +231,11 @@ MultiProfile = multiple
|
||||
# Defaults to 1
|
||||
#EnableAdvMonInterleaveScan=
|
||||
|
||||
@ -219,3 +241,6 @@ index ca2abcd..cd535e1 100644
|
||||
[GATT]
|
||||
# GATT attribute cache.
|
||||
# Possible values:
|
||||
--
|
||||
2.41.0
|
||||
|
||||
|
@ -0,0 +1,104 @@
|
||||
From 805b1f5bf596d747f28f53191b7a28507efb7797 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= <frederic.danis@collabora.com>
|
||||
Date: Thu, 25 Jan 2024 20:08:01 +0100
|
||||
Subject: [PATCH BlueZ 1/5] shared/gatt: Prevent security level change for PTS
|
||||
GATT tests
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Some PTS GATT tests like GATT/CL/GAR/BI-04-C request to be able to get the
|
||||
security error and do not try to change the security level.
|
||||
|
||||
This commit adds the ability to prevent to change the security level for
|
||||
an operation.
|
||||
---
|
||||
src/shared/att.c | 26 ++++++++++++++++++++++++++
|
||||
src/shared/att.h | 1 +
|
||||
src/shared/gatt-client.c | 19 +++++++++++++++++++
|
||||
src/shared/gatt-client.h | 3 +++
|
||||
4 files changed, 49 insertions(+)
|
||||
|
||||
diff --git a/src/shared/att.c b/src/shared/att.c
|
||||
index 85feead77..64544f89b 100644
|
||||
--- a/src/shared/att.c
|
||||
+++ b/src/shared/att.c
|
||||
@@ -2034,3 +2034,29 @@ bool bt_att_has_crypto(struct bt_att *att)
|
||||
|
||||
return att->crypto ? true : false;
|
||||
}
|
||||
+
|
||||
+bool bt_att_set_retry(struct bt_att *att, unsigned int id, bool retry)
|
||||
+{
|
||||
+ struct att_send_op *op;
|
||||
+
|
||||
+ if (!id)
|
||||
+ return false;
|
||||
+
|
||||
+ op = queue_find(att->req_queue, match_op_id, UINT_TO_PTR(id));
|
||||
+ if (op)
|
||||
+ goto done;
|
||||
+
|
||||
+ op = queue_find(att->ind_queue, match_op_id, UINT_TO_PTR(id));
|
||||
+ if (op)
|
||||
+ goto done;
|
||||
+
|
||||
+ op = queue_find(att->write_queue, match_op_id, UINT_TO_PTR(id));
|
||||
+
|
||||
+done:
|
||||
+ if (!op)
|
||||
+ return false;
|
||||
+
|
||||
+ op->retry = !retry;
|
||||
+
|
||||
+ return true;
|
||||
+}
|
||||
diff --git a/src/shared/att.h b/src/shared/att.h
|
||||
index 4aa3de87b..6fd78636e 100644
|
||||
--- a/src/shared/att.h
|
||||
+++ b/src/shared/att.h
|
||||
@@ -110,3 +110,4 @@ bool bt_att_set_local_key(struct bt_att *att, uint8_t sign_key[16],
|
||||
bool bt_att_set_remote_key(struct bt_att *att, uint8_t sign_key[16],
|
||||
bt_att_counter_func_t func, void *user_data);
|
||||
bool bt_att_has_crypto(struct bt_att *att);
|
||||
+bool bt_att_set_retry(struct bt_att *att, unsigned int id, bool retry);
|
||||
diff --git a/src/shared/gatt-client.c b/src/shared/gatt-client.c
|
||||
index efc013a20..2c16e78be 100644
|
||||
--- a/src/shared/gatt-client.c
|
||||
+++ b/src/shared/gatt-client.c
|
||||
@@ -3817,3 +3817,22 @@ bool bt_gatt_client_idle_unregister(struct bt_gatt_client *client,
|
||||
|
||||
return false;
|
||||
}
|
||||
+
|
||||
+bool bt_gatt_client_set_retry(struct bt_gatt_client *client,
|
||||
+ unsigned int id,
|
||||
+ bool retry)
|
||||
+{
|
||||
+ struct request *req;
|
||||
+
|
||||
+ if (!client || !id)
|
||||
+ return false;
|
||||
+
|
||||
+ req = queue_find(client->pending_requests, match_req_id,
|
||||
+ UINT_TO_PTR(id));
|
||||
+ if (!req)
|
||||
+ return false;
|
||||
+
|
||||
+ bt_att_set_retry(client->att, req->att_id, retry);
|
||||
+
|
||||
+ return true;
|
||||
+}
|
||||
diff --git a/src/shared/gatt-client.h b/src/shared/gatt-client.h
|
||||
index bccd04a62..63cf99500 100644
|
||||
--- a/src/shared/gatt-client.h
|
||||
+++ b/src/shared/gatt-client.h
|
||||
@@ -134,3 +134,6 @@ unsigned int bt_gatt_client_idle_register(struct bt_gatt_client *client,
|
||||
bt_gatt_client_destroy_func_t destroy);
|
||||
bool bt_gatt_client_idle_unregister(struct bt_gatt_client *client,
|
||||
unsigned int id);
|
||||
+bool bt_gatt_client_set_retry(struct bt_gatt_client *client,
|
||||
+ unsigned int id,
|
||||
+ bool retry);
|
||||
--
|
||||
2.34.1
|
||||
|
@ -0,0 +1,224 @@
|
||||
From c92872e79bdf835060e7a6d2cab2103841f428ac Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= <frederic.danis@collabora.com>
|
||||
Date: Thu, 25 Jan 2024 20:08:02 +0100
|
||||
Subject: [PATCH BlueZ 2/5] btgatt-client: Add command to prevent security
|
||||
level change
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Some PTS GATT tests like GATT/CL/GAR/BI-04-C request to be able to get the
|
||||
security error and do not try to change the security level.
|
||||
|
||||
This commit adds the ability to prevent to change the security level.
|
||||
---
|
||||
tools/btgatt-client.c | 84 ++++++++++++++++++++++++++++++++++++-------
|
||||
1 file changed, 72 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/tools/btgatt-client.c b/tools/btgatt-client.c
|
||||
index 58a03bd48..3bcb7e1cf 100644
|
||||
--- a/tools/btgatt-client.c
|
||||
+++ b/tools/btgatt-client.c
|
||||
@@ -57,6 +57,7 @@ struct client {
|
||||
struct bt_gatt_client *gatt;
|
||||
|
||||
unsigned int reliable_session_id;
|
||||
+ bool sec_retry;
|
||||
};
|
||||
|
||||
static void print_prompt(void)
|
||||
@@ -172,6 +173,7 @@ static struct client *client_create(int fd, uint16_t mtu)
|
||||
fprintf(stderr, "Failed to allocate memory for client\n");
|
||||
return NULL;
|
||||
}
|
||||
+ cli->sec_retry = true;
|
||||
|
||||
cli->att = bt_att_new(fd, false);
|
||||
if (!cli->att) {
|
||||
@@ -488,6 +490,7 @@ static void cmd_read_multiple(struct client *cli, char *cmd_str)
|
||||
char *argv[512];
|
||||
int i;
|
||||
char *endptr = NULL;
|
||||
+ unsigned int id;
|
||||
|
||||
if (!bt_gatt_client_is_ready(cli->gatt)) {
|
||||
printf("GATT client not initialized\n");
|
||||
@@ -514,9 +517,12 @@ static void cmd_read_multiple(struct client *cli, char *cmd_str)
|
||||
}
|
||||
}
|
||||
|
||||
- if (!bt_gatt_client_read_multiple(cli->gatt, value, argc,
|
||||
- read_multiple_cb, NULL, NULL))
|
||||
+ id = bt_gatt_client_read_multiple(cli->gatt, value, argc,
|
||||
+ read_multiple_cb, NULL, NULL);
|
||||
+ if (!id)
|
||||
printf("Failed to initiate read multiple procedure\n");
|
||||
+ else if (!cli->sec_retry)
|
||||
+ bt_gatt_client_set_retry(cli->gatt, id, false);
|
||||
|
||||
free(value);
|
||||
}
|
||||
@@ -558,6 +564,7 @@ static void cmd_read_value(struct client *cli, char *cmd_str)
|
||||
int argc = 0;
|
||||
uint16_t handle;
|
||||
char *endptr = NULL;
|
||||
+ unsigned int id;
|
||||
|
||||
if (!bt_gatt_client_is_ready(cli->gatt)) {
|
||||
printf("GATT client not initialized\n");
|
||||
@@ -575,9 +582,12 @@ static void cmd_read_value(struct client *cli, char *cmd_str)
|
||||
return;
|
||||
}
|
||||
|
||||
- if (!bt_gatt_client_read_value(cli->gatt, handle, read_cb,
|
||||
- NULL, NULL))
|
||||
+ id = bt_gatt_client_read_value(cli->gatt, handle, read_cb,
|
||||
+ NULL, NULL);
|
||||
+ if (!id)
|
||||
printf("Failed to initiate read value procedure\n");
|
||||
+ else if (!cli->sec_retry)
|
||||
+ bt_gatt_client_set_retry(cli->gatt, id, false);
|
||||
}
|
||||
|
||||
static void read_long_value_usage(void)
|
||||
@@ -592,6 +602,7 @@ static void cmd_read_long_value(struct client *cli, char *cmd_str)
|
||||
uint16_t handle;
|
||||
uint16_t offset;
|
||||
char *endptr = NULL;
|
||||
+ unsigned int id;
|
||||
|
||||
if (!bt_gatt_client_is_ready(cli->gatt)) {
|
||||
printf("GATT client not initialized\n");
|
||||
@@ -616,9 +627,12 @@ static void cmd_read_long_value(struct client *cli, char *cmd_str)
|
||||
return;
|
||||
}
|
||||
|
||||
- if (!bt_gatt_client_read_long_value(cli->gatt, handle, offset, read_cb,
|
||||
- NULL, NULL))
|
||||
+ id = bt_gatt_client_read_long_value(cli->gatt, handle, offset, read_cb,
|
||||
+ NULL, NULL);
|
||||
+ if (!id)
|
||||
printf("Failed to initiate read long value procedure\n");
|
||||
+ else if (!cli->sec_retry)
|
||||
+ bt_gatt_client_set_retry(cli->gatt, id, false);
|
||||
}
|
||||
|
||||
static void write_value_usage(void)
|
||||
@@ -659,6 +673,7 @@ static void cmd_write_value(struct client *cli, char *cmd_str)
|
||||
uint8_t *value = NULL;
|
||||
bool without_response = false;
|
||||
bool signed_write = false;
|
||||
+ unsigned int id;
|
||||
|
||||
if (!bt_gatt_client_is_ready(cli->gatt)) {
|
||||
printf("GATT client not initialized\n");
|
||||
@@ -740,10 +755,13 @@ static void cmd_write_value(struct client *cli, char *cmd_str)
|
||||
goto done;
|
||||
}
|
||||
|
||||
- if (!bt_gatt_client_write_value(cli->gatt, handle, value, length,
|
||||
+ id = bt_gatt_client_write_value(cli->gatt, handle, value, length,
|
||||
write_cb,
|
||||
- NULL, NULL))
|
||||
+ NULL, NULL);
|
||||
+ if (!id)
|
||||
printf("Failed to initiate write procedure\n");
|
||||
+ else if (!cli->sec_retry)
|
||||
+ bt_gatt_client_set_retry(cli->gatt, id, false);
|
||||
|
||||
done:
|
||||
free(value);
|
||||
@@ -789,6 +807,7 @@ static void cmd_write_long_value(struct client *cli, char *cmd_str)
|
||||
int length;
|
||||
uint8_t *value = NULL;
|
||||
bool reliable_writes = false;
|
||||
+ unsigned int id;
|
||||
|
||||
if (!bt_gatt_client_is_ready(cli->gatt)) {
|
||||
printf("GATT client not initialized\n");
|
||||
@@ -863,11 +882,14 @@ static void cmd_write_long_value(struct client *cli, char *cmd_str)
|
||||
}
|
||||
}
|
||||
|
||||
- if (!bt_gatt_client_write_long_value(cli->gatt, reliable_writes, handle,
|
||||
+ id = bt_gatt_client_write_long_value(cli->gatt, reliable_writes, handle,
|
||||
offset, value, length,
|
||||
write_long_cb,
|
||||
- NULL, NULL))
|
||||
+ NULL, NULL);
|
||||
+ if (!id)
|
||||
printf("Failed to initiate long write procedure\n");
|
||||
+ else if (!cli->sec_retry)
|
||||
+ bt_gatt_client_set_retry(cli->gatt, id, false);
|
||||
|
||||
free(value);
|
||||
}
|
||||
@@ -999,12 +1021,18 @@ done:
|
||||
value, length,
|
||||
write_long_cb, NULL,
|
||||
NULL);
|
||||
- if (!cli->reliable_session_id)
|
||||
+ if (!cli->reliable_session_id) {
|
||||
printf("Failed to proceed prepare write\n");
|
||||
- else
|
||||
+ } else {
|
||||
+ if (!cli->sec_retry)
|
||||
+ bt_gatt_client_set_retry(cli->gatt,
|
||||
+ cli->reliable_session_id,
|
||||
+ false);
|
||||
+
|
||||
printf("Prepare write success.\n"
|
||||
"Session id: %d to be used on next write\n",
|
||||
cli->reliable_session_id);
|
||||
+ }
|
||||
|
||||
free(value);
|
||||
}
|
||||
@@ -1236,6 +1264,36 @@ static void cmd_get_security(struct client *cli, char *cmd_str)
|
||||
printf("Security level: %u\n", level);
|
||||
}
|
||||
|
||||
+static void set_security_retry_usage(void)
|
||||
+{
|
||||
+ printf("Usage: set-security-retry <y/n>\n"
|
||||
+ "e.g.:\n"
|
||||
+ "\tset-security-retry n\n");
|
||||
+}
|
||||
+
|
||||
+static void cmd_set_security_retry(struct client *cli, char *cmd_str)
|
||||
+{
|
||||
+ char *argv[2];
|
||||
+ int argc = 0;
|
||||
+
|
||||
+ if (!bt_gatt_client_is_ready(cli->gatt)) {
|
||||
+ printf("GATT client not initialized\n");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (!parse_args(cmd_str, 1, argv, &argc) || argc != 1) {
|
||||
+ set_security_retry_usage();
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (argv[0][0] == 'y')
|
||||
+ cli->sec_retry = true;
|
||||
+ else if (argv[0][0] == 'n')
|
||||
+ cli->sec_retry = false;
|
||||
+ else
|
||||
+ printf("Invalid argument: %s\n", argv[0]);
|
||||
+}
|
||||
+
|
||||
static bool convert_sign_key(char *optarg, uint8_t key[16])
|
||||
{
|
||||
int i;
|
||||
@@ -1327,6 +1385,8 @@ static struct {
|
||||
"\tSet security level on le connection"},
|
||||
{ "get-security", cmd_get_security,
|
||||
"\tGet security level on le connection"},
|
||||
+ { "set-security-retry", cmd_set_security_retry,
|
||||
+ "\tSet retry on security error by elevating security"},
|
||||
{ "set-sign-key", cmd_set_sign_key,
|
||||
"\tSet signing key for signed write command"},
|
||||
{ }
|
||||
--
|
||||
2.34.1
|
||||
|
@ -0,0 +1,110 @@
|
||||
From fd39b61b38336cba2ef6fb3d0e2884f88e4ef0a8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= <frederic.danis@collabora.com>
|
||||
Date: Thu, 25 Jan 2024 20:08:03 +0100
|
||||
Subject: [PATCH BlueZ 3/5] btgatt-client: Add function to search service based
|
||||
on UUID
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This is requested to pass PTS GATT/CL/GAD/BV-02-C test.
|
||||
---
|
||||
tools/btgatt-client.c | 69 +++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 69 insertions(+)
|
||||
|
||||
diff --git a/tools/btgatt-client.c b/tools/btgatt-client.c
|
||||
index 3bcb7e1cf..99a123697 100644
|
||||
--- a/tools/btgatt-client.c
|
||||
+++ b/tools/btgatt-client.c
|
||||
@@ -33,6 +33,7 @@
|
||||
#include "src/shared/queue.h"
|
||||
#include "src/shared/gatt-db.h"
|
||||
#include "src/shared/gatt-client.h"
|
||||
+#include "src/shared/gatt-helpers.h"
|
||||
|
||||
#define ATT_CID 4
|
||||
|
||||
@@ -1353,6 +1354,72 @@ static void cmd_set_sign_key(struct client *cli, char *cmd_str)
|
||||
set_sign_key_usage();
|
||||
}
|
||||
|
||||
+static void search_service_usage(void)
|
||||
+{
|
||||
+ printf("Usage: search-service <uuid>\n"
|
||||
+ "e.g.:\n"
|
||||
+ "\tsearch-service 1800\n");
|
||||
+}
|
||||
+
|
||||
+static void search_service_cb(bool success, uint8_t att_ecode,
|
||||
+ struct bt_gatt_result *result,
|
||||
+ void *user_data)
|
||||
+{
|
||||
+ struct bt_gatt_iter iter;
|
||||
+ uint16_t start_handle, end_handle;
|
||||
+ uint128_t u128;
|
||||
+ bt_uuid_t uuid;
|
||||
+ char uuid_str[MAX_LEN_UUID_STR];
|
||||
+
|
||||
+ if (!success) {
|
||||
+ PRLOG("\nService discovery failed: %s (0x%02x)\n",
|
||||
+ ecode_to_string(att_ecode), att_ecode);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (!result || !bt_gatt_iter_init(&iter, result))
|
||||
+ return;
|
||||
+
|
||||
+ printf("\n");
|
||||
+ while (bt_gatt_iter_next_service(&iter, &start_handle, &end_handle,
|
||||
+ u128.data)) {
|
||||
+ bt_uuid128_create(&uuid, u128);
|
||||
+ bt_uuid_to_string(&uuid, uuid_str, sizeof(uuid_str));
|
||||
+ printf("Found start handle: 0x%04x, end handle: 0x%04x, "
|
||||
+ "UUID: %s\n",
|
||||
+ start_handle, end_handle, uuid_str);
|
||||
+ }
|
||||
+ PRLOG("\n");
|
||||
+}
|
||||
+
|
||||
+static void cmd_search_service(struct client *cli, char *cmd_str)
|
||||
+{
|
||||
+ char *argv[2];
|
||||
+ int argc = 0;
|
||||
+ bt_uuid_t uuid;
|
||||
+
|
||||
+ if (!bt_gatt_client_is_ready(cli->gatt)) {
|
||||
+ printf("GATT client not initialized\n");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (!parse_args(cmd_str, 1, argv, &argc) || argc != 1) {
|
||||
+ search_service_usage();
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (bt_string_to_uuid(&uuid, argv[0]) < 0) {
|
||||
+ printf("Invalid UUID: %s\n", argv[0]);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ bt_gatt_discover_primary_services(bt_gatt_client_get_att(cli->gatt),
|
||||
+ &uuid, 0x0001, 0xFFFF,
|
||||
+ search_service_cb,
|
||||
+ NULL,
|
||||
+ NULL);
|
||||
+}
|
||||
+
|
||||
static void cmd_help(struct client *cli, char *cmd_str);
|
||||
|
||||
typedef void (*command_func_t)(struct client *cli, char *cmd_str);
|
||||
@@ -1389,6 +1456,8 @@ static struct {
|
||||
"\tSet retry on security error by elevating security"},
|
||||
{ "set-sign-key", cmd_set_sign_key,
|
||||
"\tSet signing key for signed write command"},
|
||||
+ { "search-service", cmd_search_service,
|
||||
+ "\tSearch service"},
|
||||
{ }
|
||||
};
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
@ -0,0 +1,117 @@
|
||||
From b36be985e700374f815c21fa7a787c4740edc1f4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= <frederic.danis@collabora.com>
|
||||
Date: Thu, 25 Jan 2024 20:08:04 +0100
|
||||
Subject: [PATCH BlueZ 4/5] btgatt-client: Add function to search
|
||||
characteristics
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This is requested to pass PTS GATT/CL/GAD/BV-05-C test.
|
||||
This search characteristics based on UUID, start and end handles.
|
||||
---
|
||||
tools/btgatt-client.c | 82 +++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 82 insertions(+)
|
||||
|
||||
diff --git a/tools/btgatt-client.c b/tools/btgatt-client.c
|
||||
index 99a123697..04fd3ce0f 100644
|
||||
--- a/tools/btgatt-client.c
|
||||
+++ b/tools/btgatt-client.c
|
||||
@@ -1420,6 +1420,86 @@ static void cmd_search_service(struct client *cli, char *cmd_str)
|
||||
NULL);
|
||||
}
|
||||
|
||||
+static void search_characteristics_usage(void)
|
||||
+{
|
||||
+ printf("Usage: search-characteristics <start_hanlde> <end_handle> "
|
||||
+ "<uuid>\n"
|
||||
+ "e.g.:\n"
|
||||
+ "\tsearch-characteristics 0x0001 0xFFFF 1800\n");
|
||||
+}
|
||||
+
|
||||
+static void search_characteristics_cb(bool success, uint8_t att_ecode,
|
||||
+ struct bt_gatt_result *result,
|
||||
+ void *user_data)
|
||||
+{
|
||||
+ struct bt_gatt_iter iter;
|
||||
+ uint16_t handle, length;
|
||||
+ const uint8_t *value;
|
||||
+ int i;
|
||||
+
|
||||
+ if (!success) {
|
||||
+ PRLOG("\nCharacteristics discovery failed: %s (0x%02x)\n",
|
||||
+ ecode_to_string(att_ecode), att_ecode);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (!result || !bt_gatt_iter_init(&iter, result))
|
||||
+ return;
|
||||
+
|
||||
+ printf("\n");
|
||||
+ while (bt_gatt_iter_next_read_by_type(&iter, &handle, &length,
|
||||
+ &value)) {
|
||||
+ printf("Found handle: 0x%04x value: ", handle);
|
||||
+ for (i = 0; i < length; i++)
|
||||
+ printf("%02x ", value[i]);
|
||||
+ printf("\n");
|
||||
+ }
|
||||
+ PRLOG("\n");
|
||||
+}
|
||||
+
|
||||
+static void cmd_search_characteristics(struct client *cli, char *cmd_str)
|
||||
+{
|
||||
+ char *argv[4];
|
||||
+ int argc = 0;
|
||||
+ uint16_t start_handle, end_handle;
|
||||
+ char *endptr = NULL;
|
||||
+ bt_uuid_t uuid;
|
||||
+
|
||||
+ if (!bt_gatt_client_is_ready(cli->gatt)) {
|
||||
+ printf("GATT client not initialized\n");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (!parse_args(cmd_str, 3, argv, &argc) || argc != 3) {
|
||||
+ search_characteristics_usage();
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ start_handle = strtol(argv[0], &endptr, 0);
|
||||
+ if (!endptr || *endptr != '\0') {
|
||||
+ printf("Invalid start handle: %s\n", argv[0]);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ end_handle = strtol(argv[1], &endptr, 0);
|
||||
+ if (!endptr || *endptr != '\0') {
|
||||
+ printf("Invalid end handle: %s\n", argv[1]);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (bt_string_to_uuid(&uuid, argv[2]) < 0) {
|
||||
+ printf("Invalid UUID: %s\n", argv[2]);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ bt_gatt_read_by_type(bt_gatt_client_get_att(cli->gatt), start_handle,
|
||||
+ end_handle,
|
||||
+ &uuid,
|
||||
+ search_characteristics_cb,
|
||||
+ NULL,
|
||||
+ NULL);
|
||||
+}
|
||||
+
|
||||
static void cmd_help(struct client *cli, char *cmd_str);
|
||||
|
||||
typedef void (*command_func_t)(struct client *cli, char *cmd_str);
|
||||
@@ -1458,6 +1538,8 @@ static struct {
|
||||
"\tSet signing key for signed write command"},
|
||||
{ "search-service", cmd_search_service,
|
||||
"\tSearch service"},
|
||||
+ { "search-characteristics", cmd_search_characteristics,
|
||||
+ "\tSearch characteristics"},
|
||||
{ }
|
||||
};
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
@ -0,0 +1,71 @@
|
||||
From 52aa25f70651df9e9357fdab47bddd25e096d150 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= <frederic.danis@collabora.com>
|
||||
Date: Thu, 25 Jan 2024 20:08:05 +0100
|
||||
Subject: [PATCH BlueZ 5/5] btgatt-client: Add function to search all primary
|
||||
services
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This is requested to pass PTS GATT/CL/GAD/BV-01-C test.
|
||||
---
|
||||
tools/btgatt-client.c | 30 +++++++++++++++++++++++-------
|
||||
1 file changed, 23 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/tools/btgatt-client.c b/tools/btgatt-client.c
|
||||
index 04fd3ce0f..b47914da3 100644
|
||||
--- a/tools/btgatt-client.c
|
||||
+++ b/tools/btgatt-client.c
|
||||
@@ -1354,13 +1354,6 @@ static void cmd_set_sign_key(struct client *cli, char *cmd_str)
|
||||
set_sign_key_usage();
|
||||
}
|
||||
|
||||
-static void search_service_usage(void)
|
||||
-{
|
||||
- printf("Usage: search-service <uuid>\n"
|
||||
- "e.g.:\n"
|
||||
- "\tsearch-service 1800\n");
|
||||
-}
|
||||
-
|
||||
static void search_service_cb(bool success, uint8_t att_ecode,
|
||||
struct bt_gatt_result *result,
|
||||
void *user_data)
|
||||
@@ -1392,6 +1385,27 @@ static void search_service_cb(bool success, uint8_t att_ecode,
|
||||
PRLOG("\n");
|
||||
}
|
||||
|
||||
+static void cmd_search_all_primary_services(struct client *cli, char *cmd_str)
|
||||
+{
|
||||
+ if (!bt_gatt_client_is_ready(cli->gatt)) {
|
||||
+ printf("GATT client not initialized\n");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ bt_gatt_discover_all_primary_services(bt_gatt_client_get_att(cli->gatt),
|
||||
+ NULL,
|
||||
+ search_service_cb,
|
||||
+ NULL,
|
||||
+ NULL);
|
||||
+}
|
||||
+
|
||||
+static void search_service_usage(void)
|
||||
+{
|
||||
+ printf("Usage: search-service <uuid>\n"
|
||||
+ "e.g.:\n"
|
||||
+ "\tsearch-service 1800\n");
|
||||
+}
|
||||
+
|
||||
static void cmd_search_service(struct client *cli, char *cmd_str)
|
||||
{
|
||||
char *argv[2];
|
||||
@@ -1536,6 +1550,8 @@ static struct {
|
||||
"\tSet retry on security error by elevating security"},
|
||||
{ "set-sign-key", cmd_set_sign_key,
|
||||
"\tSet signing key for signed write command"},
|
||||
+ { "search-all-primary-services", cmd_search_all_primary_services,
|
||||
+ "\tSearch all primary services"},
|
||||
{ "search-service", cmd_search_service,
|
||||
"\tSearch service"},
|
||||
{ "search-characteristics", cmd_search_characteristics,
|
||||
--
|
||||
2.34.1
|
||||
|
@ -1,8 +1,7 @@
|
||||
diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
|
||||
index dda9a30..d0ae0a4 100644
|
||||
--- a/profiles/audio/avrcp.c
|
||||
+++ b/profiles/audio/avrcp.c
|
||||
@@ -1210,6 +1210,10 @@ static GList *player_list_metadata(struct avrcp_player *player)
|
||||
diff -ru bluez-5.66.orig/profiles/audio/avrcp.c bluez-5.66/profiles/audio/avrcp.c
|
||||
--- bluez-5.66.orig/profiles/audio/avrcp.c 2022-03-16 08:06:20.000000000 -0700
|
||||
+++ bluez-5.66/profiles/audio/avrcp.c 2023-07-30 08:03:17.414213611 -0700
|
||||
@@ -1210,6 +1210,10 @@
|
||||
GUINT_TO_POINTER(str_to_metadata(key)));
|
||||
}
|
||||
|
||||
@ -13,3 +12,4 @@ index dda9a30..d0ae0a4 100644
|
||||
return attrs;
|
||||
}
|
||||
|
||||
Only in bluez-5.66/profiles/audio: avrcp.c.orig
|
||||
|
@ -21,6 +21,11 @@ Patch2: power-state-adapter-property.patch
|
||||
Patch3: AVRCP_TG_MDI_BV-04-C.patch
|
||||
Patch4: 0001-valve-bluetooth-config.patch
|
||||
Patch5: 0002-valve-bluetooth-phy.patch
|
||||
Patch6: 0006-shared-gatt-Prevent-security-level-change-for-PTS-GA.patch
|
||||
Patch7: 0007-btgatt-client-Add-command-to-prevent-security-level-.patch
|
||||
Patch8: 0008-btgatt-client-Add-function-to-search-service-based-o.patch
|
||||
Patch9: 0009-btgatt-client-Add-function-to-search-characteristics.patch
|
||||
Patch10: 0010-btgatt-client-Add-function-to-search-all-primary-ser.patch
|
||||
|
||||
BuildRequires: dbus-devel >= 1.6
|
||||
BuildRequires: glib2-devel
|
||||
|
24
spec_files/gamescope/add_720p_var.patch
Normal file
24
spec_files/gamescope/add_720p_var.patch
Normal file
@ -0,0 +1,24 @@
|
||||
From dab64a97b336c13c4d48a14550b72508f98cc1d4 Mon Sep 17 00:00:00 2001
|
||||
From: Sterophonick <sterophonick@gmail.com>
|
||||
Date: Wed, 17 Jan 2024 12:00:44 -0700
|
||||
Subject: [PATCH] steamcompmgr: add env var to enable/disable 720p restriction
|
||||
|
||||
---
|
||||
src/steamcompmgr.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp
|
||||
index e50265c..22e9345 100644
|
||||
--- a/src/steamcompmgr.cpp
|
||||
+++ b/src/steamcompmgr.cpp
|
||||
@@ -5822,7 +5822,7 @@ handle_property_notify(xwayland_ctx_t *ctx, XPropertyEvent *ev)
|
||||
int width = xwayland_mode_ctl[ 1 ];
|
||||
int height = xwayland_mode_ctl[ 2 ];
|
||||
|
||||
- if ( g_nOutputWidth != 1280 && width == 1280 )
|
||||
+ if ( ( g_nOutputWidth != 1280 && width == 1280 ) && !getenv("GAMESCOPE_ENABLE_720P_RESTRICT") )
|
||||
{
|
||||
width = g_nOutputWidth;
|
||||
height = g_nOutputHeight;
|
||||
--
|
||||
2.43.0
|
@ -12,6 +12,9 @@ URL: https://github.com/ValveSoftware/gamescope
|
||||
Source1: stb.pc
|
||||
Source2: chimeraos.patch
|
||||
Source3: crashfix.patch
|
||||
Source4: add_720p_var.patch
|
||||
Source5: touch_gestures_env.patch
|
||||
Source6: legion_go.patch
|
||||
|
||||
BuildRequires: meson >= 0.54.0
|
||||
BuildRequires: ninja-build
|
||||
@ -76,6 +79,9 @@ mkdir -p pkgconfig
|
||||
cp %{SOURCE1} pkgconfig/stb.pc
|
||||
patch -Np1 < %{SOURCE2}
|
||||
patch -Np1 < %{SOURCE3}
|
||||
patch -Np1 < %{SOURCE4}
|
||||
patch -Np1 < %{SOURCE5}
|
||||
patch -Np1 < %{SOURCE6}
|
||||
|
||||
%build
|
||||
cd gamescope
|
||||
|
30
spec_files/gamescope/legion_go.patch
Normal file
30
spec_files/gamescope/legion_go.patch
Normal file
@ -0,0 +1,30 @@
|
||||
diff --git a/src/drm.cpp b/src/drm.cpp
|
||||
index acff5e5..fdf58ee 100644
|
||||
--- a/src/drm.cpp
|
||||
+++ b/src/drm.cpp
|
||||
@@ -101,6 +101,12 @@ static uint32_t galileo_display_rates[] =
|
||||
90,
|
||||
};
|
||||
|
||||
+static uint32_t legion_go_display_rates[] =
|
||||
+{
|
||||
+ 60,
|
||||
+ 144,
|
||||
+};
|
||||
+
|
||||
static uint32_t get_conn_display_info_flags(struct drm_t *drm, struct connector *connector)
|
||||
{
|
||||
if (!connector)
|
||||
@@ -911,8 +917,11 @@ static void parse_edid( drm_t *drm, struct connector *conn)
|
||||
conn->valid_display_rates = std::span(galileo_display_rates);
|
||||
} else {
|
||||
conn->is_galileo_display = 0;
|
||||
- if ( conn->is_steam_deck_display )
|
||||
+ if ( conn->is_steam_deck_display ) {
|
||||
conn->valid_display_rates = std::span(steam_deck_display_rates);
|
||||
+ } else if ( strcmp(conn->make_pnp, "LEN") == 0 && strcmp(conn->model, "Go Display") == 0 ) {
|
||||
+ conn->valid_display_rates = std::span(legion_go_display_rates);
|
||||
+ }
|
||||
}
|
||||
|
||||
drm_hdr_parse_edid(drm, conn, edid);
|
78
spec_files/gamescope/touch_gestures_env.patch
Normal file
78
spec_files/gamescope/touch_gestures_env.patch
Normal file
@ -0,0 +1,78 @@
|
||||
From 0e7329bd8275e46705a97a584c548a3998d08a25 Mon Sep 17 00:00:00 2001
|
||||
From: Kyle Gospodnetich <me@kylegospodneti.ch>
|
||||
Date: Fri, 9 Feb 2024 16:55:04 -0800
|
||||
Subject: [PATCH] Add environment variable to disable touch gestures
|
||||
|
||||
Requested by some of our users due to them accidentally firing them off. Defaults to gestures enabled
|
||||
---
|
||||
src/wlserver.cpp | 54 ++++++++++++++++++++++++++----------------------
|
||||
1 file changed, 29 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/src/wlserver.cpp b/src/wlserver.cpp
|
||||
index e7fb7c9eb..31e0998a8 100644
|
||||
--- a/src/wlserver.cpp
|
||||
+++ b/src/wlserver.cpp
|
||||
@@ -2048,34 +2048,38 @@ void wlserver_touchmotion( double x, double y, int touch_id, uint32_t time )
|
||||
|
||||
if ( get_effective_touch_mode() == WLSERVER_TOUCH_CLICK_PASSTHROUGH )
|
||||
{
|
||||
- bool start_gesture = false;
|
||||
wlr_seat_touch_notify_motion( wlserver.wlr.seat, time, touch_id, wlserver.mouse_surface_cursorx, wlserver.mouse_surface_cursory );
|
||||
|
||||
- // Round the x-coordinate to the nearest whole number
|
||||
- uint32_t roundedCursorX = static_cast<int>(std::round(wlserver.mouse_surface_cursorx));
|
||||
- // Grab 2% of the display to be used for the edge range
|
||||
- double edge_range = g_nOutputWidth * 0.02;
|
||||
-
|
||||
- // if the touch cursor x position is less or equal to the range then start the gesture for left to right
|
||||
- if (roundedCursorX <= edge_range) {
|
||||
- start_gesture = true;
|
||||
- }
|
||||
- // if the touch cursor x position is the output width minus the edge range value then we are doing right to left
|
||||
- if (roundedCursorX >= g_nOutputWidth - edge_range) {
|
||||
- start_gesture = true;
|
||||
- }
|
||||
- // when the gesture is started and we are moving to the end of the edge range open home
|
||||
- if (start_gesture && roundedCursorX >= 1 && roundedCursorX <= edge_range) {
|
||||
- wl_log.infof("Detected Home gesture");
|
||||
- wlserver_open_steam_menu(0);
|
||||
- start_gesture = false;
|
||||
+ if(!getenv("GAMESCOPE_DISABLE_TOUCH_GESTURES")) {
|
||||
+ bool start_gesture = false;
|
||||
+
|
||||
+ // Round the x-coordinate to the nearest whole number
|
||||
+ uint32_t roundedCursorX = static_cast<int>(std::round(wlserver.mouse_surface_cursorx));
|
||||
+ // Grab 2% of the display to be used for the edge range
|
||||
+ double edge_range = g_nOutputWidth * 0.02;
|
||||
+
|
||||
+ // if the touch cursor x position is less or equal to the range then start the gesture for left to right
|
||||
+ if (roundedCursorX <= edge_range) {
|
||||
+ start_gesture = true;
|
||||
+ }
|
||||
+ // if the touch cursor x position is the output width minus the edge range value then we are doing right to left
|
||||
+ if (roundedCursorX >= g_nOutputWidth - edge_range) {
|
||||
+ start_gesture = true;
|
||||
+ }
|
||||
+ // when the gesture is started and we are moving to the end of the edge range open home
|
||||
+ if (start_gesture && roundedCursorX >= 1 && roundedCursorX <= edge_range) {
|
||||
+ wl_log.infof("Detected Home gesture");
|
||||
+ wlserver_open_steam_menu(0);
|
||||
+ start_gesture = false;
|
||||
+ }
|
||||
+ // when the gesture is started and we are moving from the output width minus the edge range to the output width open QAM
|
||||
+ if (start_gesture && roundedCursorX >= g_nOutputWidth - edge_range && roundedCursorX <= g_nOutputWidth ) {
|
||||
+ wl_log.infof("Detected QAM gesture");
|
||||
+ wlserver_open_steam_menu(1);
|
||||
+ start_gesture = false;
|
||||
+ }
|
||||
}
|
||||
- // when the gesture is started and we are moving from the output width minus the edge range to the output width open QAM
|
||||
- if (start_gesture && roundedCursorX >= g_nOutputWidth - edge_range && roundedCursorX <= g_nOutputWidth ) {
|
||||
- wl_log.infof("Detected QAM gesture");
|
||||
- wlserver_open_steam_menu(1);
|
||||
- start_gesture = false;
|
||||
- } }
|
||||
+ }
|
||||
else if ( get_effective_touch_mode() == WLSERVER_TOUCH_CLICK_DISABLED )
|
||||
{
|
||||
return;
|
@ -61,7 +61,7 @@
|
||||
|
||||
Name: mesa
|
||||
Summary: Mesa graphics libraries
|
||||
%global ver 23.3.4
|
||||
%global ver 23.3.5
|
||||
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
|
||||
Release: 100.bazzite.{{{ git_dir_version }}}
|
||||
License: MIT AND BSD-3-Clause AND SGI-B-2.0
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
||||
*Using a handheld other than the Steam Deck?*~Be sure to follow our [alternative handheld documentation](https://github.com/ublue-os/bazzite#alternative-handhelds).
|
||||
*Using a handheld other than the Steam Deck?* Be sure to follow our alternative handheld documentation~[here](https://github.com/ublue-os/bazzite#alternative-handhelds).
|
||||
*Having issues with controls on a handheld other than the Steam Deck?*~Be sure to read the [hhd after install guide](https://github.com/hhd-dev/hhd#after-install).
|
||||
*Want to install Decky Loader?* There's a `ujust` command for that! `ujust get-decky`
|
||||
The updater built into Steam game mode has been modified to update Bazzite, Flatpaks, and Distrobox containers. *Just ignore the changelog.*
|
||||
|
@ -12,8 +12,7 @@ if grep -qz 'not initialized' <<< $(/usr/bin/waydroid status); then
|
||||
/usr/bin/ujust init-waydroid
|
||||
fi
|
||||
|
||||
# Launch Weston
|
||||
killall -9 weston
|
||||
# Launch Cage & Waydroid
|
||||
pkexec /usr/libexec/waydroid-container-start
|
||||
if [ -z "$(pgrep wlr-randr)" ]; then
|
||||
cage -- bash -c "wlr-randr --output X11-1 --custom-mode ${WAYDROID_WIDTH:-1280}x${WAYDROID_HEIGHT:-800}; sleep 1; waydroid show-full-ui &> /dev/null &"
|
||||
@ -23,11 +22,12 @@ fi
|
||||
while [ "" == "$(pgrep surfaceflinger)" ]; do
|
||||
sleep 1
|
||||
done
|
||||
sleep 10
|
||||
pkexec /usr/libexec/waydroid-fix-controllers
|
||||
|
||||
# Waydroid is now live!
|
||||
# Wait for exit and then clean up
|
||||
while [ -n "$(pgrep weston)" ]; do
|
||||
while [ -n "$(pgrep cage)" ]; do
|
||||
sleep 1
|
||||
done
|
||||
|
||||
|
@ -0,0 +1 @@
|
||||
L %t/discord-ipc-0 - - - - app/com.discordapp.Discord/discord-ipc-0
|
@ -1,3 +1,2 @@
|
||||
# Enable GSP firmware
|
||||
# options nouveau config=NvGspRm=1
|
||||
# Waiting for Kernel 6.7
|
||||
options nouveau config=NvGspRm=1
|
@ -7,7 +7,7 @@ IMAGE_FLAVOR=$(jq -r '."image-flavor"' < $IMAGE_INFO)
|
||||
FEDORA_VERSION=$(jq -r '."fedora-version"' < $IMAGE_INFO)
|
||||
|
||||
# SCRIPT VERSION
|
||||
HWS_VER=29
|
||||
HWS_VER=32
|
||||
HWS_VER_FILE="/etc/bazzite/hws_version"
|
||||
HWS_VER_RAN=$(cat $HWS_VER_FILE)
|
||||
|
||||
@ -132,7 +132,12 @@ if [[ $IMAGE_NAME =~ "deck" && ":AOKZOE A1 AR07:" =~ ":$SYS_ID:" ]]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ ":83E1:" =~ ":$SYS_ID:" ]]; then
|
||||
if [[ ":Galileo:" =~ ":$SYS_ID:" ]]; then
|
||||
if [[ ! $KARGS =~ "video" ]]; then
|
||||
echo "Adding panel orientation for Steam Deck OLED"
|
||||
NEEDED_KARGS+=("--append-if-missing=video=eDP-1:panel_orientation=right_side_up")
|
||||
fi
|
||||
elif [[ ":83E1:" =~ ":$SYS_ID:" ]]; then
|
||||
if [[ ! $KARGS =~ "video" ]]; then
|
||||
echo "Adding panel orientation for Lenovo Legion Go"
|
||||
NEEDED_KARGS+=("--append-if-missing=video=eDP-1:panel_orientation=left_side_up")
|
||||
@ -156,6 +161,11 @@ if [[ $KARGS =~ "nomodeset" ]]; then
|
||||
NEEDED_KARGS+=("--delete-if-present=nomodeset")
|
||||
fi
|
||||
|
||||
if [[ ! $KARGS =~ "gpu_sched.sched_policy" ]]; then
|
||||
echo "Fixing GPU scheduler default"
|
||||
NEEDED_KARGS+=("--append-if-missing=gpu_sched.sched_policy=0")
|
||||
fi
|
||||
|
||||
if [[ -n "$NEEDED_KARGS" ]]; then
|
||||
echo "Found needed karg changes, applying the following: ${NEEDED_KARGS[*]}"
|
||||
plymouth display-message --text="Updating kargs - Please wait, this may take a while" || true
|
||||
@ -226,29 +236,33 @@ if grep -qv "graphical.target" <<< "$(systemctl get-default)"; then
|
||||
systemctl set-default graphical.target
|
||||
fi
|
||||
|
||||
# CLEAN UP
|
||||
# AMDGPU settings change that the fsync kernel now handles.
|
||||
if [[ -f "/etc/modprobe.d/amdgpu.conf" ]]; then
|
||||
rm -f "/etc/modprobe.d/amdgpu.conf"
|
||||
# Ensure files needed for topgrade are always present
|
||||
if [[ ! -f "/etc/ublue-os/topgrade.toml" ]]; then
|
||||
mkdir -p "/etc/ublue-os"
|
||||
cp "/usr/etc/ublue-os/topgrade.toml" "/etc/ublue-os/topgrade.toml"
|
||||
fi
|
||||
# Controller changes are no longer needed thanks to patched xone driver.
|
||||
if [[ -f "/etc/modprobe.d/xone.conf" ]]; then
|
||||
rm -f "/etc/modprobe.d/xone.conf"
|
||||
|
||||
if [[ ! -f "/etc/ublue-update/topgrade-system.toml" ]]; then
|
||||
mkdir -p "/etc/ublue-update"
|
||||
cp "/usr/etc/ublue-update/topgrade-system.toml" "/etc/ublue-update/topgrade-system.toml"
|
||||
fi
|
||||
if [[ -f "/etc/modprobe.d/xpad-noone-blacklist.conf" ]]; then
|
||||
rm -f "/etc/modprobe.d/xpad-noone-blacklist.conf"
|
||||
|
||||
if [[ ! -f "/etc/ublue-update/topgrade-user.toml" ]]; then
|
||||
mkdir -p "/etc/ublue-update"
|
||||
cp "/usr/etc/ublue-update/topgrade-user.toml" "/etc/ublue-update/topgrade-user.toml"
|
||||
fi
|
||||
if [[ -f "/etc/modules-load.d/xpad-noone.conf" ]]; then
|
||||
rm -f "/etc/modules-load.d/xpad-noone.conf"
|
||||
|
||||
if [[ ! -f "/etc/ublue-update/ublue-update.toml" ]]; then
|
||||
mkdir -p "/etc/ublue-update"
|
||||
cp "/usr/etc/ublue-update/ublue-update.toml" "/etc/ublue-update/ublue-update.toml"
|
||||
fi
|
||||
if [[ -f "/etc/modprobe.d/xpadneo.conf" ]]; then
|
||||
rm -f "/etc/modprobe.d/xpadneo.conf"
|
||||
fi
|
||||
# Previous optional solution for zenpower3 that has been replaced with zenergy.
|
||||
if [[ -f "/etc/modprobe.d/amdcpu.conf" ]]; then
|
||||
rm -f "/etc/modprobe.d/amdcpu.conf"
|
||||
|
||||
if [[ ! -f "/etc/ublue-update.d/system/00-system-update.py" ]]; then
|
||||
mkdir -p "/etc/ublue-update.d/system"
|
||||
cp "/usr/etc/ublue-update.d/system/00-system-update.py" "/etc/ublue-update.d/system/00-system-update.py"
|
||||
fi
|
||||
|
||||
|
||||
mkdir -p /etc/bazzite
|
||||
echo $HWS_VER > $HWS_VER_FILE
|
||||
echo $IMAGE_NAME > $KNOWN_IMAGE_NAME_FILE
|
||||
|
@ -1,7 +1,7 @@
|
||||
It is **always** better to install packages with Distrobox rather than layer them with rpm-ostree. `ujust distrobox` makes it easy!~[More about supported packages](https://universal-blue.discourse.group/docs?topic=35)
|
||||
It is **always** better to install packages with Distrobox rather than layer them with rpm-ostree. `ujust distrobox` makes it easy!~[More info](https://universal-blue.discourse.group/docs?topic=35)
|
||||
Packages installed in Distrobox can be exported to appear like any other application~[View documentation](https://github.com/89luca89/distrobox/blob/main/docs/usage/distrobox-export.md)
|
||||
*Update break something?* You can roll back and pin the previous release or rebase by build date~[View our guide](https://universal-blue.discourse.group/docs?topic=36)
|
||||
*This isn't a distro*, this is a custom image built on Fedora Atomic Desktop technology~[View our mission](https://ublue.it/mission/)
|
||||
*Looking to dual-boot with Windows?*~[Check out our dual booting guide](https://universal-blue.discourse.group/docs?topic=129)
|
||||
*Looking to dual-boot with Windows?*~[View dual booting guide](https://universal-blue.discourse.group/docs?topic=129)
|
||||
**Support the app store!**~[Donate to Flatpak](https://opencollective.com/flatpak)
|
||||
**H.264 hardware acceleration is supported out of the box.** No tweaks necessary!
|
||||
|
Loading…
x
Reference in New Issue
Block a user