Patchwork matchbox-keyboard: check and link against libXrender

login
register
mail settings
Submitter Mark Hatle
Date Nov. 21, 2013, 7:22 a.m.
Message ID <1385018566-23581-1-git-send-email-mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/62107/
State New
Headers show

Comments

Mark Hatle - Nov. 21, 2013, 7:22 a.m.
From: Lei Liu <lei.liu2@windriver.com>

Implict dependency library libXrender is missing from linker
options, which causes build error.  Fix it by checking and
linking the library explictly.

Signed-off-by: Lei Liu <lei.liu2@windriver.com>
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
---
 .../files/add-lXrender-to-link.patch               | 55 ++++++++++++++++++++++
 .../matchbox-keyboard/matchbox-keyboard_git.bb     |  4 +-
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-sato/matchbox-keyboard/files/add-lXrender-to-link.patch
Ross Burton - Nov. 21, 2013, 4:12 p.m.
On 21 November 2013 07:22, Mark Hatle <mark.hatle@windriver.com> wrote:
> +Upstream-Status: Pending

This is sad considering that we host the git repo for this.  I've
merged an equivalent fix from master to the 0.1 branch in git, merged
in some more patches that we were hanging on to were already in
master, and have a patch to oe-core that I'm just testing now to move
our recipe to match.

Ross

Patch

diff --git a/meta/recipes-sato/matchbox-keyboard/files/add-lXrender-to-link.patch b/meta/recipes-sato/matchbox-keyboard/files/add-lXrender-to-link.patch
new file mode 100644
index 0000000..5f99d05
--- /dev/null
+++ b/meta/recipes-sato/matchbox-keyboard/files/add-lXrender-to-link.patch
@@ -0,0 +1,55 @@ 
+Add explict link against -lXrender to fix build error.
+
+Upstream-Status: Pending
+
+Signed-off-by: Lei Liu <lei.liu2@windriver.com>
+---
+ configure.ac    |    6 ++++++
+ src/Makefile.am |    4 ++--
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9bbbd76..75bffee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -65,6 +65,9 @@ AC_ARG_WITH(expat-lib,
+ PKG_CHECK_MODULES(FAKEKEY, libfakekey,,
+ 	         AC_MSG_ERROR([*** You need to install libfakekey from MB SVN  ***]))
+ 
++PKG_CHECK_MODULES(XRENDER, xrender,,
++	         AC_MSG_ERROR([*** Required Xrender Library not found ***]))
++
+ if test x$enable_cairo = xyes; then
+    PKG_CHECK_MODULES(CAIRO, cairo,, [enable_cairo="no"])
+ fi
+@@ -202,6 +205,9 @@ AC_SUBST(EXPAT_CFLAGS)
+ AC_SUBST(PNG_LIBS)
+ AC_SUBST(PNG_CFLAGS)
+ 
++AC_SUBST(XRENDER_LIBS)
++AC_SUBST(XRENDER_CFLAGS)
++
+ AC_OUTPUT([
+ Makefile
+ src/Makefile  
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6dc986e..6df9480 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -12,11 +12,11 @@ XFT_BACKEND_C =                                                       \
+         matchbox-keyboard-ui-xft-backend.h
+ endif
+ 
+-INCLUDES = -DDATADIR=\"$(DATADIR)\" -DPKGDATADIR=\"$(PKGDATADIR)\" -DPREFIX=\"$(PREFIXDIR)\" $(FAKEKEY_CFLAGS) $(XFT_CFLAGS) $(EXPAT_CFLAGS) $(CAIRO_CFLAGS) $(PNG_CFLAGS)
++INCLUDES = -DDATADIR=\"$(DATADIR)\" -DPKGDATADIR=\"$(PKGDATADIR)\" -DPREFIX=\"$(PREFIXDIR)\" $(FAKEKEY_CFLAGS) $(XFT_CFLAGS) $(EXPAT_CFLAGS) $(CAIRO_CFLAGS) $(PNG_CFLAGS) $(XRENDER_CFLAGS)
+ 
+ bin_PROGRAMS = matchbox-keyboard
+ 
+-matchbox_keyboard_LDADD = $(FAKEKEY_LIBS) $(XFT_LIBS) $(EXPAT_LIBS) $(CAIRO_LIBS) $(PNG_LIBS)
++matchbox_keyboard_LDADD = $(FAKEKEY_LIBS) $(XFT_LIBS) $(EXPAT_LIBS) $(CAIRO_LIBS) $(PNG_LIBS) $(XRENDER_LIBS)
+ 
+ matchbox_keyboard_SOURCES =                                          \
+ 	matchbox-keyboard.c matchbox-keyboard.h                      \
+-- 
+1.7.0.4
+
diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
index ffcabca..85e856f 100644
--- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
+++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
@@ -18,7 +18,9 @@  SRC_URI = "git://git.yoctoproject.org/${BPN} \
            file://configure_fix.patch;maxrev=1819 \
            file://single-instance.patch \
            file://80matchboxkeyboard.shbg \
-           file://png-fix.patch"
+           file://png-fix.patch \
+           file://add-lXrender-to-link.patch \
+           "
 
 S = "${WORKDIR}/git"