* [Buildroot] [PATCH 1/1] matchbox-keyboard: Fix dependencies
@ 2014-05-20 15:58 Bernd Kuhls
2014-05-20 20:26 ` Peter Korsgaard
0 siblings, 1 reply; 6+ messages in thread
From: Bernd Kuhls @ 2014-05-20 15:58 UTC (permalink / raw)
To: buildroot
Always depend on xlib_libXft, pango is not used by the package
Fixes
http://autobuild.buildroot.net/results/473/47380d57e507ec395a1132dfd7b32d35459c1c7a//
http://autobuild.buildroot.net/results/d9a/d9aa2b6ddce920ea45fbd7093addfc0ee6b94467//
http://autobuild.buildroot.net/results/aad/aad393a81812df28cbc296f556de2acb4e6d114b//
http://autobuild.buildroot.net/results/124/124b28336ed61822fa6d5d2591b4e70d83b8a213//
and 17 other build errors, dating back to 2013-07-03
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/matchbox/Config.in | 3 ++-
package/matchbox/matchbox-keyboard/matchbox-keyboard.mk | 12 +-----------
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index 67c9716..e1f6db9 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -35,7 +35,8 @@ config BR2_PACKAGE_MATCHBOX_COMMON_PDA
config BR2_PACKAGE_MATCHBOX_KEYBOARD
bool "Matchbox Virtual Keyboard"
- select BR2_PACKAGE_XLIB_LIBXTST
+ select BR2_PACKAGE_XLIB_LIBXTST # matchbox-fakekey
+ select BR2_PACKAGE_XLIB_LIBXFT
help
Virtual Keyboard
diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
index ff85370..d8109ad 100644
--- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
+++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
@@ -9,7 +9,7 @@ MATCHBOX_KEYBOARD_SOURCE = matchbox-keyboard-$(MATCHBOX_KEYBOARD_VERSION).tar.bz
MATCHBOX_KEYBOARD_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION)
MATCHBOX_KEYBOARD_LICENSE = GPLv2+
MATCHBOX_KEYBOARD_LICENSE_FILES = COPYING
-MATCHBOX_KEYBOARD_DEPENDENCIES = matchbox-lib matchbox-fakekey
+MATCHBOX_KEYBOARD_DEPENDENCIES = matchbox-lib matchbox-fakekey xlib_libXft
# Workaround bug in configure script
MATCHBOX_KEYBOARD_CONF_ENV = expat=yes
@@ -20,14 +20,4 @@ endef
MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FIXES
-################################################################################
-
-ifeq ($(BR2_PACKAGE_PANGO),y)
- MATCHBOX_PKEYBOARD_CONF_OPT += --enable-pango
-else
- MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft
-endif
-
-################################################################################
-
$(eval $(autotools-package))
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] matchbox-keyboard: Fix dependencies
2014-05-20 15:58 [Buildroot] [PATCH 1/1] matchbox-keyboard: Fix dependencies Bernd Kuhls
@ 2014-05-20 20:26 ` Peter Korsgaard
2014-05-20 20:34 ` Bernd Kuhls
2014-05-20 20:43 ` Thomas Petazzoni
0 siblings, 2 replies; 6+ messages in thread
From: Peter Korsgaard @ 2014-05-20 20:26 UTC (permalink / raw)
To: buildroot
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:
> Always depend on xlib_libXft, pango is not used by the package
> Fixes
> http://autobuild.buildroot.net/results/473/47380d57e507ec395a1132dfd7b32d35459c1c7a//
> http://autobuild.buildroot.net/results/d9a/d9aa2b6ddce920ea45fbd7093addfc0ee6b94467//
> http://autobuild.buildroot.net/results/aad/aad393a81812df28cbc296f556de2acb4e6d114b//
> http://autobuild.buildroot.net/results/124/124b28336ed61822fa6d5d2591b4e70d83b8a213//
> and 17 other build errors, dating back to 2013-07-03
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> +++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
> @@ -9,7 +9,7 @@ MATCHBOX_KEYBOARD_SOURCE = matchbox-keyboard-$(MATCHBOX_KEYBOARD_VERSION).tar.bz
> MATCHBOX_KEYBOARD_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION)
> MATCHBOX_KEYBOARD_LICENSE = GPLv2+
> MATCHBOX_KEYBOARD_LICENSE_FILES = COPYING
> -MATCHBOX_KEYBOARD_DEPENDENCIES = matchbox-lib matchbox-fakekey
> +MATCHBOX_KEYBOARD_DEPENDENCIES = matchbox-lib matchbox-fakekey xlib_libXft
> # Workaround bug in configure script
> MATCHBOX_KEYBOARD_CONF_ENV = expat=yes
> @@ -20,14 +20,4 @@ endef
> MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FIXES
> -################################################################################
> -
> -ifeq ($(BR2_PACKAGE_PANGO),y)
> - MATCHBOX_PKEYBOARD_CONF_OPT += --enable-pango
> -else
> - MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft
> -endif
No?
./configure --help|grep cairo
--enable-cairo enable experimental Cairo support default=no
grep -A3 'enable_cairo =' configure.ac
if test x$enable_cairo = xyes; then
PKG_CHECK_MODULES(CAIRO, cairo,, [enable_cairo="no"])
fi
if test x$enable_cairo = xno; then
PKG_CHECK_MODULES(XFT, xft,,
AC_MSG_ERROR([*** Required xft Librarys not found ***]))
fi
From that the previous logic seems correct?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] matchbox-keyboard: Fix dependencies
2014-05-20 20:26 ` Peter Korsgaard
@ 2014-05-20 20:34 ` Bernd Kuhls
2014-05-20 21:12 ` Peter Korsgaard
2014-05-20 20:43 ` Thomas Petazzoni
1 sibling, 1 reply; 6+ messages in thread
From: Bernd Kuhls @ 2014-05-20 20:34 UTC (permalink / raw)
To: buildroot
Peter Korsgaard <jacmet@uclibc.org> wrote in
news:87sio4gpso.fsf at dell.be.48ers.dk:
> > -ifeq ($(BR2_PACKAGE_PANGO),y)
> > - MATCHBOX_PKEYBOARD_CONF_OPT += --enable-pango
> > -else
> > - MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft
> > -endif
>
> No?
>
> ./configure --help|grep cairo
> --enable-cairo enable experimental Cairo support default=no
Hi,
I fail to see the connection between pango and cairo regarding the matchbox-
keyboard package.
The defconfig used by autobuilder enables BR2_PACKAGE_PANGO, but the phrase
"pango" is used nowhere in the matchbox-keyboard-0.1 sourcecode.
Support for cairo is disabled by default in matchbox-keyboard-
0.1/configure.ac, and not present in package/matchbox/* either, so the
matchbox-keyboard package will always check for xlib_libXft and fail if it?s
absent. This is fixed by my patch.
Regards, Bernd
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] matchbox-keyboard: Fix dependencies
2014-05-20 20:26 ` Peter Korsgaard
2014-05-20 20:34 ` Bernd Kuhls
@ 2014-05-20 20:43 ` Thomas Petazzoni
2014-05-20 21:01 ` Peter Korsgaard
1 sibling, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2014-05-20 20:43 UTC (permalink / raw)
To: buildroot
Dear Peter Korsgaard,
On Tue, 20 May 2014 22:26:15 +0200, Peter Korsgaard wrote:
> > -################################################################################
> > -
> > -ifeq ($(BR2_PACKAGE_PANGO),y)
> > - MATCHBOX_PKEYBOARD_CONF_OPT += --enable-pango
> > -else
> > - MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft
> > -endif
>
> No?
>
> ./configure --help|grep cairo
> --enable-cairo enable experimental Cairo support default=no
Hum cairo != pango ?
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] matchbox-keyboard: Fix dependencies
2014-05-20 20:43 ` Thomas Petazzoni
@ 2014-05-20 21:01 ` Peter Korsgaard
0 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2014-05-20 21:01 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
> Dear Peter Korsgaard,
> On Tue, 20 May 2014 22:26:15 +0200, Peter Korsgaard wrote:
>> > -################################################################################
>> > -
>> > -ifeq ($(BR2_PACKAGE_PANGO),y)
>> > - MATCHBOX_PKEYBOARD_CONF_OPT += --enable-pango
>> > -else
>> > - MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft
>> > -endif
>>
>> No?
>>
>> ./configure --help|grep cairo
>> --enable-cairo enable experimental Cairo support default=no
> Hum cairo != pango ?
Ehh, true. I guess I need to go to bed.
With that said, I think the fix is simply to s/pango/cairo/.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] matchbox-keyboard: Fix dependencies
2014-05-20 20:34 ` Bernd Kuhls
@ 2014-05-20 21:12 ` Peter Korsgaard
0 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2014-05-20 21:12 UTC (permalink / raw)
To: buildroot
>>>>> "Bernd" == Bernd Kuhls <berndkuhls@hotmail.com> writes:
> Peter Korsgaard <jacmet@uclibc.org> wrote in
> news:87sio4gpso.fsf at dell.be.48ers.dk:
>> > -ifeq ($(BR2_PACKAGE_PANGO),y)
>> > - MATCHBOX_PKEYBOARD_CONF_OPT += --enable-pango
>> > -else
>> > - MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft
>> > -endif
>>
>> No?
>>
>> ./configure --help|grep cairo
>> --enable-cairo enable experimental Cairo support default=no
> Hi,
> I fail to see the connection between pango and cairo regarding the matchbox-
> keyboard package.
Yes, sorry about that - I got confused about cairo vs pango, and the
original package author apparently did as well (as the above should have
been cairo, not pango).
I also see that there's a typo in the _CONF_OPT variable.
I'll fix it up here. I'm just doing a test build with/without cairo to
ensure everything is correct.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-05-20 21:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-20 15:58 [Buildroot] [PATCH 1/1] matchbox-keyboard: Fix dependencies Bernd Kuhls
2014-05-20 20:26 ` Peter Korsgaard
2014-05-20 20:34 ` Bernd Kuhls
2014-05-20 21:12 ` Peter Korsgaard
2014-05-20 20:43 ` Thomas Petazzoni
2014-05-20 21:01 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.