merge of 30cb3036d3a6a06d185c6a941ab380be44868897

     and f53aad80b477af19e98c6b4ac4cc29e7b0277338

18 files changed, 112 insertions, 1 deletions

diff --git a/packages/atftp/atftp_0.7.bb b/packages/atftp/atftp_0.7.bb
index ab51647096..ab51647096 100755..100644
--- a/packages/atftp/atftp_0.7.bb
+++ b/packages/atftp/atftp_0.7.bb
diff --git a/packages/initscripts/initscripts-1.0/openslug/device_table.txt b/packages/initscripts/initscripts-1.0/openslug/device_table.txt
index e01396ecd6..ae3cb79913 100644
--- a/packages/initscripts/initscripts-1.0/openslug/device_table.txt
+++ b/packages/initscripts/initscripts-1.0/openslug/device_table.txt
@@ -164,5 +164,6 @@
 /dev/ttyUSB	c	660	0	5	188	0	0	1	2
 /dev/urandom	c	644	0	0	1	9	-	-	-
 /dev/usbmouse	c	640	0	45	10	32	-	-	-
+/dev/video	c	644	0	0	81	0	0	1	4	
 /dev/zero	c	644	0	0	1	5	-	-	-
 /dev/input/mice	c	660	0	0	13	63	-	-	-
diff --git a/packages/initscripts/initscripts-openslug_1.0.bb b/packages/initscripts/initscripts-openslug_1.0.bb
index 475e273f3d..b5252bfdeb 100644
--- a/packages/initscripts/initscripts-openslug_1.0.bb
+++ b/packages/initscripts/initscripts-openslug_1.0.bb
@@ -11,7 +11,7 @@ RCONFLICTS = "initscripts"
 # All other standard definitions inherited from initscripts
 # Except the PR which is hacked here.  The format used is
 # a suffix
-PR := "${PR}.1"
+PR := "${PR}.2"
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
diff --git a/packages/inkscape/inkscape_0.42.bb b/packages/inkscape/inkscape_0.42.bb
new file mode 100644
index 0000000000..b6fbcde316
--- /dev/null
+++ b/packages/inkscape/inkscape_0.42.bb
@@ -0,0 +1,14 @@
+SECTION = "x11/utils"
+DESCRIPTION = "Inkscape is an SVG-based graphics editor featuring alpha \
+blending, node editing, SVG to PNG export, and more. Its goal is for features \
+similar to Illustrator, CorelDraw, Visio, etc."
+MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+DEPENDS = "libgc intltool-native gtk+ libart-lgpl libxml2 libsigc++-1.2 popt"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/inkscape/inkscape-${PV}.tar.bz2"
+S = "${WORKDIR}/inkscape-${PV}"
+
+inherit autotools gettext
+
+EXTRA_OECONF = "--disable-mmx"
diff --git a/packages/libgc/.mtn2git_empty b/packages/libgc/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libgc/.mtn2git_empty
diff --git a/packages/libgc/libgc_6.5.bb b/packages/libgc/libgc_6.5.bb
new file mode 100644
index 0000000000..143b62dcec
--- /dev/null
+++ b/packages/libgc/libgc_6.5.bb
@@ -0,0 +1,22 @@
+DESCRIPTION 	= "Garbage collector for C and C++"
+LICENSE 	= "As is"
+HOMEPAGE	= "http://www.hpl.hp.com/personal/Hans_Boehm/gc/"
+
+DEPENDS		= "sed-native"
+SRC_URI 	= "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz"
+S 		= "${WORKDIR}/gc6.5" 
+FILES_${PN}-doc += "/usr/share/gc/"
+
+inherit autotools
+
+do_configure_append() {
+	#fix libtool script
+	 sed -i 's:${SED}:sed:g' libtool
+	 sed -i 's:$SED:sed:g' libtool
+}
+
+do_stage() {
+	autotools_stage_includes
+	install -d ${STAGING_LIBDIR}
+	install -m 755 .libs/libgc.so* ${STAGING_LIBDIR}/
+}
diff --git a/packages/libmpeg2/libmpeg2_0.4.0b.bb b/packages/libmpeg2/libmpeg2_0.4.0b.bb
index 3fa46f1f24..3fa46f1f24 100755..100644
--- a/packages/libmpeg2/libmpeg2_0.4.0b.bb
+++ b/packages/libmpeg2/libmpeg2_0.4.0b.bb
diff --git a/packages/miau/miau_0.5.3.bb b/packages/miau/miau_0.5.3.bb
index 5644c1141e..5644c1141e 100755..100644
--- a/packages/miau/miau_0.5.3.bb
+++ b/packages/miau/miau_0.5.3.bb
diff --git a/packages/puppy/puppy_1.8.bb b/packages/puppy/puppy_1.8.bb
index 5ea2713873..5ea2713873 100755..100644
--- a/packages/puppy/puppy_1.8.bb
+++ b/packages/puppy/puppy_1.8.bb
diff --git a/packages/puppy/puppy_1.9.bb b/packages/puppy/puppy_1.9.bb
index 4c578cc9b3..4c578cc9b3 100755..100644
--- a/packages/puppy/puppy_1.9.bb
+++ b/packages/puppy/puppy_1.9.bb
diff --git a/packages/pwc/pwc-10.0.7a/.mtn2git_empty b/packages/pwc/pwc-10.0.7a/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pwc/pwc-10.0.7a/.mtn2git_empty
diff --git a/packages/pwc/pwc-10.0.7a/Makefile b/packages/pwc/pwc-10.0.7a/Makefile
new file mode 100644
index 0000000000..d941f1a6f2
--- /dev/null
+++ b/packages/pwc/pwc-10.0.7a/Makefile
@@ -0,0 +1,13 @@
+ifneq ($(KERNELRELEASE),)
+pwc-objs        := pwc-if.o pwc-misc.o pwc-ctrl.o pwc-v4l.o pwc-uncompress.o \
+		   pwc-dec1.o pwc-dec23.o pwc-kiara.o pwc-timon.o
+
+obj-m	+= pwc.o
+
+else
+KDIR	:= /lib/modules/$(shell uname -r)/build
+PWD	:= $(shell pwd)
+
+default modules:
+	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+endif
diff --git a/packages/pwc/pwc_10.0.7a.bb b/packages/pwc/pwc_10.0.7a.bb
new file mode 100644
index 0000000000..f6af027f56
--- /dev/null
+++ b/packages/pwc/pwc_10.0.7a.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Philips USB Webcam driver for Linux that supports VGA resolution"
+PRIORITY = "optional"
+SECTION = "kernel/modules"
+MAINTAINER = "dyoung <dyoung8888@yahoo.com>"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.saillard.org/linux/pwc/files/pwc-${PV}.tar.bz2 \
+	   file://Makefile"
+
+S = "${WORKDIR}/pwc-${PV}"
+
+inherit module
+
+do_compile_prepend() {
+	cp -f ${WORKDIR}/Makefile ${S}/
+}
+
+do_compile () {
+        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+        oe_runmake 'KDIR=${STAGING_KERNEL_DIR}' \
+                   'CC=${KERNEL_CC}' \
+                   'LD=${KERNEL_LD}' 
+}
+
+do_install() {   
+        install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
+        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
+}
+
diff --git a/packages/setpwc/.mtn2git_empty b/packages/setpwc/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/setpwc/.mtn2git_empty
diff --git a/packages/setpwc/files/.mtn2git_empty b/packages/setpwc/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/setpwc/files/.mtn2git_empty
diff --git a/packages/setpwc/files/Makefile.patch b/packages/setpwc/files/Makefile.patch
new file mode 100644
index 0000000000..257f90a1ac
--- /dev/null
+++ b/packages/setpwc/files/Makefile.patch
@@ -0,0 +1,14 @@
+*** setpwc-0.9/Makefile.orig	2005-07-26 09:16:09.000000000 +0930
+--- setpwc-0.9/Makefile	2005-07-26 09:16:18.000000000 +0930
+***************
+*** 22,30 ****
+  
+  setpwc: $(OBJS)
+  	$(CC) -Wall -W $(OBJS) $(LDFLAGS) -o setpwc
+- 	strip setpwc
+- 	echo
+- 	echo Oh, blatant plug: http://keetweej.vanheusden.com/wishlist.html
+  
+  install: setpwc
+  	cp setpwc /usr/bin
+--- 22,27 ----
diff --git a/packages/setpwc/setpwc_0.9.bb b/packages/setpwc/setpwc_0.9.bb
new file mode 100644
index 0000000000..595e2ab764
--- /dev/null
+++ b/packages/setpwc/setpwc_0.9.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Set various aspects of Philips (and compatible) WebCams."
+SECTION = "console"
+PRIORITY = "optional"
+MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>"
+HOMEPAGE = "http://www.vanheusden.com/setpwc/"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.vanheusden.com/setpwc/setpwc-${PV}.tgz \
+	   file://Makefile.patch;patch=1"
+
+inherit autotools
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 ${S}/setpwc ${D}${bindir}/setpwc
+}
diff --git a/packages/thc/thcrut_1.2.5.bb b/packages/thc/thcrut_1.2.5.bb
index 57e91d3417..57e91d3417 100755..100644
--- a/packages/thc/thcrut_1.2.5.bb
+++ b/packages/thc/thcrut_1.2.5.bb