Merge branch 'tizen_2.4_develop' into tizen_3.0_develop

Change-Id: I06342f388a1b0edcea06b3ddf3aee95a6b2576f0
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --cc configure
Simple merge

diff --cc package/changelog
Simple merge

diff --cc package/pkginfo.manifest
Simple merge

diff --cc tizen/emulator_configure.sh
index d6cd88df7b402cf401ec13bebe89e042d2cc4715,51492fbb7e2c98033a7edc2555818c7064224718..360a01a75669ff9af1777ddc1b1d9aa6ee4203fd
--- 1/tizen/emulator_configure.sh
--- 2/tizen/emulator_configure.sh
+++ b/tizen/emulator_configure.sh
@@@ -87,38 -82,74 +84,68 @@@ els
  export PKG_CONFIG_PATH=${TIZEN_SDK_DEV_PATH}/distrib/lib/pkgconfig:${PKG_CONFIG_PATH}
  fi
  
 - --disable-gtk
 - --disable-quorum
+ # append common options
+ CONFIGURE_APPEND="
+  --target-list=$EMUL_TARGET_LIST
++ --enable-maru
+  --enable-yagl
+  --enable-curl
 - --enable-maru
+  --enable-vigs
 - --enable-qt
++ --enable-qt
+  --enable-libav
+  --enable-libpng
++ --disable-sdl
++ --disable-gtk
++ --disable-vnc
++ --disable-spice
++ --disable-curses
++ --disable-quorum
++ --disable-xen
+  $CONFIGURE_APPEND"
+ 
+ # append platform specific options
  case $targetos in
  Linux*)
- cd ..
- echo ""
- echo "##### QEMU configuring for emulator"
- echo "##### QEMU configure append:" $CONFIGURE_APPEND
- exec ./configure \
-  --enable-werror \
-  --extra-ldflags=-Wl,--export-dynamic \
-  --audio-drv-list=alsa \
-  --enable-virtfs \
-  $CONFIGURE_APPEND \
+ CONFIGURE_APPEND="
+  --enable-werror
+  --extra-ldflags=-Wl,--export-dynamic
+  --audio-drv-list=alsa
 - --disable-vnc
 - --disable-pie
+  --enable-virtfs
 - --disable-xen
 - --enable-sdl
 - --enable-java-ui
+  $CONFIGURE_APPEND
+ "
  ;;
  MINGW*)
- cd ..
- echo ""
- echo "##### QEMU configuring for emulator"
- echo "##### QEMU configure append:" $CONFIGURE_APPEND
- exec ./configure \
-  --enable-werror \
-  --cc=gcc \
-  --extra-cflags=-Wno-error=format \
-  --extra-cflags=-Wno-error=format-extra-args \
-  --extra-cflags=-Wno-error=redundant-decls \
-  --extra-ldflags=-Wl,--large-address-aware \
-  --extra-ldflags=-Wl,--export-all-symbols \
-  --audio-drv-list=winwave \
-  --enable-hax \
-  $CONFIGURE_APPEND \
+ CONFIGURE_APPEND="
++ --cc=gcc
++ --cxx=g++
+  --enable-werror
+  --extra-cflags=-Wno-error=format
+  --extra-cflags=-Wno-error=format-extra-args
+  --extra-cflags=-Wno-error=redundant-decls
+  --extra-ldflags=-Wl,--large-address-aware
+  --extra-ldflags=-Wl,--export-all-symbols
 - --cc=gcc
+  --audio-drv-list=winwave
+  --enable-hax
 - --disable-vnc
 - --enable-sdl
 - --enable-java-ui
+  $CONFIGURE_APPEND
+ "
  ;;
  Darwin*)
 - --enable-werror
+ CONFIGURE_APPEND="
 - --enable-shm
+  --cc=clang
+  --cxx=clang
++ --enable-werror
+  --extra-cflags=-mmacosx-version-min=10.4
+  --extra-ldflags=-lstdc++
+  --audio-drv-list=coreaudio
 - --disable-vnc
+  --enable-hax
 - --disable-sdl
 - --enable-java-ui
+  --disable-cocoa
+  $CONFIGURE_APPEND
+ "
  # FIXME: "-export_dynamic" causes error on old version clang
+ # --extra-ldflags="-Xlinker -export_dynamic" \
+ ;;
+ esac
+ 
  cd ..
  echo ""
  echo "##### QEMU configuring for emulator"

diff --cc tizen/src/emul_state.c
Simple merge

diff --cc tizen/src/emul_state.h
index 57a321c1518dfbe9577fbfed6777f365e5636f46,12e68f076590f997d3a110ea1c872c22cfa48b5a..e8ccc643c2ea923e89b255867fc6492684efbd7c
--- 1/tizen/src/emul_state.h
--- 2/tizen/src/emul_state.h
+++ b/tizen/src/emul_state.h
@@@ -33,10 -33,12 +33,11 @@@
  #ifndef __EMUL_STATE_H__
  #define __EMUL_STATE_H__
  
- #include "display/maru_finger.h"
  #include "config-host.h"
+ 
+ #include "display/maru_finger.h"
  #include "hw/maru_device_ids.h"
  
 -#define SUPPORT_LEGACY_ARGS
  #define MAX_ADDR_LEN    256
  #define MAX_PORT_LEN    256
  

diff --cc tizen/src/emulator.c
Simple merge

diff --cc tizen/src/util/error_handler.c
Simple merge