[Release version 0.2.29] Update to remove unnecessary dependency

Change-Id: I354ec2ba230eaf835c9c67b022a8a9200df7efbf
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7ff5c5..b255ade 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,12 +9,18 @@ SET(fw_name "${service}-${submodule}")
 
 PROJECT(${fw_name})
 
-SET(pc_dependents "dlog mm-common mused libtbm mm-camcorder")
+SET(pc_dependents "dlog mm-common mused libtbm")
 
 SET(PC_NAME ${fw_name})
+SET(PACKAGE_DESCRIPTION "muse camera module")
 SET(PC_REQUIRED ${pc_dependents})
 SET(PC_LDFLAGS -lmuse-camera)
 
+SET(PC_NAME2 legacy-camera)
+SET(PACKAGE_DESCRIPTION2 "legacy camera library")
+SET(PC_REQUIRED2 "mm-camcorder")
+SET(PC_LDFLAGS2 -llegacy-camera)
+
 CONFIGURE_FILE(
     ${fw_name}.pc.in
     ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc
@@ -22,6 +28,13 @@ CONFIGURE_FILE(
 )
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
+CONFIGURE_FILE(
+    legacy-camera.pc.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/legacy-camera.pc
+    @ONLY
+)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/legacy-camera.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+
 ADD_SUBDIRECTORY(legacy)
 ADD_SUBDIRECTORY(muse)
 

diff --git a/legacy-camera.pc.in b/legacy-camera.pc.in
new file mode 100644 (file)
index 0000000..201515b
--- /dev/null
+++ b/legacy-camera.pc.in
@@ -0,0 +1,15 @@
+
+# Package Information for pkg-config
+
+prefix=@PREFIX@
+exec_prefix=/usr
+libdir=@LIB_INSTALL_DIR@
+includedir=/usr/include/media
+
+Name: @PC_NAME2@
+Description: @PACKAGE_DESCRIPTION2@
+Version: @VERSION@
+Requires: @PC_REQUIRED2@
+Libs: -L${libdir} @PC_LDFLAGS2@
+Cflags: -I${includedir}
+

diff --git a/legacy/CMakeLists.txt b/legacy/CMakeLists.txt
index bbb5d0e..ba63123 100644 (file)
--- a/legacy/CMakeLists.txt
+++ b/legacy/CMakeLists.txt
@@ -4,7 +4,7 @@ SET(service "legacy")
 SET(submodule "camera")
 
 # for package file
-SET(dependents "dlog mm-camcorder capi-base-common capi-media-tool gstreamer-1.0 libtbm evas ecore elementary vconf")
+SET(dependents "dlog mm-camcorder capi-base-common gstreamer-1.0 evas ecore elementary vconf")
 
 SET(fw_name "${service}-${submodule}")
 

diff --git a/legacy/include/legacy_camera.h b/legacy/include/legacy_camera.h
index 7cf527e..3e6f5ba 100644 (file)
--- a/legacy/include/legacy_camera.h
+++ b/legacy/include/legacy_camera.h
@@ -14,11 +14,10 @@
 * limitations under the License.
 */
 
-#ifndef __TIZEN_MULTIMEDIA_CAMERA_H__
-#define __TIZEN_MULTIMEDIA_CAMERA_H__
+#ifndef __TIZEN_MULTIMEDIA_LEGACY_CAMERA_H__
+#define __TIZEN_MULTIMEDIA_LEGACY_CAMERA_H__
 
 #include <tizen.h>
-#include <media_packet.h>
 #include <mm_camcorder.h>
 
 #ifdef __cplusplus
@@ -3536,5 +3535,5 @@ int legacy_camera_attr_set_encoded_preview_gop_interval(camera_h camera, int int
 }
 #endif
 
-#endif /* __TIZEN_MULTIMEDIA_CAMERA_H__ */
+#endif /* __TIZEN_MULTIMEDIA_LEGACY_CAMERA_H__ */
 

diff --git a/legacy/include/legacy_camera_internal.h b/legacy/include/legacy_camera_internal.h
index 5eeb16c..bdd6dbb 100644 (file)
--- a/legacy/include/legacy_camera_internal.h
+++ b/legacy/include/legacy_camera_internal.h
@@ -14,8 +14,8 @@
 * limitations under the License.
 */
 
-#ifndef __TIZEN_MULTIMEDIA_CAMERA_INTERNAL_H__
-#define        __TIZEN_MULTIMEDIA_CAMERA_INTERNAL_H__
+#ifndef __TIZEN_MULTIMEDIA_LEGACY_CAMERA_INTERNAL_H__
+#define __TIZEN_MULTIMEDIA_LEGACY_CAMERA_INTERNAL_H__
 #include <legacy_camera.h>
 
 #ifdef __cplusplus
@@ -66,4 +66,4 @@ int legacy_camera_set_client_pid(camera_h camera, int pid);
 }
 #endif
 
-#endif //__TIZEN_MULTIMEDIA_CAMERA_INTERNAL_H__
+#endif /* __TIZEN_MULTIMEDIA_LEGACY_CAMERA_INTERNAL_H__ */

diff --git a/legacy/include/legacy_camera_private.h b/legacy/include/legacy_camera_private.h
index 31deb73..d59c35e 100644 (file)
--- a/legacy/include/legacy_camera_private.h
+++ b/legacy/include/legacy_camera_private.h
@@ -78,7 +78,6 @@ typedef struct _camera_s{
        bool is_used_in_recorder;
        bool on_continuous_focusing;
        int cached_focus_mode;
-       media_format_h pkt_fmt;
        camera_device_e device_type;
 
        GList *cb_data_list;

diff --git a/legacy/src/legacy_camera.c b/legacy/src/legacy_camera.c
index 5b1533f..538a59f 100644 (file)
--- a/legacy/src/legacy_camera.c
+++ b/legacy/src/legacy_camera.c
@@ -27,8 +27,6 @@
 #include <glib.h>
 #include <dlog.h>
 #include <gst/gst.h>
-#include <tbm_bufmgr.h>
-#include <tbm_surface_internal.h>
 #include <Evas.h>
 #include <Ecore.h>
 #ifdef HAVE_WAYLAND
@@ -678,11 +676,6 @@ int legacy_camera_destroy(camera_h camera)
 
        LOGW("camera handle %p", handle);
 
-       if (handle->pkt_fmt) {
-               media_format_unref(handle->pkt_fmt);
-               handle->pkt_fmt = NULL;
-       }
-
        ret = mm_camcorder_destroy(handle->mm_handle);
        if (ret == MM_ERROR_NONE) {
                _camera_remove_cb_message(handle);

diff --git a/mmsvc-camera.pc.in b/mmsvc-camera.pc.in
index 1508489..b780415 100644 (file)
--- a/mmsvc-camera.pc.in
+++ b/mmsvc-camera.pc.in
@@ -10,6 +10,5 @@ Name: @PC_NAME@
 Description: @PACKAGE_DESCRIPTION@
 Version: @VERSION@
 Requires: @PC_REQUIRED@
-Libs: -L${libdir} @PC_LDFLAGS@
 Cflags: -I${includedir}
 

diff --git a/muse/include/muse_camera.h b/muse/include/muse_camera.h
index 500e2bd..6aeeafd 100644 (file)
--- a/muse/include/muse_camera.h
+++ b/muse/include/muse_camera.h
@@ -30,8 +30,7 @@ extern "C" {
 #include <glib.h>
 #include <stdio.h>
 #include <tbm_bufmgr.h>
-#include "legacy_camera_internal.h"
-#include <mm_camcorder.h>
+
 
 /**
  * @brief Enumeration for the muse camera apis.
@@ -234,18 +233,6 @@ typedef struct {
        void *internal_buffer;
 } muse_camera_export_data;
 
-typedef struct {
-       camera_h camera_handle;
-       tbm_bufmgr bufmgr;
-       GList *data_list;
-       GMutex list_lock;
-       GMutex preview_cb_lock;
-       GCond preview_cb_cond;
-#ifdef HAVE_WAYLAND
-       MMCamWaylandInfo wl_info;
-#endif /* HAVE_WAYLAND */
-} muse_camera_handle_s;
-
 
 /**
  * @brief The structure type for muse camera errors.

diff --git a/muse/include/muse_camera_internal.h b/muse/include/muse_camera_internal.h
new file mode 100644 (file)
index 0000000..f8bb919
--- /dev/null
+++ b/muse/include/muse_camera_internal.h
@@ -0,0 +1,49 @@
+/*
+* Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+#ifndef __MUSE_CAMERA_INTERNAL_H__
+#define __MUSE_CAMERA_INTERNAL_H__
+
+#ifdef _cplusplus
+extern "C" {
+#endif
+
+/**
+  * @file muse_camera_internal.h
+  * @brief This file contains the muse camera internal API for framework, related structures and enumerations.
+  */
+
+#include <muse_camera.h>
+#include <legacy_camera_internal.h>
+
+typedef struct {
+       camera_h camera_handle;
+       tbm_bufmgr bufmgr;
+       GList *data_list;
+       GMutex list_lock;
+       GMutex preview_cb_lock;
+       GCond preview_cb_cond;
+#ifdef HAVE_WAYLAND
+       MMCamWaylandInfo wl_info;
+#endif /* HAVE_WAYLAND */
+} muse_camera_handle_s;
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MUSE_CAMERA_INTERNAL_H__ */

diff --git a/muse/src/muse_camera_dispatcher.c b/muse/src/muse_camera_dispatcher.c
index 371c0f5..01ec571 100644 (file)
--- a/muse/src/muse_camera_dispatcher.c
+++ b/muse/src/muse_camera_dispatcher.c
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <dlog.h>
 #include "muse_camera_msg.h"
-#include "muse_camera.h"
+#include "muse_camera_internal.h"
 #include <muse_core.h>
 #include <muse_core_ipc.h>
 #include <mm_types.h>
@@ -1300,7 +1300,7 @@ int camera_dispatcher_set_display(muse_module_h module)
 #ifdef HAVE_WAYLAND
        MMCamWaylandInfo *wl_info = NULL;
 #endif /* HAVE_WAYLAND */
-       camera_display_type_e type = CAMERA_DISPLAY_TYPE_OVERLAY;
+       camera_display_type_e type = CAMERA_DISPLAY_TYPE_NONE;
        camera_h camera = NULL;;
 
        muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module);
@@ -1723,7 +1723,6 @@ int camera_dispatcher_get_flash_state(muse_module_h module)
 {
        int ret = CAMERA_ERROR_NONE;
        camera_device_e device_type = CAMERA_DEVICE_CAMERA0;
-       muse_camera_handle_s *muse_camera = NULL;
        camera_flash_state_e get_flash_state = CAMERA_FLASH_STATE_NOT_USED;
        muse_camera_api_e api = MUSE_CAMERA_API_GET_FLASH_STATE;
        muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE;
@@ -1731,9 +1730,9 @@ int camera_dispatcher_get_flash_state(muse_module_h module)
        muse_camera_msg_get(device_type, muse_core_client_get_msg(module));
 
        if (device_type == CAMERA_DEVICE_CAMERA0)
-               muse_core_client_get_value(module, "flash_state_camera0", &get_flash_state);
+               muse_core_client_get_value(module, "flash_state_camera0", (int *)&get_flash_state);
        else
-               muse_core_client_get_value(module, "flash_state_camera1", &get_flash_state);
+               muse_core_client_get_value(module, "flash_state_camera1", (int *)&get_flash_state);
 
        LOGD("fash state : %d", get_flash_state);
 

diff --git a/packaging/mmsvc-camera.spec b/packaging/mmsvc-camera.spec
index e1a6abe..7cd4d39 100755 (executable)
--- a/packaging/mmsvc-camera.spec
+++ b/packaging/mmsvc-camera.spec
@@ -3,7 +3,7 @@
 
 Name:       mmsvc-camera
 Summary:    A Camera module for muse server
-Version:    0.2.28
+Version:    0.2.29
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0
@@ -14,7 +14,6 @@ BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(mused)
 BuildRequires:  pkgconfig(mm-camcorder)
 BuildRequires:  pkgconfig(capi-base-common)
-BuildRequires:  pkgconfig(capi-media-tool)
 %if %{with x}
 BuildRequires:  pkgconfig(ecore-x)
 %endif
@@ -38,7 +37,6 @@ A Camera module for muse server and native camera API.
 Summary:  A Camera module for muse server (Development)
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig(libtbm)
-Requires: pkgconfig(capi-media-tool)
 
 
 %description devel