merge of b527e063b110f80270c8dc87e41ce53a83d4870a

     and c8b301a65a734bb6f775222ccee1d1e8e7372ba3

11 files changed, 71 insertions, 8 deletions

diff --git a/packages/frodo/frodo_4.2.bb b/packages/frodo/frodo_4.2.bb
index 8158cb2d5b..0c7772d729 100644
--- a/packages/frodo/frodo_4.2.bb
+++ b/packages/frodo/frodo_4.2.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 SRCDATE = "20040801"
 PR = "r1"
 
-SRC_URI = "cvs://anoncvs:anoncvs@down.physik.uni-mainz.de/cvs;module=Frodo4 \
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.cebix.net/home/cvs/cebix;module=Frodo4 \
            file://m4.patch;patch=1 \
            file://configure.patch;patch=1 \
            file://frodorc \
diff --git a/packages/gnome/gnome-vfs-dbus_svn.bb b/packages/gnome/gnome-vfs-dbus_svn.bb
index 029101b77e..604da1168c 100644
--- a/packages/gnome/gnome-vfs-dbus_svn.bb
+++ b/packages/gnome/gnome-vfs-dbus_svn.bb
@@ -84,6 +84,10 @@ do_configure_prepend() {
 	install ${WORKDIR}/gtk-doc.make ./
 }
 
+do_compile_prepend() {
+    find ${S} -name Makefile | xargs sed -i 's:-Werror::'
+}
+
 do_stage() {
 	oe_libinstall -so -C libgnomevfs libgnomevfs-2 ${STAGING_LIBDIR}
 	install -d ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs
diff --git a/packages/links/links-x11_2.1pre20.bb b/packages/links/links-x11_2.1pre21.bb
index f763df7f60..f763df7f60 100644
--- a/packages/links/links-x11_2.1pre20.bb
+++ b/packages/links/links-x11_2.1pre21.bb
diff --git a/packages/links/links_2.1pre20.bb b/packages/links/links_2.1pre21.bb
index 81906242d3..e0a991e148 100644
--- a/packages/links/links_2.1pre20.bb
+++ b/packages/links/links_2.1pre21.bb
@@ -16,4 +16,4 @@ EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
 	        --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
 	        --without-libtiff --without-svgalib --with-fb \
 	        --without-directfb --without-pmshell --without-atheos \
-	        --without-x"
+	        --without-x --without-sdl"
diff --git a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r1.patch b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r1.patch
new file mode 100644
index 0000000000..c14482babb
--- /dev/null
+++ b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r1.patch
@@ -0,0 +1,45 @@
+
+The ident for Seagate 8GB microdrive is
+"SEAGATE", "ST1"
+hash 0x76dc4190, 0xcfba9599
+manfid 0x0111, 0x0000
+
+Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
+
+ drivers/ide/legacy/ide-cs.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: linux-2.6.16/drivers/ide/legacy/ide-cs.c
+===================================================================
+--- linux-2.6.16.orig/drivers/ide/legacy/ide-cs.c	2006-04-20 12:41:41.000000000 +0200
++++ linux-2.6.16/drivers/ide/legacy/ide-cs.c	2006-04-20 12:45:19.640621552 +0200
+@@ -444,6 +444,7 @@
+ 	PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591),
+ 	PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728),
+ 	PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1),
++	PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x76dc4190, 0xcfba9599),	/* Seagate 8GB microdrive */
+ 	PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),
+ 	PCMCIA_DEVICE_PROD_ID1("TRANSCEND    512M   ", 0xd0909443),
+ 	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
+
+
+-------------------------------------------------------------------------
+With pcmcia-cs -> pcmciautils change some cards which was working with
+hostap driver now are bound into orinoco driver.
+
+This patch made them bound into hostap like it was before.
+
+Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
+
+--- linux/drivers/net/wireless/hostap/hostap_cs.c.orig	2006-04-09 12:42:34.944903728 +0200
++++ linux/drivers/net/wireless/hostap/hostap_cs.c	2006-04-09 12:42:37.474519168 +0200
+@@ -912,6 +912,9 @@
+ 	PCMCIA_DEVICE_PROD_ID123(
+ 		"SMC", "SMC2632W", "Version 01.02",
+ 		0xc4f8b18b, 0x474a1f2a, 0x4b74baa0),
++	PCMCIA_DEVICE_PROD_ID123(
++		"Pretec", "CompactWLAN Card 802.11b", "2.5",
++		0x1cadd3e5, 0xe697636c, 0x7a5bfcf1),
+ 	PCMCIA_DEVICE_PROD_ID12("BUFFALO", "WLI-CF-S11G", 
+ 				0x2decece3, 0x82067c18),
+ 	PCMCIA_DEVICE_PROD_ID12("Compaq", "WL200_11Mbps_Wireless_PCI_Card",
diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb
index 1225eb5830..3230c0b1b8 100644
--- a/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/packages/linux/linux-openzaurus_2.6.16.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r5"
+PR = "r6"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -66,7 +66,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
            ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \
            ${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \
            ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \
-	   ${DOSRC}/kexec-arm-r2.patch;patch=1 \
+           ${DOSRC}/kexec-arm-r2.patch;patch=1 \
            ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
            ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \
            ${RPSRC}/poodle_ts_hack-r0.patch;patch=1 \
@@ -75,6 +75,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
            ${RPSRC}/pxa-linking-bug.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            file://connectplus-remove-ide-HACK.patch;patch=1 \
+           file://hrw-pcmcia-ids-r1.patch;patch=1 \
            file://defconfig-c7x0 \
            file://defconfig-ipaq-pxa270 \
            file://defconfig-collie \
diff --git a/packages/openobex/files/libusb_crosscompile_check.patch b/packages/openobex/files/libusb_crosscompile_check.patch
new file mode 100644
index 0000000000..c28921b8ca
--- /dev/null
+++ b/packages/openobex/files/libusb_crosscompile_check.patch
@@ -0,0 +1,12 @@
+diff -Naur openobex-1.2_old/acinclude.m4 openobex-1.2/acinclude.m4
+--- openobex-1.2_old/acinclude.m4	2006-03-07 19:57:49.000000000 +0200
++++ openobex-1.2/acinclude.m4	2006-04-18 23:07:25.000000000 +0300
+@@ -195,7 +195,7 @@
+ 
+ 	if (test "${usb_enable}" = "yes" && test "${usb_found}" = "yes"); then
+ 		AC_DEFINE(HAVE_USB, 1, [Define if system supports USB and it's enabled])
+-		AC_CHECK_FILE(${usb_prefix}/lib/pkgconfig/libusb.pc, REQUIRES="$REQUIRES libusb")
++		REQUIRES="libusb"
+ 	fi
+ 
+ 	AM_CONDITIONAL(APPS, test "${apps_enable}" = "yes")
diff --git a/packages/openobex/openobex_1.2.bb b/packages/openobex/openobex_1.2.bb
index 421b342476..97f030d3e2 100644
--- a/packages/openobex/openobex_1.2.bb
+++ b/packages/openobex/openobex_1.2.bb
@@ -8,7 +8,8 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \
-           file://disable-cable-test.patch;patch=1"
+           file://disable-cable-test.patch;patch=1" \
+	   file://libusb_crosscompile_check.patch;patch=1"
 
 inherit autotools binconfig pkgconfig
 
diff --git a/packages/uae/e-uae_0.8.27.bb b/packages/uae/e-uae_0.8.27.bb
index 60b9b7d8e9..454136cc05 100644
--- a/packages/uae/e-uae_0.8.27.bb
+++ b/packages/uae/e-uae_0.8.27.bb
@@ -5,7 +5,7 @@ DEPENDS = "libsdl-qpe"
 LICENSE = "GPL"
 PR = "r1"
 
-SRC_URI = "http://rcdrummond.net/uae/e-uae-${PV}/e-uae-${PV}.tar.bz2 \
+SRC_URI = "http://rcdrummond.net/uae/old/e-uae-${PV}/e-uae-${PV}.tar.bz2 \
            file://configure.patch;patch=1"
 #           file://m4.patch;patch=1"
 
diff --git a/packages/xlibs/libxxf86dga_1.0.0.bb b/packages/xlibs/libxxf86dga_1.0.0.bb
index 9a4824c153..46ab999c5f 100644
--- a/packages/xlibs/libxxf86dga_1.0.0.bb
+++ b/packages/xlibs/libxxf86dga_1.0.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Xxf86dga extension library."
 SECTION = "x11/libs"
 LICENSE = "XFree86"
 
-DEPENDS = "libx11 libxext xxf86dgaproto"
+DEPENDS = "libx11 libxext xf86dgaproto"
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXxf86dga-${PV}.tar.bz2"
 S = "${WORKDIR}/libXxf86dga-${PV}"
diff --git a/packages/xlibs/libxxf86vm_1.0.0.bb b/packages/xlibs/libxxf86vm_1.0.0.bb
index fe67e123d9..a5df50e566 100644
--- a/packages/xlibs/libxxf86vm_1.0.0.bb
+++ b/packages/xlibs/libxxf86vm_1.0.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Xxf86vm extension library."
 SECTION = "x11/libs"
 LICENSE = "MIT"
 
-DEPENDS = "libx11 libxext xxf86vidmodeproto"
+DEPENDS = "libx11 libxext xf86vidmodeproto"
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXxf86vm-${PV}.tar.bz2"
 S = "${WORKDIR}/libXxf86vm-${PV}"