diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2011-08-16 17:42:02 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-11-02 22:30:21 +0100 |
| commit | 7ab600073bb4cb6fb22fcafe52d77eae7b118149 (patch) | |
| tree | b68438390978ad59c884b6c1da76f4adf5df0603 /patches/fbgrab-1.0 | |
| parent | 7c103e786141e7deddbb89167995bf09b13307a9 (diff) | |
| download | ptxdist-7ab600073bb4cb6fb22fcafe52d77eae7b118149.tar.gz ptxdist-7ab600073bb4cb6fb22fcafe52d77eae7b118149.tar.xz | |
fbgrab: include zlib.h, fix linker dependencies
- We have to include zlib.h explicitly when using symbols from there.
- fbgrab does not link directly against zlib, and if libpng needs it,
we can leave the job of finding the right libs to pkg_config
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/fbgrab-1.0')
| -rw-r--r-- | patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch (renamed from patches/fbgrab-1.0/fbgrab-1.0-crosscompile.diff) | 14 | ||||
| -rw-r--r-- | patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch | 24 | ||||
| -rw-r--r-- | patches/fbgrab-1.0/series | 6 |
3 files changed, 36 insertions, 8 deletions
diff --git a/patches/fbgrab-1.0/fbgrab-1.0-crosscompile.diff b/patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch index d85f71e6c..9fd77f9be 100644 --- a/patches/fbgrab-1.0/fbgrab-1.0-crosscompile.diff +++ b/patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch @@ -1,19 +1,19 @@ From: Roland Hostettler <r.hostettler@gmx.ch> -Subject: [patch] make makefile cross compilation aware +Date: Tue, 16 Aug 2011 17:35:19 +0200 +Subject: [PATCH] make makefile cross compilation aware The upstream makefile is not usable for cross compilation. [wsa] Simplified 'strip' support Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> - --- - Makefile | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) + Makefile | 11 +++++------ + 1 files changed, 5 insertions(+), 6 deletions(-) -Index: Makefile -=================================================================== ---- a/Makefile.orig +diff --git a/Makefile b/Makefile +index 14c63cb..252b098 100644 +--- a/Makefile +++ b/Makefile @@ -4,13 +4,12 @@ ### diff --git a/patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch b/patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch new file mode 100644 index 000000000..6c1b33eac --- /dev/null +++ b/patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch @@ -0,0 +1,24 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Date: Tue, 16 Aug 2011 17:36:49 +0200 +Subject: [PATCH] fbgrab: include zlib.h + +Newer libpng versions do not include zlib.h in their api any more, so if +we use symbols from there, we should include zlib.h directly. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> +--- + fbgrab.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/fbgrab.c b/fbgrab.c +index fc89f5a..0c959f6 100644 +--- a/fbgrab.c ++++ b/fbgrab.c +@@ -23,6 +23,7 @@ + #include <getopt.h> + #include <sys/vt.h> /* to handle vt changing */ + #include <png.h> /* PNG lib */ ++#include <zlib.h> /* zlib */ + #include <linux/fb.h> /* to handle framebuffer ioctls */ + + #define VERSION "1.0 beta 1" diff --git a/patches/fbgrab-1.0/series b/patches/fbgrab-1.0/series index d4a2f2b81..45420ced9 100644 --- a/patches/fbgrab-1.0/series +++ b/patches/fbgrab-1.0/series @@ -1 +1,5 @@ -fbgrab-1.0-crosscompile.diff +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-make-makefile-cross-compilation-aware.patch +0002-fbgrab-include-zlib.h.patch +# 07f6b94abfd5520604fa320ff0fa961c - git-ptx-patches magic |