9 files changed, 100 insertions, 8 deletions
diff --git a/packages/curl/curl-native_7.14.0.bb b/packages/curl/curl-native_7.14.0.bb
index c70dd3b9dc..e056ec10c3 100644
--- a/packages/curl/curl-native_7.14.0.bb
+++ b/packages/curl/curl-native_7.14.0.bb
@@ -1,5 +1,6 @@
 require curl_${PV}.bb
 inherit native
+DEPENDS = "zlib-native"
 
 do_stage () {
         install -d ${STAGING_INCDIR}/curl
diff --git a/packages/curl/curl-native_7.15.1.bb b/packages/curl/curl-native_7.15.1.bb
index c70dd3b9dc..e056ec10c3 100644
--- a/packages/curl/curl-native_7.15.1.bb
+++ b/packages/curl/curl-native_7.15.1.bb
@@ -1,5 +1,6 @@
 require curl_${PV}.bb
 inherit native
+DEPENDS = "zlib-native"
 
 do_stage () {
         install -d ${STAGING_INCDIR}/curl
diff --git a/packages/fstests/.mtn2git_empty b/packages/fstests/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fstests/.mtn2git_empty
diff --git a/packages/fstests/files/.mtn2git_empty b/packages/fstests/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fstests/files/.mtn2git_empty
diff --git a/packages/fstests/files/compile-fix.patch b/packages/fstests/files/compile-fix.patch
new file mode 100644
index 0000000000..83b3a1cfaf
--- /dev/null
+++ b/packages/fstests/files/compile-fix.patch
@@ -0,0 +1,73 @@
+Index: tests/Makefile.am
+===================================================================
+--- tests.orig/Makefile.am
++++ tests/Makefile.am
+@@ -18,13 +18,13 @@ test_fb_SOURCES = test-fb.c
+ 
+ # fullscreen blit to gtk drawing area via gtk pixbufs
+ test_gdk_SOURCES = test-gdk.c
+-test_gdk_LDADD = @GTK_LIBS@
+-test_gdk_CFLAGS = @GTK_CFLAGS@
++test_gdk_LDADD = @GTK_LIBS@ @PANGO_LIBS@
++test_gdk_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@
+ 
+ # fullscreen blit to gtk drawing area via gtk pixbufs in an idle handler
+ test_gdk_idle_SOURCES = test-gdk-idle.c
+-test_gdk_idle_LDADD = @GTK_LIBS@
+-test_gdk_idle_CFLAGS = @GTK_CFLAGS@
++test_gdk_idle_LDADD = @GTK_LIBS@ @PANGO_LIBS@
++test_gdk_idle_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@
+ 
+ # fullscreen blit to x window via shm
+ test_x_SOURCES = test-x.c
+@@ -43,8 +43,8 @@ test_freetype_cached_CFLAGS = @FREETYPE_
+ 
+ # draw strings via xft
+ test_xft_SOURCES = test-xft.c
+-test_xft_LDADD = @XLIBS_LIBS@
+-test_xft_CFLAGS = @XLIBS_CFLAGS@
++test_xft_LDADD = @XLIBS_LIBS@ @PANGO_LIBS@
++test_xft_CFLAGS = @XLIBS_CFLAGS@ @PANGO_CFLAGS@
+ 
+ # draws pango strings with just x
+ test_pango_SOURCES = test-pango.c
+@@ -55,29 +55,29 @@ test_pango_CFLAGS = @PANGO_CFLAGS@
+ 
+ # Draws a list of Pango glyphs onto a GtkWindow with pango_xft_render
+ test_pango_gdk_SOURCES = test-pango-gdk.c
+-test_pango_gdk_LDADD = @GTK_LIBS@
+-test_pango_gdk_CFLAGS = @GTK_CFLAGS@
++test_pango_gdk_LDADD = @GTK_LIBS@ @PANGO_LIBS@
++test_pango_gdk_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@
+ 
+ # Draws a list of Pango glyphs onto a GtkDrawingArea with pango_xft_render
+ test_pango_gtk_SOURCES = test-pango-gtk.c
+-test_pango_gtk_LDADD = @GTK_LIBS@
+-test_pango_gtk_CFLAGS = @GTK_CFLAGS@
++test_pango_gtk_LDADD = @GTK_LIBS@ @PANGO_LIBS@
++test_pango_gtk_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@
+ 
+ # Draws a list of Pango glyphs onto a GtkWindow with gdk_draw_glyphs
+ # can probably go
+ # test_gtk_SOURCES = test-gtk.c
+-# test_gtk_LDADD = @GTK_LIBS@
+-# test_gtk_CFLAGS = @GTK_CFLAGS@
++# test_gtk_LDADD = @GTK_LIBS@ @PANGO_LIBS@
++# test_gtk_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@
+ 
+ 
+ test_pango_layout_SOURCES = test-pango-layout.c
+-test_pango_layout_LDADD = @GTK_LIBS@
+-test_pango_layout_CFLAGS = @GTK_CFLAGS@
++test_pango_layout_LDADD = @GTK_LIBS@ @PANGO_LIBS@
++test_pango_layout_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@
+ 
+ # As above PangoLayout onto a GtkWindow with gdk_draw_layout XXX TOGO ?
+ test_gtk_layout_SOURCES = test-gtk-layout.c
+-test_gtk_layout_LDADD = @GTK_LIBS@
+-test_gtk_layout_CFLAGS = @GTK_CFLAGS@
++test_gtk_layout_LDADD = @GTK_LIBS@ @PANGO_LIBS@
++test_gtk_layout_CFLAGS = @GTK_CFLAGS@ @PANGO_CFLAGS@
+ 
+ 
+ 
diff --git a/packages/fstests/fstests.bb b/packages/fstests/fstests.bb
new file mode 100644
index 0000000000..5af7c94028
--- /dev/null
+++ b/packages/fstests/fstests.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Various benchmarking tests for X"
+HOMEPAGE = "http://www.o-hand.com"
+SECTION = "devel"
+LICENSE = "GPL"
+PV = "0.0+svn${SRCDATE}"
+PR = "r1"
+
+inherit autotools
+
+SRC_URI = \
+    "svn://svn.o-hand.com/repos/misc/trunk;module=fstests;proto=http \
+    file://compile-fix.patch;patch=0"
+
+S = "${WORKDIR}/fstests/tests"
+
+do_install() {
+    install -d ${D}${bindir}
+    find . -name "test-*" -type f -perm -755 -exec install -m 0755 {} ${D}${bindir} \;   
+}
diff --git a/packages/gcc/gcc4-build-sdk.inc b/packages/gcc/gcc4-build-sdk.inc
index e2ec9565a7..86aa566e5c 100644
--- a/packages/gcc/gcc4-build-sdk.inc
+++ b/packages/gcc/gcc4-build-sdk.inc
@@ -1,7 +1,5 @@
 USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
 
-SRC_URI += 'file://sdk-libstdc++-includes.patch;patch=1'
-
 STAGING_TARGET_INCDIR = "${STAGING_DIR}/${TARGET_SYS}/include"
 STAGING_TARGET_LIBDIR = "${STAGING_DIR}/${TARGET_SYS}/lib"
 
diff --git a/packages/libmimedir/libmimedir_0.4.0-20060804.bb b/packages/libmimedir/libmimedir_0.4.0-20060804.bb
index e28bd6a4e8..298b90ea70 100644
--- a/packages/libmimedir/libmimedir_0.4.0-20060804.bb
+++ b/packages/libmimedir/libmimedir_0.4.0-20060804.bb
@@ -11,7 +11,7 @@ PV = "0.4.0+cvs${SRCDATE}"
 SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libmimedir \
            file://mimedir-update.patch;patch=1 \
            file://mimedir-write-sequence.patch;patch=1;pnum=0 \
-	   file://gslist-fix.patch;patch=1"
+	   file://gslist-fix.patch;patch=1;maxdate=20060814"
 
 S = "${WORKDIR}/libmimedir"
 
diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb
index 8b303f307c..45ce8520df 100644
--- a/packages/meta/meta-toolchain.bb
+++ b/packages/meta/meta-toolchain.bb
@@ -72,22 +72,22 @@ EOF
         echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so
         echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so
 	# remove unwanted housekeeping files
-	mv ${SDK_OUTPUT}${libdir}/../arm-linux/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
+	mv ${SDK_OUTPUT}${libdir}/../${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
 	rm -rf ${SDK_OUTPUT}${libdir}/ipkg
 
 	# remove unwanted executables
 	rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc
 
 	# remove broken .la files
-	rm ${SDK_OUTPUT}/${prefix}/arm-linux/lib/*.la
+	rm ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/*.la
 
 	# fix pkgconfig data files
-	cd ${SDK_OUTPUT}/${prefix}/arm-linux/lib/pkgconfig
+	cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig
 	for f in *.pc ; do
-		sed -i 's%=/usr%=${prefix}/arm-linux%g' "$f"
+		sed -i 's%=/usr%=${prefix}/${TARGET_SYS}%g' "$f"
 	done
 	for f in *.pc ; do
-		sed -i 's%${STAGING_DIR}%/usr/local/arm/oe%g' "$f"
+		sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f"
 	done
 
         mkdir -p ${SDK_DEPLOY}