Patchwork [meta-efl] imlib2: upgrade to use pkg-config for freetype2 support

login
register
mail settings
Submitter Martin Jansa
Date June 23, 2014, 1:25 p.m.
Message ID <1403529932-12048-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/74251/
State Accepted, archived
Headers show

Comments

Martin Jansa - June 23, 2014, 1:25 p.m.
* 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>
---
 meta-efl/recipes-efl/efl/{imlib2_svn.bb => imlib2_git.bb} | 12 +++++-------
 meta-efl/recipes-navigation/mcnavi/mcnavi_0.3.4.bb        |  2 --
 2 files changed, 5 insertions(+), 9 deletions(-)
 rename meta-efl/recipes-efl/efl/{imlib2_svn.bb => imlib2_git.bb} (84%)

Patch

diff --git a/meta-efl/recipes-efl/efl/imlib2_svn.bb b/meta-efl/recipes-efl/efl/imlib2_git.bb
similarity index 84%
rename from meta-efl/recipes-efl/efl/imlib2_svn.bb
rename to meta-efl/recipes-efl/efl/imlib2_git.bb
index 9806de7..dc91763 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 1a6e4a0..d07b143 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"