From 0c3c317807715b76f1f6b8756cb0aa8914ccf789 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Wed, 25 Jun 2014 21:02:55 +0200 Subject: [PATCH] Fix libmedia-service Change-Id: Ieb816864d4d383241269ebbc319a1a3e807245cf Signed-off-by: Ronan Le Martret --- .../libmedia-service/libmedia-service.inc | 45 ++++++++++------------ 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/recipes-tizen/libmedia-service/libmedia-service.inc b/recipes-tizen/libmedia-service/libmedia-service.inc index ea2bada..64b4d81 100644 --- a/recipes-tizen/libmedia-service/libmedia-service.inc +++ b/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 = "" @@ -46,11 +46,11 @@ DEPENDS += "libslp-db-util" do_prep() { cd ${S} chmod -Rf a+rX,u+w,g-w,o-w ${S} - #setup -q + #setup -q cp ${S}/packaging/libmedia-service.manifest . - - - + + + } do_patch_append() { bb.build.exec_func('do_prep', d) @@ -68,11 +68,11 @@ do_compile() { CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ; FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ; LD_AS_NEEDED=1; export LD_AS_NEEDED ; - - - CFLAGS="${CFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CFLAGS ; - CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ; - FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export FFLAGS ; + + + CFLAGS="${CFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CFLAGS ; + CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ; + FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export FFLAGS ; cmake \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \ @@ -82,11 +82,11 @@ do_compile() { -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON . + -DBUILD_SHARED_LIBS:BOOL=ON . make -j16 - - - + + + } do_install() { @@ -97,23 +97,18 @@ do_install() { unset DISPLAY rm -rf ${D} mkdir -p ${D} - + rm -rf ${D} - + oe_runmake \ DESTDIR=${D} \ INSTALL_ROOT=${D} \ BINDIR=${prefix}/bin \ - install - rm -f ${D}${infodir}/dir - find ${D} -regex ".*\.la$" | xargs rm -f -- + install + rm -f ${D}${infodir}/dir + 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 - - + } pkg_postinst_${PN}() { -- 2.7.4