diff options
author | Jean-Francois Dagenais <dagenaisj@sonatest.com> | 2019-02-11 13:52:42 -0500 |
---|---|---|
committer | Jean-Francois Dagenais <jeff.dagenais@gmail.com> | 2019-02-12 11:23:23 -0500 |
commit | a2172fbe46890467e112544372bbb6ef7d92c617 (patch) | |
tree | 68cbb403ec527ae6710b47b2fce516c1e90345b0 | |
parent | 21b499d505e27b3c9ebfa0857f40acb75144a2e1 (diff) | |
download | meta-openembedded-contrib-a2172fbe46890467e112544372bbb6ef7d92c617.tar.gz |
x11vnc: patch: don't install Xdummy when configured --without-x
There is just no point in Xdummy if x11 is not in DISTRO_FEATURES.
-rw-r--r-- | meta-oe/recipes-graphics/x11vnc/files/0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch | 37 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/x11vnc/files/0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch b/meta-oe/recipes-graphics/x11vnc/files/0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch new file mode 100644 index 0000000000..a15f3fe5bd --- /dev/null +++ b/meta-oe/recipes-graphics/x11vnc/files/0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch @@ -0,0 +1,37 @@ +From 686491573827b98ba031adaa5da373366079d3d8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dagenais?= <jeff.dagenais@gmail.com> +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 <jeff.dagenais@gmail.com> +--- + 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) < $< > $@.tmp + mv -f $@.tmp $@ ++endif +-- +2.17.1 + diff --git a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb index 5a15948166..1aace02001 100644 --- a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb +++ b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb @@ -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 \ " SRC_URI[md5sum] = "64172e8f896389ec963fff93415f0d93" |