Patchwork x11vnc: respect zeroconf DISTRO_FEATURE to enable Avahi support

login
register
mail settings
Submitter Ross Burton
Date Sept. 19, 2013, 10:06 a.m.
Message ID <1379585199-27059-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/58357/
State New
Headers show

Comments

Ross Burton - Sept. 19, 2013, 10:06 a.m.
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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Saul Wold - Sept. 19, 2013, 2:09 p.m.
On 09/19/2013 03:06 AM, Ross Burton wrote:
> 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.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb |    8 ++++----
>   1 file 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 0abc84a..098d8e8 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+"
>   LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \
>                       file://x11vnc/x11vnc.h;endline=33;md5=6f95dc6535467d7ee1563fd434fb372e"
>
> -DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib libxfixes libxrandr libxdamage libxtst"
> -
> -PR = "r0"
> -
>   SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\
>              file://starting-fix.patch \
>              file://endian-fix.patch "
> @@ -18,5 +14,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\
>   SRC_URI[md5sum] = "a372ec4fe8211221547b1c108cf56e4c"
>   SRC_URI[sha256sum] = "f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b"
>
> +DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib libxfixes libxrandr libxdamage libxtst"
> +
Did you intend to move the DEPENDS line here and keep avahi as you have 
avahi in the PACKAGECONFIG below.

Sau!

>   inherit autotools
>
> +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}"
> +PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi"
>
Ross Burton - Sept. 19, 2013, 2:16 p.m.
On 19 September 2013 15:09, Saul Wold <sgw@linux.intel.com> wrote:
> Did you intend to move the DEPENDS line here and keep avahi as you have
> avahi in the PACKAGECONFIG below.

Not my month is it. V2 incoming.

Ross

Patch

diff --git a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
index 0abc84a..098d8e8 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+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \
                     file://x11vnc/x11vnc.h;endline=33;md5=6f95dc6535467d7ee1563fd434fb372e"
 
-DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib libxfixes libxrandr libxdamage libxtst"
-
-PR = "r0"
-
 SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\
            file://starting-fix.patch \
            file://endian-fix.patch "
@@ -18,5 +14,9 @@  SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\
 SRC_URI[md5sum] = "a372ec4fe8211221547b1c108cf56e4c"
 SRC_URI[sha256sum] = "f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b"
 
+DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib libxfixes libxrandr libxdamage libxtst"
+
 inherit autotools
 
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}"
+PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi"