diff options
| author | Ed Swarthout <Ed.Swarthout@hwdebug.com> | 2009-11-22 21:56:39 +0000 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-01-25 18:40:55 +0800 |
| commit | 25164769ce940ae09c4fea0a70de1e05806de75f (patch) | |
| tree | 4d19b7f5c37adb56fe75032a6bb7d5e47f15d56e /recipes/vnc | |
| parent | ccffb0d58e3b36b3be440b9ceadb05ebabe0d847 (diff) | |
x11vnc-0.9.8 fix xshm header
Backport X_ShmAttach fix from 0.9.9
Signed-off-by: Ed Swarthout <Ed.Swarthout@hwdebug.com>
Signed-off-by: Holger Hans Peter Freyther <zecke@selfish.org>
Diffstat (limited to 'recipes/vnc')
| -rw-r--r-- | recipes/vnc/files/x11vnc-0.9.8-xshm-header-fix.patch | 15 | ||||
| -rw-r--r-- | recipes/vnc/x11vnc_0.9.8.bb | 4 |
2 files changed, 18 insertions, 1 deletions
diff --git a/recipes/vnc/files/x11vnc-0.9.8-xshm-header-fix.patch b/recipes/vnc/files/x11vnc-0.9.8-xshm-header-fix.patch new file mode 100644 index 0000000000..3383f63365 --- /dev/null +++ b/recipes/vnc/files/x11vnc-0.9.8-xshm-header-fix.patch @@ -0,0 +1,15 @@ +Looks like X_ShmAttach is considered private to the library and has been removed from its headers. +Just hardcode the value, it's only usd to print some help in case of an shm attach error. +--- x11vnc-0.9.8/x11vnc/cleanup.c ++++ x11vnc-0.9.8/x11vnc/cleanup.c +@@ -276,6 +276,10 @@ + return 0; + } + ++#ifndef X_ShmAttach ++#define X_ShmAttach 1 ++#endif ++ + static int Xerror(Display *d, XErrorEvent *error) { + X_UNLOCK; + diff --git a/recipes/vnc/x11vnc_0.9.8.bb b/recipes/vnc/x11vnc_0.9.8.bb index f3d706be5b..fd29d278e0 100644 --- a/recipes/vnc/x11vnc_0.9.8.bb +++ b/recipes/vnc/x11vnc_0.9.8.bb @@ -5,6 +5,8 @@ SECTION = "x11/utils" LICENSE = "GPL" DEPENDS = "openssl virtual/libx11 libxtst libxext avahi jpeg zlib" -SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz" +PR = "r1" +SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz \ + file://x11vnc-0.9.8-xshm-header-fix.patch;patch=1" inherit autotools |