From a060591ca04ae04228e7c9163c6b2d43a7b12cf8 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 3 Jul 2014 12:50:37 +0200
Subject: [PATCH] v4l-utils: update to 1.2.1.

---
 common/shlibs              |  1 +
 srcpkgs/qv4l2/template     | 10 +++-------
 srcpkgs/v4l-utils/template | 17 +++--------------
 3 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 657e85f9f4..2799f1eb3c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -786,6 +786,7 @@ libva-wayland.so.1 libva-1:1.3.0_1
 libv4l2.so.0 v4l-utils-0.8.5_1
 libv4lconvert.so.0 v4l-utils-0.8.5_1
 libv4l1.so.0 v4l-utils-0.8.5_1
+libv4l2rds.so.0 v4l-utils-1.2.1_1
 libclutter-gst-1.0.so.0 clutter-gst-1.5.4_1
 libmx-1.0.so.2 mx-1.4.3_1_1
 libmx-gtk-1.0.so.0 mx-1.4.3_1_1
diff --git a/srcpkgs/qv4l2/template b/srcpkgs/qv4l2/template
index ef49637cef..883d370926 100644
--- a/srcpkgs/qv4l2/template
+++ b/srcpkgs/qv4l2/template
@@ -1,11 +1,11 @@
 # Template file for 'qv4l2'
 pkgname=qv4l2
-version=1.0.1
+version=1.2.1
 revision=1
 wrksrc="v4l-utils-${version}"
 build_style=gnu-configure
 configure_args="--enable-qv4l2 --with-udevdir=/usr/lib/udev"
-hostmakedepends="libtool which pkg-config"
+hostmakedepends="which pkg-config"
 makedepends="libjpeg-turbo-devel libsysfs-devel qt-devel hicolor-icon-theme desktop-file-utils"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="QT v4l2 control panel application"
@@ -13,11 +13,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://freshmeat.net/projects/libv4l"
 license="GPL-2, LGPL-2.1"
 distfiles="http://linuxtv.org/downloads/v4l-utils/v4l-utils-${version}.tar.bz2"
-checksum=fc0132e82a18dfad9619be3abf50c206e2f449b1c14440cde36f25874fdce7df
-
-pre_configure() {
-	libtoolize -f
-}
+checksum=9b658fbcaaf8127115316e07fea314aebc21dd6dc3491cd8753a768521c4b9af
 
 do_install() {
 	cd utils/qv4l2
diff --git a/srcpkgs/v4l-utils/template b/srcpkgs/v4l-utils/template
index 0ba395cd3e..658a922a68 100644
--- a/srcpkgs/v4l-utils/template
+++ b/srcpkgs/v4l-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'v4l-utils'
 pkgname=v4l-utils
-version=1.0.1
-revision=3
+version=1.2.1
+revision=1
 build_style=gnu-configure
 configure_args="--disable-qv4l2 --with-udevdir=/usr/lib/udev"
 hostmakedepends="libtool which pkg-config"
@@ -12,18 +12,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://freshmeat.net/projects/libv4l"
 license="GPL-2, LGPL-2.1"
 distfiles="http://linuxtv.org/downloads/$pkgname/$pkgname-$version.tar.bz2"
-checksum=fc0132e82a18dfad9619be3abf50c206e2f449b1c14440cde36f25874fdce7df
-
-if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
-	configure_args+=" --libdir=/usr/lib32"
-	pre_install() {
-		vmkdir usr/lib
-		ln -s lib ${DESTDIR}/usr/lib32
-	}
-	post_install() {
-		rm ${DESTDIR}/usr/lib32
-	}
-fi
+checksum=9b658fbcaaf8127115316e07fea314aebc21dd6dc3491cd8753a768521c4b9af
 
 pre_configure() {
 	libtoolize -f