Skip to content

Commit

Permalink
Merge branch 'stable' into stable-kde
Browse files Browse the repository at this point in the history
  • Loading branch information
honjow committed Nov 10, 2024
2 parents 602bb37 + 52fa17d commit 00324ec
Show file tree
Hide file tree
Showing 7 changed files with 106 additions and 22 deletions.
2 changes: 1 addition & 1 deletion aur-pkgs/tsukimi-bin
Submodule tsukimi-bin updated from cec636 to 19c3b4
40 changes: 20 additions & 20 deletions manifest
Original file line number Diff line number Diff line change
Expand Up @@ -209,26 +209,26 @@ export PACKAGES="\
"

export PACKAGE_OVERRIDES="\
https://github.com/3003n/linux-chimeraos/releases/download/v6.11.6-sko1-1/linux-chimeraos-6.11.6.sko1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/linux-chimeraos/releases/download/v6.11.6-sko1-1/linux-chimeraos-headers-6.11.6.sko1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.2.6-chos1-1/lib32-libva-mesa-driver-1--24.2.6.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.2.6-chos1-1/lib32-mesa-1--24.2.6.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.2.6-chos1-1/lib32-mesa-vdpau-1--24.2.6.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.2.6-chos1-1/lib32-opencl-rusticl-mesa-1--24.2.6.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.2.6-chos1-1/lib32-vulkan-intel-1--24.2.6.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.2.6-chos1-1/lib32-vulkan-mesa-layers-1--24.2.6.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.2.6-chos1-1/lib32-vulkan-radeon-1--24.2.6.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.2.6-chos1-1/lib32-vulkan-nouveau-1--24.2.6.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.2.6-chos1-1/lib32-vulkan-swrast-1--24.2.6.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.2.6-chos1-1/libva-mesa-driver-1--24.2.6.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.2.6-chos1-1/mesa-1--24.2.6.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.2.6-chos1-1/mesa-vdpau-1--24.2.6.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.2.6-chos1-1/opencl-rusticl-mesa-1--24.2.6.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.2.6-chos1-1/vulkan-intel-1--24.2.6.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.2.6-chos1-1/vulkan-mesa-layers-1--24.2.6.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.2.6-chos1-1/vulkan-radeon-1--24.2.6.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.2.6-chos1-1/vulkan-nouveau-1--24.2.6.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.2.6-chos1-1/vulkan-swrast-1--24.2.6.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/linux-chimeraos/releases/download/v6.11.7-sko1-1/linux-chimeraos-6.11.7.sko1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/linux-chimeraos/releases/download/v6.11.7-sko1-1/linux-chimeraos-headers-6.11.7.sko1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0.rc1-chos1-1/lib32-libva-mesa-driver-1--24.3.0.rc1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0.rc1-chos1-1/lib32-mesa-1--24.3.0.rc1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0.rc1-chos1-1/lib32-mesa-vdpau-1--24.3.0.rc1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0.rc1-chos1-1/lib32-opencl-rusticl-mesa-1--24.3.0.rc1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0.rc1-chos1-1/lib32-vulkan-intel-1--24.3.0.rc1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0.rc1-chos1-1/lib32-vulkan-mesa-layers-1--24.3.0.rc1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0.rc1-chos1-1/lib32-vulkan-radeon-1--24.3.0.rc1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0.rc1-chos1-1/lib32-vulkan-nouveau-1--24.3.0.rc1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0.rc1-chos1-1/lib32-vulkan-swrast-1--24.3.0.rc1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0.rc1-chos1-1/libva-mesa-driver-1--24.3.0.rc1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0.rc1-chos1-1/mesa-1--24.3.0.rc1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0.rc1-chos1-1/mesa-vdpau-1--24.3.0.rc1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0.rc1-chos1-1/opencl-rusticl-mesa-1--24.3.0.rc1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0.rc1-chos1-1/vulkan-intel-1--24.3.0.rc1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0.rc1-chos1-1/vulkan-mesa-layers-1--24.3.0.rc1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0.rc1-chos1-1/vulkan-radeon-1--24.3.0.rc1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0.rc1-chos1-1/vulkan-nouveau-1--24.3.0.rc1.chos1-1-x86_64.pkg.tar.zst \
https://github.com/3003n/mesa-chimeraos/releases/download/24.3.0.rc1-chos1-1/vulkan-swrast-1--24.3.0.rc1.chos1-1-x86_64.pkg.tar.zst \
"

# Each entry is the clone url (https://aur.archlinux.org/{AUR_PACKAGE}.git)
Expand Down
63 changes: 63 additions & 0 deletions pkgs/lact-libadwaita/PKGBUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# Maintainer: Ilya Zlobintsev <[email protected]>
pkgname=('lact-libadwaita')
pkgbase=lact
pkgver=0.5.6
pkgrel=1
pkgdesc="AMDGPU Controller application"
arch=('x86_64' 'aarch64')
url="https://github.com/ilya-zlobintsev/LACT"
license=('MIT')
depends=('hwdata' 'gtk4')
makedepends=('blueprint-compiler' 'cargo' 'clang' 'libadwaita' 'git')
install="$pkgbase.install"
source=("git+https://github.com/ilya-zlobintsev/LACT.git#tag=v$pkgver")
# Since the source is a git repository tag and not an archive, there's no single file with a checksum to check
sha256sums=('9440a4d94f95d0a62124d635855817ea95fc8a5d2a70f2e52cb166364e1e630f')

prepare() {
cd "LACT"
export CARGO_HOME="$srcdir/cargo-home"
export RUSTUP_TOOLCHAIN=stable
cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
}

build() {
cd "LACT"
export CARGO_HOME="$srcdir/cargo-home"
export RUSTUP_TOOLCHAIN=stable
export CARGO_TARGET_DIR=target

# Libadwaita
cargo build -p "$pkgbase" --frozen --release --features=adw
mv "target/release/$pkgbase" "target/release/$pkgbase-adw"

# Gtk 4
cargo build -p "$pkgbase" --frozen --release
}

check() {
cd "LACT"
export CARGO_HOME="$srcdir/cargo-home"
export RUSTUP_TOOLCHAIN=stable
cargo test --frozen --no-default-features -p lact
}

package_lact() {
cd "LACT"
make PREFIX=/usr DESTDIR="$pkgdir/" install

install -Dvm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgbase/"
}

package_lact-libadwaita() {
pkgdesc+=" (libadwaita edition)"
provides=("$pkgbase")
conflicts=("$pkgbase")
depends+=('libadwaita')

cd "LACT"
make PREFIX=/usr DESTDIR="$pkgdir/" install

install -Dvm755 "target/release/$pkgbase-adw" "$pkgdir/usr/bin/$pkgbase"
install -Dvm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgbase/"
}
5 changes: 5 additions & 0 deletions pkgs/lact-libadwaita/lact.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[Desktop Entry]
Type=Application
Name=LACT
Description=AMDGPU Control Application
Exec=lact-gui
6 changes: 6 additions & 0 deletions pkgs/lact-libadwaita/lact.install
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/sh

post_install() {
echo ":: To be able to change settings in LACT, you need to enable the lactd service:"
echo " sudo systemctl enable --now lactd"
}
10 changes: 10 additions & 0 deletions pkgs/lact-libadwaita/lactd.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[Unit]
Description=AMDGPU Control Daemon
After=multi-user.target

[Service]
ExecStartPre=/usr/bin/sleep 2
ExecStart=/usr/bin/lact-daemon

[Install]
WantedBy=graphical.target
2 changes: 1 addition & 1 deletion rootfs/usr/lib/frzr.d/bootconfig.conf
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ibt=off pci=noaer split_lock_detect=off iomem=relaxed zswap.enabled=0 nowatchdog
ibt=off pci=noaer split_lock_detect=off iomem=relaxed zswap.enabled=0 amdgpu ppfeaturemask=0xFFF7FFFF nowatchdog

0 comments on commit 00324ec

Please sign in to comment.