merge of '3113cfe3acb79d8bce9b167f4840c404f744c7a4'

     and 'da7c8d017a4154208fc087bae975d8058f6c2e6f'

37 files changed, 43800 insertions, 928 deletions

diff --git a/packages/cairo/cairo_1.3.12.bb b/packages/cairo/cairo_1.3.12.bb
index b6a6a482bf..cb83b8e4a2 100644
--- a/packages/cairo/cairo_1.3.12.bb
+++ b/packages/cairo/cairo_1.3.12.bb
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1"
 require cairo.inc
 
 SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz \
-           file://cairo-surface-cache.patch;patch=1"
+           file://cairo-surface-cache-3.patch;patch=1"
 
-PR = "r1"
+PR = "r2"
 
diff --git a/packages/cairo/files/cairo-surface-cache-3.patch b/packages/cairo/files/cairo-surface-cache-3.patch
new file mode 100644
index 0000000000..ba714359a6
--- /dev/null
+++ b/packages/cairo/files/cairo-surface-cache-3.patch
@@ -0,0 +1,371 @@
+diff --git a/src/cairo-clip.c b/src/cairo-clip.c
+diff --git a/src/cairo-color.c b/src/cairo-color.c
+index a348839..0688167 100644
+--- a/src/cairo-color.c
++++ b/src/cairo-color.c
+@@ -159,3 +159,10 @@ _cairo_color_get_rgba_premultiplied (cai
+     *blue  = color->blue  * color->alpha;
+     *alpha = color->alpha;
+ }
++
++cairo_bool_t
++_cairo_color_equal (cairo_color_t *color_a,
++                    cairo_color_t *color_b)
++{
++    return (memcmp (color_a, color_b, sizeof (cairo_color_t)) == 0);
++}
+diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c
+index 686510d..96ee212 100644
+--- a/src/cairo-directfb-surface.c
++++ b/src/cairo-directfb-surface.c
+@@ -1514,6 +1514,15 @@ _cairo_directfb_surface_show_glyphs ( vo
+ }
+ #endif /* DFB_SHOW_GLYPHS */
+ 
++static cairo_bool_t
++_cairo_directfb_surface_is_compatible (void *surface_a,
++                                       void *surface_b)
++{
++    cairo_directfb_surface_t *a = (cairo_directfb_surface_t*) surface_a;
++    cairo_directfb_surface_t *b = (cairo_directfb_surface_t*) surface_b;
++
++    return (a->dfb == b->dfb);
++}
+ 
+ static cairo_surface_backend_t cairo_directfb_surface_backend = {
+          CAIRO_SURFACE_TYPE_DIRECTFB, /*type*/
+@@ -1564,7 +1573,8 @@ #if DFB_SHOW_GLYPHS
+ #else
+         NULL, /* show_glyphs */
+ #endif
+-        NULL /* snapshot */
++        NULL, /* snapshot */
++        _cairo_directfb_is_compatible
+ };
+ 
+ 
+diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
+diff --git a/src/cairo-glitz-surface.c b/src/cairo-glitz-surface.c
+index f492739..79e0162 100644
+--- a/src/cairo-glitz-surface.c
++++ b/src/cairo-glitz-surface.c
+@@ -1799,6 +1799,19 @@ _cairo_glitz_surface_scaled_glyph_fini (
+     }
+ }
+ 
++static cairo_bool_t
++_cairo_glitz_surface_is_compatible (void *surface_a,
++                                    void *surface_b)
++{
++    cairo_glitz_surface_t *a = (cairo_glitz_surface_t*) surface_a;
++    cairo_glitz_surface_t *b = (cairo_glitz_surface_t*) surface_b;
++
++    glitz_drawable *drawable_a = glitz_surface_get_drawable (a->surface);
++    glitz_drawable *drawable_b = glitz_surface_get_drawable (b->surface);
++
++    return (drawable_a == drawable_b);
++}
++
+ #define FIXED_TO_FLOAT(f) (((glitz_float_t) (f)) / 65536)
+ 
+ static cairo_status_t
+@@ -2194,7 +2207,16 @@ static const cairo_surface_backend_t cai
+     _cairo_glitz_surface_flush,
+     NULL, /* mark_dirty_rectangle */
+     _cairo_glitz_surface_scaled_font_fini,
+-    _cairo_glitz_surface_scaled_glyph_fini
++    _cairo_glitz_surface_scaled_glyph_fini,
++
++    NULL, /* paint */
++    NULL, /* mask */
++    NULL, /* stroke */
++    NULL, /* fill */
++    NULL, /* show_glyphs */
++
++    NULL, /* snapshot */
++    _cairo_glitz_surface_is_compatible
+ };
+ 
+ static const cairo_surface_backend_t *
+diff --git a/src/cairo-gstate.c b/src/cairo-gstate.c
+diff --git a/src/cairo-meta-surface.c b/src/cairo-meta-surface.c
+diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
+index b488d1f..28f8561 100644
+--- a/src/cairo-pattern.c
++++ b/src/cairo-pattern.c
+@@ -1020,6 +1020,8 @@ _cairo_pattern_acquire_surface_for_gradi
+     return status;
+ }
+ 
++#define MAX_CACHE_SIZE 16
++
+ static cairo_int_status_t
+ _cairo_pattern_acquire_surface_for_solid (cairo_solid_pattern_t	     *pattern,
+ 					  cairo_surface_t	     *dst,
+@@ -1030,12 +1032,59 @@ _cairo_pattern_acquire_surface_for_solid
+ 					  cairo_surface_t	     **out,
+ 					  cairo_surface_attributes_t *attribs)
+ {
+-    *out = _cairo_surface_create_similar_solid (dst,
+-						CAIRO_CONTENT_COLOR_ALPHA,
+-						1, 1,
+-						&pattern->color);
+-    if ((*out)->status)
+-	return CAIRO_STATUS_NO_MEMORY;
++    /* We have a small cache here, because we don't want to constantly
++     * recreate surfaces for simple solid colors */
++    static struct {
++        cairo_color_t    color;
++        cairo_surface_t *surface;
++    } cache[MAX_CACHE_SIZE];
++    static int cache_size = 0;
++    static int i = 0;
++    CAIRO_MUTEX_DECLARE (cache_lock);
++
++    cairo_surface_t *surface;
++    cairo_status_t status;
++
++    CAIRO_MUTEX_LOCK (cache_lock);
++
++    /* Check cache first */
++    if (i < cache_size)
++        if (_cairo_color_equal (&cache[i].color, &pattern->color) &&
++            _cairo_surface_is_compatible (cache[i].surface, dst))
++            goto DONE;
++
++    for (i = 0; i < cache_size; i++)
++        if (_cairo_color_equal (&cache[i].color, &pattern->color) &&
++            _cairo_surface_is_compatible (cache[i].surface, dst))
++            goto DONE;
++
++    /* Not cached, need to create new */
++    surface = _cairo_surface_create_similar_solid (dst,
++						   CAIRO_CONTENT_COLOR_ALPHA,
++						   1, 1,
++						   &pattern->color);
++    if (surface->status) {
++        status = CAIRO_STATUS_NO_MEMORY;
++
++	goto UNLOCK;
++    }
++
++    /* Cache new */
++    if (cache_size < MAX_CACHE_SIZE)
++        cache_size++;
++    else {
++        i = rand () % MAX_CACHE_SIZE;
++
++        /* Evict old */
++        cairo_surface_destroy (cache[i].surface);
++    }
++
++    cache[i].color   = pattern->color;
++    cache[i].surface = surface;
++
++DONE:
++
++    *out = cairo_surface_reference (cache[i].surface);
+ 
+     attribs->x_offset = attribs->y_offset = 0;
+     cairo_matrix_init_identity (&attribs->matrix);
+@@ -1043,7 +1092,13 @@ _cairo_pattern_acquire_surface_for_solid
+     attribs->filter = CAIRO_FILTER_NEAREST;
+     attribs->acquired = FALSE;
+ 
+-    return CAIRO_STATUS_SUCCESS;
++    status = CAIRO_STATUS_SUCCESS;
++
++UNLOCK:
++
++    CAIRO_MUTEX_UNLOCK (cache_lock);
++
++    return status;
+ }
+ 
+ /**
+diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c
+diff --git a/src/cairo-surface-fallback.c b/src/cairo-surface-fallback.c
+diff --git a/src/cairo-surface.c b/src/cairo-surface.c
+index 2bff0da..78cad9b 100644
+--- a/src/cairo-surface.c
++++ b/src/cairo-surface.c
+@@ -1078,6 +1078,32 @@ _cairo_surface_snapshot (cairo_surface_t
+     return _cairo_surface_fallback_snapshot (surface);
+ }
+ 
++/**
++ * _cairo_surface_is_compatible
++ * @surface_a: a #cairo_surface_t
++ * @surface_b: a #cairo_surface_t
++ *
++ * Find out whether the given surfaces share the same backend,
++ * and if so, whether they can be considered compatible.
++ *
++ * The definition of "compatible" depends on the backend. In the
++ * xlib case, it means the surfaces share the same display.
++ *
++ * Return value: TRUE if the surfaces are compatible.
++ **/
++cairo_bool_t
++_cairo_surface_is_compatible (cairo_surface_t *surface_a,
++                              cairo_surface_t *surface_b)
++{
++    if (surface_a->backend != surface_b->backend)
++        return FALSE;
++
++    if (surface_a->backend->is_compatible)
++        return surface_a->backend->is_compatible (surface_a, surface_b);
++
++    return TRUE;
++}
++
+ cairo_status_t
+ _cairo_surface_composite (cairo_operator_t	op,
+ 			  cairo_pattern_t	*src,
+diff --git a/src/cairo-win32-surface.c b/src/cairo-win32-surface.c
+index be7e706..81eb916 100644
+--- a/src/cairo-win32-surface.c
++++ b/src/cairo-win32-surface.c
+@@ -1609,6 +1609,16 @@ _cairo_win32_surface_show_glyphs (void		
+     return (win_result) ? CAIRO_STATUS_SUCCESS : CAIRO_INT_STATUS_UNSUPPORTED;
+ }
+ 
++static cairo_bool_t
++_cairo_win32_surface_is_compatible (void *surface_a,
++                                    void *surface_b)
++{
++    cairo_win32_surface_t *a = (cairo_win32_surface_t*) surface_a;
++    cairo_win32_surface_t *b = (cairo_win32_surface_t*) surface_b;
++
++    return (a->dc == b->dc);
++}
++
+ #undef STACK_GLYPH_SIZE
+ 
+ /**
+@@ -1879,7 +1889,8 @@ static const cairo_surface_backend_t cai
+     NULL, /* fill */
+     _cairo_win32_surface_show_glyphs,
+ 
+-    NULL  /* snapshot */
++    NULL, /* snapshot */
++    _cairo_win32_surface_is_compatible
+ };
+ 
+ /*
+diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c
+index 2fdf8a1..8df859d 100644
+--- a/src/cairo-xcb-surface.c
++++ b/src/cairo-xcb-surface.c
+@@ -1578,6 +1578,10 @@ _cairo_xcb_surface_show_glyphs (void    
+ 				 int		      num_glyphs,
+ 				 cairo_scaled_font_t *scaled_font);
+ 
++static cairo_bool_t
++_cairo_xcb_surface_is_compatible (void *surface_a,
++                                  void *surface_b);
++
+ /* XXX: move this to the bottom of the file, XCB and Xlib */
+ 
+ static const cairo_surface_backend_t cairo_xcb_surface_backend = {
+@@ -1609,7 +1613,8 @@ static const cairo_surface_backend_t cai
+     NULL, /* stroke */
+     NULL, /* fill */
+     _cairo_xcb_surface_show_glyphs,
+-    NULL  /* snapshot */
++    NULL, /* snapshot */
++    _cairo_xcb_surface_is_compatible
+ };
+ 
+ /**
+@@ -2451,3 +2456,13 @@ _cairo_xcb_surface_show_glyphs (void    
+ 
+     return status;
+ }
++
++static cairo_bool_t
++_cairo_xcb_surface_is_compatible (void *surface_a,
++                                  void *surface_b)
++{
++    cairo_xcb_surface_t *a = (cairo_xcb_surface_t*) surface_a;
++    cairo_xcb_surface_t *b = (cairo_xcb_surface_t*) surface_b;
++
++    return (a->dpy == b->dpy);
++}
+diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
+index 6a0d3e4..9228c95 100644
+--- a/src/cairo-xlib-surface.c
++++ b/src/cairo-xlib-surface.c
+@@ -74,6 +74,10 @@ _cairo_xlib_surface_show_glyphs (void   
+ 				 int		      num_glyphs,
+ 				 cairo_scaled_font_t *scaled_font);
+ 
++static cairo_bool_t
++_cairo_xlib_surface_is_compatible (void *surface_a,
++                                   void *surface_b);
++
+ /*
+  * Instead of taking two round trips for each blending request,
+  * assume that if a particular drawable fails GetImage that it will
+@@ -1783,7 +1787,8 @@ static const cairo_surface_backend_t cai
+     NULL, /* stroke */
+     NULL, /* fill */
+     _cairo_xlib_surface_show_glyphs,
+-    NULL  /* snapshot */
++    NULL, /* snapshot */
++    _cairo_xlib_surface_is_compatible
+ };
+ 
+ /**
+@@ -2913,3 +2918,13 @@ _cairo_xlib_surface_show_glyphs (void   
+ 
+     return status;
+ }
++
++static cairo_bool_t
++_cairo_xlib_surface_is_compatible (void *surface_a,
++                                   void *surface_b)
++{
++    cairo_xlib_surface_t *a = (cairo_xlib_surface_t*) surface_a;
++    cairo_xlib_surface_t *b = (cairo_xlib_surface_t*) surface_b;
++
++    return (a->dpy == b->dpy);
++}
+diff --git a/src/cairo.c b/src/cairo.c
+diff --git a/src/cairoint.h b/src/cairoint.h
+index 060b988..01c0e2a 100755
+--- a/src/cairoint.h
++++ b/src/cairoint.h
+@@ -933,6 +933,10 @@ struct _cairo_surface_backend {
+ 
+     cairo_surface_t *
+     (*snapshot)			(void			*surface);
++
++    cairo_bool_t
++    (*is_compatible)            (void                   *surface_a,
++                                 void                   *surface_b);
+ };
+ 
+ typedef struct _cairo_format_masks {
+@@ -1497,6 +1501,10 @@ _cairo_color_get_rgba_premultiplied (cai
+ 				     double	   *blue,
+ 				     double	   *alpha);
+ 
++cairo_private cairo_bool_t
++_cairo_color_equal (cairo_color_t *color_a,
++                    cairo_color_t *color_b);
++
+ /* cairo-font.c */
+ 
+ cairo_private void
+@@ -1922,6 +1930,10 @@ _cairo_surface_clone_similar (cairo_surf
+ cairo_private cairo_surface_t *
+ _cairo_surface_snapshot (cairo_surface_t *surface);
+ 
++cairo_private cairo_bool_t
++_cairo_surface_is_compatible (cairo_surface_t *surface_a,
++                              cairo_surface_t *surface_b);
++
+ cairo_private unsigned int
+ _cairo_surface_get_current_clip_serial (cairo_surface_t *surface);
+ 
diff --git a/packages/cairo/files/cairo-surface-cache.patch b/packages/cairo/files/cairo-surface-cache.patch
deleted file mode 100644
index ee9fc3a46e..0000000000
--- a/packages/cairo/files/cairo-surface-cache.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Hi,
-
-Last month, Xan xtraced[1] cairo text drawing (using xlib), and noticed
-that cairo creates (and afterward destroys) a 1x1 pixmap (a cairo
-surface) every time it draws some text. Xft doesn't do this.
-
-Carl and Behdad suggested ways to, like Xft, cache surfaces so as not to
-have to recreate them all the time.
-
-As suggested by Carl in the same thread, I first investigated
-per-pattern caching of acquired surfaces. This didn't work as patterns
-mostly get copied before their surfaces are requested. 
-
-Attached patch adds a simple 16-entry static cache to
-_cairo_pattern_acquire_surface_for_solid(). It still needs work, however
-this already yields a speedup[2] of 12% when drawing text using GTK+
-2.10, exceeding the performance of GTK+ 2.6. Yay!
-
-Comments appreciated,
-
-Jorn
-
-diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
-index b488d1f..be63faf 100644
---- a/src/cairo-pattern.c
-+++ b/src/cairo-pattern.c
-@@ -1020,6 +1020,8 @@ _cairo_pattern_acquire_surface_for_gradi
-     return status;
- }
- 
-+#define MAX_CACHE_SIZE 16
-+
- static cairo_int_status_t
- _cairo_pattern_acquire_surface_for_solid (cairo_solid_pattern_t	     *pattern,
- 					  cairo_surface_t	     *dst,
-@@ -1030,13 +1032,50 @@ _cairo_pattern_acquire_surface_for_solid
- 					  cairo_surface_t	     **out,
- 					  cairo_surface_attributes_t *attribs)
- {
--    *out = _cairo_surface_create_similar_solid (dst,
--						CAIRO_CONTENT_COLOR_ALPHA,
--						1, 1,
--						&pattern->color);
--    if ((*out)->status)
-+    /* We have a small cache here, because we don't want to constantly
-+     * recreate surfaces for simple solid colors */
-+    static struct {
-+        cairo_color_t    color;
-+        cairo_surface_t *surface;
-+    } cache[MAX_CACHE_SIZE];
-+    static int cache_size = 0;
-+
-+    cairo_surface_t *surface;
-+    int i;
-+
-+    /* Check cache first */
-+    for (i = 0; i < cache_size; i++)
-+        if (cache[i].surface->backend == dst->backend &&
-+            memcmp (&cache[i].color,
-+                    &pattern->color,
-+                    sizeof (cairo_color_t)) == 0)
-+            goto DONE;
-+
-+    /* Not cached, need to create new */
-+    surface = _cairo_surface_create_similar_solid (dst,
-+						   CAIRO_CONTENT_COLOR_ALPHA,
-+						   1, 1,
-+						   &pattern->color);
-+    if (surface->status)
- 	return CAIRO_STATUS_NO_MEMORY;
- 
-+    /* Cache new */
-+    if (cache_size < MAX_CACHE_SIZE)
-+        cache_size++;
-+    else {
-+        i = random () % MAX_CACHE_SIZE;
-+
-+        /* Evict old */
-+        cairo_surface_destroy (cache[i].surface);
-+    }
-+
-+    cache[i].color   = pattern->color;
-+    cache[i].surface = surface;
-+
-+DONE:
-+
-+    *out = cairo_surface_reference (cache[i].surface);
-+
-     attribs->x_offset = attribs->y_offset = 0;
-     cairo_matrix_init_identity (&attribs->matrix);
-     attribs->extend = CAIRO_EXTEND_REPEAT;
diff --git a/packages/directfb/directfb_0.9.99+1.0.0rc2.bb b/packages/directfb/directfb_0.9.99+1.0.0rc3.bb
index 0298f2a247..5bb6aa362e 100644
--- a/packages/directfb/directfb_0.9.99+1.0.0rc2.bb
+++ b/packages/directfb/directfb_0.9.99+1.0.0rc3.bb
@@ -10,12 +10,11 @@ DEPENDS = "jpeg libpng freetype zlib tslib"
 PR = "r1"
 RV = "1.0-0"
 
-SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.0.0-rc2.tar.gz \
+SRC_URI = "http://www.directfb.org/download/DirectFB/DirectFB-1.0.0-rc3.tar.gz \
            file://fix-pkgconfig-specs.patch;patch=1 \
-	   file://mkdfiff.patch;patch=1 \
-	   file://tslib_support.patch;patch=1"
+	   file://mkdfiff.patch;patch=1"
 
-S = "${WORKDIR}/DirectFB-1.0.0-rc2"
+S = "${WORKDIR}/DirectFB-1.0.0-rc3"
 
 LDFLAGS_append =" -lts -lm"
 
@@ -32,8 +31,19 @@ do_install() {
         oe_runmake 'DESTDIR=${D}' install
 }
 
+FILES_directfb-dbg_append = " ${libdir}/directfb-${RV}/*/*/.debug/*.so \
+			      ${libdir}/directfb-${RV}/*/.debug/*.so \
+			  "
+
+FILES_directfb-dev_append = " ${libdir}/directfb-${RV}/systems/*.la \
+                              ${libdir}/directfb-${RV}/inputdrivers/*.la \
+                              ${libdir}/directfb-${RV}/interfaces/*/*.la \
+                              ${libdir}/directfb-${RV}/wm/*.la"
+
+
 FILES_directfb_append = " ${libdir}/directfb-${RV}/systems/*.so \
                           ${libdir}/directfb-${RV}/inputdrivers/*.so \
                           ${libdir}/directfb-${RV}/interfaces/*/*.so \
                           ${libdir}/directfb-${RV}/wm/*.so \
-                          ${datadir}/directfb-${RV}"
+                          ${datadir}/directfb-1.0.0-rc3 \
+			  "
diff --git a/packages/directfb/files/tslib_support.patch b/packages/directfb/files/tslib_support.patch
deleted file mode 100644
index f444cb9574..0000000000
--- a/packages/directfb/files/tslib_support.patch
+++ /dev/null
@@ -1,818 +0,0 @@
-diff -u'rNF^function' DirectFB-1.0.0-rc1~org/configure.in DirectFB-1.0.0-rc1/configure.in
---- DirectFB-1.0.0-rc1~org/configure.in	2006-09-30 17:08:56.000000000 -0400
-+++ DirectFB-1.0.0-rc1/configure.in	2006-10-16 08:15:32.000000000 -0400
-@@ -998,6 +998,7 @@
- checkfor_serialmouse=no
- checkfor_sonypijogdial=no
- checkfor_ucb1x00=no
-+checkfor_tslib=no
- checkfor_wm97xx=no
- 
- AC_MSG_CHECKING(which inputdrivers should be built)
-@@ -1027,6 +1028,7 @@
-   checkfor_serialmouse=yes
-   checkfor_sonypijogdial=yes
-   checkfor_ucb1x00="$have_arm"
-+  checkfor_tslib=yes
-   checkfor_wm97xx=yes
-   AC_MSG_RESULT(all)
- else 
-@@ -1083,6 +1085,9 @@
-           ucb1x00)
-                   checkfor_ucb1x00=yes
-                   ;;
-+	  tslib)
-+                  checkfor_tslib=yes
-+                  ;;
-           wm97xx)
-                   checkfor_wm97xx=yes
-                   ;;
-@@ -1196,6 +1201,12 @@
-   enable_ucb1x00_ts=yes
- fi
- 
-+enable_tslib=no
-+if test "$checkfor_tslib" = "yes"; then
-+  dnl Test for TSLIB Touchscreen support
-+  enable_tslib=yes
-+fi
-+
- enable_wm97xx_ts=no
- if test "$checkfor_wm97xx" = "yes"; then
-   dnl Test for WM97xx Touchscreen support
-@@ -1266,6 +1277,7 @@
- AM_CONDITIONAL(WM97XX_TS, test "$enable_wm97xx_ts" = "yes")
- 
- AM_CONDITIONAL(UCB1X00_TS, test "$enable_ucb1x00_ts" = "yes")
-+AM_CONDITIONAL(TSLIB, test "$enable_tslib" = "yes")
- 
- AM_CONDITIONAL(BUILD_TESTS, test "$with_tests" = "yes")
- AM_CONDITIONAL(BUILD_TOOLS, test "$with_tools" = "yes")
-@@ -1426,6 +1438,7 @@
- inputdrivers/serialmouse/Makefile
- inputdrivers/sonypi/Makefile
- inputdrivers/ucb1x00_ts/Makefile
-+inputdrivers/tslib/Makefile
- inputdrivers/wm97xx_ts/Makefile
- 
- interfaces/Makefile
-@@ -1536,6 +1549,7 @@
-   Serial Mouse              $enable_serial_mouse
-   SonyPI Jogdial            $enable_sonypi_jogdial
-   ucb1x00 Touchscreen       $enable_ucb1x00_ts
-+  tslib Touchscreen	    $enable_tslib
-   WM97xx Touchscreen        $enable_wm97xx_ts]);
- fi
- 
-diff -u'rNF^function' DirectFB-1.0.0-rc1~org/inputdrivers/Makefile.am DirectFB-1.0.0-rc1/inputdrivers/Makefile.am
---- DirectFB-1.0.0-rc1~org/inputdrivers/Makefile.am	2006-09-30 17:06:58.000000000 -0400
-+++ DirectFB-1.0.0-rc1/inputdrivers/Makefile.am	2006-10-16 08:06:27.000000000 -0400
-@@ -44,6 +44,10 @@
- UCB1X00_TS_DIR = ucb1x00_ts
- endif
- 
-+if TSLIB
-+TSLIB_DIR = tslib
-+endif
-+
- if SONYPI
- SONYPI_DIR = sonypi
- endif
-@@ -80,6 +84,7 @@
- 	$(SERIALMOUSE_INPUT_DIR) \
- 	$(H3600_TS_DIR)		\
- 	$(UCB1X00_TS_DIR)	\
-+	$(TSLIB_DIR)		\
- 	$(MUTOUCH_TS_DIR)	\
- 	$(PENMOUNT_TS_DIR)	\
- 	$(SONYPI_DIR)		\
-diff -u'rNF^function' DirectFB-1.0.0-rc1~org/inputdrivers/tslib/Makefile.am DirectFB-1.0.0-rc1/inputdrivers/tslib/Makefile.am
---- DirectFB-1.0.0-rc1~org/inputdrivers/tslib/Makefile.am	1969-12-31 19:00:00.000000000 -0500
-+++ DirectFB-1.0.0-rc1/inputdrivers/tslib/Makefile.am	2006-10-13 07:44:02.000000000 -0400
-@@ -0,0 +1,31 @@
-+## Makefile.am for DirectFB/inputdrivers/tslib
-+
-+INCLUDES = \
-+	-I$(top_srcdir)/include	\
-+	-I$(top_builddir)/lib	\
-+	-I$(top_srcdir)/lib	\
-+	-I$(top_srcdir)/src
-+
-+input_LTLIBRARIES = libdirectfb_tslib.la
-+
-+if BUILD_STATIC
-+input_DATA = $(input_LTLIBRARIES:.la=.o)
-+endif
-+
-+inputdir = $(MODULEDIR)/inputdrivers
-+
-+libdirectfb_tslib_la_SOURCES =	\
-+	tslib.c
-+
-+libdirectfb_tslib_la_LDFLAGS = \
-+	-export-dynamic		\
-+	-avoid-version		\
-+	$(DFB_LDFLAGS)
-+
-+libdirectfb_tslib_la_LIBADD = \
-+	$(top_builddir)/lib/direct/libdirect.la \
-+	$(top_builddir)/src/libdirectfb.la
-+
-+
-+include $(top_srcdir)/rules/libobject.make
-+	
-diff -u'rNF^function' DirectFB-1.0.0-rc1~org/inputdrivers/tslib/Makefile.in DirectFB-1.0.0-rc1/inputdrivers/tslib/Makefile.in
---- DirectFB-1.0.0-rc1~org/inputdrivers/tslib/Makefile.in	1969-12-31 19:00:00.000000000 -0500
-+++ DirectFB-1.0.0-rc1/inputdrivers/tslib/Makefile.in	2006-10-13 07:44:02.000000000 -0400
-@@ -0,0 +1,429 @@
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = ../..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+host_alias = @host_alias@
-+host_triplet = @host@
-+AR = @AR@
-+AS = @AS@
-+ASFLAGS = @ASFLAGS@
-+CC = @CC@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+DATADIR = @DATADIR@
-+DFB_CFLAGS_OMIT_FRAME_POINTER = @DFB_CFLAGS_OMIT_FRAME_POINTER@
-+DFB_INTERNAL_CFLAGS = @DFB_INTERNAL_CFLAGS@
-+DFB_LDFLAGS = @DFB_LDFLAGS@
-+DIRECTFB_BINARY_AGE = @DIRECTFB_BINARY_AGE@
-+DIRECTFB_CSOURCE = @DIRECTFB_CSOURCE@
-+DIRECTFB_INTERFACE_AGE = @DIRECTFB_INTERFACE_AGE@
-+DIRECTFB_MAJOR_VERSION = @DIRECTFB_MAJOR_VERSION@
-+DIRECTFB_MICRO_VERSION = @DIRECTFB_MICRO_VERSION@
-+DIRECTFB_MINOR_VERSION = @DIRECTFB_MINOR_VERSION@
-+DIRECTFB_VERSION = @DIRECTFB_VERSION@
-+DIRECT_BUILD_DEBUG = @DIRECT_BUILD_DEBUG@
-+DIRECT_BUILD_DEBUGS = @DIRECT_BUILD_DEBUGS@
-+DIRECT_BUILD_GETTID = @DIRECT_BUILD_GETTID@
-+DIRECT_BUILD_NETWORK = @DIRECT_BUILD_NETWORK@
-+DIRECT_BUILD_TEXT = @DIRECT_BUILD_TEXT@
-+DIRECT_BUILD_TRACE = @DIRECT_BUILD_TRACE@
-+DLLTOOL = @DLLTOOL@
-+DYNLI