From 907d104cc91de18bf9ca00dbcda48ce6ab91575d Mon Sep 17 00:00:00 2001 From: honjow Date: Mon, 9 Dec 2024 10:59:53 +0800 Subject: [PATCH 1/6] update aurs --- aur-pkgs/amdgpu-test-scripts-git | 2 +- aur-pkgs/gamescope-sk | 2 +- aur-pkgs/hhd | 2 +- aur-pkgs/hhd-ui | 2 +- aur-pkgs/mission-center | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aur-pkgs/amdgpu-test-scripts-git b/aur-pkgs/amdgpu-test-scripts-git index f35f7a60..97c68bcd 160000 --- a/aur-pkgs/amdgpu-test-scripts-git +++ b/aur-pkgs/amdgpu-test-scripts-git @@ -1 +1 @@ -Subproject commit f35f7a6092c5867b6f4b04580388cd16832c40da +Subproject commit 97c68bcdf288a20969715248a488224d0c2ede71 diff --git a/aur-pkgs/gamescope-sk b/aur-pkgs/gamescope-sk index 828e9f55..9aac6669 160000 --- a/aur-pkgs/gamescope-sk +++ b/aur-pkgs/gamescope-sk @@ -1 +1 @@ -Subproject commit 828e9f5514b09129f43226252c6376867abc5c36 +Subproject commit 9aac6669ff7242570313e31c52cc199331bb46cf diff --git a/aur-pkgs/hhd b/aur-pkgs/hhd index 02a72a43..52c94af1 160000 --- a/aur-pkgs/hhd +++ b/aur-pkgs/hhd @@ -1 +1 @@ -Subproject commit 02a72a4352f90ca9cdbb41d6a8467eba6bab81b6 +Subproject commit 52c94af153a50cc581cb5c5c8db99f311e9a22bd diff --git a/aur-pkgs/hhd-ui b/aur-pkgs/hhd-ui index 03097716..249257f5 160000 --- a/aur-pkgs/hhd-ui +++ b/aur-pkgs/hhd-ui @@ -1 +1 @@ -Subproject commit 03097716f0e58be663e0c7f83cb6c67e813b29e2 +Subproject commit 249257f59239519e0e366f7a2404d7ba2155310a diff --git a/aur-pkgs/mission-center b/aur-pkgs/mission-center index 63a2cfa2..9d268c53 160000 --- a/aur-pkgs/mission-center +++ b/aur-pkgs/mission-center @@ -1 +1 @@ -Subproject commit 63a2cfa2c597e442ddd4071dd6b75319d4773125 +Subproject commit 9d268c5351db9d234c5c3181075839f73692b759 From c1c7d5f3ce2a6f5d9199e21911611847e39e7229 Mon Sep 17 00:00:00 2001 From: honjow Date: Mon, 9 Dec 2024 11:49:25 +0800 Subject: [PATCH 2/6] update mesa to 24.3.1.chos1-1 --- manifest | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/manifest b/manifest index 50c1aebd..bc3b48e1 100644 --- a/manifest +++ b/manifest @@ -201,24 +201,25 @@ export PACKAGES="\ export PACKAGE_OVERRIDES="\ https://github.com/3003n/linux-chimeraos/releases/download/v6.11.9-sko1-1/linux-chimeraos-6.11.9.sko1-1-x86_64.pkg.tar.zst \ https://github.com/3003n/linux-chimeraos/releases/download/v6.11.9-sko1-1/linux-chimeraos-headers-6.11.9.sko1-1-x86_64.pkg.tar.zst \ - https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/lib32-libva-mesa-driver-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \ - https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/lib32-mesa-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \ - https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/lib32-mesa-vdpau-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \ - https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/lib32-opencl-rusticl-mesa-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \ - https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/lib32-vulkan-intel-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \ - https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/lib32-vulkan-mesa-layers-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \ - https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/lib32-vulkan-radeon-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \ - https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/lib32-vulkan-nouveau-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \ - https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/lib32-vulkan-swrast-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \ - https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/libva-mesa-driver-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \ - https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/mesa-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \ - https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/mesa-vdpau-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \ - https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/opencl-rusticl-mesa-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \ - https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/vulkan-intel-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \ - https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/vulkan-mesa-layers-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \ - https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/vulkan-radeon-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \ - https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/vulkan-nouveau-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \ - https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0-chos1-1/vulkan-swrast-1--24.3.0.chos1-1-x86_64.pkg.tar.zst \ + https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/lib32-mesa-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \ + https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/lib32-opencl-clover-mesa-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \ + https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/lib32-opencl-rusticl-mesa-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \ + https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/lib32-vulkan-intel-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \ + https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/lib32-vulkan-mesa-layers-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \ + https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/lib32-vulkan-nouveau-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \ + https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/lib32-vulkan-radeon-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \ + https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/lib32-vulkan-swrast-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \ + https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/lib32-vulkan-virtio-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \ + https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/mesa-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \ + https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/mesa-docs-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \ + https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/opencl-clover-mesa-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \ + https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/opencl-rusticl-mesa-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \ + https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/vulkan-intel-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \ + https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/vulkan-mesa-layers-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \ + https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/vulkan-nouveau-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \ + https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/vulkan-radeon-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \ + https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/vulkan-swrast-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \ + https://github.com/3003n/mesa-chimeraos/releases/download/24.3.1-chos1-1/vulkan-virtio-1--24.3.1.chos1-1-x86_64.pkg.tar.zst \ https://ns.switchsystem.eu.org/d/guest/stos/pkgs/mutter-x11-scaling-47.1-2-x86_64.pkg.tar.zst \ " From 4e6e537033dd76390133f75f0d7cecf7c8d3b496 Mon Sep 17 00:00:00 2001 From: honjow Date: Mon, 9 Dec 2024 12:15:06 +0800 Subject: [PATCH 3/6] remove edid-decode-git --- .gitmodules | 3 --- aur-pkgs/edid-decode-git | 1 - manifest | 1 - 3 files changed, 5 deletions(-) delete mode 160000 aur-pkgs/edid-decode-git diff --git a/.gitmodules b/.gitmodules index fbcf91fe..9fb6c6c5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -142,9 +142,6 @@ [submodule "aur-pkgs/yay-git"] path = aur-pkgs/yay-git url = https://aur.archlinux.org/yay-git.git -[submodule "aur-pkgs/edid-decode-git"] - path = aur-pkgs/edid-decode-git - url = https://aur.archlinux.org/edid-decode-git.git [submodule "aur-pkgs/hhd-ui"] path = aur-pkgs/hhd-ui url = https://aur.archlinux.org/hhd-ui.git diff --git a/aur-pkgs/edid-decode-git b/aur-pkgs/edid-decode-git deleted file mode 160000 index 437757d6..00000000 --- a/aur-pkgs/edid-decode-git +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 437757d6eee6d433a7b029a947556c9636711dcb diff --git a/manifest b/manifest index bc3b48e1..2c0b7a77 100644 --- a/manifest +++ b/manifest @@ -236,7 +236,6 @@ export AUR_PACKAGES="\ chimeraos-device-quirks-sk-git \ downgrade \ ds-inhibit \ - edid-decode-git \ evdev-keepalive \ frzr-sk \ gamescope-session-sk-git \ From 8e1c00b6593d019f60a51cd99d9dad2995024cf7 Mon Sep 17 00:00:00 2001 From: honjow Date: Mon, 9 Dec 2024 12:15:41 +0800 Subject: [PATCH 4/6] Add v4l-utils-git --- .gitmodules | 3 +++ aur-pkgs/v4l-utils-git | 1 + manifest | 1 + 3 files changed, 5 insertions(+) create mode 160000 aur-pkgs/v4l-utils-git diff --git a/.gitmodules b/.gitmodules index 9fb6c6c5..0972290f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -160,3 +160,6 @@ [submodule "aur-pkgs/parui"] path = aur-pkgs/parui url = https://aur.archlinux.org/parui.git +[submodule "aur-pkgs/v4l-utils-git"] + path = aur-pkgs/v4l-utils-git + url = https://aur.archlinux.org/v4l-utils-git.git diff --git a/aur-pkgs/v4l-utils-git b/aur-pkgs/v4l-utils-git new file mode 160000 index 00000000..7fdfdc29 --- /dev/null +++ b/aur-pkgs/v4l-utils-git @@ -0,0 +1 @@ +Subproject commit 7fdfdc29deb1ed1d8b6968d23a4be451eca987ca diff --git a/manifest b/manifest index 2c0b7a77..7ba916b0 100644 --- a/manifest +++ b/manifest @@ -279,6 +279,7 @@ export AUR_PACKAGES="\ sk-chos-tool \ steam_notif_daemon \ tsukimi-bin \ + v4l-utils-git \ waydroid \ waydroid-script-git \ yay-git \ From 0fc63ce2cf125ef0885386cd6fa3aaed532d9b40 Mon Sep 17 00:00:00 2001 From: honjow Date: Mon, 9 Dec 2024 13:40:00 +0800 Subject: [PATCH 5/6] remove v4l-utils --- manifest | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest b/manifest index 7ba916b0..c8c72966 100644 --- a/manifest +++ b/manifest @@ -296,6 +296,7 @@ export PACKAGES_TO_DELETE="\ openvr \ pulseaudio \ pulseaudio-alsa \ + v4l-utils \ " export OWN_PACKAGES_TO_DELETE="" From ec1a984b90f0c2b22c3aad2b9d9837f125c9b647 Mon Sep 17 00:00:00 2001 From: honjow Date: Mon, 9 Dec 2024 13:41:30 +0800 Subject: [PATCH 6/6] fix install scripts --- all-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/all-install.sh b/all-install.sh index a47fd22d..2fb628e1 100755 --- a/all-install.sh +++ b/all-install.sh @@ -33,7 +33,7 @@ else fi for package in ${OWN_PACKAGES_TO_DELETE}; do - rm -f "/own_pkgs/${package}" || true + rm -f /own_pkgs/${package} || true done # install own override packages @@ -64,7 +64,7 @@ done # remove AUR packages for package in ${AUR_PACKAGES_TO_DELETE}; do - rm -f "/extra_pkgs/${package}" || true + rm -f /extra_pkgs/${package} || true done # install AUR packages