Tried some fixes, still build errors.

2 files changed, 80 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 796d44b2ea90..f4b3752ff0d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 pkgbase = amdgpud-git
-	pkgdesc = Fan control service for AMD GPUs
-	pkgver = 1.0.6.r2.g0c93053
+	pkgdesc = Fan control service for AMD GPUs.
+	pkgver = 1.0.12+2.r126.20231122.26dd62b
 	pkgrel = 1
 	url = https://github.com/eraden/amdgpud
 	arch = x86_64
 	license = Apache
 	license = MIT
 	makedepends = git
-	makedepends = cargo
+	makedepends = rust-nightly
 	depends = gcc-libs
 	provides = amdgpud
 	conflicts = amdgpud
 	backup = etc/amdgpud/config.toml
-	source = amdgpud-git::git+https://github.com/eraden/amdgpud?signed
+	source = amdgpud-git::git+https://github.com/eraden/amdgpud
 	source = config.toml
-	validpgpkeys = 0768AEEA335417256AEEA0910012845A89C7352B
 	sha256sums = SKIP
 	sha256sums = 708070794d89e86d307fd17009e0410adf49adc471cfcde0fdec1f217c85f0de
 
diff --git a/PKGBUILD b/PKGBUILD
index 223bc42bf57f..a1809c7ea7f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,59 +1,100 @@
-# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+# Maintainer:  dreieck (https://aur.archlinux.org/account/dreieck)
+# Contributor: Luis Martinez (https://aur.archlinux.org/account/lmartinez-mirror)
 
 pkgname=amdgpud-git
-_name=${pkgname%-git}
-pkgver=1.0.6.r2.g0c93053
+_name="${pkgname%-git}"
+pkgver=1.0.12+2.r126.20231122.26dd62b
 pkgrel=1
-pkgdesc="Fan control service for AMD GPUs"
+pkgdesc="Fan control service for AMD GPUs."
 arch=('x86_64')
 url="https://github.com/eraden/amdgpud"
 license=('Apache' 'MIT')
-depends=('gcc-libs')
-makedepends=('git' 'cargo')
+depends=(
+  'gcc-libs'
+)
+makedepends=(
+  'git'
+  'rust-nightly' # 2023-11-27: -nightly is needed because otherwise compilation errors out with `error[E0554]: `#![feature]` may not be used on the stable release channel`.
+)
 provides=("$_name")
 conflicts=("$_name")
 backup=("etc/$_name/config.toml")
-source=("$pkgname::git+$url?signed"
-        'config.toml')
-sha256sums=('SKIP'
-            '708070794d89e86d307fd17009e0410adf49adc471cfcde0fdec1f217c85f0de')
-validpgpkeys=('0768AEEA335417256AEEA0910012845A89C7352B') ## Adrian Wozniak
+source=(
+  "$pkgname::git+$url"
+  'config.toml'
+)
+sha256sums=(
+  'SKIP'
+  '708070794d89e86d307fd17009e0410adf49adc471cfcde0fdec1f217c85f0de'
+)
+validpgpkeys=()
 
 pkgver() {
-	git -C "$pkgname" describe --long --tags | sed 's/^v//;s/-/.r/;s/-/./'
+  export CARGO_HOME="${srcdir}/.cargo"
+
+  cd "${srcdir}/${pkgname}"
+
+  _ver="$(git describe  --tags | sed 's|^[vV]||' | sed 's|-g[0-9a-fA-F]*$||' | tr '-' '+')"
+  _rev="$(git rev-list --count HEAD)"
+  _date="$(git log -1 --date=format:"%Y%m%d" --format="%ad")"
+  _hash="$(git rev-parse --short HEAD)"
+
+  if [ -z "${_ver}" ]; then
+    error "Version could not be determined."
+    return 1
+  else
+    printf '%s' "${_ver}.r${_rev}.${_date}.${_hash}"
+  fi
 }
 
 prepare() {
-	cd "$pkgname"
-	cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+  export CARGO_HOME="${srcdir}/.cargo"
+  rustup default nightly
+
+  cd "${srcdir}/${pkgname}"
+
+  cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
 
 build() {
-	export RUSTUP_TOOLCHAIN=stable
-	export CARGO_TARGET_DIR=target
-	cd "$pkgname"
-	cargo build --release --frozen --all-features --target="$CARCH-unknown-linux-gnu"
+  export CARGO_HOME="${srcdir}/.cargo"
+
+  # export RUSTUP_TOOLCHAIN=stable
+  export RUSTUP_TOOLCHAIN=nightly
+  export CARGO_TARGET_DIR=target
+
+  cd "${srcdir}/${pkgname}"
+
+  cargo build --release --frozen --all-features --target="$CARCH-unknown-linux-gnu"
 }
 
 check() {
-	export RUSTUP_TOOLCHAIN=stable
-	cd "$pkgname"
-	cargo test --frozen --all-features --target="$CARCH-unknown-linux-gnu"
+  export CARGO_HOME="${srcdir}/.cargo"
+
+  # export RUSTUP_TOOLCHAIN=stable
+  export RUSTUP_TOOLCHAIN=nightly
+
+  cd "${srcdir}/${pkgname}"
+
+  cargo test --frozen --all-features --target="$CARCH-unknown-linux-gnu"
 }
 
 package() {
-	cd "$pkgname"
-	find "target/$CARCH-unknown-linux-gnu/release/" \
-		-maxdepth 1 \
-		-executable \
-		-type f \
-		-exec install -D -t "$pkgdir/usr/bin/" '{}' \+
-	find services \
-		-maxdepth 1 \
-		-name '*.service' \
-		-type f \
-		-exec install -Dm644 -t "$pkgdir/usr/lib/systemd/system/" '{}' \+
-	install -Dm644 LICENSE* -t "$pkgdir/usr/share/licenses/$pkgname/"
-	install -Dm644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
-	install -Dm644 "$srcdir/config.toml" -t "$pkgdir/etc/$_name/"
+  export CARGO_HOME="${srcdir}/.cargo"
+
+  cd "${srcdir}/${pkgname}"
+
+  find "target/$CARCH-unknown-linux-gnu/release/" \
+    -maxdepth 1 \
+    -executable \
+    -type f \
+    -exec install -D -t "$pkgdir/usr/bin/" '{}' \+
+  find services \
+    -maxdepth 1 \
+    -name '*.service' \
+    -type f \
+    -exec install -Dm644 -t "$pkgdir/usr/lib/systemd/system/" '{}' \+
+  install -Dm644 LICENSE* -t "$pkgdir/usr/share/licenses/$pkgname/"
+  install -Dm644 README.md -t "$pkgdir/usr/share/doc/$pkgname/"
+  install -Dm644 "$srcdir/config.toml" -t "$pkgdir/etc/$_name/"
 }