aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Colista <fcolista@alpinelinux.org>2014-12-16 10:27:49 +0000
committerFrancesco Colista <fcolista@alpinelinux.org>2014-12-16 10:27:49 +0000
commited7677e2640ee17955fdd924af1b9698cb41d9d2 (patch)
tree01e1568c1018d09b1a1cd4dd2b385cc6da7086b3
parent1568fac0eb51fca62637eb4221da1ab402b2f066 (diff)
downloadaports-ed7677e2640ee17955fdd924af1b9698cb41d9d2.tar.bz2
aports-ed7677e2640ee17955fdd924af1b9698cb41d9d2.tar.xz
main/v4l-utils: upgrade to 1.6.2
-rw-r--r--main/v4l-utils/APKBUILD16
-rw-r--r--main/v4l-utils/fix-compliance.patch21
2 files changed, 14 insertions, 23 deletions
diff --git a/main/v4l-utils/APKBUILD b/main/v4l-utils/APKBUILD
index 564ee10ef3..d81c7274c4 100644
--- a/main/v4l-utils/APKBUILD
+++ b/main/v4l-utils/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Francesco Colista <francesco.colista@gmail.com>
pkgname=v4l-utils
-pkgver=1.0.1
+pkgver=1.6.2
pkgrel=0
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"
+makedepends="qt-dev libjpeg-turbo-dev argp-standalone linux-headers"
install=""
subpackages="$pkgname-dev qv4l2 $pkgname-dvbv5"
source="http://linuxtv.org/downloads/v4l-utils/$pkgname-$pkgver.tar.bz2
@@ -75,15 +75,15 @@ dvbv5() {
"$subpkgdir"/usr/lib/ || return 1
}
-md5sums="b06ea8b15e27cff352b4536e835448bc v4l-utils-1.0.1.tar.bz2
-03ff8a10297477ca274a051ef6e622e0 fix-compliance.patch
+md5sums="9cb3c178f937954e65bf30920af433ef v4l-utils-1.6.2.tar.bz2
+53cebe0358ebef84eecea1c97a57bacf fix-compliance.patch
75ef594ddfe48e48df99c96c2af6b51e qv4l2.svg
b2e51f9663cee1c38a1d99d76a6b529f qv4l2.desktop"
-sha256sums="fc0132e82a18dfad9619be3abf50c206e2f449b1c14440cde36f25874fdce7df v4l-utils-1.0.1.tar.bz2
-2baccef9aecc1d1ae658d27a48662e0748c663cfc95985faf68bee219def843e fix-compliance.patch
+sha256sums="d3d6eb1f0204fb11f3d318bfca35d5f73cc077f88fac7665a47856a16496be7d v4l-utils-1.6.2.tar.bz2
+8a9ad49b5ea0580aad949fe60dd3e616914d682988b07f0b51499957ef464611 fix-compliance.patch
b1dad7c1649881be8e66f4d9d0f32206796dd0a10dd936c342426ec64cf9c77c qv4l2.svg
1c5739631e37a7338409ea8b5c797a6888fd9a595e72d9dc96dd634df26373f3 qv4l2.desktop"
-sha512sums="2d107fccaa62841828c92fa19dbcc6cb7dea59f4315e683c9384dd91a3ca9df4940ede06c7b5732b1005550810428d150d9d33b1a2199b118ba69c683bb031cc v4l-utils-1.0.1.tar.bz2
-1f0e8ad5cde8d66cabad4b670b0911650756ea293711438e37fd7161603fa047d4858fc9e7e7cbf794775da7eddbfcd21c4cb896e9b8f2df64c403dedddb3cd1 fix-compliance.patch
+sha512sums="e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2 v4l-utils-1.6.2.tar.bz2
+5f8d656c9614b23a61bb303214a90b24021495716e8101dc7f691b6d8d9c307d85861fbcc9ef732d01c98491eebae70047a340bc518271f29c830fced0201f21 fix-compliance.patch
bc18280046c15b19984103f7c2bb44a0aea79715803c64f0c64bc932499c09022c956914c3b15ae59499adc09f6fbff5378be45707fe851250f495a26b63d682 qv4l2.svg
6f74aa524b3de420eeb8de788ff3f717020732a3f1f6530caee50e63aae7eddbe5f551ffc50065c9f5d6078c13bace089948ecdcacf01f8b82c1a44960e06315 qv4l2.desktop"
diff --git a/main/v4l-utils/fix-compliance.patch b/main/v4l-utils/fix-compliance.patch
index 4ce0cd7536..34b85eeb55 100644
--- a/main/v4l-utils/fix-compliance.patch
+++ b/main/v4l-utils/fix-compliance.patch
@@ -1,5 +1,5 @@
---- v4l-utils-1.0.0.orig/lib/libv4l1/v4l1compat.c
-+++ v4l-utils-1.0.0/lib/libv4l1/v4l1compat.c
+--- a/lib/libv4l1/v4l1compat.c
++++ b/lib/libv4l1/v4l1compat.c
@@ -62,7 +62,7 @@
return fd;
}
@@ -30,8 +30,8 @@
LIBV4L_PUBLIC void *mmap64(void *start, size_t length, int prot, int flags, int fd,
__off64_t offset)
{
---- v4l-utils-1.0.0.orig/lib/libv4l2/v4l2convert.c
-+++ v4l-utils-1.0.0/lib/libv4l2/v4l2convert.c
+--- a/lib/libv4l2/v4l2convert.c
++++ b/lib/libv4l2/v4l2convert.c
@@ -86,7 +86,7 @@
return fd;
}
@@ -62,8 +62,8 @@
LIBV4L_PUBLIC void *mmap64(void *start, size_t length, int prot, int flags, int fd,
__off64_t offset)
{
---- v4l-utils-1.0.0.orig/lib/libv4lconvert/libv4lsyscall-priv.h
-+++ v4l-utils-1.0.0/lib/libv4lconvert/libv4lsyscall-priv.h
+--- a/lib/libv4lconvert/libv4lsyscall-priv.h
++++ b/lib/libv4lconvert/libv4lsyscall-priv.h
@@ -41,7 +41,9 @@
#include <linux/ioctl.h>
/* On 32 bits archs we always use mmap2, on 64 bits archs there is no mmap2 */
@@ -74,13 +74,4 @@
#define MMAP2_PAGE_SHIFT 12
#else
#define SYS_mmap2 SYS_mmap
---- v4l-utils-1.0.0.orig/utils/qv4l2/v4l2-api.h
-+++ v4l-utils-1.0.0/utils/qv4l2/v4l2-api.h
-@@ -21,6 +21,7 @@
- #define V4L2_API_H
-
- #include <QString>
-+#include <stdint.h>
- #include <linux/videodev2.h>
- #include <libv4lconvert.h>