summaryrefslogtreecommitdiff
path: root/user/libraw1394
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-07-15 23:16:29 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-07-15 23:16:29 -0500
commit93c681497f2c194995304544bbae726b8c8c7f73 (patch)
treee4efb6112dd37cce1abf3bd0ce4fe146824dcba8 /user/libraw1394
parentbc67c03b9689bdd3015d63ce401d0af4b835abc9 (diff)
downloadpackages-93c681497f2c194995304544bbae726b8c8c7f73.tar.gz
packages-93c681497f2c194995304544bbae726b8c8c7f73.tar.bz2
packages-93c681497f2c194995304544bbae726b8c8c7f73.tar.xz
packages-93c681497f2c194995304544bbae726b8c8c7f73.zip
user/libraw1394: pull in, fix
Diffstat (limited to 'user/libraw1394')
-rw-r--r--user/libraw1394/APKBUILD43
-rw-r--r--user/libraw1394/fix-types.patch62
2 files changed, 105 insertions, 0 deletions
diff --git a/user/libraw1394/APKBUILD b/user/libraw1394/APKBUILD
new file mode 100644
index 000000000..0c8bb3501
--- /dev/null
+++ b/user/libraw1394/APKBUILD
@@ -0,0 +1,43 @@
+# Maintainer:
+pkgname=libraw1394
+pkgver=2.1.2
+pkgrel=2
+pkgdesc="Library to provide access to FireWire devices"
+url="https://sourceforge.net/projects/libraw1394"
+arch="all"
+license="LGPL-2.1+"
+depends=""
+makedepends="linux-headers"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
+source="https://kernel.org/pub/linux/libs/ieee1394/$pkgname-$pkgver.tar.xz"
+
+build() {
+ cd "$builddir"
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --disable-static
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+tools() {
+ pkgdesc="FireWire management tools"
+ mkdir -p "$subpkgdir"/usr/
+ mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+}
+
+sha512sums="1ef38961b747c4ebb18d823a4c38d5bf019f8bd0ac55547838d153b1899b91ae0ff56f5b6732e309d6975b55725d1ce989917ffcf605cf64f7d33624f54f0567 libraw1394-2.1.2.tar.xz"
diff --git a/user/libraw1394/fix-types.patch b/user/libraw1394/fix-types.patch
new file mode 100644
index 000000000..d82cf815a
--- /dev/null
+++ b/user/libraw1394/fix-types.patch
@@ -0,0 +1,62 @@
+diff -ru libraw1394-2.1.0.orig/src/fw-iso.c libraw1394-2.1.0/src/fw-iso.c
+--- libraw1394-2.1.0.orig/src/fw-iso.c 2012-06-27 23:10:19.000000000 +0300
++++ libraw1394-2.1.0/src/fw-iso.c 2013-09-30 17:38:30.070506505 +0300
+@@ -303,7 +303,7 @@
+ }
+
+ static int handle_iso_event(raw1394handle_t handle,
+- struct epoll_closure *closure, __uint32_t events)
++ struct epoll_closure *closure, uint32_t events)
+ {
+ fw_handle_t fwhandle = handle->mode.fw;
+ struct fw_cdev_event_iso_interrupt *interrupt;
+diff -ru libraw1394-2.1.0.orig/src/fw.c libraw1394-2.1.0/src/fw.c
+--- libraw1394-2.1.0.orig/src/fw.c 2012-07-08 21:27:52.000000000 +0300
++++ libraw1394-2.1.0/src/fw.c 2013-09-30 17:38:30.070506505 +0300
+@@ -187,7 +187,7 @@
+
+ static int
+ handle_echo_pipe(raw1394handle_t handle,
+- struct epoll_closure *ec, __uint32_t events)
++ struct epoll_closure *ec, uint32_t events)
+ {
+ quadlet_t value;
+
+@@ -258,7 +258,7 @@
+
+ static int
+ handle_device_event(raw1394handle_t handle,
+- struct epoll_closure *ec, __uint32_t events)
++ struct epoll_closure *ec, uint32_t events)
+ {
+ fw_handle_t fwhandle = handle->mode.fw;
+ union fw_cdev_event *u;
+@@ -421,7 +421,7 @@
+
+ static int
+ handle_inotify(raw1394handle_t handle, struct epoll_closure *ec,
+- __uint32_t events)
++ uint32_t events)
+ {
+ fw_handle_t fwhandle = handle->mode.fw;
+ struct inotify_event *event;
+diff -ru libraw1394-2.1.0.orig/src/fw.h libraw1394-2.1.0/src/fw.h
+--- libraw1394-2.1.0.orig/src/fw.h 2012-07-08 21:27:52.000000000 +0300
++++ libraw1394-2.1.0/src/fw.h 2013-09-30 17:38:42.330440087 +0300
+@@ -12,6 +12,7 @@
+ #ifndef LIBRAW1394_FW_H
+ #define LIBRAW1394_FW_H
+
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <byteswap.h>
+
+@@ -48,7 +49,7 @@
+
+ struct epoll_closure {
+ int (*func)(raw1394handle_t handle,
+- struct epoll_closure *closure, __uint32_t events);
++ struct epoll_closure *closure, uint32_t events);
+ };
+
+ struct port {