From c11f208cb2d00666c84a0d07644c4bf8ac5adf3c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 31 Jul 2013 15:19:39 +0200 Subject: [PATCH] imlib2, lightmediascanner: Add PRIVATE_LIBS * to resolve following warning: WARNING: lightmediascanner-0.4.4 is already registered as shlib provider for png.so, ignoring imlib2-loaders-1.4.5+svnr82070 trying to register the same WARNING: lightmediascanner-0.4.4 is already registered as shlib provider for jpeg.so, ignoring imlib2-loaders-1.4.5+svnr82070 trying to register the same WARNING: lightmediascanner-0.4.4 is already registered as shlib provider for id3.so, ignoring imlib2-loaders-1.4.5+svnr82070 trying to register the same when fixes from https://bugzilla.yoctoproject.org/show_bug.cgi?id=4628 are included in build Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/imlib2_svn.bb | 5 +++++ .../lightmediascanner/lightmediascanner_0.4.4.bb | 3 +++ 2 files changed, 8 insertions(+) diff --git a/meta-efl/recipes-efl/efl/imlib2_svn.bb b/meta-efl/recipes-efl/efl/imlib2_svn.bb index eeaaf529cc..a83216df96 100644 --- a/meta-efl/recipes-efl/efl/imlib2_svn.bb +++ b/meta-efl/recipes-efl/efl/imlib2_svn.bb @@ -29,3 +29,8 @@ FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so" FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so" FILES_imlib2-loaders-dbg += "${libdir}/imlib2/loaders/.debug" FILES_imlib2-filters-dbg += "${libdir}/imlib2/filters/.debug" + +# png.so jpeg.so id3.so are also provided by lightmediascanner +PRIVATE_LIBS_imlib2-loaders = "pnm.so lbm.so argb.so tiff.so zlib.so bmp.so tga.so gif.so xpm.so bz2.so" + +PRIVATE_LIBS_imlib2-filters = "bumpmap.so colormod.so testfilter.so" diff --git a/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.4.4.bb b/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.4.4.bb index 8fdce18588..a3ff5d22f4 100644 --- a/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.4.4.bb +++ b/meta-efl/recipes-multimedia/lightmediascanner/lightmediascanner_0.4.4.bb @@ -31,3 +31,6 @@ FILES_${PN}-staticdev += "${libdir}/${PN}/plugins/*.a" # otherwise fails with ERROR: could not add conversion charset 'UTF-16BE': Invalid argument RDEPENDS_${PN}-test_append_libc-glibc = " glibc-gconv-utf-16" + +# png.so jpeg.so id3.so are provided also by imlib2-loaders +PRIVATE_LIBS_${PN} = "video-dummy.so png.so jpeg.so id3.so pls.so audio-dummy.so rm.so ogg.so dummy.so m3u.so flac.so asf.so"