Skip to contentSkip to conversation

package/gd: Add dependency to libvpx

PATCH New Bernd Kuhls 2 participants 3 messages Apr 10, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/gd: Add dependency to libvpx

Needed to get reproducable builds and to reproduce this build error:
http://autobuild.buildroot.net/results/046/046dd505feb5e92bdee3d0993366be162da1223a/

---
 package/gd/gd.mk |    7 +++++++
 1 file changed, 7 insertions(+)
package/gd/gd.mk +7 -0
index 2991cd5..1b519de 100644
@@ -51,6 +51,13 @@ else
 GD_CONF_OPTS += --without-png
 endif
 
+ifeq ($(BR2_PACKAGE_LIBVPX),y)
+GD_DEPENDENCIES += libvpx
+GD_CONF_OPTS += --with-vpx
+else
+GD_CONF_OPTS += --without-vpx
+endif
+
 ifeq ($(BR2_PACKAGE_TIFF),y)
 GD_DEPENDENCIES += tiff
 GD_CONF_OPTS += --with-tiff
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 2/2 package/gd: Switch from libvpx to webp

Since bumping libvpx to 1.4.0
http://git.buildroot.net/buildroot/commit/package/libvpx?id=7d9a0c4d3960bb470e993494ac350b1415b72442

building gd was broken.
This patch adds some upstream commits which switch the dependency from libvpx to webp.

Fixes
http://autobuild.buildroot.net/results/046/046dd505feb5e92bdee3d0993366be162da1223a/
http://autobuild.buildroot.net/results/617/61739df0009015451ba78a7ca335dcc0d0dedcc8/
http://autobuild.buildroot.net/results/526/526550e73581a91427b394d566d3389554ee90ed/
http://autobuild.buildroot.net/results/b89/b89d7e3a1fc9403984bcd6462b8fd8d1196f2095/
http://autobuild.buildroot.net/results/dfe/dfed2b62aad83cc960ba3c93b7f0a994f18ad22a/
http://autobuild.buildroot.net/results/a91/a919d2bcbbd573e7a5556fbcdea053d4d451dd50/

---
 package/gd/0004-webp-pre.patch |   37 ++++
 package/gd/0005-webp.patch     |  418 ++++++++++++++++++++++++++++++++++++++++
 package/gd/gd.mk               |    9 +-
 3 files changed, 460 insertions(+), 4 deletions(-)
 create mode 100644 package/gd/0004-webp-pre.patch
 create mode 100644 package/gd/0005-webp.patch
package/gd/0004-webp-pre.patch new file +37 -0
new file mode 100644
index 0000000..a4bc068
@@ -0,0 +1,37 @@
+Patch committed upstream
+https://bitbucket.org/libgd/gd-libgd/commits/c7e5dc617c7466c44935cdefbe7e79de319f98ca?at=master
+
+Downloaded from Gentoo
+https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/gd/files/gd-2.1.1-webp-pre.patch?revision=1.1&view=markup
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+---
+https://bugs.gentoo.org/545956
+
+From c7e5dc617c7466c44935cdefbe7e79de319f98ca Mon Sep 17 00:00:00 2001
+From: Pierre Joye <[email protected]>
+Date: Sat, 17 Jan 2015 08:20:17 +0100
+Subject: [PATCH]  fix #111, invalid default quantization
+
+---
+ src/gd_webp.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/gd_webp.c b/src/gd_webp.c
+index fae3861..a3ae1ac 100644
+--- a/src/gd_webp.c
++++ b/src/gd_webp.c
+@@ -185,6 +185,9 @@ BGD_DECLARE(void) gdImageWebpCtx (gdImagePtr im, gdIOCtx * outfile, int quantiza
+ 		gd_error("gd-webp error: cannot allocate Y buffer");
+ 		return;
+ 	}
++	if (quantization == -1) {
++		quantization = 80;
++	}
+ 	vp8_quality = mapQualityToVP8QP(quantization);
+ 
+ 	U = Y + width * height;
+-- 
+2.3.5
+
package/gd/0005-webp.patch new file +418 -0

418 lines not on this page · raw message

package/gd/gd.mk +5 -4
index 1b519de..c056241 100644
@@ -7,6 +7,7 @@
 GD_VERSION = 2.1.1
 GD_SOURCE = libgd-$(GD_VERSION).tar.xz
 GD_SITE = https://bitbucket.org/libgd/gd-libgd/downloads
+GD_AUTORECONF = YES
 GD_INSTALL_STAGING = YES
 GD_LICENSE = GD license
 GD_LICENSE_FILES = COPYING
@@ -51,11 +52,11 @@ else
 GD_CONF_OPTS += --without-png
 endif
 
-ifeq ($(BR2_PACKAGE_LIBVPX),y)
-GD_DEPENDENCIES += libvpx
-GD_CONF_OPTS += --with-vpx
+ifeq ($(BR2_PACKAGE_WEBP),y)
+GD_DEPENDENCIES += webp
+GD_CONF_OPTS += --with-webp
 else
-GD_CONF_OPTS += --without-vpx
+GD_CONF_OPTS += --without-webp
 endif
 
 ifeq ($(BR2_PACKAGE_TIFF),y)
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 1/2 package/gd: Add dependency to libvpx

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 7 lines · Bernd Kuhls

Needed to get reproducable builds and to reproduce this build error:
http://autobuild.buildroot.net/results/046/046dd505feb5e92bdee3d0993366be162da1223a/

---
 package/gd/gd.mk |    7 +++++++
 1 file changed, 7 insertions(+)

Both patches applied.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com