Fixed `PKGBUILD` issues.

4 files changed, 116 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 25202f433e48..8e56270cef95 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,28 @@
 pkgbase = ryzenctrl-git
 	pkgdesc = Fine-tuning of power limits and frequency of APU Ryzen Mobile
-	pkgver = 0.5.2.926
+	pkgver = 0.5.1.870+9.r140.20220301.baf6084
 	pkgrel = 1
+	epoch = 1
 	url = https://github.com/xodj/RyzenAdjCtrl
-	install = ryzenctrl-root.service.install
 	arch = x86_64
-	license = GPL3
-	makedepends = git
+	license = GPL-3.0-or-later
+	makedepends = binutils
 	makedepends = cmake
-	makedepends = qt6-tools
-	depends = ryzen_smu-dkms-git
-	depends = ryzenadj-git
-	depends = qt6-base
-	depends = qt6-svg
-	optdepends = faustus-rublag-dkms-git: (AUR) Needed for ArmoryCrate profiles support.
-	provides = ryzenctrl
+	makedepends = gcc
+	makedepends = git
+	makedepends = make
+	depends = gcc-libs
+	depends = glibc
+	depends = hicolor-icon-theme
+	depends = ryzen_smu
+	depends = ryzenadj
+	depends = qt5-base
+	optdepends = faustus-rublag-dkms: Needed for ArmoryCrate profiles support.
+	provides = ryzenctrl=0.5.1.870+9.r140.20220301.baf6084
 	conflicts = ryzenctrl
-	source = ryzenctrl::git+https://github.com/xodj/RyzenAdjCtrl
-	source = ryzenadj-git::git+https://github.com/FlyGoat/RyzenAdj
-	sha256sums = SKIP
+	source = xodj-RyzenAdjCtrl::git+https://github.com/xodj/RyzenAdjCtrl.git
+	source = fix-ryzenadj.h-path.patch
 	sha256sums = SKIP
+	sha256sums = 95389e1380d8a18ae55b0500916053016ad830f5b942e9f5ca2c8f82d53c061a
 
 pkgname = ryzenctrl-git
diff --git a/PKGBUILD b/PKGBUILD
index 77b95673de31..9a7a086e924c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,104 @@
+# Maintainer:  dreieck (https://aur.archlinux.org/account/dreieck)
+# Contributor: xodj (https://aur.archlinux.org/account/xodj)
+
 pkgname="ryzenctrl-git"
-pkgver=0.5.2.926
+epoch=1
+pkgver=0.5.1.870+9.r140.20220301.baf6084
 pkgrel=1
 pkgdesc="Fine-tuning of power limits and frequency of APU Ryzen Mobile"
 url="https://github.com/xodj/RyzenAdjCtrl"
 arch=("x86_64")
-depends=("ryzen_smu-dkms-git" "ryzenadj-git" "qt6-base" "qt6-svg")
-makedepends=("git" "cmake" "qt6-tools")
-optdepends=("faustus-rublag-dkms-git: (AUR) Needed for ArmoryCrate profiles support.")
-license=("GPL3")
-provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}")
-source=("${pkgname%-git}::git+https://github.com/xodj/RyzenAdjCtrl" "ryzenadj-git::git+https://github.com/FlyGoat/RyzenAdj")
-sha256sums=("SKIP" "SKIP")
-install="ryzenctrl-root.service.install"
+depends=(
+  "gcc-libs"
+  "glibc"
+  "hicolor-icon-theme"
+  "ryzen_smu"
+  "ryzenadj"
+  "qt5-base"
+  # "qt5-svg"
+)
+makedepends=(
+  "binutils"
+  "cmake"
+  "gcc"
+  "git"
+  "make"
+)
+optdepends=(
+  "faustus-rublag-dkms: Needed for ArmoryCrate profiles support."
+)
+license=("GPL-3.0-or-later")
+provides=(
+  "${pkgname%-git}=${pkgver}"
+)
+conflicts=(
+  "${pkgname%-git}"
+)
+source=(
+  "xodj-RyzenAdjCtrl::git+https://github.com/xodj/RyzenAdjCtrl.git"
+  #"ryzenadj::git+https://github.com/FlyGoat/RyzenAdj.git" # Needed for `lib/ryzenadj.h`, and needed to be downloaded to `ryzenadj`.
+  "fix-ryzenadj.h-path.patch"
+)
+sha256sums=(
+  "SKIP"
+  #"SKIP"
+  "95389e1380d8a18ae55b0500916053016ad830f5b942e9f5ca2c8f82d53c061a"
+)
+
+prepare() {
+  cd "${srcdir}/xodj-RyzenAdjCtrl"
+
+  for _patch in "${srcdir}/fix-ryzenadj.h-path.patch"; do
+    printf '%s\n' "    > Applying patch '$(basename "${_patch}")' ..."
+    patch -N -p1 --follow-symlinks -i "${_patch}"
+  done
+
+  mkdir -p build
+
+  git log > git.log
+}
+
 
 pkgver() {
-    cd "$srcdir/${pkgname%-git}"
-    git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  cd "${srcdir}/xodj-RyzenAdjCtrl"
+  _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
 }
 
 build() {
-    cd "$srcdir/${pkgname%-git}"
-    mkdir build -p && cd build
-    cmake -DCMAKE_BUILD_TYPE=Release ..
-    make
+  cd "${srcdir}/xodj-RyzenAdjCtrl"
+  cd build
+  cmake \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_STANDALONE=false \
+    ..
+  make
 }
 
 package() {
-    cd "$srcdir/${pkgname%-git}"
-    install -Dsm755 ./build/Appfolder/RyzenCtrl $pkgdir/usr/bin/RyzenCtrl
-    install -Dm644 ./ru.ryzenctrl.service.conf $pkgdir/etc/dbus-1/system.d/ru.ryzenctrl.service.conf
-	install -Dm755 ./RyzenCtrl.desktop $pkgdir/usr/share/applications/RyzenCtrl.desktop
-    install -Dm644 ./ryzenctrl-root.service $pkgdir/usr/lib/systemd/system/ryzenctrl-root.service
-	install -Dm644 ./media/main/amd_icon.png $pkgdir/usr/share/icons/hicolor/256x256/apps/amd_icon.png
+  cd "${srcdir}/xodj-RyzenAdjCtrl"
+
+  install -Dsm755 "build/Appfolder/RyzenCtrl"  "${pkgdir}/usr/bin/RyzenCtrl"
+  install -Dvm644 "ru.ryzenctrl.service.conf"  "${pkgdir}/etc/dbus-1/system.d/ru.ryzenctrl.service.conf"
+  install -Dvm755 "RyzenCtrl.desktop"          "${pkgdir}/usr/share/applications/RyzenCtrl.desktop"
+  install -Dvm644 "ryzenctrl-root.service"     "${pkgdir}/usr/lib/systemd/system/ryzenctrl-root.service"
+  install -Dvm644 "media/main/amd_icon.png"    "${pkgdir}/usr/share/icons/hicolor/256x256/apps/amd_icon.png"
+
+  for _docfile in git.log README.md; do
+    install -Dvm644 -t "${pkgdir}/usr/share/doc/${pkgname%-git}" "${_docfile}"
+  done
+  for _licensefile in LICENSE; do
+    install -Dvm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" "${_licensefile}"
+    ln -svr "${pkgdir}/usr/share/licenses/${pkgname}/$(basename "${_licensefile}")" "${pkgdir}/usr/share/doc/${pkgname%-git}/$(basename "${_licensefile}")"
+  done
 }
diff --git a/fix-ryzenadj.h-path.patch b/fix-ryzenadj.h-path.patch
new file mode 100644
index 000000000000..23c5975fce15
--- /dev/null
+++ b/fix-ryzenadj.h-path.patch
@@ -0,0 +1,8 @@
+diff -U1 -r xodj-RyzenAdjCtrl.org/CtrlService.h xodj-RyzenAdjCtrl/CtrlService.h
+--- xodj-RyzenAdjCtrl.org/CtrlService.h	2024-01-29 14:23:08.867198072 +0100
++++ xodj-RyzenAdjCtrl/CtrlService.h	2024-01-29 14:23:57.040533430 +0100
+@@ -11,3 +11,3 @@
+ #include "CtrlArmour.h"
+-#include "lib/ryzenadj.h"
++#include "ryzenadj.h"
+ #include "CtrlBus.h"
diff --git a/ryzenctrl-root.service.install b/ryzenctrl-root.service.install
deleted file mode 100644
index f726a663f1da..000000000000
--- a/ryzenctrl-root.service.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    systemctl start ryzenctrl-root.service
-    systemctl enable ryzenctrl-root.service
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    systemctl stop ryzenctrl-root.service
-}