Merge branch 'upstream' into master_merged
authorPatrick Ohly <patrick.ohly@intel.com>
Mon, 26 Jan 2015 11:20:16 +0000 (03:20 -0800)
committerPatrick Ohly <patrick.ohly@intel.com>
Mon, 26 Jan 2015 11:20:16 +0000 (03:20 -0800)
Conflicts:
meta-tizen-common-base/recipes-application-framework/app-svc/app-svc.inc
meta-tizen-common-base/recipes-multimedia/libmm-common/libmm-common.inc
meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk.inc
meta-tizen-ivi/recipes-graphics/genivi-shell/genivi-shell.inc
meta-tizen-ivi/recipes-ico/ico-vic-amb-plugin/ico-vic-amb-plugin.inc

   All caused by the -j16 change.

meta-tizen-common-base/recipes-application-framework/pkgmgr/pkgmgr_git.bb

   Source was manually changed. Now uses the IVI revision.

meta-tizen-common-base/recipes-multimedia/pulseaudio/pulseaudio.inc
meta-tizen-common-share/recipes-connectivity/ofono/ofono.inc

   Caused by manually fixing the Bluez4 dependency. Manual fix no longer
   necessary.

Change-Id: I5c8d814fb87cd06cc72ca6253d625c8c9c4f5f60

31 files changed:
1  2 
meta-tizen-common-base/recipes-application-framework/ail/ail.inc
meta-tizen-common-base/recipes-application-framework/app-svc/app-svc.inc
meta-tizen-common-base/recipes-application-framework/pkgmgr/pkgmgr.inc
meta-tizen-common-base/recipes-connectivity/download-provider/download-provider.inc
meta-tizen-common-base/recipes-core/tizen-platform-config/tizen-platform-config.inc
meta-tizen-common-base/recipes-devtools/gobject-introspection/gobject-introspection.inc
meta-tizen-common-base/recipes-devtools/tdb/tdb.inc
meta-tizen-common-base/recipes-devtools/vala/vala.inc
meta-tizen-common-base/recipes-framework/notification/notification_git.bb
meta-tizen-common-base/recipes-graphics/libtbm/libtbm.inc
meta-tizen-common-base/recipes-graphics/libtbm/libtbm_git.bb
meta-tizen-common-base/recipes-graphics/weston/weston.inc
meta-tizen-common-base/recipes-multimedia/libmedia-thumbnail/libmedia-thumbnail.inc
meta-tizen-common-base/recipes-multimedia/libmm-common/libmm-common.inc
meta-tizen-common-base/recipes-multimedia/libmm-sound/libmm-sound.inc
meta-tizen-common-base/recipes-multimedia/media-server/media-server.inc
meta-tizen-common-base/recipes-multimedia/pulseaudio/pulseaudio.inc
meta-tizen-common-base/recipes-multimedia/tiff/tiff.inc
meta-tizen-common-base/recipes-security/gsignond/gsignond.inc
meta-tizen-common-base/recipes-security/libsecret/libsecret.inc
meta-tizen-common-base/recipes-security/smack/smack.inc
meta-tizen-common-share/recipes-connectivity/ofono/ofono.inc
meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty.inc
meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk.inc
meta-tizen-common-share/recipes-crosswalk/tizen-extensions-crosswalk/tizen-extensions-crosswalk.inc
meta-tizen-ivi/recipes-extended/automotive-message-broker/automotive-message-broker.inc
meta-tizen-ivi/recipes-graphics/genivi-shell/genivi-shell.inc
meta-tizen-ivi/recipes-graphics/weston-ivi-shell/weston-ivi-shell.inc
meta-tizen-ivi/recipes-ico/ico-uxf-homescreen/ico-uxf-homescreen.inc
meta-tizen-ivi/recipes-ico/ico-uxf-weston-plugin/ico-uxf-weston-plugin.inc
meta-tizen-ivi/recipes-ico/ico-vic-amb-plugin/ico-vic-amb-plugin.inc

@@@ -118,10 -118,9 +118,9 @@@ do_compile() 
           -DCMAKE_SKIP_RPATH:BOOL=ON \
           -DBUILD_SHARED_LIBS:BOOL=ON \
           -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
-          ${EXTRA_OECMAKE} . \
-      -DX11_SUPPORT=Off
+          ${EXTRA_OECMAKE} .
   
 - oe_runmake -j16
 + oe_runmake ${PARALLEL_MAKE}
   
   
   
@@@ -53,11 -56,12 +56,11 @@@ do_compile() 
    unset DISPLAY
    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"
    
    autotools_do_configure
 -  make -j16
 -  
 +  oe_runmake ${PARALLEL_MAKE}
    
    
    
@@@ -93,8 -94,14 +94,14 @@@ do_compile() 
   # to be left out (since several pieces are built with -Werror). At least in
   # M39, this is preventing the "rtc_base" target from being built because it
   # does not expect -Wall to be passed to the compiler (see webrtc issue 3307).
 - export CXXFLAGS=`echo $CXXFLAGS | sed s,-Wall,,g`
 + export CXXFLAGS="`echo $CXXFLAGS | sed s,-Wall,,g`"
   
+  # Do not use -finline-functions: it breaks the build because it causes -Wall to
+  # 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`
+  
   # 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
   # CFLAGS end up appending -fno-omit-frame-pointer. See http://crbug.com/37246
   -Duse_system_bzip2=1 \
   -Duse_system_libexif=1 \
   -Duse_system_libxml=1 \
+  -Duse_system_protobuf=1 \
   -Duse_system_yasm=1 \
-  -Dshared_process_mode=1 \
-  -Denable_hidpi=1
+  -Denable_hidpi=1 \
+  -Dwerror= \
+  -Dskia_warnings_as_errors=0
   
 - ninja -j16 -C src/out/Release xwalk-thirdparty
 + ninja ${PARALLEL_MAKE} -C src/out/Release xwalk-thirdparty
   
   
   
@@@ -192,9 -207,11 +207,11 @@@ do_compile() 
   -Duse_system_nspr=1 \
   -Duse_system_yasm=1 \
   -Dshared_process_mode=1 \
-  -Denable_hidpi=1
+  -Denable_hidpi=1 \
+  -Dwerror= \
+  -Dskia_warnings_as_errors=0
   
-  ninja ${PARALLEL_MAKE} -C src/out/Release xwalk xwalk_launcher xwalk_application_tools
 - ninja -j16 -C src/out/Release xwalk xwalk_launcher xwalk_application_tools widget-manifest-parser
++ ninja ${PARALLEL_MAKE} -C src/out/Release xwalk xwalk_launcher xwalk_application_tools widget-manifest-parser
   
   
   
@@@ -172,20 -232,25 +232,25 @@@ do_compile() 
           -DBUILD_SHARED_LIBS:BOOL=ON \
           -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
           ${EXTRA_OECMAKE} \
-         -Dxwalk_vehicle_extension=ON \
-         -DXWALK_EXTENSION_PATH=/tizen-extensions-crosswalk \
-         -Ddatabase_plugin=ON \
-         -Dmurphy_plugin=ON \
-         -Dobd2_plugin=ON \
-         -Dtest_plugin=ON \
-         -Dgpsnmea_plugin=ON \
-         -Dcangen_plugin=ON \
-         -Dcansim_plugin=ON \
-         -Dusebluez5=ON \
-         -Denable_docs=ON
+          -Dxwalk_vehicle_extension=ON \
+          -DXWALK_EXTENSION_PATH=/tizen-extensions-crosswalk \
+          -Dqtmainloop=ON \
+          -Dopencvlux_plugin=ON \
+          -Dwebsocket_plugin=ON \
+          -Dbluetooth_plugin=ON \
+          -Dbluemonkey_plugin=ON \
+          -Ddatabase_plugin=ON \
+          -Dmurphy_plugin=ON \
+          -Dobd2_plugin=ON \
+          -Dtest_plugin=ON \
+          -Dgpsnmea_plugin=ON \
+          -Dcangen_plugin=ON \
+          -Dcansim_plugin=ON \
+          -Dusebluez5=ON \
+          -Denable_docs=ON
   
   
 - oe_runmake -j16
 + oe_runmake ${PARALLEL_MAKE}
   
   
   
@@@ -84,7 -67,24 +67,24 @@@ do_prep() 
           -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
           ${EXTRA_OECMAKE} .
   
-  oe_runmake ${PARALLEL_MAKE} V=1
+  
+ }
+ do_patch_append() {
+     bb.build.exec_func('do_prep', d)
+ }
+ do_configure() {
+ }
+ do_compile() {
+  cd ${S}
+  LANG=C
+  export LANG
+  unset DISPLAY
+  LD_AS_NEEDED=1; export LD_AS_NEEDED ;
+  
+  
 - make -j16 V=1
++ make ${PARALLEL_MAKE} V=1
   
   
   
@@@ -68,9 -70,8 +70,7 @@@ do_compile() 
           -DBUILD_SHARED_LIBS:BOOL=ON \
           -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
           ${EXTRA_OECMAKE}
-  
-  make ${PARALLEL_MAKE}
 - oe_runmake -j16
-- 
++ oe_runmake ${PARALLEL_MAKE}
   
   
  }