summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen.kooi@linaro.org>2015-09-03 09:51:20 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2015-09-23 15:34:26 +0200
commit016db91036a224f5bcf70af27c7b9a663e2ba91e (patch)
treeec00739a2e757cd59c5b6e53f8d730976b91fabe
parent57f718ec3eb75b10278b0ea0d7e3dbd8e8d8bd74 (diff)
downloadmeta-openembedded-016db91036a224f5bcf70af27c7b9a663e2ba91e.tar.gz
gd: disable webp/vpx support
The recent update to libvpx 1.4.x broke gd. Upstream has replaced libvpx with libwebp, so fixing it isn't worth it. If webp support is really needed, backport https://bitbucket.org/libgd/gd-libgd/commits/a79232c5fa69 and add a PACKAGECONFIG for it. Signed-off-by: Koen Kooi <koen.kooi@linaro.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-support/gd/gd_2.1.1.bb6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/gd/gd_2.1.1.bb b/meta-oe/recipes-support/gd/gd_2.1.1.bb
index 0731902d8..62008dfb3 100644
--- a/meta-oe/recipes-support/gd/gd_2.1.1.bb
+++ b/meta-oe/recipes-support/gd/gd_2.1.1.bb
@@ -10,7 +10,7 @@ HOMEPAGE = "http://libgd.bitbucket.org/"
10SECTION = "libs" 10SECTION = "libs"
11LICENSE = "GD" 11LICENSE = "GD"
12LIC_FILES_CHKSUM = "file://COPYING;md5=c97638cafd3581eb87abd37332137669" 12LIC_FILES_CHKSUM = "file://COPYING;md5=c97638cafd3581eb87abd37332137669"
13DEPENDS = "freetype libpng jpeg zlib tiff libvpx" 13DEPENDS = "freetype libpng jpeg zlib tiff"
14 14
15SRC_URI = "https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${PV}.tar.bz2 \ 15SRC_URI = "https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${PV}.tar.bz2 \
16" 16"
@@ -26,7 +26,9 @@ EXTRA_OECONF += " --disable-rpath \
26 --with-freetype=yes \ 26 --with-freetype=yes \
27 --without-fontconfig \ 27 --without-fontconfig \
28 --without-xpm \ 28 --without-xpm \
29 --without-x" 29 --without-x \
30 --without-vpx \
31 "
30 32
31EXTRA_OEMAKE = 'LDFLAGS="${LDFLAGS}"' 33EXTRA_OEMAKE = 'LDFLAGS="${LDFLAGS}"'
32 34