main/v4l-utils: fix build, now libdvbv5 is linked against udev

1 files changed, 21 insertions, 21 deletions

diff --git a/main/v4l-utils/APKBUILD b/main/v4l-utils/APKBUILD
index ae05d38856..3d3749fc1d 100644
--- a/main/v4l-utils/APKBUILD
+++ b/main/v4l-utils/APKBUILD
@@ -2,23 +2,24 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=v4l-utils
 pkgver=1.12.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 url="http://freshmeat.net/projects/libv4l"
 arch="all"
 license="LGPL2+"
-depends=""
-makedepends="qt-dev libjpeg-turbo-dev argp-standalone linux-headers"
-install=""
+makedepends="qt-dev libjpeg-turbo-dev argp-standalone linux-headers eudev-dev"
 subpackages="$pkgname-dev $pkgname-doc qv4l2 $pkgname-dvbv5 $pkgname-libs ir_keytable"
 source="http://linuxtv.org/downloads/v4l-utils/$pkgname-$pkgver.tar.bz2
 	qv4l2.svg
 	qv4l2.desktop
-	0001-ir-ctl-fixes-for-musl-compile.patch
-	"
-
+	0001-ir-ctl-fixes-for-musl-compile.patch"
 builddir="$srcdir"/$pkgname-$pkgver
 
+check() {
+	cd "$builddir"
+	make check
+}
+
 build() {
 	cd "$builddir"
 	[ "$CLIBC" = "musl" ] && export CFLAGS="$CFLAGS -D__off_t=off_t"
@@ -31,17 +32,16 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
-		--disable-static \
 		--enable-libdvbv5 \
-		|| return 1
-        make || return 1
+		--disable-static
+        make
 }
 
 package() {
         cd "$builddir"
-        make -j1 DESTDIR="$pkgdir" install || return 1
+        make -j1 DESTDIR="$pkgdir" install
 	install -Dm644 "$srcdir"/qv4l2.desktop \
-		"$pkgdir"/usr/share/applications/qv4l2.desktop || return 1
+		"$pkgdir"/usr/share/applications/qv4l2.desktop
 	install -Dm644 "$srcdir"/qv4l2.svg \
 		"$pkgdir"/usr/share/icons/hicolor/scalable/apps/qv4l2.svg
 }
@@ -49,8 +49,8 @@ package() {
 qv4l2() {
 	pkgdesc="QT v4l2 test control and streaming test application"
 	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/qv4l2 "$subpkgdir"/usr/bin/ || return 1
-	mv "$pkgdir"/usr/share "$subpkgdir"/usr/ || return 1
+	mv "$pkgdir"/usr/bin/qv4l2 "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/share "$subpkgdir"/usr/
 }
 
 dvbv5() {
@@ -58,16 +58,16 @@ dvbv5() {
 	mkdir -p "$subpkgdir"/usr/bin \
 		"$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/bin/dvb* \
-		"$subpkgdir"/usr/bin/ || return 1
+		"$subpkgdir"/usr/bin/
 	mv "$pkgdir"/usr/lib/libdvbv5.* \
-		"$subpkgdir"/usr/lib/ || return 1
+		"$subpkgdir"/usr/lib/
 }
 
 libs() {
 	pkgdesc="Collection of video4linux support libraries"
 	mkdir -p "$subpkgdir"/usr/lib
         mv "$pkgdir"/usr/lib/* \
-                "$subpkgdir"/usr/lib || return 1
+                "$subpkgdir"/usr/lib
 }
 
 ir_keytable() {
@@ -77,13 +77,13 @@ ir_keytable() {
 		"$subpkgdir"/usr/bin \
 		"$subpkgdir"/etc
 	mv "$pkgdir"/lib/udev/rc_keymaps/* \
-                "$subpkgdir"/lib/udev/rc_keymaps || return 1
+                "$subpkgdir"/lib/udev/rc_keymaps
 	mv "$pkgdir"/lib/udev/rules.d/* \
-		"$subpkgdir"/lib/udev/rules.d || return 1
+		"$subpkgdir"/lib/udev/rules.d
 	mv "$pkgdir"/usr/bin/ir-keytable \
-		"$subpkgdir"/usr/bin || return 1
+		"$subpkgdir"/usr/bin
 	mv "$pkgdir"/etc/rc_maps.cfg \
-		"$subpkgdir"/etc || return 1
+		"$subpkgdir"/etc
 }
 
 sha512sums="6d0269d900c5dad08499ee551ce1507b8b750895f48423ccd534db51cf68794b59a279743fd22dc6da0c092ca31ef744aa564f26b6d6252cbbc7a62e2e1c714a  v4l-utils-1.12.3.tar.bz2