Patchwork [meta-oe,1/3] gd: update to version 2.1.0

login
register
mail settings
Submitter jackie huang
Date April 15, 2014, 7:01 a.m.
Message ID <00038b50f96f259beae9e06813ec54085dd9fa17.1397545082.git.jackie.huang@windriver.com>
Download mbox | patch
Permalink /patch/70597/
State Accepted, archived
Headers show

Comments

jackie huang - April 15, 2014, 7:01 a.m.
From: Jackie Huang <jackie.huang@windriver.com>

Changes:
- Add DESCRIPTION and HOMEPAGE
- libgd.org is down, use bitbucket.org instead and also
  remove the MIRROR for it.
- Remove the unnecessary specified dir for --with-png.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 .../gd/{gd_2.0.35+2.0.36rc1.bb => gd_2.1.0.bb}     |   22 ++++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)
 rename meta-oe/recipes-support/gd/{gd_2.0.35+2.0.36rc1.bb => gd_2.1.0.bb} (43%)
Martin Jansa - April 20, 2014, 8:24 a.m.
On Tue, Apr 15, 2014 at 03:01:24PM +0800, jackie.huang@windriver.com wrote:
> From: Jackie Huang <jackie.huang@windriver.com>
> 
> Changes:
> - Add DESCRIPTION and HOMEPAGE
> - libgd.org is down, use bitbucket.org instead and also
>   remove the MIRROR for it.
> - Remove the unnecessary specified dir for --with-png.
> 
> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> ---
>  .../gd/{gd_2.0.35+2.0.36rc1.bb => gd_2.1.0.bb}     |   22 ++++++++++++--------
>  1 file changed, 13 insertions(+), 9 deletions(-)
>  rename meta-oe/recipes-support/gd/{gd_2.0.35+2.0.36rc1.bb => gd_2.1.0.bb} (43%)
> 
> diff --git a/meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb b/meta-oe/recipes-support/gd/gd_2.1.0.bb
> similarity index 43%
> rename from meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb
> rename to meta-oe/recipes-support/gd/gd_2.1.0.bb
> index 957c4eb..1b78b9b 100644
> --- a/meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb
> +++ b/meta-oe/recipes-support/gd/gd_2.1.0.bb
> @@ -1,22 +1,26 @@
> +SUMMARY = "gd is a library used to create PNG, JPEG, or WBMP images"
> +DESCRIPTION = "The gd graphics library allows your code to quickly draw images \
> +complete with lines, arcs, text, multiple colors, cut and paste from other \
> +images, and flood fills, and to write out the result as a PNG or JPEG file. \
> +This is particularly useful in Web applications, where PNG and JPEG are two \
> +of the formats accepted for inline images by most browsers. Note that gd is not \
> +a paint program."
> +HOMEPAGE = "http://libgd.bitbucket.org/"
>  SECTION = "libs"
> +
>  LICENSE = "GD"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=c97638cafd3581eb87abd37332137669"
> -SUMMARY = "gd is a library used to create PNG, JPEG, or WBMP images"
>  DEPENDS = "freetype libpng jpeg zlib"
> -PR = "r5"
> -
> -SRC_URI = "http://www.libgd.org/releases/gd-2.0.36RC1.tar.gz"
> -SRC_URI[md5sum] = "39ac48e6d5e0012a3bd2248a0102f209"
> -SRC_URI[sha256sum] = "dd7c1795271221b9237769b96b8cec7fbdc5db7b8954d864ead51fc1296a6ac8"
>  
> -MIRRORS += "http://www.libgd.org/releases/ http://fossies.org/unix/www/ \n"
> +SRC_URI = "https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${PV}.tar.bz2"
> +SRC_URI[md5sum] = "5a1d5bab3a4a41d9f111bcceee4ad25b"
> +SRC_URI[sha256sum] = "f3e1bc472bd81ee976a739436659fe752a14727a964c64530fde68531ddeee91"
>  
> -S = "${WORKDIR}/gd-2.0.36RC1"
> +S = "${WORKDIR}/libgd-${PV}"
>  
>  inherit autotools binconfig gettext
>  
>  EXTRA_OECONF += " --with-zlib=${STAGING_LIBDIR}/.. \
> -                  --with-png=${STAGING_LIBDIR}/.. \
>                    --with-jpeg=${STAGING_LIBDIR}/.. \
>                    --with-freetype \

http://patchwork.openembedded.org/patch/69991/ adds
--with-freetype=${STAGING_LIBDIR}/.. \

and together with this it fails with:
| configure:13838: error: freetype support requested, but not found:
/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm/usr/lib/../bin/freetype-config

can you please check it?

>                    --without-fontconfig \
> -- 
> 1.7.9.5
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb b/meta-oe/recipes-support/gd/gd_2.1.0.bb
similarity index 43%
rename from meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb
rename to meta-oe/recipes-support/gd/gd_2.1.0.bb
index 957c4eb..1b78b9b 100644
--- a/meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb
+++ b/meta-oe/recipes-support/gd/gd_2.1.0.bb
@@ -1,22 +1,26 @@ 
+SUMMARY = "gd is a library used to create PNG, JPEG, or WBMP images"
+DESCRIPTION = "The gd graphics library allows your code to quickly draw images \
+complete with lines, arcs, text, multiple colors, cut and paste from other \
+images, and flood fills, and to write out the result as a PNG or JPEG file. \
+This is particularly useful in Web applications, where PNG and JPEG are two \
+of the formats accepted for inline images by most browsers. Note that gd is not \
+a paint program."
+HOMEPAGE = "http://libgd.bitbucket.org/"
 SECTION = "libs"
+
 LICENSE = "GD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c97638cafd3581eb87abd37332137669"
-SUMMARY = "gd is a library used to create PNG, JPEG, or WBMP images"
 DEPENDS = "freetype libpng jpeg zlib"
-PR = "r5"
-
-SRC_URI = "http://www.libgd.org/releases/gd-2.0.36RC1.tar.gz"
-SRC_URI[md5sum] = "39ac48e6d5e0012a3bd2248a0102f209"
-SRC_URI[sha256sum] = "dd7c1795271221b9237769b96b8cec7fbdc5db7b8954d864ead51fc1296a6ac8"
 
-MIRRORS += "http://www.libgd.org/releases/ http://fossies.org/unix/www/ \n"
+SRC_URI = "https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${PV}.tar.bz2"
+SRC_URI[md5sum] = "5a1d5bab3a4a41d9f111bcceee4ad25b"
+SRC_URI[sha256sum] = "f3e1bc472bd81ee976a739436659fe752a14727a964c64530fde68531ddeee91"
 
-S = "${WORKDIR}/gd-2.0.36RC1"
+S = "${WORKDIR}/libgd-${PV}"
 
 inherit autotools binconfig gettext
 
 EXTRA_OECONF += " --with-zlib=${STAGING_LIBDIR}/.. \
-                  --with-png=${STAGING_LIBDIR}/.. \
                   --with-jpeg=${STAGING_LIBDIR}/.. \
                   --with-freetype \
                   --without-fontconfig \