meta: 3 fixes
cover meta: 3 fixes
Hello,
For the first patch:
cpan-base.bbclass: avoid using immmediate assignment for PERLLIBDIRS
I'm not sure what changes recently cause I meet the error, does anyone have any idea, please ?
// Robert
The following changes since commit 24f19fedb40d0af84beb8e9a6595ea06f09d4615:
gstreamer1.0-omx: use mulitple SCMs to fetch submodules (2014-12-31 08:22:53 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/3fixes
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rtb/3fixes
Robert Yang (3):
cpan-base.bbclass: avoid using immmediate assignment for PERLLIBDIRS
cups: check avahi before use it
cogl: enable egl-x11 when build with x11
meta/classes/cpan-base.bbclass | 4 +-- meta/recipes-extended/cups/cups.inc | 1 + ...1-test-ippserver.c-check-avahi-before-use.patch | 34 ++++++++++++++++++++ meta/recipes-graphics/cogl/cogl-1.0.inc | 6 ++-- 4 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-extended/cups/cups/0001-test-ippserver.c-check-avahi-before-use.patch
Signature · 1 line
1.7.9.5
PATCH 1/3 cpan-base.bbclass: avoid using immmediate assignment for PERLLIBDIRS
The immediate assignment:
PERLLIBDIRS := "${@perl_get_libdirs(d)}"
may cause PERLLIBDIRS get wrong values when multilib, for example, when the default target arch is x86_64 (/usr/lib64), and mutilib is lib32 (/usr/lib), the ":=" would cause lib32-BPN's PERLLIBDIRS to be /usr/lib64, and lead to build errors.
--- meta/classes/cpan-base.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/classes/cpan-base.bbclass +2 -2
@@ -42,8 +42,8 @@ def is_target(d): return "yes" return "no" -PERLLIBDIRS := "${@perl_get_libdirs(d)}" -PERLVERSION := "${@get_perl_version(d)}" +PERLLIBDIRS = "${@perl_get_libdirs(d)}" +PERLVERSION = "${@get_perl_version(d)}" PERLVERSION[vardepvalue] = "" FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/*/.debug \
Signature · 1 line
1.7.9.5
PATCH 2/3 cups: check avahi before use it
In reply to Robert YangFixed the error when --disable-avahi:
ippserver.c:425:8: error: unknown type name 'AvahiThreadedPoll'
The avahi is optional, we need check whether it is enabled before use as other code does.
--- meta/recipes-extended/cups/cups.inc | 1 + ...1-test-ippserver.c-check-avahi-before-use.patch | 34 ++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 meta/recipes-extended/cups/cups/0001-test-ippserver.c-check-avahi-before-use.patch
meta/recipes-extended/cups/cups.inc +1 -0
@@ -10,6 +10,7 @@ SRC_URI = "http://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \ file://cups.socket \ file://cups.path \ file://cups.service \ + file://0001-test-ippserver.c-check-avahi-before-use.patch \ " LEAD_SONAME = "libcupsdriver.so"
meta/recipes-extended/cups/cups/0001-test-ippserver.c-check-avahi-before-use.patch new file +34 -0
@@ -0,0 +1,34 @@ +From fba92768324e76fa60d9c5f709e045bd4f7aee89 Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +Date: Sat, 3 Jan 2015 05:56:24 +0000 +Subject: [PATCH] test/ippserver.c: check avahi before use it + +Fixed the error when --disable-avahi: +ippserver.c:425:8: error: unknown type name 'AvahiThreadedPoll' + +The avahi is optional, we need check whether it is enabled before use as +other code does. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <[email protected]> +--- + test/ippserver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/ippserver.c b/test/ippserver.c +index c785e5f..26c8a66 100644 +--- a/test/ippserver.c ++++ b/test/ippserver.c +@@ -421,7 +421,7 @@ static int valid_job_attributes(_ipp_client_t *client); + + # ifdef HAVE_DNSSD + static DNSServiceRef DNSSDMaster = NULL; +-# else /* HAVE_AVAHI */ ++# elif defined(HAVE_AVAHI) /* HAVE_AVAHI */ + static AvahiThreadedPoll *DNSSDMaster = NULL; + static AvahiClient *DNSSDClient = NULL; + # endif /* HAVE_DNSSD */ +-- +2.0.1 +
Signature · 1 line
1.7.9.5
PATCH 3/3 cogl: enable egl-x11 when build with x11
In reply to Robert YangFixed clutter-1.0 compile error when build with x11:
clutter-backend-eglnative.h:31:27: fatal error: cogl/cogl-egl.h: No such file or directory
#include <cogl/cogl-egl.h>
compilation terminated.
We need enable egl-x11 when x11 as we enable egl-wayland when wayland.
--- meta/recipes-graphics/cogl/cogl-1.0.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-graphics/cogl/cogl-1.0.inc +4 -2
@@ -42,7 +42,7 @@ PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDE # EGL backends PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS}" PACKAGECONFIG[egl-null] = "--enable-null-egl-platform,--disable-null-egl-platform" -PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11}" +PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11} ${EDEPENDS_EGL}" PACKAGECONFIG[egl-wayland] = "--enable-wayland-egl-platform,--disable-wayland-egl-platform,${EDEPENDS_WAYLAND}" # Wayland (server-side)
@@ -55,7 +55,9 @@ PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango" # default. PACKAGECONFIG ??= "cogl-pango gles2 \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx egl-x11', '', d)} \ + " + FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" FILES_libcogl = "${libdir}/libcogl${SOLIBS}"
Signature · 1 line
1.7.9.5