summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorClemens Gruber <clemens.gruber@pqgruber.com>2017-06-21 01:22:20 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2017-06-24 11:17:03 +0200
commita32b6e25b51a449015bda4bcb5c672c052dd9adb (patch)
treeb522ec8cf968b31a87a0025c07b0900a5c6dbc56 /patches
parent89ab141d5c8c752082f9991fddf5eb53e34aae21 (diff)
downloadptxdist-a32b6e25b51a449015bda4bcb5c672c052dd9adb.tar.gz
ptxdist-a32b6e25b51a449015bda4bcb5c672c052dd9adb.tar.xz
libgd: version bump 2.0.36RC1 -> 2.2.4
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> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/gd-2.0.36RC1/series1
-rw-r--r--patches/gd-2.2.4/0001-gdlib-config-add-SYSROOT-support.patch (renamed from patches/gd-2.0.36RC1/0001-gdlib-config-add-SYSROOT-support.patch)16
-rw-r--r--patches/gd-2.2.4/series4
3 files changed, 10 insertions, 11 deletions
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
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