From c6a7ea034b02587fe2dfdb7e710582c0d85c92b3 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Fri, 28 May 2010 08:51:08 +0000
Subject: [PATCH] libv4l ist uralt. neue version gefunden - die ist in
 v4l-utils enthalten

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5655 504e572c-2e33-0410-9681-be2bf7408885
---
 SysBuild/multimedia/{libv4l => v4l-utils} | 86 ++++-------------------
 1 file changed, 13 insertions(+), 73 deletions(-)
 rename SysBuild/multimedia/{libv4l => v4l-utils} (65%)

diff --git a/SysBuild/multimedia/libv4l b/SysBuild/multimedia/v4l-utils
similarity index 65%
rename from SysBuild/multimedia/libv4l
rename to SysBuild/multimedia/v4l-utils
index f5b543c..493f430 100644
--- a/SysBuild/multimedia/libv4l
+++ b/SysBuild/multimedia/v4l-utils
@@ -58,14 +58,10 @@
 # 128   : Patches zu den Sourcen nicht einspielen - Module muss sich darum
 #         kümmern
 
-#Module zur Erstellung des Packetes: libv4l
-#Quelle der Source Archive: http://people.atrpms.net/~hdegoede/
-#ACHTUNG: Beschreibung nicht in der gleichen Zeile beginnen!
-#Neue Zeile anfangen. sonste funktioniert die metadaten erzeugung
-#nicht!
+#Module zur Erstellung des Packetes: v4l-utils
+#Quelle der Source Archive: http://freshmeat.net/projects/libv4l
 #Kurzbeschreibung:
-#THIN abstraction layer library für das Video4linux projekt
-#
+#Video4linux utils, die für diverse webcams notwendig sind.
 #
 #Letzte Änderung von: $Author: $
 #Datum der letzten Änderung: $Date: $
@@ -75,84 +71,28 @@
 SRCPATH=MultiMedia/Lib
 
 premk() {
-	echo "Nothing to do for premk()"
+	mkdir $TMPROOT/usr
 }
 
 mk32() {
-	make USE_ARCH=32 \
-	     CC="gcc $BUILDOPTIONS32" \
+	make CC="gcc $BUILDOPTIONS32" \
 	     CXX="g++ $BUILDOPTIONS32" \
+	     USE_ARCH=32 \
 	     -j $NUMCPU
-	mkdir -p $TMPROOT/usr/{lib,include}
-	tar -C lib -cf - .|tar -C $TMPROOT/usr/lib -xvf -
-	tar -C include -cf - |tar -C $TMPROOT/usr/include -xvf -
+	make -j $NUMCPU PREFIX=$TMPROOT/usr install
 	make clean
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
-	make USE_ARCH=$UARCH \
-	     CC="gcc $BUILDOPTIONS" \
+	make CC="gcc $BUILDOPTIONS" \
 	     CXX="g++ $BUILDOPTIONS" \
+	     USE_ARCH=$UARCH \
 	     -j $NUMCPU
-	mkdir -p $TMPROOT/usr/{$LIBDIR,include}
-	tar -C lib -cf - .|tar -C $TMPROOT/usr/$LIBDIR -xvf -
-	tar -C include -cf - .|tar -C $TMPROOT/usr/include -xvf -
+	make -j $NUMCPU PREFIX=$TMPROOT/usr \
+	                LIBDIR=$TMPROOT/usr/$LIBDIR \
+			install
 }
 
 postmk() {
-	mkdir $TMPROOT/usr/lib/pkgconfig
-	cat > $TMPROOT/usr/lib/pkgconfig/libv4l2.pc <<EOF
-prefix=/usr
-exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib
-includedir=\${prefix}/include
-
-Name: libv4l2
-Description: V4L abstraction library
-Version: 0.1
-Libs: -L\${libdir} -lv4l1
-Cflags:
-EOF
-	cat > $TMPROOT/usr/lib/pkgconfig/libv4l1.pc <<EOF
-prefix=/usr
-exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib
-includedir=\${prefix}/include
-
-Name: libv4l1
-Description: V4L abstraction library
-Version: 0.1
-Libs: -L\${libdir} -lv4l1
-Cflags:
-EOF
-	if [ "$MK64BIT" == "true" ]; then
-		mkdir $TMPROOT/usr/lib64/pkgconfig
-		cat > $TMPROOT/usr/lib64/pkgconfig/libv4l2.pc <<EOF
-prefix=/usr
-exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib64
-includedir=\${prefix}/include
-
-Name: libv4l2
-Description: V4L abstraction library
-Version: 0.1
-Libs: -L\${libdir} -lv4l1
-Cflags:
-EOF
-	cat > $TMPROOT/usr/lib64/pkgconfig/libv4l1.pc <<EOF
-prefix=/usr
-exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib64
-includedir=\${prefix}/include
-
-Name: libv4l1
-Description: V4L abstraction library
-Version: 0.1
-Libs: -L\${libdir} -lv4l1
-Cflags:
-EOF
-	fi
+	echo "Nothing to do for postmk()"
 }