main/libdc1394: upgrade to 2.2.5

3 files changed, 48 insertions, 45 deletions

diff --git a/main/libdc1394/0001-Fix-build-with-musl-libc.patch b/main/libdc1394/0001-Fix-build-with-musl-libc.patch
new file mode 100644
index 0000000000..9e7316375a
--- /dev/null
+++ b/main/libdc1394/0001-Fix-build-with-musl-libc.patch
@@ -0,0 +1,34 @@
+From d71ad4f86fe0c356920cf80281b79ee4906ed508 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 22 Dec 2016 13:25:49 +0000
+Subject: [PATCH] Fix build with musl libc
+
+Use standard integer type instead of uint. This fixes the following
+error which occurs with musl libc:
+
+bayer.c: In function 'dc1394_bayer_Downsample':
+bayer.c:778:2: error: unknown type name 'uint'
+  uint tmp;
+  ^~~~
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ libdc1394/dc1394/bayer.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libdc1394/dc1394/bayer.c b/libdc1394/dc1394/bayer.c
+index 10a4c1b..c348c24 100644
+--- a/dc1394/bayer.c
++++ b/dc1394/bayer.c
+@@ -775,7 +775,7 @@ dc1394_bayer_Downsample(const uint8_t *restrict bayer, uint8_t *restrict rgb, in
+ {
+ 	uint8_t *outR, *outG, *outB;
+ 	register int i, j;
+-	uint tmp;
++	unsigned int tmp;
+ 	int st=sx*sy;
+ 	int p;
+ 	int sx2=sx<<1;
+-- 
+2.11.0
+
diff --git a/main/libdc1394/APKBUILD b/main/libdc1394/APKBUILD
index 696a1db5af..a70c511330 100644
--- a/main/libdc1394/APKBUILD
+++ b/main/libdc1394/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libdc1394
-pkgver=2.2.4
+pkgver=2.2.5
 pkgrel=0
 pkgdesc="High level programming interface to control IEEE 1394 based cameras"
 url="http://damien.douxchamps.net/ieee1394/libdc1394/"
@@ -12,12 +12,14 @@ depends_dev="libusb-dev libraw1394-dev"
 makedepends="$depends_dev linux-headers"
 install=""
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/$pkgver/libdc1394-$pkgver.tar.gz"
+source="http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/$pkgver/libdc1394-$pkgver.tar.gz
+	0001-Fix-build-with-musl-libc.patch
+	"
 
-_builddir="$srcdir"/libdc1394-$pkgver
+builddir="$srcdir"/libdc1394-$pkgver
 prepare() {
 	local i
-	cd "$_builddir"
+	cd "$builddir"
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
@@ -26,7 +28,7 @@ prepare() {
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -40,7 +42,7 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 
@@ -52,6 +54,9 @@ package() {
 #	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
 #}
 
-md5sums="620eb745d64b714c6009f3e6f2ba33ec  libdc1394-2.2.4.tar.gz"
-sha256sums="a93689a353c241884a98727128f315ecf9965db70dca710b08af10e5fa0d2e6f  libdc1394-2.2.4.tar.gz"
-sha512sums="adb461fc5562855c3d26279971e25f38f3356c21e6be3fe343390c322d78f2515cf071da00da0ff39aec0d08147851354a2a0dbf325ad2fc179659e6ef5ab6e9  libdc1394-2.2.4.tar.gz"
+md5sums="01acfcde2cc85863b0acb90dcffa1659  libdc1394-2.2.5.tar.gz
+ab577e13d2efb2e426c726965989c6be  0001-Fix-build-with-musl-libc.patch"
+sha256sums="350cc8d08aee5ffc4e1f3049e2e1c2bc6660642d424595157da97ab5b1263337  libdc1394-2.2.5.tar.gz
+f58f9c7177d2713959f2e8b9c9bb02124027d3fd17137f2191f65373a88dece2  0001-Fix-build-with-musl-libc.patch"
+sha512sums="4a02560b7b2db7199b91c35786cb9d5af51398795fc1b7f0cb577d3563b27c0d03d407fa472d9756a2f87b658350a55d29c16fef401a74f835ba86e25214d13c  libdc1394-2.2.5.tar.gz
+7ce7c49941ca1240f9a93492aea77681ca8c29911cc7f9be90708b05a3c5993d3aac2b550c3d5c3e7e4f7a5203850dbbedf77f6a715525aaea366fce7e767cc6  0001-Fix-build-with-musl-libc.patch"
diff --git a/main/libdc1394/conditional-dc1394_vloopback.patch b/main/libdc1394/conditional-dc1394_vloopback.patch
deleted file mode 100644
index 308d539636..0000000000
--- a/main/libdc1394/conditional-dc1394_vloopback.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: David Moore <david.moore@gmail.com>
-Date: Mon, 28 Mar 2011 05:48:15 +0000 (-0700)
-Subject: Conditionally compile dc1394_vloopback only when linux/videodev.h exists
-X-Git-Url: http://libdc1394.git.sourceforge.net/git/gitweb.cgi?p=libdc1394%2Flibdc1394;a=commitdiff_plain;h=2ee7e7f98dd6225b40d5cd570c240504be7bc86a
-
-Conditionally compile dc1394_vloopback only when linux/videodev.h exists
----
-
-diff --git a/configure.in b/libdc1394/configure.in
-index 69babab..bdddc9b 100644
---- a/configure.in
-+++ b/configure.in
-@@ -75,6 +75,9 @@ AM_CONDITIONAL(HAVE_WINDOWS, test x$have_windows = xtrue)
- AM_CONDITIONAL(HAVE_LIBRAW1394, test x$libraw1394 = xtrue)
- AM_CONDITIONAL(HAVE_LIBUSB, test "x$LIBUSB_LIBS" != "x")
- 
-+AC_CHECK_HEADER([linux/videodev.h], [have_videodev=true])
-+AM_CONDITIONAL(HAVE_VIDEODEV, test x$have_videodev = xtrue)
-+
- AC_ARG_ENABLE([examples], [AS_HELP_STRING([--disable-examples], [don't build example programs])], [build_examples=$enableval], [build_examples=true])
- 
- AM_CONDITIONAL(MAKE_EXAMPLES, test x$build_examples = xtrue)
-diff --git a/libdc1394/examples/Makefile.am b/libdc1394/examples/Makefile.am
-index fcebf18..035612e 100644
---- a/examples/Makefile.am
-+++ b/examples/Makefile.am
-@@ -8,7 +8,9 @@ A = grab_gray_image grab_partial_image grab_color_image \
- B = dc1394_reset_bus
- 
- if HAVE_LINUX
-+if HAVE_VIDEODEV
- B += dc1394_vloopback
-+endif
- if HAVE_XV
- A += dc1394_multiview
- endif