merge of 74c6df5277dd79cbaaba08bdb441d1299119179e

     and f3e744d286e5596939ace0b10699542f2cc2a925

4 files changed, 91 insertions, 0 deletions

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..9dc9e51bc5
--- /dev/null
+++ b/packages/fstests/fstests.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Various benchmarking tests for X"
+HOMEPAGE = "http://www.o-hand.com"
+SECTION = "devel"
+LICENSE = "GPL"
+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} \;   
+}