Use g_uuid_string_random() instead of uuid

Used glib instead of uuid to reduce dependencies.

Change-Id: I59ee8eaebff27aa5e007bc6d06f2f99161fd9a81
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b27f249bc8b1343681c31658672ee439e227cfc..3c1fa211e5cfb883a777e17dccf0647f34b82f43 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,7 @@ EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
 
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs REQUIRED glib-2.0 dlog sqlite3 libexif mm-fileinfo libmedia-utils aul uuid libxml-2.0 libzip media-thumbnail libpodofo capi-system-info)
+pkg_check_modules(pkgs REQUIRED glib-2.0 dlog sqlite3 libexif mm-fileinfo libmedia-utils aul libxml-2.0 libzip media-thumbnail libpodofo capi-system-info)
 
 FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/packaging/libmedia-service.spec b/packaging/libmedia-service.spec
index ff826cb135c74e04c2d5a37e903f5a4639aa3ef9..aaeec6237236db6e49428d65e92cf1b091f92875 100644 (file)
--- a/packaging/libmedia-service.spec
+++ b/packaging/libmedia-service.spec
@@ -1,6 +1,6 @@
 Name:       libmedia-service
 Summary:    Media information service library for multimedia applications
-Version:    0.7.3
+Version:    0.7.4
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0
@@ -20,7 +20,6 @@ BuildRequires:  pkgconfig(libzip)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(mm-fileinfo)
 BuildRequires:  pkgconfig(libmedia-utils)
-BuildRequires:  pkgconfig(uuid)
 BuildRequires:  pkgconfig(media-thumbnail)
 BuildRequires:  pkgconfig(libpodofo)
 BuildRequires:  pkgconfig(capi-system-info)

diff --git a/src/media-svc-util.c b/src/media-svc-util.c
index 276a3bccdb6cb5511d868024f7f965f3ce062afa..7ae3ed1500df79df8605953ef6778132e42e5715 100644 (file)
--- a/src/media-svc-util.c
+++ b/src/media-svc-util.c
@@ -27,7 +27,6 @@
 #include <aul/aul.h>
 #include <mm_file.h>
 #include <libexif/exif-data.h>
-#include <uuid/uuid.h>
 #include <media-thumbnail.h>
 #include <media-util-user.h>
 #include "media-svc-util.h"
@@ -111,23 +110,6 @@ static const char sound_mime_table[SOUND_MIME_NUM][MIME_LENGTH] = {
        "text/x-iMelody"
 };
 
-static char *__media_info_generate_uuid(void)
-{
-       uuid_t uuid_value;
-       char uuid_unparsed[37];
-
-RETRY_GEN:
-       uuid_generate(uuid_value);
-       uuid_unparse(uuid_value, uuid_unparsed);
-
-       if (strlen(uuid_unparsed) < 36) {
-               media_svc_debug("INVALID UUID : %s. RETRY GENERATE.", uuid_unparsed);
-               goto RETRY_GEN;
-       }
-
-       return g_strdup(uuid_unparsed);
-}
-
 static int __media_svc_get_media_type(const char *path, const char *mime_type, media_svc_media_type_e *media_type)
 {
        int idx = 0;
@@ -363,7 +345,7 @@ int _media_svc_set_media_info(media_svc_content_info_s *content_info, const char
        if (!refresh) {
                media_svc_retv_del_if(!storage_id, MS_MEDIA_ERR_INTERNAL, content_info);
                content_info->storage_uuid = g_strdup(storage_id);
-               content_info->media_uuid = __media_info_generate_uuid();
+               content_info->media_uuid = g_uuid_string_random();
        }
 
        ret = __media_svc_get_mime_type(path, mime_type);