mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

matchbox-keyboard: fix the build with libpng15

Browse Source 
(From OE-Core rev: d49facde4fffc95cd153195fc0114dfbc1bf512c)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2012-12-12 11:53:57 +00:00
committed by Richard Purdie
parent d7bca38b11
commit db07a94e0f
2 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
meta/recipes-sato/matchbox-keyboard/files/png-fix.patch Normal file
View File

@@ -0,0 +1,49 @@
Change matchbox-keyboard to look for "libpng" instead of "libpng12", and fix the
code so that it works with the 1.2 and 1.5 API.
Upstream-Status: Backport
Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/configure.ac b/configure.ac
index 9678cf7..9bbbd76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,24 +171,7 @@ dnl ------ Expat ------------------------------------------------------------
dnl ------ Check for PNG ---------------------------------------------------
-AC_MSG_CHECKING(for libpng12)
-
-if $PKG_CONFIG --exists libpng12; then
- AC_MSG_RESULT(yes)
- PNG_LIBS=`$PKG_CONFIG --libs libpng12`
- PNG_CFLAGS=`$PKG_CONFIG --cflags libpng12`
-else
- AC_MSG_RESULT(no)
- AC_CHECK_LIB([png], [png_create_read_struct],
- [have_png="yes"], [have_png="no"])
-
- if test x$have_png=xyes && test x$have_png_h=xyes; then
- PNG_LIBS="-lpng -lz"
- else
- AC_MSG_ERROR([*** Cannot find libpng12 ****])
- fi
-fi
-
+PKG_CHECK_MODULES(PNG, libpng)
dnl ------ Debug Build ------------------------------------------------------
diff --git a/src/matchbox-keyboard-image.c b/src/matchbox-keyboard-image.c
index 8accc3e..6b4b0e8 100644
--- a/src/matchbox-keyboard-image.c
+++ b/src/matchbox-keyboard-image.c
@@ -65,7 +65,7 @@ png_file_load (const char *file,
return NULL;
}
- if ( setjmp( png_ptr->jmpbuf ) ) {
+ if (setjmp (png_jmpbuf (png_ptr))) {
png_destroy_read_struct( &png_ptr, &info_ptr, NULL);
fclose(fd);
return NULL;

5
meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
View File

@@ -12,12 +12,13 @@ RDEPENDS_${PN} = "formfactor dbus-wait"
SECTION = "x11"
SRCREV = "b38f24036cff3be6c2fbcf9ca9881803e69003ac"
PV = "0.0+git${SRCPV}"
PR = "r3"
PR = "r4"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
file://configure_fix.patch;maxrev=1819 \
file://single-instance.patch \
file://80matchboxkeyboard.shbg"
file://80matchboxkeyboard.shbg \
file://png-fix.patch"
S = "${WORKDIR}/git"