import clean BK tree at cset 1.3670

4 files changed, 81 insertions, 0 deletions

diff --git a/packages/w3cam/.mtn2git_empty b/packages/w3cam/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/w3cam/.mtn2git_empty
diff --git a/packages/w3cam/files/.mtn2git_empty b/packages/w3cam/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/w3cam/files/.mtn2git_empty
diff --git a/packages/w3cam/files/staticpaths.patch b/packages/w3cam/files/staticpaths.patch
index e69de29bb2..005b60ac88 100644
--- a/packages/w3cam/files/staticpaths.patch
+++ b/packages/w3cam/files/staticpaths.patch
@@ -0,0 +1,50 @@
+diff -urN w3cam-0.7.2.orig/configure w3cam-0.7.2/configure
+--- w3cam-0.7.2.orig/configure	2001-10-26 07:10:41.000000000 -1000
++++ w3cam-0.7.2/configure	2005-03-20 03:12:24.592016401 -1000
+@@ -771,8 +771,8 @@
+ fi
+ 
+ 
+-LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/local/X11/lib"
+-CFLAGS="$CFLAGS -I/usr/local/include"
++LDFLAGS="$LDFLAGS"
++CFLAGS="$CFLAGS"
+ 
+ echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6
+ echo "configure:779: checking for pow in -lm" >&5
+diff -urN w3cam-0.7.2.orig/configure.in w3cam-0.7.2/configure.in
+--- w3cam-0.7.2.orig/configure.in	2001-10-26 07:10:40.000000000 -1000
++++ w3cam-0.7.2/configure.in	2005-03-20 03:12:08.447121775 -1000
+@@ -1,8 +1,8 @@
+ AC_INIT()
+ AC_ISC_POSIX
+ 
+-LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/local/X11/lib"
+-CFLAGS="$CFLAGS -I/usr/local/include"
++LDFLAGS="$LDFLAGS"
++CFLAGS="$CFLAGS"
+ 
+ AC_CHECK_LIB(m, pow)
+ AC_CHECK_LIB(z, gzopen)
+diff -urN w3cam-0.7.2.orig/w3camd/Makefile.in w3cam-0.7.2/w3camd/Makefile.in
+--- w3cam-0.7.2.orig/w3camd/Makefile.in	2000-05-01 04:59:20.000000000 -1000
++++ w3cam-0.7.2/w3camd/Makefile.in	2005-03-20 02:44:40.623003906 -1000
+@@ -4,7 +4,8 @@
+ prefix=@prefix@
+ sbindir=@prefix@/sbin
+ 
+-CFLAGS = @CFLAGS@ -I.. -I. -I@prefix@/include -g -DDEBUG -DCAM_PORT=8999 -D_REENTRANT
++CFLAGS = @CFLAGS@ -g -DDEBUG -DCAM_PORT=8999 -D_REENTRANT
++LDFLAGS = @LDFLAGS@
+ CC = @CC@
+ 
+ default: w3camd
+@@ -15,7 +16,7 @@
+ 	$(CC) $(CFLAGS) -c $<
+ 
+ w3camd: $(OBJ)
+-	$(CC) -o $@ $(OBJ) -lpthread -ljpeg
++	$(CC) -o $@ $(OBJ) $(LDFLAGS) -lpthread -ljpeg
+ 
+ install:
+ 	install w3camd $(sbindir)/
diff --git a/packages/w3cam/w3cam_0.7.2.bb b/packages/w3cam/w3cam_0.7.2.bb
index e69de29bb2..02e543c507 100644
--- a/packages/w3cam/w3cam_0.7.2.bb
+++ b/packages/w3cam/w3cam_0.7.2.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "a small and fast cgi program to retrieve images from a V4L device."
+SECTION = "console/network"
+PRIORITY = "optional"
+MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
+DEPENDS="jpeg"
+LICENSE = "GPLV2"
+PR = "r0"
+
+SRC_URI = "http://mpx.freeshell.net/w3cam-0.7.2.tar.gz \
+	   file://staticpaths.patch;patch=1"
+
+S = "${WORKDIR}/w3cam-0.7.2/"
+
+inherit autotools
+
+LDFLAGS += "-L${STAGING_LIBDIR}"
+CFLAGS += "-L${STAGING_LIBDIR} -I${STAGING_INCDIR}"
+
+EXTRA_OECONF = "--without-x --without-ttf-inc"
+
+do_install() {
+	install -d ${D}${sbindir}
+	install -d ${D}${bindir}
+	install -d ${D}${mandir}/man1
+	install -d ${D}usr/cgi-bin
+	install -m 0755 ${S}w3camd/w3camd ${D}${sbindir}/w3camd
+	install -m 0755 ${S}w3cam.cgi ${D}usr/cgi-bin/w3camd.cgi
+	install -m 0755 ${S}vidcat ${D}${bindir}/vidcat
+	install -m 0644 ${S}vidcat.1 ${D}${mandir}/man1/vidcat.1
+}
+