[oe-commits] [meta-openembedded] 01/15: libvncserver: Fix build with security flags on and disable libva
git at git.openembedded.org
git at git.openembedded.org
Tue Dec 13 10:20:54 UTC 2016
martin_jansa pushed a commit to branch master
in repository meta-openembedded.
commit a14aa989b93f86712d3440728eee650d2fa8fdf0
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Fri Dec 2 19:04:15 2016 -0800
libvncserver: Fix build with security flags on and disable libva
When libva is present it detects it and then fails to build
until the support is fixed, lets disable it
Add a patch to fix issue found when compiling with
security flags turned on
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
.../libvncserver/0002-format_string.patch | 21 +++++++++++++++++++++
.../libvncserver/libvncserver_0.9.10.bb | 3 +++
2 files changed, 24 insertions(+)
diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver/0002-format_string.patch b/meta-oe/recipes-graphics/libvncserver/libvncserver/0002-format_string.patch
new file mode 100644
index 0000000..566a208
--- /dev/null
+++ b/meta-oe/recipes-graphics/libvncserver/libvncserver/0002-format_string.patch
@@ -0,0 +1,21 @@
+From: Luca Falavigna <dktrkranz at debian.org>
+Date: Tue, 27 Jan 2015 01:26:04 +0000
+Subject: format_string
+
+---
+ client_examples/gtkvncviewer.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/client_examples/gtkvncviewer.c b/client_examples/gtkvncviewer.c
+index 261b2da..861e4e3 100644
+--- a/client_examples/gtkvncviewer.c
++++ b/client_examples/gtkvncviewer.c
+@@ -588,7 +588,7 @@ static void GtkDefaultLog (const char *format, ...)
+
+ time (&log_clock);
+ strftime (buf, 255, "%d/%m/%Y %X ", localtime (&log_clock));
+- fprintf (stdout, buf);
++ fprintf (stdout, "%s", buf);
+
+ vfprintf (stdout, format, args);
+ fflush (stdout);
diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
index 387202b..0eba87c 100644
--- a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
+++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
@@ -14,6 +14,7 @@ SRC_URI = "\
${DEBIAN_MIRROR}/main/libv/libvncserver/libvncserver_0.9.10+dfsg.orig.tar.xz \
file://0001-remove-webclients-build.patch \
file://0002-common-add-sha1.patch \
+ file://0002-format_string.patch \
"
SRC_URI[md5sum] = "e883b6c7bd339a5e1c48645051abe5c4"
@@ -21,4 +22,6 @@ SRC_URI[sha256sum] = "583f28869b82aec57768d7d18cd7ff81bf092ecbbc1209b587c2c2cd68
S = "${WORKDIR}/${BPN}-LibVNCServer-${PV}"
+EXTRA_OECONF += "--without-libva"
+
TARGET_LDFLAGS += "-lgcrypt"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list