directfb: Upgrade to 1.7.4 version

Poky master upgraded directfb to 1.7.6 but 3.10.53-1.1.0 GA
release is compatible with directfb 1.7.4.

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/meta-fsl-arm/conf/machine/include/imx-base.inc b/meta-fsl-arm/conf/machine/include/imx-base.inc
index 2d07778c0dde90eca1e2ffd130a85a8b0f6f9d57..b51354d3b5549be79843072ea1bdb6baa0900d15 100644 (file)
--- a/meta-fsl-arm/conf/machine/include/imx-base.inc
+++ b/meta-fsl-arm/conf/machine/include/imx-base.inc
@@ -25,7 +25,7 @@ XSERVER = "xserver-xorg \
            xf86-input-evdev \
            ${XSERVER_DRIVER}"
 
-PREFERRED_VERSION_directfb_mx6 = "1.7.1"
+PREFERRED_VERSION_directfb_mx6 = "1.7.4"
 
 # Ship kernel modules
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"

diff --git a/meta-fsl-arm/recipes-graphics/directfb/directfb/Check-input-NULL-pointer.patch b/meta-fsl-arm/recipes-graphics/directfb/directfb/Check-input-NULL-pointer.patch
new file mode 100644 (file)
index 0000000..1d54172
--- /dev/null
+++ b/meta-fsl-arm/recipes-graphics/directfb/directfb/Check-input-NULL-pointer.patch
@@ -0,0 +1,42 @@
+From 0c1e3d1d54b7f2e637b0984ea10aef1de278ff87 Mon Sep 17 00:00:00 2001
+From: "yong.gan" <yong.gan@freescale.com>
+Date: Fri, 23 May 2014 14:15:09 +0800
+Subject: [PATCH] Check input NULL pointer
+
+Fix the segmentation fault in multi-instance test.
+
+Upstream Status: Pending
+---
+ inputdrivers/linux_input/linux_input.c | 2 +-
+ src/core/input.c                       | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/inputdrivers/linux_input/linux_input.c b/inputdrivers/linux_input/linux_input.c
+index e275762..35cfbdd 100644
+--- a/inputdrivers/linux_input/linux_input.c
++++ b/inputdrivers/linux_input/linux_input.c
+@@ -1979,7 +1979,7 @@ driver_get_keymap_entry( CoreInputDevice           *device,
+      unsigned short              value;
+      DFBInputDeviceKeyIdentifier identifier;
+ 
+-     if (data->vt_fd < 0)
++     if (data == NULL || data->vt_fd < 0)
+           return DFB_UNSUPPORTED;
+ 
+      /* fetch the base level */
+diff --git a/src/core/input.c b/src/core/input.c
+index d77bc9f..ee23909 100644
+--- a/src/core/input.c
++++ b/src/core/input.c
+@@ -723,6 +723,8 @@ dfb_input_core_suspend( DFBInputCore *data )
+                          driver->info.name );
+           }
+      }
++     if(data == NULL)
++        return DFB_FAILURE;
+ 
+      direct_list_foreach (device, data->devices) {
+           InputDeviceShared *devshared;
+-- 
+1.9.1
+

diff --git a/meta-fsl-arm/recipes-graphics/directfb/directfb/fix-compilation-with-zlib.patch b/meta-fsl-arm/recipes-graphics/directfb/directfb/fix-compilation-with-zlib.patch
deleted file mode 100644 (file)
index 8b99b4e..0000000
--- a/meta-fsl-arm/recipes-graphics/directfb/directfb/fix-compilation-with-zlib.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Upstream-Status: Pending
-
-From 1d6d597050fc24769e9df2693f754bdc824a8b78 Mon Sep 17 00:00:00 2001
-From: Laurentiu Palcu <laurentiu.palcu@intel.com>
-Date: Tue, 3 Jul 2012 16:06:10 +0300
-Subject: [PATCH] fix compilation with zlib
-
-Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
----
- src/core/surface.c |    3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/core/surface.c b/src/core/surface.c
-index 50434a2..52f50ab 100644
---- a/src/core/surface.c
-+++ b/src/core/surface.c
-@@ -49,6 +49,9 @@
- #include <gfx/convert.h>
- #include <gfx/util.h>
- 
-+#ifdef USE_ZLIB
-+#include <zlib.h>
-+#endif
- 
- D_DEBUG_DOMAIN( Core_Surface, "Core/Surface", "DirectFB Core Surface" );
- 
--- 
-1.7.9.5
-

diff --git a/meta-fsl-arm/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch b/meta-fsl-arm/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch
deleted file mode 100644 (file)
index 443df5a..0000000
--- a/meta-fsl-arm/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch
+++ /dev/null
@@ -1,345 +0,0 @@
-Rename __no_instrument_function__ macro to avoid conficting redefinitions
-of the same symbol.
-
-Upstream-Status: Pending
-Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
-
-Index: DirectFB-1.6.1/lib/direct/clock.c
-===================================================================
---- DirectFB-1.6.1.orig/lib/direct/clock.c     2012-06-29 19:01:11.000000000 +0300
-+++ DirectFB-1.6.1/lib/direct/clock.c  2013-01-05 18:03:24.000000000 +0200
-@@ -36,28 +36,28 @@
- 
- /**********************************************************************************************************************/
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- long long
- direct_clock_get_micros( void )
- {
-      return direct_clock_get_time( DIRECT_CLOCK_SESSION );
- }
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- long long
- direct_clock_get_millis( void )
- {
-      return direct_clock_get_time( DIRECT_CLOCK_SESSION ) / 1000LL;
- }
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- long long
- direct_clock_get_abs_micros( void )
- {
-      return direct_clock_get_time( DIRECT_CLOCK_REALTIME );
- }
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- long long
- direct_clock_get_abs_millis( void )
- {
-Index: DirectFB-1.6.1/lib/direct/debug.c
-===================================================================
---- DirectFB-1.6.1.orig/lib/direct/debug.c     2012-06-29 19:01:11.000000000 +0300
-+++ DirectFB-1.6.1/lib/direct/debug.c  2013-01-05 18:03:49.000000000 +0200
-@@ -48,7 +48,7 @@
- 
- #if DIRECT_BUILD_DEBUGS  /* Build with debug support? */
-   
--__no_instrument_function__
-+__dfb_no_instrument_function__
- void
- direct_debug_log( DirectLogDomain *domain,
-               unsigned int     debug_level,  /* 1-9, 0 = info */
-@@ -63,7 +63,7 @@
-      va_end( ap );
- }
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- void
- direct_debug_at( DirectLogDomain *domain,
-                  const char      *format, ... )
-@@ -77,7 +77,7 @@
- 
- #endif /* DIRECT_BUILD_DEBUGS */
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- void
- direct_debug_at_always( DirectLogDomain *domain,
-                         const char      *format, ... )
-@@ -93,7 +93,7 @@
- 
- #if DIRECT_BUILD_DEBUGS  /* Build with debug support? */
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- void
- direct_break( const char *func,
-               const char *file,
-@@ -123,7 +123,7 @@
-           direct_trap( "Break", SIGABRT );
- }
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- void
- direct_assertion( const char *exp,
-                   const char *func,
-@@ -144,7 +144,7 @@
-           direct_trap( "Assertion", SIGTRAP );
- }
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- void
- direct_assumption( const char *exp,
-                    const char *func,
-Index: DirectFB-1.6.1/lib/direct/interface.c
-===================================================================
---- DirectFB-1.6.1.orig/lib/direct/interface.c 2012-06-29 19:01:11.000000000 +0300
-+++ DirectFB-1.6.1/lib/direct/interface.c      2013-01-05 18:04:56.000000000 +0200
-@@ -522,7 +522,7 @@
- 
- /**************************************************************************************************/
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- static InterfaceDesc *
- allocate_interface_desc( void )
- {
-@@ -543,7 +543,7 @@
-      return &alloc_list[alloc_count++];
- }
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- static __inline__ void
- fill_interface_desc( InterfaceDesc     *desc,
-                      const void        *interface_ptr,
-@@ -565,7 +565,7 @@
- 
- /**************************************************************************************************/
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- void
- direct_dbg_interface_add( const char *func,
-                           const char *file,
-@@ -586,7 +586,7 @@
-      direct_mutex_unlock( &alloc_lock );
- }
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- void
- direct_dbg_interface_remove( const char *func,
-                              const char *file,
-Index: DirectFB-1.6.1/lib/direct/log.c
-===================================================================
---- DirectFB-1.6.1.orig/lib/direct/log.c       2012-06-29 19:01:11.000000000 +0300
-+++ DirectFB-1.6.1/lib/direct/log.c    2013-01-05 18:04:18.000000000 +0200
-@@ -128,7 +128,7 @@
-      return DR_OK;
- }
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- DirectResult
- direct_log_printf( DirectLog  *log,
-                    const char *format, ... )
-@@ -197,7 +197,7 @@
-      return DR_OK;
- }
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- void
- direct_log_lock( DirectLog *log )
- {
-@@ -211,7 +211,7 @@
-      direct_mutex_lock( &log->lock );
- }
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- void
- direct_log_unlock( DirectLog *log )
- {
-@@ -262,7 +262,7 @@
- 
- /**********************************************************************************************************************/
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- DirectLog *
- direct_log_default( void )
- {
-Index: DirectFB-1.6.1/lib/direct/log_domain.c
-===================================================================
---- DirectFB-1.6.1.orig/lib/direct/log_domain.c        2012-06-29 19:01:11.000000000 +0300
-+++ DirectFB-1.6.1/lib/direct/log_domain.c     2013-01-05 18:04:38.000000000 +0200
-@@ -69,7 +69,7 @@
- 
- /**********************************************************************************************************************/
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- static __inline__ LogDomainEntry *
- lookup_domain( const char *name, bool sub );
- 
-@@ -104,7 +104,7 @@
-      return NULL;
- }
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- static DirectLogLevel
- check_domain( DirectLogDomain *domain );
- 
-@@ -207,7 +207,7 @@
- /* FIXME: merge following */
- 
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- DirectResult
- direct_log_domain_vprintf( DirectLogDomain *domain,
-                            DirectLogLevel   level,
-@@ -268,7 +268,7 @@
-      return DR_OK;
- }
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- DirectResult
- direct_log_domain_log( DirectLogDomain *domain,
-                        DirectLogLevel   level,
-Index: DirectFB-1.6.1/lib/direct/mem.c
-===================================================================
---- DirectFB-1.6.1.orig/lib/direct/mem.c       2012-06-29 19:01:11.000000000 +0300
-+++ DirectFB-1.6.1/lib/direct/mem.c    2013-01-05 18:03:08.000000000 +0200
-@@ -121,7 +121,7 @@
- 
- /**********************************************************************************************************************/
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- static __inline__ MemDesc *
- fill_mem_desc( MemDesc *desc, int bytes, const char *func, const char *file, int line, DirectTraceBuffer *trace )
- {
-Index: DirectFB-1.6.1/lib/direct/messages.c
-===================================================================
---- DirectFB-1.6.1.orig/lib/direct/messages.c  2012-06-29 19:01:11.000000000 +0300
-+++ DirectFB-1.6.1/lib/direct/messages.c       2013-01-05 18:02:57.000000000 +0200
-@@ -40,7 +40,7 @@
- 
- #if DIRECT_BUILD_TEXT
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- void
- direct_messages_info( const char *format, ... )
- {
-@@ -57,7 +57,7 @@
-      direct_log_printf( NULL, "(*) %s", buf );
- }
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- void
- direct_messages_error( const char *format, ... )
- {
-@@ -76,7 +76,7 @@
-      direct_trace_print_stack( NULL );
- }
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- void
- direct_messages_derror( DirectResult result, const char *format, ... )
- {
-@@ -95,7 +95,7 @@
-      direct_trace_print_stack( NULL );
- }
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- void
- direct_messages_perror( int erno, const char *format, ... )
- {
-@@ -114,7 +114,7 @@
-      direct_trace_print_stack( NULL );
- }
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- void
- direct_messages_dlerror( const char *dlerr, const char *format, ... )
- {
-@@ -133,7 +133,7 @@
-      direct_trace_print_stack( NULL );
- }
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- void
- direct_messages_once( const char *func,
-                       const char *file,
-@@ -155,7 +155,7 @@
-      direct_trace_print_stack( NULL );
- }
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- void
- direct_messages_unimplemented( const char *func,
-                                const char *file,
-@@ -166,7 +166,7 @@
-      direct_trace_print_stack( NULL );
- }
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- void
- direct_messages_bug( const char *func,
-                      const char *file,
-@@ -188,7 +188,7 @@
-      direct_trace_print_stack( NULL );
- }
- 
--__no_instrument_function__
-+__dfb_no_instrument_function__
- void
- direct_messages_warn( const char *func,
-                       const char *file,
-Index: DirectFB-1.6.1/lib/direct/os/linux/glibc/types.h
-===================================================================
---- DirectFB-1.6.1.orig/lib/direct/os/linux/glibc/types.h      2012-06-29 19:01:11.000000000 +0300
-+++ DirectFB-1.6.1/lib/direct/os/linux/glibc/types.h   2013-01-05 18:06:04.000000000 +0200
-@@ -74,7 +74,7 @@
- 
- #define __inline__                      inline
- #define D_UNUSED                        __attribute__((unused))
--#define __no_instrument_function__      __attribute__((no_instrument_function))
-+#define __dfb_no_instrument_function__  __attribute__((no_instrument_function))
- #define __constructor__                 __attribute__((constructor))
- #define __destructor__                  __attribute__((destructor))
- #define __typeof__(x)                   typeof(x)
-Index: DirectFB-1.6.1/lib/direct/util.c
-===================================================================
---- DirectFB-1.6.1.orig/lib/direct/util.c      2012-06-29 19:01:11.000000000 +0300
-+++ DirectFB-1.6.1/lib/direct/util.c   2013-01-05 18:03:59.000000000 +0200
-@@ -110,7 +110,7 @@
- /*
-  * translates errno to DirectResult
-  */
--__no_instrument_function__
-+__dfb_no_instrument_function__
- DirectResult
- errno2result( int erno )
- {

diff --git a/meta-fsl-arm/recipes-graphics/directfb/directfb_1.7.1.bb b/meta-fsl-arm/recipes-graphics/directfb/directfb_1.7.4.bb
similarity index 50%
rename from meta-fsl-arm/recipes-graphics/directfb/directfb_1.7.1.bb
rename to meta-fsl-arm/recipes-graphics/directfb/directfb_1.7.4.bb
index 242af6194cc479f6fabb318c0bebc23eadee50b8..9bc26373eff1655e080c9ba4fc809213fe9f33bc 100644 (file)
--- a/meta-fsl-arm/recipes-graphics/directfb/directfb_1.7.1.bb
+++ b/meta-fsl-arm/recipes-graphics/directfb/directfb_1.7.4.bb
@@ -1,11 +1,11 @@
 require recipes-graphics/directfb/directfb.inc
 
-RV = "1.7-1"
+RV = "1.7-4"
 
 DEPENDS += "sysfsutils"
 
-SRC_URI += "file://fix-compilation-with-zlib.patch \
-            file://fixsepbuild.patch"
+SRC_URI += "file://fixsepbuild.patch \
+            file://Check-input-NULL-pointer.patch"
 
 EXTRA_OECONF = "\
   --enable-freetype=yes \
@@ -16,9 +16,11 @@ EXTRA_OECONF = "\
   --disable-x11 \
   --disable-imlib2 \
   --disable-mesa \
+  --with-tests \
 "
-
 LEAD_SONAME = "libdirectfb-1.7.so.0"
 
-SRC_URI[md5sum] = "0ef44c16a414312fd38d6764e2cb9893"
-SRC_URI[sha256sum] = "dd7de38b3cd1408411b37ca28ec73e14b7672e5e28256b7bf91826240c81f519"
+SRC_URI[md5sum] = "f5bdacde77fc653279819796ae11341e"
+SRC_URI[sha256sum] = "20ccd60011c788e50c940ab566943d050679067bc84dc37ca447f1b4af08481b"
+
+PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"