[tigervnc/f16] libvnc.so: don't use unexported GetMaster function (#744881)

Adam Tkac atkac at fedoraproject.org
Fri Nov 11 13:49:17 UTC 2011 

commit eba8cb45c6383117ffc99ef89b0691a33daeaa7c
Author: Adam Tkac <atkac at redhat.com>
Date:   Fri Nov 11 14:47:47 2011 +0100

    libvnc.so: don't use unexported GetMaster function (#744881)
    
    - remove nasm buildreq
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>

 tigervnc.spec            |   12 ++++----
 tigervnc11-xorg111.patch |   59 +++++++++++++++++++++-------------------------
 2 files changed, 33 insertions(+), 38 deletions(-)
---
diff --git a/tigervnc.spec b/tigervnc.spec
index 0838aa4..d530992 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	1.1.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -25,10 +25,6 @@ BuildRequires:	desktop-file-utils, java-1.5.0-gcj-devel
 BuildRequires:	libjpeg-turbo-devel, gnutls-devel, pam-devel
 BuildRequires:	systemd-units
 
-%ifarch %ix86 x86_64
-BuildRequires: nasm
-%endif
-
 Requires(post):	systemd-units systemd-sysv chkconfig coreutils
 Requires(preun):systemd-units
 Requires(postun):systemd-units coreutils
@@ -154,7 +150,7 @@ export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$CFLAGS"
 
 autoreconf -fiv
-%configure --disable-static --with-system-jpeg
+%configure --disable-static --with-system-jpeg --without-simd
 
 make %{?_smp_mflags}
 
@@ -312,6 +308,10 @@ fi
 %doc LICENCE.TXT
 
 %changelog
+* Fri Nov 11 2011 Adam Tkac <atkac redhat com> - 1.1.0-2
+- libvnc.so: don't use unexported GetMaster function (#744881)
+- remove nasm buildreq
+
 * Mon Sep 12 2011 Adam Tkac <atkac redhat com> - 1.1.0-1
 - update to 1.1.0
 - update the xorg11 patch
diff --git a/tigervnc11-xorg111.patch b/tigervnc11-xorg111.patch
index 4e1b727..ee0ddb9 100644
--- a/tigervnc11-xorg111.patch
+++ b/tigervnc11-xorg111.patch
@@ -1,6 +1,6 @@
 diff -up tigervnc-1.1.0/unix/xserver/hw/vnc/Input.cc.xorg111 tigervnc-1.1.0/unix/xserver/hw/vnc/Input.cc
 --- tigervnc-1.1.0/unix/xserver/hw/vnc/Input.cc.xorg111	2011-08-09 23:16:36.000000000 +0200
-+++ tigervnc-1.1.0/unix/xserver/hw/vnc/Input.cc	2011-09-14 13:22:19.540000049 +0200
++++ tigervnc-1.1.0/unix/xserver/hw/vnc/Input.cc	2011-11-11 11:59:14.226819903 +0100
 @@ -82,10 +82,11 @@ static KeyCode KeysymToKeycode(KeySymsPt
  /* Event queue is shared between all devices. */
  #if XORG == 15
@@ -129,59 +129,54 @@ diff -up tigervnc-1.1.0/unix/xserver/hw/vnc/Input.cc.xorg111 tigervnc-1.1.0/unix
  		int state, maxKeysPerMod, keycode;
  #if XORG >= 17
  		KeyCode *modmap = NULL;
-+		DeviceIntPtr master;
- 
--		state = XkbStateFieldFromRec(&dev->u.master->key->xkbInfo->state);
-+		master = GetMaster(dev, MASTER_KEYBOARD);
-+
-+		state = XkbStateFieldFromRec(&master->key->xkbInfo->state);
+-
++#if XORG >= 111
++		state = XkbStateFieldFromRec(&dev->master->key->xkbInfo->state);
++#else /* XORG >= 111 */
+ 		state = XkbStateFieldFromRec(&dev->u.master->key->xkbInfo->state);
++#endif /* XORG >= 111 */
  #else
  		KeyClassPtr keyc = dev->key;
  		state = keyc->state;
-@@ -379,8 +408,10 @@ public:
- 		KeyClassPtr keyc;
+@@ -380,7 +409,11 @@ public:
  #if XORG >= 17
  		KeyCode *modmap = NULL;
-+		DeviceIntPtr master;
  
--		keyc = dev->u.master->key;
-+		master = GetMaster(dev, MASTER_KEYBOARD);
-+		keyc = master->key;
++#if XORG >= 111
++		keyc = dev->master->key;
++#else /* XORG >= 111 */
+ 		keyc = dev->u.master->key;
++#endif /* XORG >= 111 */
  		state = XkbStateFieldFromRec(&keyc->xkbInfo->state);
  #else
  		keyc = dev->key;
-@@ -565,9 +596,7 @@ static inline int isModifier(KeySymsPtr
- 
- void InputDevice::keyEvent(rdr::U32 keysym, bool down)
- {
--#if XORG < 17
- 	DeviceIntPtr master;
--#endif
- 	KeyClassPtr keyc;
- 	KeySymsPtr keymap = NULL;
- 	KeySym *map = NULL;
-@@ -596,7 +625,8 @@ void InputDevice::keyEvent(rdr::U32 keys
+@@ -596,7 +629,11 @@ void InputDevice::keyEvent(rdr::U32 keys
  	}
  
  #if XORG >= 17
--	keyc = keyboardDev->u.master->key;
-+	master = GetMaster(keyboardDev, MASTER_KEYBOARD);
-+	keyc = master->key;
++#if XORG >= 111
++	keyc = keyboardDev->master->key;
++#else /* XORG >= 111 */
+ 	keyc = keyboardDev->u.master->key;
++#endif /* XORG >= 111 */
  
  	keymap = XkbGetCoreMap(keyboardDev);
  	if (!keymap) {
-@@ -753,7 +783,7 @@ ModeSwitchFound:
+@@ -753,7 +790,11 @@ ModeSwitchFound:
  			XkbApplyMappingChange(keyboardDev, keymap, minKeyCode,
  					      maxKeyCode - minKeyCode + 1,
  					      NULL, serverClient);
--			XkbCopyDeviceKeymap(keyboardDev->u.master, keyboardDev);
-+			XkbCopyDeviceKeymap(master, keyboardDev);
++#if XORG >= 111
++			XkbCopyDeviceKeymap(keyboardDev->master, keyboardDev);
++#else
+ 			XkbCopyDeviceKeymap(keyboardDev->u.master, keyboardDev);
++#endif
  #endif /* XORG < 17 */
  			break;
  		}
 diff -up tigervnc-1.1.0/unix/xserver/hw/vnc/xorg-version.h.xorg111 tigervnc-1.1.0/unix/xserver/hw/vnc/xorg-version.h
 --- tigervnc-1.1.0/unix/xserver/hw/vnc/xorg-version.h.xorg111	2011-08-09 23:16:36.000000000 +0200
-+++ tigervnc-1.1.0/unix/xserver/hw/vnc/xorg-version.h	2011-09-12 16:51:36.958000000 +0200
++++ tigervnc-1.1.0/unix/xserver/hw/vnc/xorg-version.h	2011-11-11 11:55:32.255835319 +0100
 @@ -36,6 +36,8 @@
  #define XORG 19
  #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (10 * 100000) + (99 * 1000))
@@ -193,7 +188,7 @@ diff -up tigervnc-1.1.0/unix/xserver/hw/vnc/xorg-version.h.xorg111 tigervnc-1.1.
  #endif
 diff -up tigervnc-1.1.0/unix/xserver/hw/vnc/xvnc.cc.xorg111 tigervnc-1.1.0/unix/xserver/hw/vnc/xvnc.cc
 --- tigervnc-1.1.0/unix/xserver/hw/vnc/xvnc.cc.xorg111	2011-08-09 23:16:36.000000000 +0200
-+++ tigervnc-1.1.0/unix/xserver/hw/vnc/xvnc.cc	2011-09-14 13:49:23.751000543 +0200
++++ tigervnc-1.1.0/unix/xserver/hw/vnc/xvnc.cc	2011-11-11 11:55:32.256835319 +0100
 @@ -211,7 +211,11 @@ static void vfbFreeFramebufferMemory(vfb
  
  extern "C" {

More information about the scm-commits mailing list