summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonzalo Exequiel Pedone2018-05-21 16:20:27 -0300
committerGonzalo Exequiel Pedone2018-05-21 16:20:27 -0300
commit706d89c290a4ee895e9ba640f5016d7381e1c57b (patch)
tree6536b44e8a0f48cad09f380411662631efe4d12f
parent4866fdb4c67f509ac7a466d4172fa5c369155d65 (diff)
downloadaur-706d89c290a4ee895e9ba640f5016d7381e1c57b.tar.gz
Conflict with webcamoid-git.
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD7
2 files changed, 7 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8add082545f..f25e69aee19 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# mar oct 10 18:43:59 UTC 2017
+# lun may 21 19:19:42 UTC 2018
pkgbase = webcamoid
pkgdesc = Webcamoid is a full featured webcam capture application.
pkgver = 8.1.0
- pkgrel = 1
+ pkgrel = 2
url = https://webcamoid.github.io/
install = webcamoid.install
arch = i686
@@ -32,6 +32,7 @@ pkgbase = webcamoid
optdepends = kde-cli-tools: Root privileges for virtual camera module (Recommended)
optdepends = gksu: Root privileges for virtual camera module
provides = webcamoid
+ conflicts = webcamoid-git
source = https://github.com/webcamoid/webcamoid/archive/8.1.0.tar.gz
sha256sums = 2e51731c36a86a4b3e323c11000a04b7ce06b5d228519676f4070e44e2a62947
diff --git a/PKGBUILD b/PKGBUILD
index ad4869ec445..7bff836e8fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=webcamoid
pkgver=8.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="Webcamoid is a full featured webcam capture application."
url='https://webcamoid.github.io/'
license=('GPL')
@@ -29,14 +29,15 @@ makedepends=('v4l-utils'
'alsa-lib'
'jack')
provides=('webcamoid')
+conflicts=('webcamoid-git')
install="${pkgname}.install"
source=("https://github.com/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz")
sha256sums=('2e51731c36a86a4b3e323c11000a04b7ce06b5d228519676f4070e44e2a62947')
build() {
cd "$srcdir/${pkgname}-${pkgver}"
- qmake-qt5 Webcamoid.pro
- make
+ qmake-qt5 Webcamoid.pro CONFIG+=silent
+ make $MAKEFLAGS
}
package() {