Return-Path: Received: from mail-we0-f171.google.com (mail-we0-f171.google.com [74.125.82.171]) by mail.openembedded.org (Postfix) with ESMTP id B9ECC6C8EC for ; Thu, 19 Sep 2013 10:06:41 +0000 (UTC) Received: by mail-we0-f171.google.com with SMTP id t61so7599952wes.16 for ; Thu, 19 Sep 2013 03:06:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=tL+k2AIRhPtuHDLl3yYcxiRMesH26a4b/8rlZ2HXPkM=; b=OHHd7Hg14SEAf73++AsIqofFQ8iUjWAA7rIswCn19w4+mWNxYPF9rld8kkMNarv2dl w5okStkbBwN6DBwPFnZcPnAyy2jXb5hAhsRfZIJhUQ5uJbF3C1U7NOrmYfWQGC7AnI7z SidxZVlQMX7LnDhftUsT1WJvIlfbXIJE8L6ZN/zgYivOnyto9q2+2tC7pHVJVmb6QKiI 8/O6dJmbHphgdGZCjWkXSGNBdEGvY8fcq4TGEVJi0VI0UuZpFlz7Fx8ORlzWfuusIyrg oPMUn9uxIo3B8Us2tXQSivs/oQgimK0MQHaTVGRNP0azIQ4l8SjZQTVvsK6Wlc+ltLn7 u1xA== X-Gm-Message-State: ALoCoQlkCCWTDNoeOlgTpmT47H39TKXO52bGicgq5qfQQge2nv9eANePieR502JC0wAhdM80f51x X-Received: by 10.180.72.226 with SMTP id g2mr10893901wiv.52.1379585203032; Thu, 19 Sep 2013 03:06:43 -0700 (PDT) Received: from melchett.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by mx.google.com with ESMTPSA id z13sm8494858wib.0.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 19 Sep 2013 03:06:42 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 19 Sep 2013 11:06:39 +0100 Message-Id: <1379585199-27059-1-git-send-email-ross.burton@intel.com> X-Mailer: git-send-email 1.7.10.4 Subject: [PATCH] x11vnc: respect zeroconf DISTRO_FEATURE to enable Avahi support X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Sep 2013 10:06:42 -0000 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 --- 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