[RESEND PATCH] x11vnc: move recipe to meta-oe

[RESEND PATCH] x11vnc: move recipe to meta-oe

[Ioan-Adrian Ratiu]

x11vnc can be configured with --use-system-libvncserver to use an
external libvncserver which will be added to meta-oe. Since oe-core
should not depend on meta-oe, we move x11vnc there.

Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
---
 .../recipes-graphics/x11vnc/files/endian-fix.patch | 24 ---------------------
 .../x11vnc/files/starting-fix.patch                | 25 ----------------------
 meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb      | 25 ----------------------
 3 files changed, 74 deletions(-)
 delete mode 100644 meta/recipes-graphics/x11vnc/files/endian-fix.patch
 delete mode 100644 meta/recipes-graphics/x11vnc/files/starting-fix.patch
 delete mode 100644 meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb

diff --git a/meta/recipes-graphics/x11vnc/files/endian-fix.patch b/meta/recipes-graphics/x11vnc/files/endian-fix.patch
deleted file mode 100644
index f2a538b..0000000
--- a/meta/recipes-graphics/x11vnc/files/endian-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-libvncserver: replace LIBVNCSERVER_WORDS_BIGENDIAN with WORDS_BIGENDIAN
-
-since macro AC_C_BIGENDIAN is used in autoconf and WORDS_BIGENDIAN is
-automatically set for different arch, it is better to use WORDS_BIGENDIAN
-instead of LIBVNCSERVER_WORDS_BIGENDIAN, which cuase issue in mips.
-
-Signed-off-by: Yu Ke <ke.yu@intel.com>
-
-Upstream-Status: Pending
-
-diff --git a/libvncserver/main.c b/libvncserver/main.c
-index b6bd930..8bbb7bf 100644
---- a/libvncserver/main.c
-+++ b/libvncserver/main.c
-@@ -47,7 +47,7 @@ static MUTEX(extMutex);
- 
- static int rfbEnableLogging=1;
- 
--#ifdef LIBVNCSERVER_WORDS_BIGENDIAN
-+#ifdef WORDS_BIGENDIAN
- char rfbEndianTest = (1==0);
- #else
- char rfbEndianTest = (1==1);
-
diff --git a/meta/recipes-graphics/x11vnc/files/starting-fix.patch b/meta/recipes-graphics/x11vnc/files/starting-fix.patch
deleted file mode 100644
index f62e405..0000000
--- a/meta/recipes-graphics/x11vnc/files/starting-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-"-gui" & "-rfbport" require "wish" installed, or else x11vnc fails to start.
-Removing these 2 parameters makes x11vnc works well on poky sato image.
-
-Add also -skip_lockkeys option to ignore all Caps_Lock, Shift_Lock, Num_Lock,
-Scroll_Lock keysyms received from viewers, in order to leave the lock state on
-the server side unchanged. Yet, the keys will appear correctly.
-
-Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: x11vnc-0.9.12/x11vnc/x11vnc.desktop
-===================================================================
---- x11vnc-0.9.12.orig/x11vnc/x11vnc.desktop	2011-03-03 10:33:18.000000000 +0800
-+++ x11vnc-0.9.12/x11vnc/x11vnc.desktop	2011-03-03 10:35:20.000000000 +0800
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Name=X11VNC Server
- Comment=Share this desktop by VNC
--Exec=x11vnc -gui tray=setpass -rfbport PROMPT -bg -o %%HOME/.x11vnc.log.%%VNCDISPLAY
-+Exec=x11vnc -bg -rfbport 5900 -skip_lockkeys -o %%HOME/.x11vnc.log.%%VNCDISPLAY
- Icon=computer
- Terminal=false
- Type=Application
diff --git a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
deleted file mode 100644
index ec0241f..0000000
--- a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY = "Exports your X session on-the-fly via VNC"
-HOMEPAGE = "http://www.karlrunge.com/x11vnc/"
-
-SECTION = "x11/utils"
-AUTHOR = "Karl Runge"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \
-                    file://x11vnc/x11vnc.h;endline=33;md5=6f95dc6535467d7ee1563fd434fb372e"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\
-           file://starting-fix.patch \
-           file://endian-fix.patch "
-
-SRC_URI[md5sum] = "a372ec4fe8211221547b1c108cf56e4c"
-SRC_URI[sha256sum] = "f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b"
-
-DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr libxdamage libxtst"
-
-inherit autotools-brokensep distro_features_check
-# depends on virtual/libx11
-REQUIRED_DISTRO_FEATURES = "x11"
-
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}"
-PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi"
-PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama"
-- 
2.1.4

Re: [RESEND PATCH] x11vnc: move recipe to meta-oe

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 470 bytes --]

On 3 December 2015 at 10:17, Ioan-Adrian Ratiu <adrian.ratiu@ni.com> wrote:

> x11vnc can be configured with --use-system-libvncserver to use an
> external libvncserver which will be added to meta-oe. Since oe-core
> should not depend on meta-oe, we move x11vnc there.
>
> Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
>

Obviously we shouldn't remove it from oe-core until it's been merged into
meta-oe, so please ping when that's happened.

Ross

[-- Attachment #2: Type: text/html, Size: 939 bytes --]

Re: [RESEND PATCH] x11vnc: move recipe to meta-oe

[Ioan-Adrian Ratiu]

On Thu, 3 Dec 2015 14:18:53 +0000
"Burton, Ross" <ross.burton@intel.com> wrote:

> On 3 December 2015 at 10:17, Ioan-Adrian Ratiu <adrian.ratiu@ni.com> wrote:
> 
> > x11vnc can be configured with --use-system-libvncserver to use an
> > external libvncserver which will be added to meta-oe. Since oe-core
> > should not depend on meta-oe, we move x11vnc there.
> >
> > Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
> >
> 
> Obviously we shouldn't remove it from oe-core until it's been merged into
> meta-oe, so please ping when that's happened.
> 
> Ross

Hello

x11vnc has just been accepted into meta-oe on master-next an hour ago.

Thank you,
Adrian

Re: [RESEND PATCH] x11vnc: move recipe to meta-oe

[Ioan-Adrian Ratiu]

On Fri, 11 Dec 2015 17:09:21 +0200
Ioan-Adrian Ratiu <adrian.ratiu@ni.com> wrote:

> On Thu, 3 Dec 2015 14:18:53 +0000
> "Burton, Ross" <ross.burton@intel.com> wrote:
> 
> > On 3 December 2015 at 10:17, Ioan-Adrian Ratiu <adrian.ratiu@ni.com> wrote:
> > 
> > > x11vnc can be configured with --use-system-libvncserver to use an
> > > external libvncserver which will be added to meta-oe. Since oe-core
> > > should not depend on meta-oe, we move x11vnc there.
> > >
> > > Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
> > >
> > 
> > Obviously we shouldn't remove it from oe-core until it's been merged into
> > meta-oe, so please ping when that's happened.
> > 
> > Ross
> 
> Hello
> 
> x11vnc has just been accepted into meta-oe on master-next an hour ago.
> 
> Thank you,
> Adrian

ping? anyone? The x11vnc recipe is in meta-oe master since 18 dec

Re: [RESEND PATCH] x11vnc: move recipe to meta-oe

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 316 bytes --]

Hi,

On 5 January 2016 at 08:46, Ioan-Adrian Ratiu <adrian.ratiu@ni.com> wrote:

> ping? anyone? The x11vnc recipe is in meta-oe master since 18 dec
>

Can you rebase to master and actually remove all the other references to
x11vnc?  For example, packagegroup-core-x11-sato still depends on x11vnc.

Ross

[-- Attachment #2: Type: text/html, Size: 723 bytes --]

Re: [RESEND PATCH] x11vnc: move recipe to meta-oe

[Ioan-Adrian Ratiu]

On Tue, 5 Jan 2016 11:16:06 +0000
"Burton, Ross" <ross.burton@intel.com> wrote:

> Hi,
> 
> On 5 January 2016 at 08:46, Ioan-Adrian Ratiu <adrian.ratiu@ni.com> wrote:
> 
> > ping? anyone? The x11vnc recipe is in meta-oe master since 18 dec
> >
> 
> Can you rebase to master and actually remove all the other references to
> x11vnc?  For example, packagegroup-core-x11-sato still depends on x11vnc.

Yes, of course. I'll resend with these changes.

> 
> Ross