Add deviced dependency for scanner v2

Change-Id: I6b4401395f1fa826bdc18bbb9c168f30733678dd
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/configure.ac b/configure.ac
index 3513486..36145e4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -169,6 +169,10 @@ if test "x$USE_PRODUCT_TV" = "xyes"; then
        PKG_CHECK_MODULES(POWER_TV, capi-system-power-tv)
        AC_SUBST(POWER_TV_CFLAGS)
        AC_SUBST(POWER_TV_LIBS)
+
+       PKG_CHECK_MODULES(LIBPMCONTROL, deviced)
+       AC_SUBST(LIBPMCONTROL_CFLAGS)
+       AC_SUBST(LIBPMCONTROL_LIBS)
 fi
 AM_CONDITIONAL(USE_PRODUCT_TV, test "x$USE_PRODUCT_TV" = "xyes")
 

diff --git a/lib/media-util-user.c b/lib/media-util-user.c
index a081d01..57e3a1b 100755 (executable)
--- a/lib/media-util-user.c
+++ b/lib/media-util-user.c
@@ -97,9 +97,11 @@ static int __ms_user_get_path(ms_user_path_type_e type, uid_t uid, char **path)
        case THUMB_EXTERNAL:
                result = tzplatform_context_mkpath(context[idx], TZ_USER_SHARE, "media/.thumb/mmc");
                break;
+#ifndef _USE_TVPD_MODE
        case MEDIA_SHARED:
                result = tzplatform_context_getenv(context[idx], TZ_USER_MEDIASHARED);
                break;
+#endif
        default:
                MSAPI_DBG_ERR("Invalid type");
                ret = MS_MEDIA_ERR_INTERNAL;

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index 5a8dc87..58fb1b1 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -34,6 +34,7 @@ BuildRequires:  gettext-tools
 BuildRequires:  pkgconfig(capi-system-usbdevice)
 BuildRequires:  pkgconfig(power-defs)
 BuildRequires:  pkgconfig(capi-system-power-tv)
+BuildRequires:  pkgconfig(deviced)
 %define product_tv 1
 %else
 %define product_tv 0