Skip to content

Commit

Permalink
x11vnc: patch: don't install Xdummy when configured --without-x
Browse files Browse the repository at this point in the history
There is just no point in Xdummy if x11 is not in DISTRO_FEATURES.
  • Loading branch information
Jean-Francois Dagenais authored and jeff-dagenais committed Feb 11, 2019
1 parent 755cfe3 commit 6ea1ba5
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
From 686491573827b98ba031adaa5da373366079d3d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dagenais?= <[email protected]>
Date: Mon, 11 Feb 2019 11:42:59 -0500
Subject: [PATCH] misc/Makefile.am: don't install Xdummy when configured
--without-x

Upstream-status: submitted https://github.com/jeff-dagenais/x11vnc/pull/1

Signed-off-by: Jean-Francois Dagenais <[email protected]>
---
misc/Makefile.am | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/misc/Makefile.am b/misc/Makefile.am
index c0b98c8..e4a22c1 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -18,7 +18,10 @@ EXTRA_DIST = \
uinput.pl \
ultravnc_repeater.pl \
vcinject.pl \
- x11vnc_loop \
+ x11vnc_loop
+
+if HAVE_X11
+EXTRA_DIST += \
Xdummy.c \
Xdummy.in

@@ -32,3 +35,4 @@ do_dummy_c_subst = $(SED) \
Xdummy: $(srcdir)/Xdummy.in $(srcdir)/Xdummy.c
$(do_dummy_c_subst) < $< > [email protected]
mv -f [email protected] $@
+endif
--
2.17.1

1 change: 1 addition & 0 deletions meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \

SRC_URI = "https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz;downloadfilename=x11vnc-${PV}.tar.gz\
file://starting-fix.patch \
file://0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch \
${@bb.utils.contains('DISTRO_FEATURES', 'fbdev', 'file://uinput-x11vnc.conf', '', d)} \
"

Expand Down

0 comments on commit 6ea1ba5

Please sign in to comment.