VNC patch for Xserver 1.3

[Stefan Dirsch]

On Wed, Aug 22, 2007 at 04:29:55PM +0100, Alan Hourihane wrote:
> On Wed, 2007-08-22 at 17:21 +0200, Stefan Dirsch wrote:
> > On Wed, Aug 22, 2007 at 04:06:29PM +0100, Alan Hourihane wrote:
> > > On Wed, 2007-08-22 at 16:17 +0200, Stefan Dirsch wrote:
> > > > On Wed, Aug 22, 2007 at 12:28:28PM +0100, Alan Hourihane wrote:
> > > > > On Wed, 2007-08-22 at 12:37 +0200, Stefan Dirsch wrote:
> > > > > > On Wed, Aug 22, 2007 at 10:30:49AM +0200, Stefan Dirsch wrote:
> > > > > > > On Wed, Aug 22, 2007 at 09:18:12AM +0100, Alan Hourihane wrote:
> > > > > > > > On Wed, 2007-08-22 at 10:08 +0200, Stefan Dirsch wrote:
> > > > > > > > > On Mon, Aug 20, 2007 at 11:11:14AM +0100, Alan Hourihane wrote:
> > > > > > > > > > On Mon, 2007-08-20 at 10:57 +0100, Colin Guthrie wrote:
> > > > > > > > > > > Alan Hourihane wrote:
> > > > > > > > > > > > On Mon, 2007-08-20 at 10:19 +0100, Colin Guthrie wrote:
> > > > > > > > > > > >> Alan Hourihane wrote:
> > > > > > > > > > > >>> It contains a full copy of the xserver tree because it needs to build
> > > > > > > > > > > >>> Xvnc. It contains a pre-1.3 copy of the xserver tree though. But it
> > > > > > > > > > > >>> wasn't that far behind.
> > > > > > > > > > > >> So really, when you say it compiles fine "against" 1.3, you really mean,
> > > > > > > > > > > >> it will compile fine and run with 1.3?
> > > > > > > > > > > > 
> > > > > > > > > > > > Both. I'm just about to merge the 1.3 stable code into xf4vnc anyway.
> > > > > > > > > > > 
> > > > > > > > > > > Oh great :) So I should be able to generate a patch for Xserver 1.3
> > > > > > > > > > > after you've finished that merge? A few strategically placed -j options
> > > > > > > > > > > to cvs diff should suffice if I remember my CVS syntax :)
> > > > > > > > > > > 
> > > > > > > > > > > Thanks for that :D
> > > > > > > > > > 
> > > > > > > > > > Actually, I've decided to pull in the current trunk for now. Given that
> > > > > > > > > > 1.4 is just around the corner.
> > > > > > > > > 
> > > > > > > > > I just gave the current CVS (2007-08-21) a try. Looks like the
> > > > > > > > > standalone Xvnc Xserver works for me (didn't test test this much), but
> > > > > > > > > the vnc module does not.
> > > > > > > > > 
> > > > > > > > > (II) LoadModule: "vnc"
> > > > > > > > > (II) Loading /usr/lib64/xorg/modules//extensions/libvnc.so
> > > > > > > > > dlopen: /usr/lib64/xorg/modules//extensions/libvnc.so: undefined symbol: GetMotionHistory
> > > > > > > > > (EE) Failed to load /usr/lib64/xorg/modules//extensions/libvnc.so
> > > > > > > > > (II) UnloadModule: "vnc"
> > > > > > > > > (EE) Failed to load module "vnc" (loader failed, 7)
> > > > > > > > 
> > > > > > > > Fixed.
> > > > > > > 
> > > > > > > Thanks! I'll give it a try ASAP and give you feedback.
> > > > > > 
> > > > > > gcc -DHAVE_CONFIG_H -I. -I../../include    -DHAVE_DIX_CONFIG_H -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -D_BSD_SOURCE -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT -I/usr/include/freetype2 -I/usr/include/pixman-1   -I../../include -I../../include -I../../Xext -I../../composite -I../../damageext -I../../xfixes -I../../Xi -I../../mi -I../../miext/shadow  -I../../miext/damage -I../../render -I../../randr -I../../fb -DVNCSERVER -DHAVE_XVNC_CONFIG_H -I../../hw/dmx/vnc -DCHROMIUM=1 -O2 -fmessage-length=0 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -fno-strict-aliasing -c init.c
> > > > > > init.c:855:18: error: missing binary operator before token "("
> > > > > > make[2]: *** [init.o] Error 1
> > > > > > make[2]: Leaving directory `/usr/src/packages/BUILD/xserver/hw/vnc'
> > > > > > 
> > > > > > I replaced 
> > > > > > 
> > > > > >   #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
> > > > > > 
> > > > > > with 
> > > > > > 
> > > > > >   #if 1
> > > > > > 
> > > > > > --> init.c:(.text+0x4a9): undefined reference to `miPointerGetMotionEvents'
> > > > > > 
> > > > > > It builds with "#if 0", but then we're back to GetMotionHistory, which
> > > > > > cannot be resolved on a 1.3 X.Org server at runtime.
> > > > > 
> > > > > Can you try again Stefan ?
> > > > 
> > > > Hmm. Again the initial problem. :-(
> > > > 
> > > > (II) LoadModule: "vnc"
> > > > (II) Loading /usr/lib64/xorg/modules//extensions/libvnc.so
> > > > dlopen: /usr/lib64/xorg/modules//extensions/libvnc.so: undefined symbol: GetMotionHistory
> > > > (EE) Failed to load /usr/lib64/xorg/modules//extensions/libvnc.so
> > > > (II) UnloadModule: "vnc"
> > > > (EE) Failed to load module "vnc" (loader failed, 7)
> > > > 
> > > 
> > > Doh, sorry about that.  Should be fixed now.
> > 
> > Hmm. It doesn't look like you changed anything in CVS. Maybe you
> > forgot to commit?
> 
> No, it's there. Maybe you've been caught by the delay to copy to anoncvs
> on SF.
> 
> Try again.

Maybe you can tell me, what you changed, so I easily can verify this?

Stefan

Public Key available
------------------------------------------------------
Stefan Dirsch (Res. & Dev.)   SUSE LINUX Products GmbH
Tel: 0911-740 53 0            Maxfeldstraße 5
FAX: 0911-740 53 479          D-90409 Nürnberg
http://www.suse.de            Germany 
-----------------------------------------------------------------
SUSE LINUX Products GmbH, GF: Markus Rex, HRB 16746 (AG Nürnberg)
-----------------------------------------------------------------