Patchwork [4/5] freetype: upgrade to 2.5.3

login
register
mail settings
Submitter Ross Burton
Date May 7, 2014, 4:05 p.m.
Message ID <1399478735-27819-4-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/71701/
State Accepted
Commit f7eac57fb0393006878cc1b0cc3b770fc9557c8f
Headers show

Comments

Ross Burton - May 7, 2014, 4:05 p.m.
Also drop the redundant definition of S.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../freetype/{freetype_2.5.2.bb => freetype_2.5.3.bb}        |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
 rename meta/recipes-graphics/freetype/{freetype_2.5.2.bb => freetype_2.5.3.bb} (89%)
Saul Wold - May 7, 2014, 6:04 p.m.
On 05/07/2014 09:05 AM, Ross Burton wrote:
> Also drop the redundant definition of S.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   .../freetype/{freetype_2.5.2.bb => freetype_2.5.3.bb}        |   10 +++-------
>   1 file changed, 3 insertions(+), 7 deletions(-)
>   rename meta/recipes-graphics/freetype/{freetype_2.5.2.bb => freetype_2.5.3.bb} (89%)
>
> diff --git a/meta/recipes-graphics/freetype/freetype_2.5.2.bb b/meta/recipes-graphics/freetype/freetype_2.5.3.bb
> similarity index 89%
> rename from meta/recipes-graphics/freetype/freetype_2.5.2.bb
> rename to meta/recipes-graphics/freetype/freetype_2.5.3.bb
> index 0c62a67..7182c21 100644
> --- a/meta/recipes-graphics/freetype/freetype_2.5.2.bb
> +++ b/meta/recipes-graphics/freetype/freetype_2.5.3.bb
> @@ -13,13 +13,9 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=c017ff17fc6f0794adf93db5559ccd56
>
>   SECTION = "libs"
>
> -SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
> -"
> -
> -SRC_URI[md5sum] = "10e8f4d6a019b124088d18bc26123a25"
> -SRC_URI[sha256sum] = "4ff4bd393aa01071ec7b849d035508a505a78f88b2bcf25ff11e58e43c0b9def"
> -
> -S = "${WORKDIR}/freetype-${PV}"
>
> +SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2"
> +SRC_URI[md5sum] = "d6b60f06bfc046e43ab2a6cbfd171d65"
> +SRC_URI[sha256sum] = "c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e"
>
>   inherit autotools-brokensep pkgconfig binconfig multilib_header
>
>

Hmm, something else went wrong:

>  /srv/hdd/builds/world/tmp/sysroots/x86_64-linux/lib -Wl,-O1 -L/srv/hdd/builds/world/tmp/sysroots/x86_64-linux/usr/lib -lharfbuzz  -no-undefined
>> | /bin/grep: /srv/hdd/builds/world/tmp/sysroots/x86_64-linux/usr/lib/libfreetype.la: No such file or directory
>> | sed: can't read /srv/hdd/builds/world/tmp/sysroots/x86_64-linux/usr/lib/libfreetype.la: No such file or directory
>> | libtool:   error: '/srv/hdd/builds/world/tmp/sysroots/x86_64-linux/usr/lib/libfreetype.la' is not a valid libtool archive
>> | make: *** [/srv/hdd/builds/world/tmp/work/x86_64-linux/freetype-native/2.5.3-r0/freetype-2.5.3/objs/libfreetype.la] Error 1
>> | ERROR: oe_runmake failed
>> | WARNING: /srv/hdd/builds/world/tmp/work/x86_64-linux/freetype-native/2.5.3-r0/temp/run.do_compile.28294:1 exit 1 from
>> |   exit 1
>> | ERROR: Function failed: do_compile (log file is located at /srv/hdd/builds/world/tmp/work/x86_64-linux/freetype-native/2.5.3-r0/temp/log.do_compile.28294)
>


Sau!

Patch

diff --git a/meta/recipes-graphics/freetype/freetype_2.5.2.bb b/meta/recipes-graphics/freetype/freetype_2.5.3.bb
similarity index 89%
rename from meta/recipes-graphics/freetype/freetype_2.5.2.bb
rename to meta/recipes-graphics/freetype/freetype_2.5.3.bb
index 0c62a67..7182c21 100644
--- a/meta/recipes-graphics/freetype/freetype_2.5.2.bb
+++ b/meta/recipes-graphics/freetype/freetype_2.5.3.bb
@@ -13,13 +13,9 @@  LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=c017ff17fc6f0794adf93db5559ccd56
 
 SECTION = "libs"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
-"
-
-SRC_URI[md5sum] = "10e8f4d6a019b124088d18bc26123a25"
-SRC_URI[sha256sum] = "4ff4bd393aa01071ec7b849d035508a505a78f88b2bcf25ff11e58e43c0b9def"
-
-S = "${WORKDIR}/freetype-${PV}"
+SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2"
+SRC_URI[md5sum] = "d6b60f06bfc046e43ab2a6cbfd171d65"
+SRC_URI[sha256sum] = "c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e"
 
 inherit autotools-brokensep pkgconfig binconfig multilib_header