From 7e9320ce004b8d0916ceeafec732e00434a945b2 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Sun, 17 Apr 2011 11:00:01 +0000
Subject: main/libdc1394: build fix

patch is from upstream
---
 main/libdc1394/APKBUILD                           | 19 +++++++++---
 main/libdc1394/conditional-dc1394_vloopback.patch | 36 +++++++++++++++++++++++
 2 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 main/libdc1394/conditional-dc1394_vloopback.patch

(limited to 'main/libdc1394')

diff --git a/main/libdc1394/APKBUILD b/main/libdc1394/APKBUILD
index c9cc65944..738b885c1 100644
--- a/main/libdc1394/APKBUILD
+++ b/main/libdc1394/APKBUILD
@@ -2,17 +2,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libdc1394
 pkgver=2.1.3
-pkgrel=0
+pkgrel=1
 pkgdesc="High level programming interface to control IEEE 1394 based cameras"
 url="http://damien.douxchamps.net/ieee1394/libdc1394/"
 arch="all"
 license="LGPL"
 depends=
 depends_dev="libusb-dev libraw1394-dev"
-makedepends="$depends_dev"
+makedepends="$depends_dev autoconf automake libtool"
 install=""
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/libdc1394-$pkgver.tar.gz"
+source="http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/libdc1394-$pkgver.tar.gz
+	conditional-dc1394_vloopback.patch"
 
 _builddir="$srcdir"/libdc1394-$pkgver
 prepare() {
@@ -23,6 +24,7 @@ prepare() {
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
+	libtoolize --force && aclocal && autoconf && automake
 }
 
 build() {
@@ -41,4 +43,13 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="d8b2cbfae1b329fdeaa638da80427334  libdc1394-2.1.3.tar.gz"
+# there is on ly one tool and its only 4k...
+#tools() {
+#	pkgdesc="Tools to use with $pkgname"
+#	replaces="$pkgname"
+#	mkdir -p "$subpkgdir"/usr/
+#	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+#}
+
+md5sums="d8b2cbfae1b329fdeaa638da80427334  libdc1394-2.1.3.tar.gz
+33a30ef4e4a881707011ff4554c57c38  conditional-dc1394_vloopback.patch"
diff --git a/main/libdc1394/conditional-dc1394_vloopback.patch b/main/libdc1394/conditional-dc1394_vloopback.patch
new file mode 100644
index 000000000..308d53963
--- /dev/null
+++ b/main/libdc1394/conditional-dc1394_vloopback.patch
@@ -0,0 +1,36 @@
+From: David Moore <david.moore@gmail.com>
+Date: Mon, 28 Mar 2011 05:48:15 +0000 (-0700)
+Subject: Conditionally compile dc1394_vloopback only when linux/videodev.h exists
+X-Git-Url: http://libdc1394.git.sourceforge.net/git/gitweb.cgi?p=libdc1394%2Flibdc1394;a=commitdiff_plain;h=2ee7e7f98dd6225b40d5cd570c240504be7bc86a
+
+Conditionally compile dc1394_vloopback only when linux/videodev.h exists
+---
+
+diff --git a/configure.in b/libdc1394/configure.in
+index 69babab..bdddc9b 100644
+--- a/configure.in
++++ b/configure.in
+@@ -75,6 +75,9 @@ AM_CONDITIONAL(HAVE_WINDOWS, test x$have_windows = xtrue)
+ AM_CONDITIONAL(HAVE_LIBRAW1394, test x$libraw1394 = xtrue)
+ AM_CONDITIONAL(HAVE_LIBUSB, test "x$LIBUSB_LIBS" != "x")
+ 
++AC_CHECK_HEADER([linux/videodev.h], [have_videodev=true])
++AM_CONDITIONAL(HAVE_VIDEODEV, test x$have_videodev = xtrue)
++
+ AC_ARG_ENABLE([examples], [AS_HELP_STRING([--disable-examples], [don't build example programs])], [build_examples=$enableval], [build_examples=true])
+ 
+ AM_CONDITIONAL(MAKE_EXAMPLES, test x$build_examples = xtrue)
+diff --git a/libdc1394/examples/Makefile.am b/libdc1394/examples/Makefile.am
+index fcebf18..035612e 100644
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -8,7 +8,9 @@ A = grab_gray_image grab_partial_image grab_color_image \
+ B = dc1394_reset_bus
+ 
+ if HAVE_LINUX
++if HAVE_VIDEODEV
+ B += dc1394_vloopback
++endif
+ if HAVE_XV
+ A += dc1394_multiview
+ endif
-- 
cgit v1.2.3