summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevaev Maxim2019-01-25 17:54:17 +0300
committerDevaev Maxim2019-01-25 17:54:17 +0300
commit6acdfea89270dd578fb94ec9b0f9b79ed6fa53c9 (patch)
tree8438cf7ef8de15ce708572ee00c57279df36c9f7
parent43dc7a1413295de5b22868a2f49101064b2c5475 (diff)
downloadaur-6acdfea89270dd578fb94ec9b0f9b79ed6fa53c9.tar.gz
Update to r67-2
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD24
2 files changed, 13 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d6a402c8c5fd..325783ea76b1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mjpg-streamer
pkgdesc = Stream mjpeg frames from a webcam via http
pkgver = r67
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/jacksonliam/mjpg-streamer
arch = i686
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 3cf9d708b4e0..e76dc72fc774 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,23 +5,23 @@
# Contributor: Maxim Devaev <mdevaev@gmail.com>
-pkgname="mjpg-streamer"
-pkgver="r67"
-pkgrel="1"
+pkgname=mjpg-streamer
+pkgver=r67
+pkgrel=2
pkgdesc="Stream mjpeg frames from a webcam via http"
url="https://github.com/jacksonliam/mjpg-streamer"
-license=("GPL")
-arch=("i686" "x86_64" "armv6h" "armv7h")
-depends=("libjpeg")
-makedepends=("gcc" "cmake")
+license=(GPL)
+arch=(i686 x86_64 armv6h armv7h)
+depends=(libjpeg)
+makedepends=(gcc cmake)
_commit="f387bb44e6c087271b763b27da998bf2e06c4f5d"
-source=("https://github.com/jacksonliam/mjpg-streamer/archive/${_commit}.tar.gz")
+source=("https://github.com/jacksonliam/mjpg-streamer/archive/$_commit.tar.gz")
sha1sums=("298ad7adebe3876b87d4e19f76e4d2425fd0c9ff")
build() {
- cd "${srcdir}/mjpg-streamer-${_commit}/mjpg-streamer-experimental"
+ cd "$srcdir/mjpg-streamer-$_commit/mjpg-streamer-experimental"
unset CPPFLAGS
unset LDFLAGS
@@ -30,13 +30,13 @@ build() {
unset CFLAGS
[ -d _build ] || mkdir _build
- [ -f _build/Makefile ] || (cd _build && cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) ..)
+ [ -f _build/Makefile ] || (cd _build && cmake -DPLUGIN_INPUT_OPENCV=OFF -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) ..)
make -C _build
cp _build/mjpg_streamer .
find _build -name "*.so" -type f -exec cp {} . \;
}
package() {
- cd "${srcdir}/mjpg-streamer-${_commit}/mjpg-streamer-experimental"
- make DESTDIR="${pkgdir}" install
+ cd "$srcdir/mjpg-streamer-$_commit/mjpg-streamer-experimental"
+ make DESTDIR="$pkgdir" install
}