aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-04-02 14:16:17 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-04-02 14:16:17 +0000
commit35e723d1b4c7b57daad8977074621c57f5bdeedc (patch)
treeab9ca5c346bc2f6c89269d2d9e4e0f861495bc93
parente691ba4ff9d35731480a4eadf24a1390853929e1 (diff)
downloadaports-35e723d1b4c7b57daad8977074621c57f5bdeedc.tar.bz2
aports-35e723d1b4c7b57daad8977074621c57f5bdeedc.tar.xz
main/dvgrab: build fix for musl
-rw-r--r--main/dvgrab/APKBUILD13
-rw-r--r--main/dvgrab/musl-fixes.patch24
2 files changed, 34 insertions, 3 deletions
diff --git a/main/dvgrab/APKBUILD b/main/dvgrab/APKBUILD
index 7e9157bf7..afe717634 100644
--- a/main/dvgrab/APKBUILD
+++ b/main/dvgrab/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dvgrab
pkgver=3.5
-pkgrel=1
+pkgrel=2
pkgdesc="Utility to capture video from a DV camera"
url="http://www.kinodv.org/"
arch="all"
@@ -12,7 +12,9 @@ makedepends="libraw1394-dev libavc1394-dev libdv-dev libiec61883-dev
libjpeg-turbo-dev"
install=""
subpackages="$pkgname-doc"
-source="http://prdownloads.sourceforge.net/kino/dvgrab-$pkgver.tar.gz"
+source="http://prdownloads.sourceforge.net/kino/dvgrab-$pkgver.tar.gz
+ musl-fixes.patch
+ "
_builddir="$srcdir"/dvgrab-$pkgver
prepare() {
@@ -44,4 +46,9 @@ package() {
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="b39a242ce63e80fc347ab59931f75649 dvgrab-3.5.tar.gz"
+md5sums="b39a242ce63e80fc347ab59931f75649 dvgrab-3.5.tar.gz
+363ed7fe045422e4e7001e19ae2a7f6c musl-fixes.patch"
+sha256sums="5910183429d300221783d6054ff5add15bb2ae49ae33272d723a314bc2ce0af9 dvgrab-3.5.tar.gz
+05ef1b0e6d9e23ab0a5a2106840f97fd0d9541e6bbecc0731ef13d33f4a98a16 musl-fixes.patch"
+sha512sums="7d9cae1661d27dbef1d0dcdf18966a0ab386d936803ff7d071a18e0303fca45631c9b27187a413adfa4391c395e5909e3b8dc5c543d529e7805550f1a3ee6735 dvgrab-3.5.tar.gz
+c69220fa133812063fc6e237a1c15215b7163845d8f9b0e0aba589a86b875f194d2a6899f44449c3e209415ea94d14a13eeff23014ddda0e8a496a6973a0e21b musl-fixes.patch"
diff --git a/main/dvgrab/musl-fixes.patch b/main/dvgrab/musl-fixes.patch
new file mode 100644
index 000000000..795530836
--- /dev/null
+++ b/main/dvgrab/musl-fixes.patch
@@ -0,0 +1,24 @@
+--- ./error.h.orig 2014-04-02 14:09:23.163839471 +0000
++++ ./error.h 2014-04-02 14:14:07.630616871 +0000
+@@ -22,6 +22,10 @@
+
+ #include <stdarg.h>
+
++#if !defined(__ASSERT_FUNCTION)
++#define __ASSERT_FUNCTION __func__
++#endif
++
+ #ifdef __cplusplus
+ extern "C"
+ {
+--- ./io.c.orig 2014-04-02 14:14:29.104210187 +0000
++++ ./io.c 2014-04-02 14:14:59.264575341 +0000
+@@ -31,6 +31,8 @@
+ #include <termios.h>
+ #include <unistd.h>
+
++#include <sys/time.h>
++
+ /* Application header files */
+ #include "io.h"
+