gd: update to version 2.2.3
PATCH 1/1 gd: update to version 2.2.3
---
.../gd/files/fix-gcc-unused-functions.patch | 43 ++++++++++++++++++++++
.../gd/{gd_2.1.1.bb => gd_2.2.3.bb} | 11 +++---
2 files changed, 48 insertions(+), 6 deletions(-)
create mode 100644 meta-oe/recipes-support/gd/files/fix-gcc-unused-functions.patch
rename meta-oe/recipes-support/gd/{gd_2.1.1.bb => gd_2.2.3.bb} (82%)meta-oe/recipes-support/gd/files/fix-gcc-unused-functions.patch new file +43 -0
@@ -0,0 +1,43 @@ +gdft.c: remove functions that cause warnings about being unused + +Upstream-Status: Backport (Fixed in master branch) + +Signed-off-by: Derek Straka <[email protected]> +--- git/src/gdft.c.orig 2016-08-12 10:20:41.418440091 -0400 ++++ git/src/gdft.c 2016-08-12 10:22:34.226442987 -0400 +@@ -139,16 +139,6 @@ + } + #else + +-#ifndef HAVE_LIBFONTCONFIG +-static char * font_pattern(char **fontpath, char *fontpattern) +-{ +- (void)fontpath; +- (void)fontpattern; +- +- return "libgd was not built with FontConfig support\n"; +-} +-#endif /* HAVE_LIBFONTCONFIG */ +- + #include "gdcache.h" + /* 2.0.16 Christophe Thomas: starting with FreeType 2.1.6, this is + mandatory, and it has been supported for a long while. */ +@@ -446,16 +436,15 @@ + return (strcmp (a->fontlist, b->fontlist) == 0 && a->flags == b->flags); + } + ++#ifdef HAVE_LIBFONTCONFIG + static int useFontConfig(int flag) + { +-#ifdef HAVE_LIBFONTCONFIG + if (fontConfigFlag) { + return (!(flag & gdFTEX_FONTPATHNAME)); + } +-#endif + return flag & gdFTEX_FONTCONFIG; + } +- ++#endif + static void * + fontFetch (char **error, void *key) + {
meta-oe/recipes-support/gd/gd_2.2.3.bb renamed from meta-oe/recipes-support/gd/gd_2.1.1.bb +5 -6
@@ -12,12 +12,12 @@ LICENSE = "GD" LIC_FILES_CHKSUM = "file://COPYING;md5=c97638cafd3581eb87abd37332137669" DEPENDS = "freetype libpng jpeg zlib tiff" -SRC_URI = "https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${PV}.tar.bz2 \ -" -SRC_URI[md5sum] = "d3f1a992ac9c550ebc6da89c147f89af" -SRC_URI[sha256sum] = "895ea9c6fcab187b0a908ae3e9e6b06423756f8a643d362349b0caab4014bd0d" +SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \ + file://fix-gcc-unused-functions.patch" -S = "${WORKDIR}/libgd-${PV}" +SRCREV = "46ceef5970bf3a847ff61d1bdde7501d66c11d0c" + +S = "${WORKDIR}/git" inherit autotools binconfig gettext pkgconfig
@@ -27,7 +27,6 @@ EXTRA_OECONF += " --disable-rpath \ --without-fontconfig \ --without-xpm \ --without-x \ - --without-vpx \ " EXTRA_OEMAKE = 'LDFLAGS="${LDFLAGS}"'
Signature · 1 line
1.9.1
Does it autodetect libvpx now or was vpx removed in upstream version?
Quoted 106 lines · Derek Straka
Signed-off-by Derek Straka <[email protected]>--- .../gd/files/fix-gcc-unused-functions.patch | 43 ++++++++++++++++++++++ .../gd/{gd_2.1.1.bb => gd_2.2.3.bb} | 11 +++--- 2 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 meta-oe/recipes-support/gd/files/fix-gcc-unused- functions.patch rename meta-oe/recipes-support/gd/{gd_2.1.1.bb => gd_2.2.3.bb} (82%)meta-oe/recipes-support/gd/files/fix-gcc-unused-functions.patch new file +26
-0@@ -0,0 +1,43 @@ +gdft.c: remove functions that cause warnings about being unused + +Upstream-Status: Backport (Fixed in master branch) + +Signed-off-by: Derek Straka <[email protected]> +--- git/src/gdft.c.orig 2016-08-12 10:20:41.418440091 -0400 ++++ git/src/gdft.c 2016-08-12 10:22:34.226442987 -0400 +@@ -139,16 +139,6 @@ + } + #else + +-#ifndef HAVE_LIBFONTCONFIG +-static char * font_pattern(char **fontpath, char *fontpattern) +-{ +- (void)fontpath; +- (void)fontpattern; +- +- return "libgd was not built with FontConfig support\n"; +-} +-#endif /* HAVE_LIBFONTCONFIG */ +- + #include "gdcache.h" + /* 2.0.16 Christophe Thomas: starting with FreeType 2.1.6, this is + mandatory, and it has been supported for a long while. */ +@@ -446,16 +436,15 @@ + return (strcmp (a->fontlist, b->fontlist) == 0 && a->flags ==
b->flags);
+ }meta-oe/recipes-support/gd/files/fix-gcc-unused-functions.patch new file +16
-0+ ++#ifdef HAVE_LIBFONTCONFIG + static int useFontConfig(int flag) + { +-#ifdef HAVE_LIBFONTCONFIG + if (fontConfigFlag) { + return (!(flag & gdFTEX_FONTPATHNAME)); + } +-#endif + return flag & gdFTEX_FONTCONFIG; + } +- ++#endif + static void * + fontFetch (char **error, void *key) + {meta-oe/recipes-support/gd/gd_2.2.3.bb renamed from meta-oe/recipes-support/gd/gd_2.1.1.bb +0
-4@@ -12,12 +12,12 @@ LICENSE = "GD" LIC_FILES_CHKSUM = "file://COPYING;md5=c97638cafd3581eb87abd37332137669" DEPENDS = "freetype libpng jpeg zlib tiff" -SRC_URI = "https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${PV} .tar.bz2 \ -" -SRC_URI[md5sum] = "d3f1a992ac9c550ebc6da89c147f89af" -SRC_URI[sha256sum] = "895ea9c6fcab187b0a908ae3e9e6b0
6423756f8a643d362349b0caab4014bd0d"meta-oe/recipes-support/gd/gd_2.2.3.bb renamed from meta-oe/recipes-support/gd/gd_2.1.1.bb +5
-3+SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \ + file://fix-gcc-unused-functions.patch" -S = "${WORKDIR}/libgd-${PV}" +SRCREV = "46ceef5970bf3a847ff61d1bdde7501d66c11d0c" + +S = "${WORKDIR}/git" inherit autotools binconfig gettext pkgconfig@@ -27,7 +27,6 @@ EXTRA_OECONF += " --disable-rpath \ --without-fontconfig \ --without-xpm \ --without-x \ - --without-vpx \ " EXTRA_OEMAKE = 'LDFLAGS="${LDFLAGS}"' --1.9.1
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
The vpx support was removed upstream and instead it optionally uses libwebp. I should probably explicitly disable libwebp support. I'll send a v2 once I test it out.
Quoted 118 lines · Martin Jansa
Does it autodetect libvpx now or was vpx removed in upstream version?
Review
Quoted 11 lines · Derek Straka
Signed-off-by Derek Straka <[email protected]>--- .../gd/files/fix-gcc-unused-functions.patch | 43 ++++++++++++++++++++++ .../gd/{gd_2.1.1.bb => gd_2.2.3.bb} | 11 +++--- 2 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 meta-oe/recipes-support/gd/files/fix-gcc-unused- functions.patch rename meta-oe/recipes-support/gd/{gd_2.1.1.bb => gd_2.2.3.bb} (82%)(quoted diff) +0
-0functions.patch
Quoted 59 lines
b/meta-oe/recipes-support/gd/files/fix-gcc-unused-functions.patchnew file mode 100644
index 0000000..02cb5admeta-oe/recipes-support/gd/files/fix-gcc-unused-functions.patch new file +26
-0@@ -0,0 +1,43 @@ +gdft.c: remove functions that cause warnings about being unused + +Upstream-Status: Backport (Fixed in master branch) + +Signed-off-by: Derek Straka <[email protected]> +--- git/src/gdft.c.orig 2016-08-12 10:20:41.418440091 -0400 ++++ git/src/gdft.c 2016-08-12 10:22:34.226442987 -0400 +@@ -139,16 +139,6 @@ + } + #else + +-#ifndef HAVE_LIBFONTCONFIG +-static char * font_pattern(char **fontpath, char *fontpattern) +-{ +- (void)fontpath; +- (void)fontpattern; +- +- return "libgd was not built with FontConfig support\n"; +-} +-#endif /* HAVE_LIBFONTCONFIG */ +- + #include "gdcache.h" + /* 2.0.16 Christophe Thomas: starting with FreeType 2.1.6, this is + mandatory, and it has been supported for a long while. */ +@@ -446,16 +436,15 @@ + return (strcmp (a->fontlist, b->fontlist) == 0 && a->flags ==
b->flags);
+ }meta-oe/recipes-support/gd/files/fix-gcc-unused-functions.patch new file +16
-0+ ++#ifdef HAVE_LIBFONTCONFIG + static int useFontConfig(int flag) + { +-#ifdef HAVE_LIBFONTCONFIG + if (fontConfigFlag) { + return (!(flag & gdFTEX_FONTPATHNAME)); + } +-#endif + return flag & gdFTEX_FONTCONFIG; + } +- ++#endif + static void * + fontFetch (char **error, void *key) + {meta-oe/recipes-support/gd/gd_2.2.3.bb renamed from meta-oe/recipes-support/gd/gd_2.1.1.bb +0
-0meta-oe/recipes-support/gd/gd_2.2.3.bb LICENSE = "GD" · line 12
Quoted 1 line
meta-oe/recipes-support/gd/gd_2.2.3.bb renamed from meta-oe/recipes-support/gd/gd_2.1.1.bb +0
-0@@ -12,12 +12,12 @@ LICENSE = "GD" LIC_FILES_CHKSUM = "file://COPYING;md5=c97638cafd3581eb87abd37332137669"
Quoted 29 lines
meta-oe/recipes-support/gd/gd_2.2.3.bb renamed from meta-oe/recipes-support/gd/gd_2.1.1.bb +0
-4DEPENDS = "freetype libpng jpeg zlib tiff" -SRC_URI = "https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${PV} .tar.bz2 \ -" -SRC_URI[md5sum] = "d3f1a992ac9c550ebc6da89c147f89af" -SRC_URI[sha256sum] = "895ea9c6fcab187b0a908ae3e9e6b0
6423756f8a643d362349b0caab4014bd0d"meta-oe/recipes-support/gd/gd_2.2.3.bb renamed from meta-oe/recipes-support/gd/gd_2.1.1.bb +5
-3+SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \ + file://fix-gcc-unused-functions.patch" -S = "${WORKDIR}/libgd-${PV}" +SRCREV = "46ceef5970bf3a847ff61d1bdde7501d66c11d0c" + +S = "${WORKDIR}/git" inherit autotools binconfig gettext pkgconfig@@ -27,7 +27,6 @@ EXTRA_OECONF += " --disable-rpath \ --without-fontconfig \ --without-xpm \ --without-x \ - --without-vpx \ " EXTRA_OEMAKE = 'LDFLAGS="${LDFLAGS}"' --1.9.1
Quoted 6 lines
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel