2.0.0.r3

3 files changed, 53 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b0a1659579ec..d91cefd15a49 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,22 @@
 pkgbase = ddcutil-git
 	pkgdesc = Query and change Linux monitor settings using DDC/CI and USB.
-	pkgver = 2.0.0.r0.g67489e51
+	pkgver = 2.0.0.r3.g4e6f15d2
 	pkgrel = 1
-	url = https://www.ddcutil.com
+	url = https://github.com/rockowitz/ddcutil
 	arch = x86_64
 	license = GPL2
-	makedepends = git
 	makedepends = systemd
+	makedepends = git
 	depends = glib2
 	depends = i2c-tools
-	depends = libusb
+	depends = kmod
 	depends = libdrm
+	depends = libusb
 	depends = libxrandr
-	provides = ddcutil=2.0.0
 	provides = libddcutil.so=5
+	provides = ddcutil=2.0.0
 	conflicts = ddcutil
-	source = git+https://github.com/rockowitz/ddcutil.git#branch=master
+	source = ddcutil::git+https://github.com/rockowitz/ddcutil
 	sha256sums = SKIP
 
 pkgname = ddcutil-git
diff --git a/.gitignore b/.gitignore
index 4dab8d6386e3..018a3de08144 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,4 @@
-# Ignore everything
 *
-
-# But not these files...
-!.gitignore
 !PKGBUILD
 !.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 2228618f88f9..06867b37921c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,37 +3,64 @@
 # Contributor: Bjorn Neergaard (neersighted) <bjorn@neersighted.com>
 # Contributor: Felix Yan <felixonmars@archlinux.org>
 # Contributor: Deon Spengler <deon@spengler.co.za>
-pkgname=ddcutil-git
-pkgver=2.0.0.r0.g67489e51
+
+_pkgname="ddcutil"
+pkgname="$_pkgname-git"
+pkgver=2.0.0.r3.g4e6f15d2
 pkgrel=1
-pkgdesc="Query and change Linux monitor settings using DDC/CI and USB."
-url="https://www.ddcutil.com"
+pkgdesc='Query and change Linux monitor settings using DDC/CI and USB.'
+url='http://ddcutil.com/'
 arch=('x86_64')
 license=('GPL2')
-depends=('glib2' 'i2c-tools' 'libusb' 'libdrm' 'libxrandr')
-makedepends=('git' 'systemd')
-provides=("${pkgname%-git}=${pkgver//.r*/}" 'libddcutil.so=5')
-conflicts=("${pkgname%-git}")
-source=('git+https://github.com/rockowitz/ddcutil.git#branch=master')
-sha256sums=('SKIP')
-
-pkgver() {
-  cd "$srcdir/${pkgname%-git}"
-  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
+
+depends=(
+  'glib2'
+  'i2c-tools'
+  'kmod'
+  'libdrm'
+  'libusb'
+  'libxrandr'
+)
+makedepends=(
+  'systemd'
+)
+
+provides=(
+  'libddcutil.so=5'
+)
+
+if [ "$_pkgname" != "$pkgname" ] ; then
+  url="https://github.com/rockowitz/ddcutil"
+  makedepends+=('git')
+  provides+=("$_pkgname=${pkgver/.r*}")
+  conflicts+=("$_pkgname")
+
+  _pkgsrc="$_pkgname"
+  source=(
+    "$_pkgname"::"git+$url"
+  )
+  sha256sums=(
+    'SKIP'
+  )
+
+  pkgver() {
+    cd "$_pkgsrc"
+    git describe --long --tags --match 'v[0-9].[0-9].[0-9]' | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  }
+fi
 
 prepare() {
-  cd "$srcdir/${pkgname%-git}"
+  cd "$_pkgsrc"
   NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd "$srcdir/${pkgname%-git}"
+  cd "$_pkgsrc"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "$srcdir/${pkgname%-git}"
+  cd "$_pkgsrc"
   make DESTDIR="$pkgdir" install
 }