From 05422c4b6748b07fed40b52a8e31ee6c9e98460e Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Wed, 24 Feb 2016 15:42:04 +0900 Subject: [PATCH] [Release version 0.2.14-1] Remove unnecessary dependency Change-Id: I2fc390177b6a950be09378d0cf5acaee4c916588 Signed-off-by: Jeongmo Yang --- CMakeLists.txt | 2 +- legacy/CMakeLists.txt | 8 +++++++- muse/CMakeLists.txt | 2 +- packaging/mmsvc-recorder.spec | 3 +-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b5327c..c7497df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ SET(fw_name "${service}-${submodule}") PROJECT(${fw_name}) -SET(pc_dependents "dlog capi-media-audio-io") +SET(pc_dependents "dlog") SET(PC_NAME ${fw_name}) SET(PC_REQUIRED ${pc_dependents}) diff --git a/legacy/CMakeLists.txt b/legacy/CMakeLists.txt index 11fecf8..ade07d6 100644 --- a/legacy/CMakeLists.txt +++ b/legacy/CMakeLists.txt @@ -4,9 +4,11 @@ SET(service "legacy") SET(submodule "recorder") # for package file -SET(dependents "dlog mm-camcorder capi-media-audio-io legacy-camera") +SET(dependents "dlog mm-camcorder legacy-camera") +SET(dependents2 "capi-media-audio-io") SET(fw_name "${service}-${submodule}") +SET(fw_name2 "only_cflags") PROJECT(${fw_name}) @@ -21,6 +23,10 @@ pkg_check_modules(${fw_name} REQUIRED ${dependents}) FOREACH(flag ${${fw_name}_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) +pkg_check_modules(${fw_name2} REQUIRED ${dependents2}) +FOREACH(flag2 ${${fw_name2}_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag2}") +ENDFOREACH(flag2) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Wextra -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") diff --git a/muse/CMakeLists.txt b/muse/CMakeLists.txt index 9c07940..99449f0 100644 --- a/muse/CMakeLists.txt +++ b/muse/CMakeLists.txt @@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) SET(service "muse") SET(submodule "recorder") -SET(dependents "dlog mused mm-common glib-2.0 capi-media-audio-io") +SET(dependents "dlog mused mm-common glib-2.0") SET(fw_name "${service}-${submodule}") PROJECT(${fw_name}) diff --git a/packaging/mmsvc-recorder.spec b/packaging/mmsvc-recorder.spec index 52492c2..f0a4f39 100644 --- a/packaging/mmsvc-recorder.spec +++ b/packaging/mmsvc-recorder.spec @@ -1,7 +1,7 @@ Name: mmsvc-recorder Summary: A Recorder module for muse server Version: 0.2.14 -Release: 0 +Release: 1 Group: Multimedia/Libraries License: Apache-2.0 Source0: %{name}-%{version}.tar.gz @@ -14,7 +14,6 @@ BuildRequires: pkgconfig(legacy-camera) BuildRequires: pkgconfig(mm-common) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(mused) -BuildRequires: pkgconfig(capi-media-tool) BuildRequires: pkgconfig(capi-media-audio-io) -- 2.7.4