[ptxdist] [PATCH] libgd: version bump 2.0.36RC1 -> 2.2.4

[Clemens Gruber <clemens.gruber@pqgruber.com>]

Even with the freetype patch, the old libgd was not compatible.
Let's therefore also update libgd to the most recent stable version to
fix this.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 patches/gd-2.0.36RC1/series                        |  1 -
 .../0001-gdlib-config-add-SYSROOT-support.patch    | 16 +++---
 patches/gd-2.2.4/series                            |  4 ++
 rules/libgd.in                                     |  1 +
 rules/libgd.make                                   | 57 +++++++---------------
 5 files changed, 28 insertions(+), 51 deletions(-)
 delete mode 100644 patches/gd-2.0.36RC1/series
 rename patches/{gd-2.0.36RC1 => gd-2.2.4}/0001-gdlib-config-add-SYSROOT-support.patch (75%)
 create mode 100644 patches/gd-2.2.4/series

diff --git a/patches/gd-2.0.36RC1/series b/patches/gd-2.0.36RC1/series
deleted file mode 100644
index d0b3605ab..000000000
--- a/patches/gd-2.0.36RC1/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-gdlib-config-add-SYSROOT-support.patch
diff --git a/patches/gd-2.0.36RC1/0001-gdlib-config-add-SYSROOT-support.patch b/patches/gd-2.2.4/0001-gdlib-config-add-SYSROOT-support.patch
similarity index 75%
rename from patches/gd-2.0.36RC1/0001-gdlib-config-add-SYSROOT-support.patch
rename to patches/gd-2.2.4/0001-gdlib-config-add-SYSROOT-support.patch
index 1d49fcaff..8c740adf1 100644
--- a/patches/gd-2.0.36RC1/0001-gdlib-config-add-SYSROOT-support.patch
+++ b/patches/gd-2.2.4/0001-gdlib-config-add-SYSROOT-support.patch
@@ -1,18 +1,17 @@
-From 1a799651d294c10fe9c25ac33d0914d403f24c04 Mon Sep 17 00:00:00 2001
 From: Marc Kleine-Budde <mkl@pengutronix.de>
 Date: Sat, 9 Jan 2010 22:48:48 +0100
 Subject: [PATCH] gdlib-config: add SYSROOT support
 
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
- config/gdlib-config.in |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
+ config/gdlib-config.in | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/config/gdlib-config.in b/config/gdlib-config.in
-index 93f7282..2a0e44d 100644
+index 6e4e49447474..394f575e211b 100644
 --- a/config/gdlib-config.in
 +++ b/config/gdlib-config.in
-@@ -50,10 +50,10 @@ while test $# -gt 0; do
+@@ -53,10 +53,10 @@ while test $# -gt 0; do
  
      case $1 in
      --libdir)
@@ -25,8 +24,8 @@ index 93f7282..2a0e44d 100644
  	;;
      --version)
  	echo @VERSION@
-@@ -74,18 +74,18 @@ while test $# -gt 0; do
- 	echo @LIBS@ @LIBICONV@
+@@ -77,18 +77,18 @@ while test $# -gt 0; do
+ 	echo -lgd @LIBS@ @LIBICONV@
  	;;
      --cflags|--includes)
 -	echo -I@includedir@
@@ -48,6 +47,3 @@ index 93f7282..2a0e44d 100644
  	echo "features:   @FEATURES@"
  	;;
      *)
--- 
-1.6.6
-
diff --git a/patches/gd-2.2.4/series b/patches/gd-2.2.4/series
new file mode 100644
index 000000000..6037ddffa
--- /dev/null
+++ b/patches/gd-2.2.4/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-gdlib-config-add-SYSROOT-support.patch
+# de517217ce144facb9af4c8cbe5cf127  - git-ptx-patches magic
diff --git a/rules/libgd.in b/rules/libgd.in
index cfd146ee8..7bec08975 100644
--- a/rules/libgd.in
+++ b/rules/libgd.in
@@ -6,6 +6,7 @@ menuconfig LIBGD
 	select ZLIB
 	select LIBPNG		if LIBGD_PNG
 	select LIBJPEG		if LIBGD_JPEG
+	select LIBGD_X		if LIBGD_XPM
 	select XORG_LIB_XPM	if LIBGD_XPM
 	select FONTCONFIG	if LIBGD_FONTCONFIG
 	select FREETYPE		if LIBGD_FREETYPE
diff --git a/rules/libgd.make b/rules/libgd.make
index c2a9a35e8..850046231 100644
--- a/rules/libgd.make
+++ b/rules/libgd.make
@@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_LIBGD) += libgd
 #
 # Paths and names
 #
-LIBGD_VERSION	:= 2.0.36RC1
-LIBGD_MD5	:= 39ac48e6d5e0012a3bd2248a0102f209
+LIBGD_VERSION	:= 2.2.4
+LIBGD_MD5	:= 0a3c307b5075edbe1883543dd1153c02
 LIBGD		:= gd-$(LIBGD_VERSION)
 LIBGD_SUFFIX	:= tar.gz
-LIBGD_URL	:= http://www.pengutronix.de/software/ptxdist/temporary-src/$(LIBGD).$(LIBGD_SUFFIX)
+LIBGD_URL	:= https://github.com/libgd/libgd/releases/download/$(LIBGD)/libgd-$(LIBGD_VERSION).$(LIBGD_SUFFIX)
 LIBGD_SOURCE	:= $(SRCDIR)/$(LIBGD).$(LIBGD_SUFFIX)
 LIBGD_DIR	:= $(BUILDDIR)/$(LIBGD)
 
@@ -34,43 +34,20 @@ LIBGD_ENV 	:= $(CROSS_ENV)
 #
 # autoconf
 #
-LIBGD_AUTOCONF  := $(CROSS_AUTOCONF_USR)
-
-ifdef PTXCONF_LIBGD_X
-LIBGD_AUTOCONF += --with-x
-else
-LIBGD_AUTOCONF += --without-x
-endif
-
-ifdef PTXCONF_LIBGD_JPEG
-LIBGD_AUTOCONF += --with-jpeg=$(SYSROOT)/usr
-else
-LIBGD_AUTOCONF += --without-jpeg
-endif
-
-ifdef PTXCONF_LIBGD_PNG
-LIBGD_AUTOCONF += --with-png=$(SYSROOT)/usr
-else
-LIBGD_AUTOCONF += --without-png
-endif
-
-ifdef PTXCONF_LIBGD_XPM
-LIBGD_AUTOCONF += --with-xpm=$(SYSROOT)/usr --with-x
-else
-LIBGD_AUTOCONF += --without-xpm --without-x
-endif
-
-ifdef PTXCONF_LIBGD_FREETYPE
-LIBGD_AUTOCONF += --with-freetype=$(SYSROOT)/usr
-else
-LIBGD_AUTOCONF += --without-freetype
-endif
-
-ifdef PTXCONF_LIBGD_FONTCONFIG
-LIBGD_AUTOCONF += --with-fontconfig=$(SYSROOT)/usr
-else
-LIBGD_AUTOCONF += --without-fontconfig
-endif
+LIBGD_AUTOCONF  := \
+	$(CROSS_AUTOCONF_USR) \
+	--disable-rpath \
+	--disable-werror \
+	--$(call ptx/wwo, PTXCONF_LIBGD_X)-x \
+	--with-zlib \
+	--$(call ptx/wwo, PTXCONF_LIBGD_PNG)-png \
+	--$(call ptx/wwo, PTXCONF_LIBGD_FREETYPE)-freetype \
+	--$(call ptx/wwo, PTXCONF_LIBGD_FONTCONFIG)-fontconfig \
+	--$(call ptx/wwo, PTXCONF_LIBGD_JPEG)-jpeg \
+	--without-liq \
+	--$(call ptx/wwo, PTXCONF_LIBGD_XPM)-xpm \
+	--without-tiff \
+	--without-webp
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.13.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de