From 788c163f7bfad861710c3ccb80dab681f0f53ad1 Mon Sep 17 00:00:00 2001 From: Gilbok Lee Date: Tue, 29 Dec 2015 12:19:18 +0900 Subject: [PATCH] Remove efl build dependency and change license name Change-Id: I846cbe395525b19cf1027e9a3d021c89263fdc30 Signed-off-by: Gilbok Lee --- packaging/capi-media-video-util.spec | 3 +-- test/CMakeLists.txt | 2 +- test/video_util_test.c | 27 ++++++--------------------- 3 files changed, 8 insertions(+), 24 deletions(-) diff --git a/packaging/capi-media-video-util.spec b/packaging/capi-media-video-util.spec index e7116fe..040565d 100755 --- a/packaging/capi-media-video-util.spec +++ b/packaging/capi-media-video-util.spec @@ -3,7 +3,7 @@ Summary: A Video Utility library in Tizen Native API Version: 0.1.7 Release: 6 Group: System/Libraries -License: Apache License, Version 2.0 +License: Apache-2.0 Source0: %{name}-%{version}.tar.gz Source1001: capi-media-video-util.manifest BuildRequires: pkgconfig(dlog) @@ -11,7 +11,6 @@ BuildRequires: pkgconfig(mm-common) BuildRequires: pkgconfig(mm-transcode) BuildRequires: pkgconfig(capi-base-common) BuildRequires: pkgconfig(capi-system-info) -BuildRequires: pkgconfig(appcore-efl) BuildRequires: cmake BuildRequires: gettext-devel diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index ccdda17..b659e39 100755 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,7 +1,7 @@ SET(fw_test "${fw_name}-test") INCLUDE(FindPkgConfig) -pkg_check_modules(${fw_test} REQUIRED glib-2.0 dlog capi-base-common capi-system-info mm-transcode appcore-efl elementary) +pkg_check_modules(${fw_test} REQUIRED glib-2.0 dlog capi-base-common capi-system-info mm-transcode) FOREACH(flag ${${fw_test}_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") MESSAGE(${flag}) diff --git a/test/video_util_test.c b/test/video_util_test.c index 1e44039..6895ba0 100644 --- a/test/video_util_test.c +++ b/test/video_util_test.c @@ -19,8 +19,6 @@ #include #include #include -#include -#include #include #define PACKAGE "video_util_test" @@ -72,26 +70,10 @@ typedef struct { static void display_sub_basic(); -static int _create_app(void *data) -{ - LOGD("My app is going alive!\n"); - return 0; -} - -static int _terminate_app(void *data) -{ - LOGD("My app is going gone!\n"); - return 0; -} - -struct appcore_ops ops = { - .create = _create_app, - .terminate = _terminate_app, -}; void _quit_program(void) { - elm_exit(); + exit(0); } bool test_transcode_spec_cb(int value, void *user_data) @@ -667,14 +649,17 @@ gboolean input(GIOChannel *channel) int main(int argc, char *argv[]) { GIOChannel *stdin_channel; + GMainLoop *loop = g_main_loop_new(NULL, 0); stdin_channel = g_io_channel_unix_new(0); g_io_channel_set_flags(stdin_channel, G_IO_FLAG_NONBLOCK, NULL); g_io_add_watch(stdin_channel, G_IO_IN, (GIOFunc)input, NULL); displaymenu(); - ops.data = NULL; + g_main_loop_run(loop); + g_print("STOP main loop\n"); - return appcore_efl_main(PACKAGE, &argc, &argv, &ops); + g_main_loop_unref(loop); + return 0; } -- 2.7.4