From 6cc47fb2b007504be3e32698ed14b1bebc981526 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 23 Jun 2014 14:30:18 +0200 Subject: imlib2: upgrade to use pkg-config for freetype2 support * convert from old svn repo to new (legacy) git repo * fixed upstream: commit fe82b9760c7ceb25747c6e634bc827b4cc8ecabd Author: Kim Woelders Date: Thu Jul 4 20:08:53 2013 +0200 Autofoo updates. - Eliminate deprecated AC_TRY_CPP. - Use pkg-config in stead of freetype-config to get freetype info. - Eliminate my_includes/my_libs. - Clean up include paths. Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/imlib2_git.bb | 42 +++++++++++++++++++++ meta-efl/recipes-efl/efl/imlib2_svn.bb | 44 ---------------------- meta-efl/recipes-navigation/mcnavi/mcnavi_0.3.4.bb | 2 - 3 files changed, 42 insertions(+), 46 deletions(-) create mode 100644 meta-efl/recipes-efl/efl/imlib2_git.bb delete mode 100644 meta-efl/recipes-efl/efl/imlib2_svn.bb (limited to 'meta-efl') diff --git a/meta-efl/recipes-efl/efl/imlib2_git.bb b/meta-efl/recipes-efl/efl/imlib2_git.bb new file mode 100644 index 0000000000..dc91763a8e --- /dev/null +++ b/meta-efl/recipes-efl/efl/imlib2_git.bb @@ -0,0 +1,42 @@ +SUMMARY = "A graphic library for file loading, saving, rendering, and manipulation" +LICENSE = "MIT BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" + +DEPENDS = "freetype libpng jpeg virtual/libx11 libxext" +PROVIDES = "virtual/imlib2" +PV = "1.4.6+gitr${SRCPV}" +SRCREV = "560a58e61778d84953944f744a025af6ce986334" + +inherit efl binconfig +SRC_URI = "git://git.enlightenment.org/legacy/${BPN}.git" +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[gif] = "--with-gif,--without-gif,giflib" +PACKAGECONFIG[tiff] = "--with-tiff,--without-tiff,tiff" +PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2" +PACKAGECONFIG[id3] = "--with-id3,--without-id3,libid3tag" + +EXTRA_OECONF = "--with-x \ + --x-includes=${STAGING_INCDIR} \ + --x-libraries=${STAGING_LIBDIR} " + +# TODO: Use more fine granular version +#OE_LT_RPATH_ALLOW=":${libdir}/imlib2/loaders:${libdir}/imlib2/filters:" +OE_LT_RPATH_ALLOW = "any" +OE_LT_RPATH_ALLOW[export]="1" + +PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters" +FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so" +FILES_${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/ ${prefix}/src/debug/" +FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}" +FILES_${PN}-bin = "${bindir}" +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-efl/efl/imlib2_svn.bb b/meta-efl/recipes-efl/efl/imlib2_svn.bb deleted file mode 100644 index 9806de7586..0000000000 --- a/meta-efl/recipes-efl/efl/imlib2_svn.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "A graphic library for file loading, saving, rendering, and manipulation" -LICENSE = "MIT BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" -# can also depend on tiff34, ungif or gif, z, bz2, id3tag -DEPENDS = "freetype libpng jpeg virtual/libx11 libxext" -PROVIDES = "virtual/imlib2" -PV = "1.4.5+svnr${SRCPV}" -SRCREV = "${EFL_SRCREV}" - -PNBLACKLIST[imlib2] = "BROKEN: needs to be updated to use freetype2 pkg-config" - -inherit efl binconfig -SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep" -S = "${WORKDIR}/${SRCNAME}" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[gif] = "--with-gif,--without-gif,giflib" -PACKAGECONFIG[tiff] = "--with-tiff,--without-tiff,tiff" -PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2" -PACKAGECONFIG[id3] = "--with-id3,--without-id3,libid3tag" - -EXTRA_OECONF = "--with-x \ - --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR} " - -# TODO: Use more fine granular version -#OE_LT_RPATH_ALLOW=":${libdir}/imlib2/loaders:${libdir}/imlib2/filters:" -OE_LT_RPATH_ALLOW = "any" -OE_LT_RPATH_ALLOW[export]="1" - -PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters" -FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so" -FILES_${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/ ${prefix}/src/debug/" -FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}" -FILES_${PN}-bin = "${bindir}" -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-navigation/mcnavi/mcnavi_0.3.4.bb b/meta-efl/recipes-navigation/mcnavi/mcnavi_0.3.4.bb index 1a6e4a0a44..d07b1435f3 100644 --- a/meta-efl/recipes-navigation/mcnavi/mcnavi_0.3.4.bb +++ b/meta-efl/recipes-navigation/mcnavi/mcnavi_0.3.4.bb @@ -4,8 +4,6 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" DEPENDS = "ecore evas imlib2 gpsd edje edje-native mysql5" -PNBLACKLIST[mcnavi] = "BROKEN: depends on broken imlib2" - SRC_URI = "http://www.gps-routes.info/debian/pool/main/m/mcnavi/mcnavi_${PV}.tar.gz" SRC_URI[md5sum] = "6860cde5c02a9f93c829da4b10e5a226" SRC_URI[sha256sum] = "ee7f65155e91386175875fc4f72f4bc94e4e9cdb8258112632da94520ef2c349" -- cgit 1.2.3-korg