summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2011-03-04 21:11:37 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-04 22:26:40 +0000
commit87290a8497e892a65bde4755c4fee8b8ca93424b (patch)
tree3286cdf53d93a7d560443bc907ab009e15fecfbb /meta/recipes-graphics
parent0bc244181fce67725ddd0981481e5611b700cf51 (diff)
downloadpoky-87290a8497e892a65bde4755c4fee8b8ca93424b.tar.gz
x11vnc: fix the endian issue in mips for bug 782
x11vnc use LIBVNCSERVER_WORDS_BIGENDIAN to handle the endian, however it is not set correctly when cross-compile for mips, thus x11vnc mips does not work correctly. meanwhile, x11vnc has the autconf macro AC_C_BIGENDIAN which can handle the endian correctly. so this patch replace the LIBVNCSERVER_WORDS_BIGENDIAN with WORDS_BIGENDIAN (generated by AC_C_BIGENDIAN) to fix this issue. this patch fix the bug [YOCTO #782] this appraoch is suggested by Khem Raj CC: Khem Raj <raj.khem@gmail.com> (From OE-Core rev: da4b22c8bdf00813164d8830e52e1d6ad35cdd94) Signed-off-by: Yu Ke <ke.yu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/x11vnc/files/endian-fix.patch22
-rw-r--r--meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb5
2 files changed, 26 insertions, 1 deletions
diff --git a/meta/recipes-graphics/x11vnc/files/endian-fix.patch b/meta/recipes-graphics/x11vnc/files/endian-fix.patch
new file mode 100644
index 0000000000..0b5e4709f5
--- /dev/null
+++ b/meta/recipes-graphics/x11vnc/files/endian-fix.patch
@@ -0,0 +1,22 @@
1libvncserver: replace LIBVNCSERVER_WORDS_BIGENDIAN with WORDS_BIGENDIAN
2
3since macro AC_C_BIGENDIAN is used in autoconf and WORDS_BIGENDIAN is
4automatically set for different arch, it is better to use WORDS_BIGENDIAN
5instead of LIBVNCSERVER_WORDS_BIGENDIAN, which cuase issue in mips.
6
7Signed-off-by: Yu Ke <ke.yu@intel.com>
8
9diff --git a/libvncserver/main.c b/libvncserver/main.c
10index b6bd930..8bbb7bf 100644
11--- a/libvncserver/main.c
12+++ b/libvncserver/main.c
13@@ -47,7 +47,7 @@ static MUTEX(extMutex);
14
15 static int rfbEnableLogging=1;
16
17-#ifdef LIBVNCSERVER_WORDS_BIGENDIAN
18+#ifdef WORDS_BIGENDIAN
19 char rfbEndianTest = (1==0);
20 #else
21 char rfbEndianTest = (1==1);
22
diff --git a/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb
index f5a6662660..f92eb49a8c 100644
--- a/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb
+++ b/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb
@@ -9,8 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \
9 9
10DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib" 10DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib"
11 11
12PR = "r1"
13
12SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz\ 14SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz\
13 file://starting-fix.patch" 15 file://starting-fix.patch \
16 file://endian-fix.patch "
14 17
15SRC_URI[md5sum] = "1498a68d02aa7b6c97bf746c073c8d00" 18SRC_URI[md5sum] = "1498a68d02aa7b6c97bf746c073c8d00"
16SRC_URI[sha256sum] = "60a7cceee2c9a5f1c854340b2bae13f975ac55906237042f81f795b28a154a79" 19SRC_URI[sha256sum] = "60a7cceee2c9a5f1c854340b2bae13f975ac55906237042f81f795b28a154a79"