summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
authorKiyoshi Aman <kiyoshi.aman+adelie@gmail.com>2019-06-04 07:10:36 -0500
committerKiyoshi Aman <kiyoshi.aman+adelie@gmail.com>2019-06-04 07:55:09 -0500
commitc9562939bcd80c3697333d07bcaec47495b7e234 (patch)
tree9fe14e86b6d2d163d9c5f6d050d7ba6c0b42aa67 /user
parent3956603f428502c3be78f7307fb228b9bc3fadef (diff)
downloadpackages-c9562939bcd80c3697333d07bcaec47495b7e234.tar.gz
packages-c9562939bcd80c3697333d07bcaec47495b7e234.tar.bz2
packages-c9562939bcd80c3697333d07bcaec47495b7e234.tar.xz
packages-c9562939bcd80c3697333d07bcaec47495b7e234.zip
user/libdc1394: upgrade to 2.2.6
Diffstat (limited to 'user')
-rw-r--r--user/libdc1394/0001-Fix-bad-variable-type-uint-int.patch37
-rw-r--r--user/libdc1394/APKBUILD11
2 files changed, 4 insertions, 44 deletions
diff --git a/user/libdc1394/0001-Fix-bad-variable-type-uint-int.patch b/user/libdc1394/0001-Fix-bad-variable-type-uint-int.patch
deleted file mode 100644
index c2a572857..000000000
--- a/user/libdc1394/0001-Fix-bad-variable-type-uint-int.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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/user/libdc1394/APKBUILD b/user/libdc1394/APKBUILD
index 8bed91739..d36d55a47 100644
--- a/user/libdc1394/APKBUILD
+++ b/user/libdc1394/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer:
pkgname=libdc1394
-pkgver=2.2.5
-pkgrel=4
+pkgver=2.2.6
+pkgrel=0
pkgdesc="Programming interface to control FireWire / IIDC cameras"
url="https://damien.douxchamps.net/ieee1394/libdc1394/"
arch="all"
@@ -12,9 +12,7 @@ depends=""
depends_dev="libusb-dev libraw1394-dev"
makedepends="$depends_dev linux-headers"
subpackages="$pkgname-dev $pkgname-doc"
-source="https://downloads.sourceforge.net/project/libdc1394/libdc1394-2/$pkgver/libdc1394-$pkgver.tar.gz
- 0001-Fix-bad-variable-type-uint-int.patch
- "
+source="https://downloads.sourceforge.net/project/libdc1394/libdc1394-2/$pkgver/libdc1394-$pkgver.tar.gz"
build() {
cd "$builddir"
@@ -34,5 +32,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="4a02560b7b2db7199b91c35786cb9d5af51398795fc1b7f0cb577d3563b27c0d03d407fa472d9756a2f87b658350a55d29c16fef401a74f835ba86e25214d13c libdc1394-2.2.5.tar.gz
-ab19b1aecec17b1caa6b225f626b6adcf80818cb59f693df69e9f0f2b4014846be22aa93473a62da8c7ae937ea8265f90499a9561d48e6bfe931e1e00cb16c60 0001-Fix-bad-variable-type-uint-int.patch"
+sha512sums="2d60ed1054da67d8518e870193b60c1d79778858f48cc6487e252de00cc57a08548515d41914a37d0227d29e158d68892c290f83930ffd95f4a483dce5aa3d25 libdc1394-2.2.6.tar.gz"