summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-09-19 15:16:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-22 12:19:42 +0100
commit42095866ec1aee5277441ff97d03c9f163fe22b0 (patch)
treedc8ae012600bb9ebdf6ec0f8a90264b150e1ee41 /meta/recipes-graphics
parent139b44be7a356fa24f19ef7216c7d8330281a51f (diff)
downloadpoky-42095866ec1aee5277441ff97d03c9f163fe22b0.tar.gz
x11vnc: respect zeroconf DISTRO_FEATURE to enable Avahi support
There's a standard way of announcing VNC services over mDNS that x11vnc supports, so respect the feature and enable/disable it. Also re-order the statements and drop the redundant PR. (From OE-Core rev: e5443a0b5a70bf054cbeb6ff1fd6b5ef9d2347f8) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
index 0abc84ad2d..24c42d131d 100644
--- a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
+++ b/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
@@ -7,10 +7,6 @@ LICENSE = "GPLv2+"
7LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \ 7LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \
8 file://x11vnc/x11vnc.h;endline=33;md5=6f95dc6535467d7ee1563fd434fb372e" 8 file://x11vnc/x11vnc.h;endline=33;md5=6f95dc6535467d7ee1563fd434fb372e"
9 9
10DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib libxfixes libxrandr libxdamage libxtst"
11
12PR = "r0"
13
14SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\ 10SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\
15 file://starting-fix.patch \ 11 file://starting-fix.patch \
16 file://endian-fix.patch " 12 file://endian-fix.patch "
@@ -18,5 +14,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\
18SRC_URI[md5sum] = "a372ec4fe8211221547b1c108cf56e4c" 14SRC_URI[md5sum] = "a372ec4fe8211221547b1c108cf56e4c"
19SRC_URI[sha256sum] = "f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b" 15SRC_URI[sha256sum] = "f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b"
20 16
17DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr libxdamage libxtst"
18
21inherit autotools 19inherit autotools
22 20
21PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}"
22PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi"