aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-06-23 14:30:18 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-07-15 14:53:31 +0200
commit6cc47fb2b007504be3e32698ed14b1bebc981526 (patch)
tree915e51378cb9a74d25c11644bff1e914dd141d77
parent1352f7a5e58549e0b1167edd45393c8dcb296de5 (diff)
downloadmeta-openembedded-contrib-6cc47fb2b007504be3e32698ed14b1bebc981526.tar.gz
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 <kim@woelders.dk> 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 <Martin.Jansa@gmail.com>
-rw-r--r--meta-efl/recipes-efl/efl/imlib2_git.bb (renamed from meta-efl/recipes-efl/efl/imlib2_svn.bb)12
-rw-r--r--meta-efl/recipes-navigation/mcnavi/mcnavi_0.3.4.bb2
2 files changed, 5 insertions, 9 deletions
diff --git a/meta-efl/recipes-efl/efl/imlib2_svn.bb b/meta-efl/recipes-efl/efl/imlib2_git.bb
index 9806de7586..dc91763a8e 100644
--- a/meta-efl/recipes-efl/efl/imlib2_svn.bb
+++ b/meta-efl/recipes-efl/efl/imlib2_git.bb
@@ -1,17 +1,15 @@
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"
+PV = "1.4.6+gitr${SRCPV}"
+SRCREV = "560a58e61778d84953944f744a025af6ce986334"
inherit efl binconfig
-SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep"
-S = "${WORKDIR}/${SRCNAME}"
+SRC_URI = "git://git.enlightenment.org/legacy/${BPN}.git"
+S = "${WORKDIR}/git"
PACKAGECONFIG ??= ""
PACKAGECONFIG[gif] = "--with-gif,--without-gif,giflib"
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"