Fix build error on wearable profile 54/47254/1 accepted/tizen/mobile/20150902.004718 accepted/tizen/tv/20150902.004723 accepted/tizen/wearable/20150902.004734 submit/tizen/20150901.113441
authorJeongmo Yang <jm80.yang@samsung.com>
Tue, 1 Sep 2015 11:29:12 +0000 (20:29 +0900)
committerJeongmo Yang <jm80.yang@samsung.com>
Tue, 1 Sep 2015 11:29:12 +0000 (20:29 +0900)
Change-Id: I7686953faf36cd6d9c0691c96d648271778e6572
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
packaging/capi-media-camera.spec
src/camera.c
src/camera_internal.c

index aecfb06ecfd14aa39b2f765ccab3d558591d3a8f..9ff8cc3df2129f3c23f6bf1607a83ea938efdbf1 100755 (executable)
@@ -3,7 +3,7 @@
 
 Name:       capi-media-camera
 Summary:    A Camera library in Tizen C API
-Version:    0.2.4
+Version:    0.2.5
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
index 76d3422bcaf028efb54f4fa5e3a0be5461442aff..d2faba8c320fec54aace28ea93a34527c62f77ac 100644 (file)
@@ -32,7 +32,9 @@
 #include <tbm_surface_internal.h>
 #include <Evas.h>
 #include <Ecore.h>
+#ifdef HAVE_WAYLAND
 #include <Ecore_Wayland.h>
+#endif /* HAVE_WAYLAND */
 #include <Elementary.h>
 
 #ifdef LOG_TAG
index 9db01a20ef7d449f0193681225cfa22c68076a48..92fbd5e41de87d568bd8d1cf8925396ed995cbfb 100644 (file)
@@ -20,7 +20,9 @@
 #include <string.h>
 #include <mm.h>
 #include <mm_camcorder.h>
+#ifdef HAVE_WAYLAND
 #include <mm_camcorder_mused.h>
+#endif /* HAVE_WAYLAND */
 #include <mm_types.h>
 #include <camera.h>
 #include <camera_internal.h>
@@ -164,10 +166,12 @@ int camera_get_video_caps(camera_h camera, char **caps)
        int ret;
        camera_s *handle = (camera_s *)camera;
 
+#ifdef HAVE_WAYLAND
        ret = mm_camcorder_mused_get_video_caps(handle->mm_handle, caps);
        if(ret != MM_ERROR_NONE) {
                return __convert_camera_error_code(__func__, ret);
        }
+#endif /* HAVE_WAYLAND */
 
        return CAMERA_ERROR_NONE;
 }