* [PATCH] x11vnc: respect zeroconf DISTRO_FEATURE to enable Avahi support
@ 2013-09-19 10:06 Ross Burton
2013-09-19 14:09 ` Saul Wold
0 siblings, 1 reply; 3+ messages in thread
From: Ross Burton @ 2013-09-19 10:06 UTC (permalink / raw)
To: openembedded-core
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"
+
inherit autotools
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}"
+PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] x11vnc: respect zeroconf DISTRO_FEATURE to enable Avahi support
2013-09-19 10:06 [PATCH] x11vnc: respect zeroconf DISTRO_FEATURE to enable Avahi support Ross Burton
@ 2013-09-19 14:09 ` Saul Wold
2013-09-19 14:16 ` Burton, Ross
0 siblings, 1 reply; 3+ messages in thread
From: Saul Wold @ 2013-09-19 14:09 UTC (permalink / raw)
To: Ross Burton; +Cc: openembedded-core
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"
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] x11vnc: respect zeroconf DISTRO_FEATURE to enable Avahi support
2013-09-19 14:09 ` Saul Wold
@ 2013-09-19 14:16 ` Burton, Ross
0 siblings, 0 replies; 3+ messages in thread
From: Burton, Ross @ 2013-09-19 14:16 UTC (permalink / raw)
To: Saul Wold; +Cc: OE-core
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-09-19 14:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-19 10:06 [PATCH] x11vnc: respect zeroconf DISTRO_FEATURE to enable Avahi support Ross Burton
2013-09-19 14:09 ` Saul Wold
2013-09-19 14:16 ` Burton, Ross
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox