Clean-ups and a version bump

4 files changed, 36 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 817e8f6990f5..b9b4f1550e91 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nvidia-xrun-pm-git
-	pkgdesc = Alternative version of nvidia-xrun, that relies on kernel PM instead of bbswitch - git branch
-	pkgver = r61.017c83b
+	pkgdesc = Alternative version of nvidia-xrun, that relies on kernel PM instead of bbswitch
+	pkgver = 0.3.2.r19.gaf3b734
 	pkgrel = 1
 	url = https://github.com/michelesr/nvidia-xrun-pm
 	install = nvidia-xrun-pm-git.install
@@ -12,12 +12,14 @@ pkgbase = nvidia-xrun-pm-git
 	depends = xorg-xrandr
 	depends = nvidia
 	depends = mesa-libgl
-	depends = xf86-video-intel
 	provides = nvidia-xrun
+	provides = nvidia-xrun-git
 	provides = nvidia-xrun-pm
 	conflicts = nvidia-xrun
+	conflicts = nvidia-xrun-git
+	conflicts = nvidia-xrun-pm
 	source = nvidia-xrun-pm-git::git+https://github.com/michelesr/nvidia-xrun-pm
-	md5sums = SKIP
+	sha256sums = SKIP
 
 pkgname = nvidia-xrun-pm-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..0ff6c87d22e2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+src
+pkg
+nvidia-xrun-pm-git
+*pkg.tar.xz
+tags
diff --git a/PKGBUILD b/PKGBUILD
index fbf9ee264ec0..25c88b3206c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,41 @@
-# Maintainer: N.E. Neal <contact at [part of name before neal without dots] dog com>
+# Maintainer: Tony Lambiris <tony@criticalstack.com>
+
 pkgname=nvidia-xrun-pm-git
-pkgver=r61.017c83b
+pkgver=0.3.2.r19.gaf3b734
 pkgrel=1
-epoch=
-pkgdesc='Alternative version of nvidia-xrun, that relies on kernel PM instead of bbswitch - git branch'
+pkgdesc='Alternative version of nvidia-xrun, that relies on kernel PM instead of bbswitch'
 arch=('x86_64')
 url='https://github.com/michelesr/nvidia-xrun-pm'
 license=('GPL')
 groups=()
-depends=('xorg-server' 'xorg-xinit' 'xorg-xrandr' 'nvidia' 'mesa-libgl' 'xf86-video-intel')
+depends=('xorg-server' 'xorg-xinit' 'xorg-xrandr' 'nvidia' 'mesa-libgl')
 makedepends=('git')
 checkdepends=()
 optdepends=()
-provides=('nvidia-xrun' 'nvidia-xrun-pm')
-conflicts=('nvidia-xrun')
+provides=('nvidia-xrun' 'nvidia-xrun-git' 'nvidia-xrun-pm')
+conflicts=('nvidia-xrun' 'nvidia-xrun-git' 'nvidia-xrun-pm')
 replaces=()
 backup=()
 options=()
 install=$pkgname.install
-changelog=
-source=("$pkgname::git+https://github.com/michelesr/nvidia-xrun-pm")
-noextract=()
-md5sums=('SKIP')
-validpgpkeys=()
+source=("${pkgname}::git+${url}")
+sha256sums=('SKIP')
+
+pkgver() {
+	cd "${srcdir}/${pkgname}"
 
-pkgver () {
-	cd $pkgname
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 package() {
-	cd $pkgname
-	install -Dm 644 nvidia-xorg.conf "$pkgdir/etc/X11/nvidia-xorg.conf"
-	install -Dm 644 nvidia-xinitrc "$pkgdir/etc/X11/xinit/nvidia-xinitrc"
-	install -Dm 755 nvidia-xrun "$pkgdir/usr/bin/nvidia-xrun"
-	install -Dm 644 nvidia-xrun-pm.service "$pkgdir/etc/systemd/system/nvidia-xrun-pm.service"
-	install -dm 555 "$pkgdir/etc/X11/xinit/nvidia-xinitrc.d"
-	install -dm 555 "$pkgdir/etc/X11/nvidia-xorg.conf.d"
-}
+	cd "${srcdir}/${pkgname}"
 
+	install -Dm 644 nvidia-xorg.conf "${pkgdir}/etc/X11/nvidia-xorg.conf"
+	install -Dm 644 nvidia-xinitrc "${pkgdir}/etc/X11/xinit/nvidia-xinitrc"
+	install -Dm 644 config/nvidia-xrun "${pkgdir}/etc/default/nvidia-xrun"
+	install -Dm 755 nvidia-xrun "${pkgdir}/usr/bin/nvidia-xrun"
+	install -Dm 644 nvidia-xrun-pm.service "${pkgdir}/etc/systemd/system/nvidia-xrun-pm.service"
+	install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -dm 555 "${pkgdir}/etc/X11/xinit/nvidia-xinitrc.d"
+	install -dm 555 "${pkgdir}/etc/X11/nvidia-xorg.conf.d"
+}
diff --git a/nvidia-xrun-pm-git.install b/nvidia-xrun-pm-git.install
index eb3a6b0b9b85..e55329bb87ec 100644
--- a/nvidia-xrun-pm-git.install
+++ b/nvidia-xrun-pm-git.install
@@ -3,6 +3,8 @@ post_install() {
 In order to automatically disable the NVIDIA graphic card at boot:
   - blacklist the "nvidia" module in /etc/modprobe.d/
   - enable the "nvidia-xrun-pm" systemd service
+If you experience problems with nvidia-xrun-pm:
+  - check https://github.com/michelesr/nvidia-xrun-pm#setting-the-right-bus-id
 EOF
 }