diff options
author | Ross Burton <ross.burton@intel.com> | 2012-12-12 11:53:57 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-13 15:18:45 +0000 |
commit | db07a94e0fe400390e3bbe49a5be10aff1ea3619 (patch) | |
tree | c6c28bb4293ff3ed0e7cd7242a9ab3b5b4f12672 /meta/recipes-sato/matchbox-keyboard/files/png-fix.patch | |
parent | d7bca38b11f537405341c890526adf4891f23df4 (diff) | |
download | poky-db07a94e0fe400390e3bbe49a5be10aff1ea3619.tar.gz |
matchbox-keyboard: fix the build with libpng15
(From OE-Core rev: d49facde4fffc95cd153195fc0114dfbc1bf512c)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/matchbox-keyboard/files/png-fix.patch')
-rw-r--r-- | meta/recipes-sato/matchbox-keyboard/files/png-fix.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/meta/recipes-sato/matchbox-keyboard/files/png-fix.patch b/meta/recipes-sato/matchbox-keyboard/files/png-fix.patch new file mode 100644 index 0000000000..e3834f5e46 --- /dev/null +++ b/meta/recipes-sato/matchbox-keyboard/files/png-fix.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | Change matchbox-keyboard to look for "libpng" instead of "libpng12", and fix the | ||
2 | code so that it works with the 1.2 and 1.5 API. | ||
3 | |||
4 | Upstream-Status: Backport | ||
5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
6 | |||
7 | diff --git a/configure.ac b/configure.ac | ||
8 | index 9678cf7..9bbbd76 100644 | ||
9 | --- a/configure.ac | ||
10 | +++ b/configure.ac | ||
11 | @@ -171,24 +171,7 @@ dnl ------ Expat ------------------------------------------------------------ | ||
12 | |||
13 | dnl ------ Check for PNG --------------------------------------------------- | ||
14 | |||
15 | -AC_MSG_CHECKING(for libpng12) | ||
16 | - | ||
17 | -if $PKG_CONFIG --exists libpng12; then | ||
18 | - AC_MSG_RESULT(yes) | ||
19 | - PNG_LIBS=`$PKG_CONFIG --libs libpng12` | ||
20 | - PNG_CFLAGS=`$PKG_CONFIG --cflags libpng12` | ||
21 | -else | ||
22 | - AC_MSG_RESULT(no) | ||
23 | - AC_CHECK_LIB([png], [png_create_read_struct], | ||
24 | - [have_png="yes"], [have_png="no"]) | ||
25 | - | ||
26 | - if test x$have_png=xyes && test x$have_png_h=xyes; then | ||
27 | - PNG_LIBS="-lpng -lz" | ||
28 | - else | ||
29 | - AC_MSG_ERROR([*** Cannot find libpng12 ****]) | ||
30 | - fi | ||
31 | -fi | ||
32 | - | ||
33 | +PKG_CHECK_MODULES(PNG, libpng) | ||
34 | |||
35 | dnl ------ Debug Build ------------------------------------------------------ | ||
36 | |||
37 | diff --git a/src/matchbox-keyboard-image.c b/src/matchbox-keyboard-image.c | ||
38 | index 8accc3e..6b4b0e8 100644 | ||
39 | --- a/src/matchbox-keyboard-image.c | ||
40 | +++ b/src/matchbox-keyboard-image.c | ||
41 | @@ -65,7 +65,7 @@ png_file_load (const char *file, | ||
42 | return NULL; | ||
43 | } | ||
44 | |||
45 | - if ( setjmp( png_ptr->jmpbuf ) ) { | ||
46 | + if (setjmp (png_jmpbuf (png_ptr))) { | ||
47 | png_destroy_read_struct( &png_ptr, &info_ptr, NULL); | ||
48 | fclose(fd); | ||
49 | return NULL; | ||