From 3fda83df91d79d878e63653aa87c4f3ad817c15c Mon Sep 17 00:00:00 2001 From: "Hyunsoo, Park" Date: Thu, 17 Mar 2016 15:19:08 +0900 Subject: [PATCH] Fix hard coding path to 'Tizen Specific Path' Change-Id: I22cc33595646706eec6a8f763c3ebe9406fe084d Signed-off-by: Hyunsoo, Park --- common/Makefile.am | 2 ++ common/include/mm_wfd_sink_ini.h | 5 +++-- config/Makefile.am | 2 +- config/mmfw_wfd_sink.ini | 2 +- configure.ac | 4 ++++ packaging/libmm-wfd.spec | 9 +++++---- sink/Makefile.am | 2 ++ sink/mm_wfd_sink_util.c | 3 ++- 8 files changed, 20 insertions(+), 9 deletions(-) diff --git a/common/Makefile.am b/common/Makefile.am index 5db2d49..acc19c8 100755 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -6,8 +6,10 @@ libwfdcommon_la_SOURCES = mm_wfd_attrs.c mm_wfd_sink_ini.c libwfdcommon_la_CFLAGS = -I$(srcdir)/include \ $(GLIB_CFLAGS) \ + $(TZPLATFORM_CONFIG_CFLAGS) \ $(MMCOMMON_CFLAGS) libwfdcommon_la_LIBADD = $(GLIB_LIBS) \ $(MMCOMMON_LIBS) \ + $(TZPLATFORM_CONFIG_LIBS) \ $(INIPARSER_LIBS) diff --git a/common/include/mm_wfd_sink_ini.h b/common/include/mm_wfd_sink_ini.h index b844f3b..eea43df 100755 --- a/common/include/mm_wfd_sink_ini.h +++ b/common/include/mm_wfd_sink_ini.h @@ -24,6 +24,7 @@ #define __MM_WFD_SINK_INI_H__ #include +#include #include "mm_wfd_sink_wfd_enum.h" #ifdef __cplusplus @@ -40,7 +41,7 @@ enum WFDSinkINIProbeFlags WFD_SINK_INI_PROBE_BUFFER_DURATION = (1 << 3), }; -#define MM_WFD_SINK_INI_DEFAULT_PATH "/usr/etc/mmfw_wfd_sink.ini" +#define MM_WFD_SINK_INI_DEFAULT_PATH tzplatform_mkpath(TZ_SYS_RO_ETC, "mmfw_wfd_sink.ini") #define WFD_SINK_INI_MAX_STRLEN 256 #define WFD_SINK_INI_MAX_ELEMENT 10 @@ -212,7 +213,7 @@ enable pad probe = no\n\ ; enable wfdsrc inner pad probe\n\ enable wfdsrc pad probe = no\n\ \n\ -; enable ts data dump(/var/tmp/*.ts)\n\ +; enable ts data dump(eg. /var/tmp/*.ts)\n\ enable ts data dump = no\n\ \n\ ; allowed timeout for changing pipeline state\n\ diff --git a/config/Makefile.am b/config/Makefile.am index 68fc379..5843bdc 100755 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -1,2 +1,2 @@ -installconfiguredir=/opt/etc +installconfiguredir=$(TZ_SYS_RO_ETC) installconfigure_DATA=mmfw_wfd_sink.ini diff --git a/config/mmfw_wfd_sink.ini b/config/mmfw_wfd_sink.ini index 487febf..9772d74 100755 --- a/config/mmfw_wfd_sink.ini +++ b/config/mmfw_wfd_sink.ini @@ -17,7 +17,7 @@ enable pad probe = no ; enable wfdrtspsrc inner pad probe enable wfdrtspsrc pad probe = no -; enable ts data dump (/var/tmp/*.ts) +; enable ts data dump (eg. /var/tmp/*.ts) enable ts data dump = no ; allowed timeout for changing pipeline state diff --git a/configure.ac b/configure.ac index 741b105..7893e7b 100755 --- a/configure.ac +++ b/configure.ac @@ -89,6 +89,10 @@ PKG_CHECK_MODULES(EVAS, evas) AC_SUBST(EVAS_CFLAGS) AC_SUBST(EVAS_LIBS) +PKG_CHECK_MODULES(TZPLATFORM_CONFIG, libtzplatform-config) +AC_SUBST(TZPLATFORM_CONFIG_CFLAGS) +AC_SUBST(TZPLATFORM_CONFIG_LIBS) + # for testsuite AC_ARG_ENABLE(sdk, AC_HELP_STRING([--enable-sdk], [sdk build]), diff --git a/packaging/libmm-wfd.spec b/packaging/libmm-wfd.spec index f7ed680..cf46769 100755 --- a/packaging/libmm-wfd.spec +++ b/packaging/libmm-wfd.spec @@ -19,6 +19,7 @@ BuildRequires: pkgconfig(elementary) BuildRequires: pkgconfig(evas) BuildRequires: pkgconfig(ecore-wayland) BuildRequires: pkgconfig(libtbm) +BuildRequires: pkgconfig(libtzplatform-config) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -61,12 +62,12 @@ make %{?jobs:-j%jobs} %install rm -rf %{buildroot} %make_install -mkdir -p %{buildroot}/usr/share/dbus-1/services/ +mkdir -p %{buildroot}/%{TZ_SYS_RO_SHARE}/dbus-1/services/ mkdir -p %{buildroot}/%{_datadir}/license cp -rf %{_builddir}/%{name}-%{version}/LICENSE.APLv2.0 %{buildroot}%{_datadir}/license/%{name} -mkdir -p %{buildroot}/usr/etc -cp -rf config/mmfw_wfd_sink.ini %{buildroot}/usr/etc/mmfw_wfd_sink.ini +mkdir -p %{buildroot}/%{TZ_SYS_RO_ETC} +cp -rf config/mmfw_wfd_sink.ini %{buildroot}/%{TZ_SYS_RO_ETC}/mmfw_wfd_sink.ini %clean rm -rf %{buildroot} @@ -80,7 +81,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %{_datadir}/license/%{name} -/usr/etc/mmfw_wfd_sink.ini +%{TZ_SYS_RO_ETC}/mmfw_wfd_sink.ini %{_libdir}/*.so.* %manifest libmm-wfd.manifest diff --git a/sink/Makefile.am b/sink/Makefile.am index ffe263e..2ee962d 100755 --- a/sink/Makefile.am +++ b/sink/Makefile.am @@ -20,6 +20,7 @@ libmmfwfdsink_la_CFLAGS = -I$(srcdir)/include \ $(GST_VIDEO_CFLAGS) \ $(MM_WFD_COMMON_CFLAGS) \ $(AUDIOSESSIONMGR_CFLAGS) \ + $(TZPLATFORM_CONFIG_CFLAGS) \ -I$(top_builddir)/common/include @@ -39,6 +40,7 @@ libmmfwfdsink_la_LIBADD = $(GST_LIBS) \ $(MMCOMMON_LIBS) \ $(MM_WFD_COMMON_LIBS) \ $(AUDIOSESSIONMGR_LIBS) \ + $(TZPLATFORM_CONFIG_LIBS) \ $(GST_VIDEO_LIBS) diff --git a/sink/mm_wfd_sink_util.c b/sink/mm_wfd_sink_util.c index 45ed601..405a818 100755 --- a/sink/mm_wfd_sink_util.c +++ b/sink/mm_wfd_sink_util.c @@ -22,8 +22,9 @@ #include "mm_wfd_sink_util.h" #include +#include -#define DUMP_TS_DATA_PATH "/var/tmp/" +#define DUMP_TS_DATA_PATH tzplatform_mkpath(TZ_SYS_VAR, "tmp/") static GstPadProbeReturn _mm_wfd_sink_util_dump(GstPad *pad, GstPadProbeInfo *info, gpointer u_data) -- 2.7.4