diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-07-21 02:48:02 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-07-21 02:48:02 -0500 |
| commit | 830b3ff955c18c4cfc65135e293b47ab85eeab5f (patch) | |
| tree | f61d933269ee0f547c86e9d51b098d155525e5fc /user | |
| parent | 6e7a0124602fdd8475eb132b0de8ad9e68595939 (diff) | |
| download | packages-830b3ff955c18c4cfc65135e293b47ab85eeab5f.tar.gz packages-830b3ff955c18c4cfc65135e293b47ab85eeab5f.tar.bz2 packages-830b3ff955c18c4cfc65135e293b47ab85eeab5f.tar.xz packages-830b3ff955c18c4cfc65135e293b47ab85eeab5f.zip | |
user/libdc1394: pull in, fix up, modernise
Diffstat (limited to 'user')
| -rw-r--r-- | user/libdc1394/0001-Fix-bad-variable-type-uint-int.patch | 37 | ||||
| -rw-r--r-- | user/libdc1394/APKBUILD | 38 |
2 files changed, 75 insertions, 0 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 new file mode 100644 index 000000000..c2a572857 --- /dev/null +++ b/user/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/user/libdc1394/APKBUILD b/user/libdc1394/APKBUILD new file mode 100644 index 000000000..8bed91739 --- /dev/null +++ b/user/libdc1394/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: +pkgname=libdc1394 +pkgver=2.2.5 +pkgrel=4 +pkgdesc="Programming interface to control FireWire / IIDC cameras" +url="https://damien.douxchamps.net/ieee1394/libdc1394/" +arch="all" +options="!check" # No test suite. +license="LGPL-2.1+" +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 + " + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="4a02560b7b2db7199b91c35786cb9d5af51398795fc1b7f0cb577d3563b27c0d03d407fa472d9756a2f87b658350a55d29c16fef401a74f835ba86e25214d13c libdc1394-2.2.5.tar.gz +ab19b1aecec17b1caa6b225f626b6adcf80818cb59f693df69e9f0f2b4014846be22aa93473a62da8c7ae937ea8265f90499a9561d48e6bfe931e1e00cb16c60 0001-Fix-bad-variable-type-uint-int.patch" |