From: Hyongtaek Lim Date: Mon, 10 Aug 2015 11:44:42 +0000 (+0900) Subject: Replace capi-meida-player with deamon X-Git-Tag: submit/tizen/20150812.014234~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=28592fc5b0d046ad80a3a9ae0d264ae957766d50;p=platform%2Fcore%2Fmultimedia%2Fmmsvc-player.git Replace capi-meida-player with deamon Signed-off-by: Hyongtaek Lim Change-Id: I2a24eeaaa59b46b3f3080806cac5d3f4ca936f7a --- diff --git a/CMakeLists.txt b/CMakeLists.txt index b166bf1..864d4c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,8 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(INC_DIR include) INCLUDE_DIRECTORIES(${INC_DIR}) -SET(dependents "dlog glib-2.0 libtbm mused capi-media-player mm-common") -SET(pc_dependents "dlog") +SET(dependents "dlog glib-2.0 libtbm mused legacy-capi-media-player mm-common") +SET(pc_dependents "dlog glib-2.0 libtbm mused legacy-capi-media-player") INCLUDE(FindPkgConfig) pkg_check_modules(${fw_name} REQUIRED ${dependents}) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 106eb2b..32fc1db 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -1,6 +1,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -SET(fw_name "capi-media-player2") +SET(fw_name "capi-media-player") PROJECT(${fw_name}) @@ -10,8 +10,8 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(INC_DIR include) INCLUDE_DIRECTORIES(${INC_DIR}) -SET(dependents "dlog elementary evas libtbm mm-common mm-player capi-base-common capi-media-tool capi-media-sound-manager eom") -SET(pc_dependents "dlog") +SET(dependents "dlog elementary evas libtbm mm-common mm-playerclient capi-base-common capi-media-tool eom") +SET(pc_dependents "dlog libtbm mm-playerclient") INCLUDE(FindPkgConfig) pkg_check_modules(${fw_name} REQUIRED ${dependents}) diff --git a/client/capi-media-player2.manifest b/client/capi-media-player.manifest similarity index 52% rename from client/capi-media-player2.manifest rename to client/capi-media-player.manifest index d9569bd..e3deed8 100644 --- a/client/capi-media-player2.manifest +++ b/client/capi-media-player.manifest @@ -3,6 +3,6 @@ - + diff --git a/client/capi-media-player2.pc.in b/client/capi-media-player.pc.in similarity index 100% rename from client/capi-media-player2.pc.in rename to client/capi-media-player.pc.in diff --git a/client/test/CMakeLists.txt b/client/test/CMakeLists.txt index 7f92847..0a0cbd0 100644 --- a/client/test/CMakeLists.txt +++ b/client/test/CMakeLists.txt @@ -23,6 +23,6 @@ FOREACH(src ${sources}) GET_FILENAME_COMPONENT(src_name ${src} NAME_WE) MESSAGE("${src_name}") ADD_EXECUTABLE(${src_name} ${src}) - TARGET_LINK_LIBRARIES(${src_name} capi-media-player2 ${${client_test}_LDFLAGS}) + TARGET_LINK_LIBRARIES(${src_name} capi-media-player ${${client_test}_LDFLAGS}) ENDFOREACH() diff --git a/client/test/mused_player_es_push_test.c b/client/test/player_es_push_test.c similarity index 100% rename from client/test/mused_player_es_push_test.c rename to client/test/player_es_push_test.c diff --git a/client/test/mused_player_media_packet_test.c b/client/test/player_media_packet_test.c similarity index 100% rename from client/test/mused_player_media_packet_test.c rename to client/test/player_media_packet_test.c diff --git a/client/test/player_client_test.c b/client/test/player_test.c similarity index 100% rename from client/test/player_client_test.c rename to client/test/player_test.c diff --git a/mused-player.manifest b/mused-player.manifest index 55c989e..a76fdba 100644 --- a/mused-player.manifest +++ b/mused-player.manifest @@ -2,8 +2,4 @@ - - - - diff --git a/packaging/mused-player.spec b/packaging/mused-player.spec index 7286dca..8fcf098 100644 --- a/packaging/mused-player.spec +++ b/packaging/mused-player.spec @@ -1,9 +1,9 @@ %bcond_with wayland %bcond_with x -Name: mused-player +Name: capi-media-player Summary: A Media Daemon player library in Tizen Native API -Version: 0.1.1 +Version: 0.3.1 Release: 0 Group: Multimedia/API License: Apache-2.0 @@ -16,7 +16,7 @@ BuildRequires: pkgconfig(mm-common) BuildRequires: pkgconfig(mm-player) BuildRequires: pkgconfig(capi-base-common) BuildRequires: pkgconfig(capi-media-sound-manager) -BuildRequires: pkgconfig(capi-media-player) +BuildRequires: pkgconfig(legacy-capi-media-player) BuildRequires: pkgconfig(appcore-efl) BuildRequires: pkgconfig(elementary) BuildRequires: pkgconfig(ecore) @@ -83,9 +83,9 @@ rm -rf %{buildroot} mkdir -p %{buildroot}/usr/share/license mkdir -p %{buildroot}/usr/bin cp LICENSE.APLv2 %{buildroot}/usr/share/license/%{name} -cp client/test/player_client_test %{buildroot}/usr/bin -cp client/test/mused_player_media_packet_test %{buildroot}/usr/bin -cp client/test/mused_player_es_push_test %{buildroot}/usr/bin +cp client/test/player_test %{buildroot}/usr/bin +cp client/test/player_media_packet_test %{buildroot}/usr/bin +cp client/test/player_es_push_test %{buildroot}/usr/bin %make_install @@ -97,18 +97,14 @@ cp client/test/mused_player_es_push_test %{buildroot}/usr/bin %files %manifest mused-player.manifest -%manifest client/capi-media-player2.manifest -%{_libdir}/libmused-player.so.* -%{_libdir}/libcapi-media-player2.so.* +%manifest client/capi-media-player.manifest +%{_libdir}/libmused-player.so* +%{_libdir}/libcapi-media-player.so* %{_datadir}/license/%{name} -/usr/bin/player_client_test -/usr/bin/mused_player_media_packet_test -/usr/bin/mused_player_es_push_test +/usr/bin/player_test +/usr/bin/player_media_packet_test +/usr/bin/player_es_push_test %files devel %{_includedir}/media/*.h %{_libdir}/pkgconfig/*.pc -%{_libdir}/libmused-player.so -%{_libdir}/libcapi-media-player2.so - -