Hello community, here is the log from the commit of package LibVNCServer for openSUSE:Factory checked in at 2012-12-31 14:25:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/LibVNCServer (Old) and /work/SRC/openSUSE:Factory/.LibVNCServer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "LibVNCServer", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/LibVNCServer/LibVNCServer.changes 2012-10-26 17:13:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.LibVNCServer.new/LibVNCServer.changes 2012-12-31 14:26:03.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Dec 30 22:02:37 UTC 2012 - [email protected] + +- libvncserver-byteswap.patch : USe OS byteswapping macros + which are optimized for the target arch. + +- BuildRequire libpng-Devel + +------------------------------------------------------------------- New: ---- libvncserver-byteswap.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ LibVNCServer.spec ++++++ --- /var/tmp/diff_new_pack.3Qstx2/_old 2012-12-31 14:26:04.000000000 +0100 +++ /var/tmp/diff_new_pack.3Qstx2/_new 2012-12-31 14:26:04.000000000 +0100 @@ -17,12 +17,12 @@ Name: LibVNCServer -BuildRequires: autoconf -BuildRequires: automake BuildRequires: gnutls-devel BuildRequires: libavahi-devel BuildRequires: libgcrypt-devel BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libtool BuildRequires: lzo-devel BuildRequires: slang-devel BuildRequires: xorg-x11-devel @@ -41,6 +41,8 @@ Patch7: redef-keysym.patch #PATCH-FIX-OPENSUSE: disable x11vnc build Patch10: LibVNCServer-0.9.9-no_x11vnc.patch +#PATCH_FIX-OPENSUSE: Use system fast byteswap routines. +Patch11: libvncserver-byteswap.patch %description VNC is a set of programs using the RFB (Remote Frame Buffer) protocol. @@ -84,7 +86,7 @@ # aclocal; autoheader; automake --add-missing --copy; autoconf # ./configure --enable-maintainer-mode # sh ./autogen.sh - +%patch11 # fix encoding for file in AUTHORS ChangeLog ; do mv ${file} ${file}.OLD && \ @@ -99,12 +101,10 @@ #autoreconf %build -CFLAGS="$RPM_OPT_FLAGS -D_REENTRANT" \ +CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_REENTRANT" \ # Plase note that tightvn cause a problem; need to be fix %configure --disable-static --with-pic --enable-shared --with-gnu-ld --prefix=%{_prefix} --without-tightvnc-filetransfer -# hack to omit unused-direct-shlib-dependencies -sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool make %{?_smp_mflags} ++++++ libvncserver-byteswap.patch ++++++ --- rfb/rfb.h.orig +++ rfb/rfb.h @@ -711,19 +711,18 @@ typedef struct _rfbClientRec { ((cl)->enableCursorPosUpdates && (cl)->cursorWasMoved) || \ !sraRgnEmpty((cl)->copyRegion) || !sraRgnEmpty((cl)->modifiedRegion)) +#include <byteswap.h> /* * Macros for endian swapping. */ -#define Swap16(s) ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) +#define Swap16(s) bswap_16(s) #define Swap24(l) ((((l) & 0xff) << 16) | (((l) >> 16) & 0xff) | \ (((l) & 0x00ff00))) -#define Swap32(l) (((l) >> 24) | \ - (((l) & 0x00ff0000) >> 8) | \ - (((l) & 0x0000ff00) << 8) | \ - ((l) << 24)) +#define Swap32(l) bswap_32(l) + extern char rfbEndianTest; --- rfb/rfbclient.h.orig +++ rfb/rfbclient.h @@ -38,25 +38,16 @@ #include <unistd.h> #include <rfb/rfbproto.h> #include <rfb/keysym.h> +#include <byteswap.h> #define rfbClientSwap16IfLE(s) \ - (*(char *)&client->endianTest ? ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) : (s)) + (*(char *)&client->endianTest ? (bswap_16(s)) : (s)) #define rfbClientSwap32IfLE(l) \ - (*(char *)&client->endianTest ? ((((l) & 0xff000000) >> 24) | \ - (((l) & 0x00ff0000) >> 8) | \ - (((l) & 0x0000ff00) << 8) | \ - (((l) & 0x000000ff) << 24)) : (l)) + (*(char *)&client->endianTest ? (bswap_32(l)) : (l)) #define rfbClientSwap64IfLE(l) \ - (*(char *)&client->endianTest ? ((((l) & 0xff00000000000000ULL) >> 56) | \ - (((l) & 0x00ff000000000000ULL) >> 40) | \ - (((l) & 0x0000ff0000000000ULL) >> 24) | \ - (((l) & 0x000000ff00000000ULL) >> 8) | \ - (((l) & 0x00000000ff000000ULL) << 8) | \ - (((l) & 0x0000000000ff0000ULL) << 24) | \ - (((l) & 0x000000000000ff00ULL) << 40) | \ - (((l) & 0x00000000000000ffULL) << 56)) : (l)) + (*(char *)&client->endianTest ? (bswap_64(l)): (l)) #define FLASH_PORT_OFFSET 5400 #define LISTEN_PORT_OFFSET 5500 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
