[0.6.39] Merge branch tizen_3.0 to tizen

Change-Id: Ic11b26c766a65efa8ccacf84d0f575fb525d829e

diff --cc configure.ac
Simple merge

diff --cc packaging/libmm-player.spec
index 9d9a116,74ba6e8..dde0c45
--- 1/packaging/libmm-player.spec
--- 2/packaging/libmm-player.spec
+++ b/packaging/libmm-player.spec
@@@ -26,7 -26,8 +26,9 @@@ BuildRequires:  pkgconfig(icu-i18n
  BuildRequires:  pkgconfig(capi-media-tool)
  BuildRequires:  pkgconfig(murphy-resource)
  BuildRequires:  pkgconfig(murphy-glib)
 +BuildRequires:  pkgconfig(capi-system-info)
+ BuildRequires:  pkgconfig(storage)
+ BuildRequires:  pkgconfig(libtzplatform-config)
  
  %description
  Multimedia Framework Player Library files.

diff --cc src/Makefile.am
index 861ebc3,06e8f47..84e3c1f
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -37,7 -37,8 +37,9 @@@ libmmfplayer_la_CFLAGS =  -I$(srcdir)/i
                        $(MEDIAPACKET_CFLAGS) \
                        $(DLOG_CFLAGS) \
                        $(ECORE_CFLAGS) \
 +                      $(SYSTEMINFO_CFLAGS) \
+                       $(STORAGE_CFLAGS) \
+                       $(TZPLATFORM_CONFIG_CFLAGS) \
                        -Werror -Wno-deprecated -Wno-deprecated-declarations -Wno-cpp
  
  noinst_HEADERS = include/mm_player_utils.h \
@@@ -68,7 -69,8 +70,9 @@@ libmmfplayer_la_LIBADD = $(GST_LIBS) 
                $(DLOG_LIBS) \
                $(UTILX_LIBS) \
                $(ECORE_LIBS) \
 +              $(SYSTEMINFO_LIBS)
+               $(STORAGE_LIBS) \
+               $(TZPLATFORM_CONFIG_LIBS)
  
  
  if IS_SDK

diff --cc src/mm_player_priv.c
Simple merge