main/libdc1394: use upstream patch

3 files changed, 42 insertions, 39 deletions

diff --git a/main/libdc1394/0001-Fix-bad-variable-type-uint-int.patch b/main/libdc1394/0001-Fix-bad-variable-type-uint-int.patch
new file mode 100644
index 0000000000..c2a5728571
--- /dev/null
+++ b/main/libdc1394/0001-Fix-bad-variable-type-uint-int.patch
@@ -0,0 +1,37 @@
+From 9d0c3158bc73292ca755477f60cbf5b5fd622fde Mon Sep 17 00:00:00 2001
+From: Damien Douxchamps <ddsf@douxchamps.net>
+Date: Thu, 12 Jan 2017 16:47:27 +0900
+Subject: [PATCH] Fix bad variable type uint -> int
+
+Type was change to uint in recent commit but it should have been INT.
+
+Signed-off-by: Damien Douxchamps <ddsf@douxchamps.net>
+---
+ libdc1394/AUTHORS        | 1 +
+ libdc1394/dc1394/bayer.c | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libdc1394/dc1394/bayer.c b/libdc1394/dc1394/bayer.c
+index 10a4c1b..cbdc417 100644
+--- a/dc1394/bayer.c
++++ b/dc1394/bayer.c
+@@ -24,6 +24,7 @@
+ #include <limits.h>
+ #include <math.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ #include <string.h>
+ #include "conversions.h"
+ 
+@@ -775,7 +776,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;
++	int tmp;
+ 	int st=sx*sy;
+ 	int p;
+ 	int sx2=sx<<1;
+-- 
+2.11.0
+
diff --git a/main/libdc1394/0001-Fix-build-with-musl-libc.patch b/main/libdc1394/0001-Fix-build-with-musl-libc.patch
deleted file mode 100644
index 9e7316375a..0000000000
--- a/main/libdc1394/0001-Fix-build-with-musl-libc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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 a70c511330..20b417b90e 100644
--- a/main/libdc1394/APKBUILD
+++ b/main/libdc1394/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libdc1394
 pkgver=2.2.5
-pkgrel=0
+pkgrel=1
 pkgdesc="High level programming interface to control IEEE 1394 based cameras"
 url="http://damien.douxchamps.net/ieee1394/libdc1394/"
 arch="all"
@@ -13,7 +13,7 @@ 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
-	0001-Fix-build-with-musl-libc.patch
+	0001-Fix-bad-variable-type-uint-int.patch
 	"
 
 builddir="$srcdir"/libdc1394-$pkgver
@@ -55,8 +55,8 @@ package() {
 #}
 
 md5sums="01acfcde2cc85863b0acb90dcffa1659  libdc1394-2.2.5.tar.gz
-ab577e13d2efb2e426c726965989c6be  0001-Fix-build-with-musl-libc.patch"
+bcfa1b825e8c8497884ee571a212618f  0001-Fix-bad-variable-type-uint-int.patch"
 sha256sums="350cc8d08aee5ffc4e1f3049e2e1c2bc6660642d424595157da97ab5b1263337  libdc1394-2.2.5.tar.gz
-f58f9c7177d2713959f2e8b9c9bb02124027d3fd17137f2191f65373a88dece2  0001-Fix-build-with-musl-libc.patch"
+6b3d38005b61e40514592f0aeb0279620a3349f91f919392ff0add825b4fa975  0001-Fix-bad-variable-type-uint-int.patch"
 sha512sums="4a02560b7b2db7199b91c35786cb9d5af51398795fc1b7f0cb577d3563b27c0d03d407fa472d9756a2f87b658350a55d29c16fef401a74f835ba86e25214d13c  libdc1394-2.2.5.tar.gz
-7ce7c49941ca1240f9a93492aea77681ca8c29911cc7f9be90708b05a3c5993d3aac2b550c3d5c3e7e4f7a5203850dbbedf77f6a715525aaea366fce7e767cc6  0001-Fix-build-with-musl-libc.patch"
+ab19b1aecec17b1caa6b225f626b6adcf80818cb59f693df69e9f0f2b4014846be22aa93473a62da8c7ae937ea8265f90499a9561d48e6bfe931e1e00cb16c60  0001-Fix-bad-variable-type-uint-int.patch"