Fixes of syntax errors in Yocto recipes for Tizen IVI related to libmm-common and...

Bug Tizen on Yocto: BTY-104

Change-Id: I7f2cb7b62e0c3bac26ff413c80c05c9b1911c2c8
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>

diff --git a/meta-tizen/meta-tizen-common-base/recipes-multimedia/libmm-common/files/mm_list_private.patch b/meta-tizen/meta-tizen-common-base/recipes-multimedia/libmm-common/files/mm_list_private.patch
new file mode 100644 (file)
index 0000000..38fdd29
--- /dev/null
+++ b/meta-tizen/meta-tizen-common-base/recipes-multimedia/libmm-common/files/mm_list_private.patch
@@ -0,0 +1,11 @@
+--- git/mm_list_private.c      2015-02-19 12:48:33.186406416 +0200
++++ git/mm_list_private.c      2015-02-19 12:52:35.530408708 +0200
+@@ -27,6 +27,8 @@
+ #include <mm_debug.h>
+ #include <mm_list_private.h>
+ 
++#include <tizen.h>
++
+ /**
+  * Definition of list item
+  */

diff --git a/meta-tizen/meta-tizen-common-base/recipes-multimedia/libmm-common/libmm-common.inc b/meta-tizen/meta-tizen-common-base/recipes-multimedia/libmm-common/libmm-common.inc
index 8e8f37b..741beaa 100644 (file)
--- a/meta-tizen/meta-tizen-common-base/recipes-multimedia/libmm-common/libmm-common.inc
+++ b/meta-tizen/meta-tizen-common-base/recipes-multimedia/libmm-common/libmm-common.inc
@@ -57,7 +57,7 @@ do_compile() {
   LD_AS_NEEDED=1; export LD_AS_NEEDED ;
   
   CFLAGS="$CFLAGS -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" "
-  export CFLAGS+=" -Wall -Wcast-align -Wcast-qual -Wextra -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable"
+  CFLAGS="$CFLAGS -Wall -Wcast-align -Wcast-qual -Wextra -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable"; export CFLAGS
   
   autotools_do_configure
   oe_runmake ${PARALLEL_MAKE}

diff --git a/meta-tizen/meta-tizen-common-base/recipes-multimedia/libmm-common/libmm-common_git.bb b/meta-tizen/meta-tizen-common-base/recipes-multimedia/libmm-common/libmm-common_git.bb
index 307c74b..9a6f99b 100644 (file)
--- a/meta-tizen/meta-tizen-common-base/recipes-multimedia/libmm-common/libmm-common_git.bb
+++ b/meta-tizen/meta-tizen-common-base/recipes-multimedia/libmm-common/libmm-common_git.bb
@@ -8,3 +8,5 @@ SRC_URI += "git://review.tizen.org/platform/core/multimedia/libmm-common;tag=b27
 
 BBCLASSEXTEND += " native "
 
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
+SRC_URI += "file://mm_list_private.patch"

diff --git a/meta-tizen/meta-tizen-common-base/recipes-multimedia/libmm-log/libmm-log.inc b/meta-tizen/meta-tizen-common-base/recipes-multimedia/libmm-log/libmm-log.inc
index 7aa52a9..d2c4251 100644 (file)
--- a/meta-tizen/meta-tizen-common-base/recipes-multimedia/libmm-log/libmm-log.inc
+++ b/meta-tizen/meta-tizen-common-base/recipes-multimedia/libmm-log/libmm-log.inc
@@ -50,7 +50,7 @@ do_compile() {
   unset DISPLAY
   LD_AS_NEEDED=1; export LD_AS_NEEDED ;
   
-  export CFLAGS+=" -DUSE_DLOG"
+  CFLAGS="$CFLAG -DUSE_DLOG"; export CFLAGS
   
   
   

diff --git a/meta-tizen/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty.inc b/meta-tizen/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty.inc
index ad66654..7220bd3 100644 (file)
--- a/meta-tizen/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty.inc
+++ b/meta-tizen/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty.inc
@@ -102,7 +102,7 @@ do_compile() {
  # warn about some conditions that cannot really be reached (ie. variables that
  # may be used uninitialized while in fact thay cannot be uninitialized). See
  # TC-2299.
- export CXXFLAGS=`echo $CXXFLAGS | sed s,-finline-functions,,g`
+ export CXXFLAGS="`echo $CXXFLAGS | sed s,-finline-functions,,g`"
  
  # For ffmpeg on ia32. The original CFLAGS set by the gyp and config files in
  # src/third_party/ffmpeg already pass -O2 -fomit-frame-pointer, but Tizen's