summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO16
-rw-r--r--.gitignore31
-rw-r--r--PKGBUILD62
-rw-r--r--autorandr-git.install7
4 files changed, 31 insertions, 85 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 19395d7440d6..ecf452bd7c52 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
pkgbase = autorandr-git
- pkgdesc = Auto-detect the connect display hardware and load the appropiate X11 setup using xrandr. Formerly autodisper. No disper support.
- pkgver = 1.3.r0.gcbb5662
+ pkgdesc = Auto-detect connected display hardware and load appropiate X11 setup using xrandr
+ pkgver = 1.13.3.r8.g65a2b31
pkgrel = 1
url = https://github.com/phillipberndt/autorandr
- install = autorandr-git.install
arch = any
license = GPL3
+ makedepends = desktop-file-utils
makedepends = git
depends = python
depends = xorg-xrandr
@@ -14,13 +14,7 @@ pkgbase = autorandr-git
optdepends = xorg-xdpyinfo: For detecting the primary XRandR output
provides = autorandr
conflicts = autorandr
- conflicts = auto-disper-git
- conflicts = autorandr-asch-git
- conflicts = autorandr-phillipberndt-git
- source = autorandr-git::git+https://github.com/phillipberndt/autorandr.git
- source = autorandr-git.install
- sha256sums = SKIP
- sha256sums = 60c035d6f433d388ef1d3acec084dcd021158cbec79e9807e78cc368cb499690
+ source = git+https://github.com/phillipberndt/autorandr.git
+ b2sums = SKIP
pkgname = autorandr-git
-
diff --git a/.gitignore b/.gitignore
index 43316bc3c124..713f6f80aff8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1,4 @@
-# From: https://github.com/github/gitignore/blob/master/ArchLinuxPackages.gitignore
-
-*.tar
-*.tar.*
-*.zip
-*.tgz
-*.log
-*.log.*
-*.sig
-
-# makepkg working folders
-pkg
-src
-
-#
-# Additional ignore patterns:
-#
-
-# Source files
-*.deb
-*.gem
-*.out
-*.rpm
-*.html
-
-# Ignore package source folders
-*/*
+/*
+!/.gitignore
+!/.SRCINFO
+!/PKGBUILD
diff --git a/PKGBUILD b/PKGBUILD
index a1adeddddd57..8fedd9f682f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,32 @@
-# Maintainer: NBonaparte <nbonaparte@protonmail.com>
-# Contributor: Edgard Castro <castro@edgard.org>
-# Contributor: James An <james@jamesan.ca>
-# Contributor: Helge Willum Larsen <helgesdk@gmail.com>
-# Contributor: Ng Oon-Ee <ngoonee.talk@gmail.com>
-# Contributor: Byron Clark <byron@theclarkfamily.name> (auto-disper-git)
-# Contributor: phillipberndt (maintainer of the current autorandr)
-# Contributor: wertarbyte (original author of auto-disper and autorandr)
+# Maintainer: éclairevoyant
-pkgname=autorandr-git
-pkgver=1.3.r0.gcbb5662
+_pkgname=autorandr
+pkgname="$_pkgname-git"
+pkgver=1.13.3.r8.g65a2b31
pkgrel=1
-pkgdesc="Auto-detect the connect display hardware and load the appropiate X11 setup using xrandr. Formerly autodisper. No disper support."
-arch=('any')
-url="https://github.com/phillipberndt/${pkgname%-git}"
-license=('GPL3')
-depends=('python' 'xorg-xrandr')
-makedepends=('git')
+pkgdesc="Auto-detect connected display hardware and load appropiate X11 setup using xrandr"
+arch=(any)
+url="https://github.com/phillipberndt/$_pkgname"
+license=(GPL3)
+depends=(python xorg-xrandr)
+makedepends=(desktop-file-utils git)
optdepends=(
- "pm-utils: For changing autorandr profile on thaw/resume"
- "python2: For using autorandr_monitor"
- "xorg-xdpyinfo: For detecting the primary XRandR output"
+ "pm-utils: For changing autorandr profile on thaw/resume"
+ "python2: For using autorandr_monitor"
+ "xorg-xdpyinfo: For detecting the primary XRandR output"
)
-provides=("${pkgname%-git}")
-conflicts=(
- "${pkgname%-git}"
- "auto-disper-git"
- "autorandr-asch-git"
- "autorandr-phillipberndt-git"
-)
-install="${pkgname}.install"
-source=(
- "${pkgname}::git+${url}.git"
- "${pkgname}.install"
-)
-sha256sums=('SKIP'
- '60c035d6f433d388ef1d3acec084dcd021158cbec79e9807e78cc368cb499690')
+provides=("$_pkgname")
+conflicts=("$_pkgname")
+source=("git+$url.git")
+b2sums=('SKIP')
pkgver() {
- cd "${srcdir}/${pkgname}"
- ( set -o pipefail
- git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
- printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
- ) 2>/dev/null
+ git -C $_pkgname describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
package() {
- cd "${srcdir}/${pkgname}"
- make DESTDIR="${pkgdir}" PREFIX=/usr install
+ cd $_pkgname
+ make DESTDIR="$pkgdir" PREFIX=/usr install
+ install -vDm644 contrib/zsh_completion/_$_pkgname -t "$pkgdir/usr/share/zsh/site-functions/"
+ install -vDm644 README.md -t "$pkgdir/usr/share/doc/$_pkgname/"
}
diff --git a/autorandr-git.install b/autorandr-git.install
deleted file mode 100644
index bb8d24a25cc7..000000000000
--- a/autorandr-git.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
- post_upgrade
-}
-
-post_upgrade() {
- udevadm control --reload-rules
-}