VNC patch for Xserver 1.3

[Colin Guthrie]

Dan Nicholson wrote:
> On 10/18/07, Colin Guthrie <gmane at colin.guthr.ie> wrote:
>> Dan Nicholson wrote:
>>> You may want to try my patch. I remember fixing this. Or, you just
>>> need to make sure the symlink-vnc.sh script is executable after
>>> applying the patch.
>>>
>>> chmod +x symlink-vnc.sh
>>>
>>> That may be why it's not finding auth.c. I believe it gets symlinked
>>> from hw/vnc -> hw/xfree86/vnc.
>> *bang* That was the sound of Dan's hammer hitting Colin's nail on the head.
> 
> Glad to know that solved things. I think I'll go add that chmod
> reminder to my patch header so I don't forget again.
> 
>> After applying the patch, I simply do the chmod as you suggest and all
>> seems well :) Certainly things get past this. I still have issues with
>> dmx but I don't htink it's related to this specifically so I wont go
>> into detail.
> 
> I recall that I couldn't build dmx on vanilla xorg-server-1.4, so it
> might not be the VNC patch causing problems.

Yeah that's what I read too. It's odd tho' as as far as I know Xdmx IS
disabled in the spec but I'll suss it out. I'm not worried about this bit!

>> I'd still suggest a cleanup of the CVS repo to merge the missing
>> upstream files properly all the same.
> 
> I really wanted to send some patches to Alan and Brian, but I was
> pretty worn out after the effort to generate the patch. One of these
> days I'm gonna import the xf4vnc repo into git and start cleaning
> things up in a sane way.

One of the things I did notice was that in the CVS version there were
two files patched to deal with the pixman include path. This should be
IMO reverted (annoyingly I can't remember which two files now.... should
 have kept the patch clean and written a separate "revert" patch but I
didn't - dang) and instead @PIXMAN_CFLAGS@ added to the Makefile.am in
the hw/xfree86/vnc folder:
--- hw/xfree86/vnc/Makefile.am.orig     2007-10-18 22:56:53.000000000 +0100
+++ hw/xfree86/vnc/Makefile.am  2007-10-18 22:57:38.000000000 +0100
@@ -13,7 +13,8 @@
                    -DXFREE86VNC=1 \
                    -DCHROMIUM=1 \
                    @LIBDRM_CFLAGS@ \
-                   @GL_CFLAGS@
+                   @GL_CFLAGS@ \
+                   @PIXMAN_CFLAGS@

 #                 @MODULE_DEFINES@
 #                   @LOADER_DEFINES@


That seems to solve the problem for me (tho' due to dmx issue and time
constraints, build has never quite completed yet so not sure if this is
the only place it's needed).

I shouldn't really be playing at compiling X in my day job.... :)

Col