From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- .../recipes-graphics/x11vnc/files/endian-fix.patch | 24 ++++++ .../x11vnc/files/remove-redundant-RPATH.patch | 86 ++++++++++++++++++++++ .../x11vnc/files/starting-fix.patch | 25 +++++++ .../recipes-graphics/x11vnc/x11vnc_0.9.13.bb | 34 +++++++++ 4 files changed, 169 insertions(+) create mode 100644 meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/endian-fix.patch create mode 100644 meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/remove-redundant-RPATH.patch create mode 100644 meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch create mode 100644 meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb (limited to 'meta-openembedded/meta-oe/recipes-graphics/x11vnc') diff --git a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/endian-fix.patch b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/endian-fix.patch new file mode 100644 index 000000000..f2a538bf6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/endian-fix.patch @@ -0,0 +1,24 @@ +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 + +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-openembedded/meta-oe/recipes-graphics/x11vnc/files/remove-redundant-RPATH.patch b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/remove-redundant-RPATH.patch new file mode 100644 index 000000000..8e894bd8e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/remove-redundant-RPATH.patch @@ -0,0 +1,86 @@ +From 7be055c13c7d0d640941830a3291af3b404928c1 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Mon, 27 Jun 2016 04:44:14 -0400 +Subject: [PATCH] configure.ac: remove redundant RPATH + +It caused oe QA issue: +... +|ERROR: QA Issue: x11vnc: work/i586-poky-linux/x11vnc/0.9.13-r0/packages-split/ +x11vnc/usr/bin/x11vnc contains probably-redundant RPATH /usr/lib [useless-rpaths] +... + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia +--- + configure.ac | 21 +++++---------------- + 1 file changed, 5 insertions(+), 16 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 6f664d0..f986686 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -330,10 +330,8 @@ if test "x$with_crypto" != "xno" -a "x$with_ssl" != "xno"; then + saved_LDFLAGS="$LDFLAGS" + CPPFLAGS="$CPPFLAGS -I$with_ssl/include" + LDFLAGS="$LDFLAGS -L$with_ssl/lib" +- if test "x$ld_minus_R" = "xno"; then ++ if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then + : +- elif test "x$GCC" = "xyes"; then +- LDFLAGS="$LDFLAGS -Xlinker -R$with_ssl/lib" + else + LDFLAGS="$LDFLAGS -R$with_ssl/lib" + fi +@@ -447,10 +445,8 @@ if test ! -z "$with_system_libvncserver" -a "x$with_system_libvncserver" != "xno + fi + if test "x$with_system_libvncserver" != "xyes"; then + rflag="" +- if test "x$ld_minus_R" = "xno"; then ++ if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then + : +- elif test "x$GCC" = "xyes"; then +- rflag="-Xlinker -R$with_system_libvncserver/lib" + else + rflag="-R$with_system_libvncserver/lib" + fi +@@ -484,10 +480,8 @@ new enough. + elif libvncserver-config --version 1>/dev/null 2>&1; then + rflag="" + rprefix=`libvncserver-config --prefix` +- if test "x$ld_minus_R" = "xno"; then ++ if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then + : +- elif test "x$GCC" = "xyes"; then +- rflag=" -Xlinker -R$rprefix/lib " + else + rflag=" -R$rprefix/lib " + fi +@@ -541,11 +535,8 @@ if test "x$with_jpeg" != "xno"; then + saved_LDFLAGS="$LDFLAGS" + CPPFLAGS="$CPPFLAGS -I$with_jpeg/include" + LDFLAGS="$LDFLAGS -L$with_jpeg/lib" +- if test "x$ld_minus_R" = "xno"; then ++ if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then + : +- elif test "x$GCC" = "xyes"; then +- # this is not complete... in general a rat's nest. +- LDFLAGS="$LDFLAGS -Xlinker -R$with_jpeg/lib" + else + LDFLAGS="$LDFLAGS -R$with_jpeg/lib" + fi +@@ -590,10 +581,8 @@ if test "x$with_zlib" != "xno" -a "x$with_libz" != "xno"; then + saved_LDFLAGS="$LDFLAGS" + CPPFLAGS="$CPPFLAGS -I$with_zlib/include" + LDFLAGS="$LDFLAGS -L$with_zlib/lib" +- if test "x$ld_minus_R" = "xno"; then ++ if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then + : +- elif test "x$GCC" = "xyes"; then +- LDFLAGS="$LDFLAGS -Xlinker -R$with_zlib/lib" + else + LDFLAGS="$LDFLAGS -R$with_zlib/lib" + fi +-- +2.8.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch new file mode 100644 index 000000000..f62e405dd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch @@ -0,0 +1,25 @@ +"-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 +Signed-off-by: Laurentiu Palcu + +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-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb new file mode 100644 index 000000000..b047bc462 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb @@ -0,0 +1,34 @@ +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 \ + file://remove-redundant-RPATH.patch \ +" + +SRC_URI[md5sum] = "a372ec4fe8211221547b1c108cf56e4c" +SRC_URI[sha256sum] = "f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b" + +DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr libxdamage libxtst libtasn1 p11-kit" + +inherit autotools-brokensep distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} libvncserver" +PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi" +PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama" +PACKAGECONFIG[libvncserver] = "--with-system-libvncserver,--without-system-libvncserver,libvncserver" + +do_prepare_sources () { + # Remove old libtool macros from acinclude.m4 + sed -i -e '/^# libtool.m4/q' ${S}/acinclude.m4 +} +do_patch[postfuncs] += "do_prepare_sources" -- cgit v1.2.3