directfb: update to version 1.4.6

* ts-lib patch is applied upstream
* remove older minor versions

4 files changed, 4 insertions, 80 deletions

diff --git a/recipes/directfb/directfb-1.4.1/ts_lib_autotools.patch b/recipes/directfb/directfb-1.4.1/ts_lib_autotools.patch
deleted file mode 100644
index 414d48c2d6..0000000000
--- a/recipes/directfb/directfb-1.4.1/ts_lib_autotools.patch
+++ /dev/null
@@ -1,22 +0,0 @@
----
- configure.in |    7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-Index: DirectFB-1.4.1/configure.in
-===================================================================
---- DirectFB-1.4.1.orig/configure.in	2009-06-26 23:30:03.000000000 +0200
-+++ DirectFB-1.4.1/configure.in	2009-07-13 00:23:19.558669631 +0200
-@@ -1334,8 +1334,11 @@
- 
- enable_tslib=no
- if test "$checkfor_tslib" = "yes"; then
--  PKG_CHECK_MODULES([TSLIB], [tslib-0.0], enable_tslib=yes, enable_tslib=no 
--    AC_MSG_WARN([*** no tslib -- tslib driver will not be built.]))
-+  PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0.0], [enable_tslib=yes], [enable_tslib=no])
-+  if test "$enable_tslib" = "no"; then
-+     PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [enable_tslib=yes], [enable_tslib=no,
-+       AC_MSG_WARN([*** no tslib -- tslib driver will not be built.])])
-+  fi
- fi
- 
- enable_ucb1x00_ts=no
diff --git a/recipes/directfb/directfb-1.4.2/ts_lib_autotools.patch b/recipes/directfb/directfb-1.4.2/ts_lib_autotools.patch
deleted file mode 100644
index 414d48c2d6..0000000000
--- a/recipes/directfb/directfb-1.4.2/ts_lib_autotools.patch
+++ /dev/null
@@ -1,22 +0,0 @@
----
- configure.in |    7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-Index: DirectFB-1.4.1/configure.in
-===================================================================
---- DirectFB-1.4.1.orig/configure.in	2009-06-26 23:30:03.000000000 +0200
-+++ DirectFB-1.4.1/configure.in	2009-07-13 00:23:19.558669631 +0200
-@@ -1334,8 +1334,11 @@
- 
- enable_tslib=no
- if test "$checkfor_tslib" = "yes"; then
--  PKG_CHECK_MODULES([TSLIB], [tslib-0.0], enable_tslib=yes, enable_tslib=no 
--    AC_MSG_WARN([*** no tslib -- tslib driver will not be built.]))
-+  PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0.0], [enable_tslib=yes], [enable_tslib=no])
-+  if test "$enable_tslib" = "no"; then
-+     PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [enable_tslib=yes], [enable_tslib=no,
-+       AC_MSG_WARN([*** no tslib -- tslib driver will not be built.])])
-+  fi
- fi
- 
- enable_ucb1x00_ts=no
diff --git a/recipes/directfb/directfb_1.4.2.bb b/recipes/directfb/directfb_1.4.2.bb
deleted file mode 100644
index 5f5a2145b2..0000000000
--- a/recipes/directfb/directfb_1.4.2.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-require directfb.inc
-
-RV = "1.4-0"
-PR = "r1"
-
-DEPENDS += "sysfsutils"
-
-SRC_URI = " \
-    http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-${PV}.tar.gz \
-    file://directfb-1.2.x-fix-pkgconfig-cflags.patch \
-    file://mkdfiff.patch \
-    file://dont-use-linux-config.patch \
-    file://ts_lib_autotools.patch \
-"
-
-EXTRA_OECONF = "\
-  --enable-freetype=yes \
-  --enable-zlib \
-  --with-gfxdrivers=none \
-  --disable-sdl \
-  --disable-vnc \
-  --disable-x11 \
-"
-
-LDFLAGS_append = ""
-
-LEAD_SONAME = "libdirectfb-1.4.so.0"
-
-SRC_URI[md5sum] = "e4376c6c5b8e27d735edb7f62a7a8e86"
-SRC_URI[sha256sum] = "051847e21e88a9c32ee78f8920014602d8b21928602075c5266433cd58addbc6"
diff --git a/recipes/directfb/directfb_1.4.1.bb b/recipes/directfb/directfb_1.4.6.bb
index cc0e4c0735..9a2d7ba9c2 100644
--- a/recipes/directfb/directfb_1.4.1.bb
+++ b/recipes/directfb/directfb_1.4.6.bb
@@ -1,6 +1,7 @@
 require directfb.inc
 
 RV = "1.4-0"
+PR = "r0"
 
 DEPENDS += "sysfsutils"
 
@@ -9,8 +10,7 @@ SRC_URI = " \
     file://directfb-1.2.x-fix-pkgconfig-cflags.patch \
     file://mkdfiff.patch \
     file://dont-use-linux-config.patch \
-    file://ts_lib_autotools.patch \
-"
+   "
 
 EXTRA_OECONF = "\
   --enable-freetype=yes \
@@ -21,9 +21,7 @@ EXTRA_OECONF = "\
   --disable-x11 \
 "
 
-LDFLAGS_append = ""
-
 LEAD_SONAME = "libdirectfb-1.4.so.0"
 
-SRC_URI[md5sum] = "e7df079ff44ec98187c24a00500e597a"
-SRC_URI[sha256sum] = "aa9d532ec4481a3c9f7b3298b1786a84825a3474b714690b901d0617743d8221"
+SRC_URI[md5sum] = "dbe1957932f81790742b58b94c1c7b84"
+SRC_URI[sha256sum] = "b18121e60e9a084ee347037a53a46cfaea1c09505bd99d673c2e65eca285e69b"