From: Ronan Le Martret <ronan@fridu.net>
Date: Tue, 30 Sep 2014 15:07:03 +0000 (+0200)
Subject: meta-tizen: Fix libmedia-service license
X-Git-Tag: rev_ivi_2015_02_04~220
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2127ebd3fbc75139e2a99c1379f289d19b97d9c7;p=scm%2Fbb%2Ftizen-distro.git

meta-tizen: Fix libmedia-service license

Change-Id: I8efdf6d7a8e1f7e7d846d31784edad25035b15ed
(From meta-tizen rev: 0bd42df1dd1d48e0e605d8e957c8ce4e93db293f)

Signed-off-by: Ronan Le Martret <ronan@fridu.net>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---

diff --git a/meta-tizen/recipes-tizen/libmedia-service/libmedia-service-extraconf.inc b/meta-tizen/recipes-tizen/libmedia-service/libmedia-service-extraconf.inc
index cd813a8..1b383b6 100644
--- a/meta-tizen/recipes-tizen/libmedia-service/libmedia-service-extraconf.inc
+++ b/meta-tizen/recipes-tizen/libmedia-service/libmedia-service-extraconf.inc
@@ -1,5 +1,4 @@
 INSANE_SKIP_${PN} = "dev-so"
-LICENSE = "Apache-2.0"
 
 do_install() {
  echo export RPM_BUILD_ROOT=${D}
diff --git a/meta-tizen/recipes-tizen/libmedia-service/libmedia-service.inc b/meta-tizen/recipes-tizen/libmedia-service/libmedia-service.inc
index 34e3a31..d46644c 100644
--- a/meta-tizen/recipes-tizen/libmedia-service/libmedia-service.inc
+++ b/meta-tizen/recipes-tizen/libmedia-service/libmedia-service.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Media information service library for multimedia applications"
 HOMEPAGE = "http://nohomepage.org"
 SECTION = "System/Libraries"
-LICENSE = "Apache License, Version 2.0"
+LICENSE = "Apache-2.0"
 
 SRC_URI = ""
 
@@ -33,7 +33,6 @@ DEPENDS += "libmm-fileinfo"
 DEPENDS += "libmedia-thumbnail"
 inherit tizen_cmake
 DEPENDS += "drm-client"
-DEPENDS += "tizen-platform-config"
 DEPENDS += "libmm-common"
 DEPENDS += "aul"
 DEPENDS += "dlog"
@@ -50,7 +49,6 @@ do_prep() {
  cp ${S}/packaging/libmedia-service.manifest .
  
  
- 
 }
 do_patch_append() {
     bb.build.exec_func('do_prep', d)
@@ -79,7 +77,7 @@ do_compile() {
          -DBUILD_SHARED_LIBS:BOOL=ON \
          -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
          ${EXTRA_OECMAKE} . 
- make -j16
+ oe_runmake -j16
  
  
  
@@ -105,10 +103,6 @@ do_install() {
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
  
- #License
- mkdir -p ${D}/${prefix}/share/license
- cp -rf ${WORKDIR}/libmedia-service-0.2.43/LICENSE ${D}/${prefix}/share/license/libmedia-service
- 
  
 }
 
@@ -143,7 +137,6 @@ libmedia-service_files += "${prefix}/lib/libmedia-svc-hash.so.1.0.0"
 libmedia-service_files += "${prefix}/lib/libmedia-content-plugin.so"
 libmedia-service_files += "${prefix}/lib/libmedia-content-plugin.so.1"
 libmedia-service_files += "${prefix}/lib/libmedia-content-plugin.so.1.0.0"
-libmedia-service_files += "${prefix}/share/license/libmedia-service"
 MANIFESTFILES_${PN} = "libmedia-service.manifest"
 
 FILES_${PN}-dev = "${libmedia-service-dev_files}"
diff --git a/meta-tizen/recipes-tizen/libmedia-service/libmedia-service_git.bb b/meta-tizen/recipes-tizen/libmedia-service/libmedia-service_git.bb
index a711173..d3c3da9 100644
--- a/meta-tizen/recipes-tizen/libmedia-service/libmedia-service_git.bb
+++ b/meta-tizen/recipes-tizen/libmedia-service/libmedia-service_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/core/multimedia/libmedia-service;tag=f9d91e58b273253f324e5b7982103c3ce6a8664f;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/multimedia/libmedia-service;tag=68d8bcb105704f5d0ae3e9120e41c78c5b38c0a6;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
diff --git a/meta-tizen/recipes-tizen/meta-common/meta-common_git.bb b/meta-tizen/recipes-tizen/meta-common/meta-common_git.bb
index 706d319..c5574ab 100644
--- a/meta-tizen/recipes-tizen/meta-common/meta-common_git.bb
+++ b/meta-tizen/recipes-tizen/meta-common/meta-common_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/profile/common/meta;tag=e2f337450eab6423ce6409505631033e7c4d04bc;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/common/meta;tag=23c2a8059766f3dbbb73b67e51d184bccbdc08ec;nobranch=1"
 
 BBCLASSEXTEND += " native "