Commit 3a9a9073 authored by Leo's avatar Leo Committed by Natanael Copa

main/libdc1394: upgrade to 2.2.6

- Remove obsolete patch
- Fix license
- Modernize
- add !check
parent afed61da
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
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libdc1394
pkgver=2.2.5
pkgrel=1
pkgver=2.2.6
pkgrel=0
pkgdesc="High level programming interface to control IEEE 1394 based cameras"
url="https://damien.douxchamps.net/ieee1394/libdc1394/"
options="!check"
arch="all"
license="LGPL"
depends=
license="LGPL-2.1-or-later"
depends_dev="libusb-dev libraw1394-dev"
makedepends="$depends_dev linux-headers"
install=""
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"
builddir="$srcdir"/libdc1394-$pkgver
prepare() {
local i
cd "$builddir"
for i in $source; do
case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
esac
done
}
builddir="$srcdir"/$pkgname-$pkgver
build() {
cd "$builddir"
......@@ -36,14 +25,13 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--localstatedir=/var \
|| return 1
make || return 1
--localstatedir=/var
make
}
package() {
cd "$builddir"
make DESTDIR="$pkgdir" install || return 1
make DESTDIR="$pkgdir" install
}
# there is on ly one tool and its only 4k...
......@@ -54,9 +42,4 @@ package() {
# mv "$pkgdir"/usr/bin "$subpkgdir"/usr
#}
md5sums="01acfcde2cc85863b0acb90dcffa1659 libdc1394-2.2.5.tar.gz
bcfa1b825e8c8497884ee571a212618f 0001-Fix-bad-variable-type-uint-int.patch"
sha256sums="350cc8d08aee5ffc4e1f3049e2e1c2bc6660642d424595157da97ab5b1263337 libdc1394-2.2.5.tar.gz
6b3d38005b61e40514592f0aeb0279620a3349f91f919392ff0add825b4fa975 0001-Fix-bad-variable-type-uint-int.patch"
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"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment