summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2015-11-18 18:24:46 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2015-11-18 18:26:03 +0100
commit784e047d4ca009890cfdda6badcff5e416096911 (patch)
tree0fda31df721e7bddc4c75a1b3f8e6c03026fcf2c /patches
parent995ed8a71eac56b86ae3ac5e062e671c120d06f1 (diff)
downloadptxdist-784e047d4ca009890cfdda6badcff5e416096911.tar.gz
ptxdist-784e047d4ca009890cfdda6badcff5e416096911.tar.xz
libpng: version bump 1.2.50 -> 1.2.54
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/libpng-1.2.50/series1
-rw-r--r--patches/libpng-1.2.54/0001-add-SYSROOT-handling-to-libpng-config.patch (renamed from patches/libpng-1.2.50/libpng_config_sysroot.diff)18
-rw-r--r--patches/libpng-1.2.54/series4
3 files changed, 13 insertions, 10 deletions
diff --git a/patches/libpng-1.2.50/series b/patches/libpng-1.2.50/series
deleted file mode 100644
index fdab52170..000000000
--- a/patches/libpng-1.2.50/series
+++ /dev/null
@@ -1 +0,0 @@
-libpng_config_sysroot.diff
diff --git a/patches/libpng-1.2.50/libpng_config_sysroot.diff b/patches/libpng-1.2.54/0001-add-SYSROOT-handling-to-libpng-config.patch
index 984dbc807..fd7890d8f 100644
--- a/patches/libpng-1.2.50/libpng_config_sysroot.diff
+++ b/patches/libpng-1.2.54/0001-add-SYSROOT-handling-to-libpng-config.patch
@@ -1,18 +1,18 @@
From: Marc Kleine-Budde <mkl@pengutronix.de>
-Subject: add SYSROOT handling to libpng-config
+Date: Wed, 18 Nov 2015 18:19:39 +0100
+Subject: [PATCH] add SYSROOT handling to libpng-config
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+Upstream: https://sourceforge.net/p/libpng/feature-requests/17/
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
-# 20091229 rsc: added as https://sourceforge.net/tracker/?func=detail&aid=2922975&group_id=5624&atid=105624
-
- scripts/libpng-config.in | 6 +++---
+ scripts/libpng-config.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
-Index: libpng-1.2.41/scripts/libpng-config.in
-===================================================================
---- libpng-1.2.41.orig/scripts/libpng-config.in
-+++ libpng-1.2.41/scripts/libpng-config.in
+diff --git a/scripts/libpng-config.in b/scripts/libpng-config.in
+index 7ae7d50f2065..a61f9a58047d 100755
+--- a/scripts/libpng-config.in
++++ b/scripts/libpng-config.in
@@ -18,8 +18,8 @@ libdir="@libdir@"
includedir="@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
diff --git a/patches/libpng-1.2.54/series b/patches/libpng-1.2.54/series
new file mode 100644
index 000000000..5c10bac9e
--- /dev/null
+++ b/patches/libpng-1.2.54/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-add-SYSROOT-handling-to-libpng-config.patch
+# ad9e735a6e56ce6ad024d86b40f0020d - git-ptx-patches magic