VNC patch for Xserver 1.3

[Colin Guthrie]

Colin Guthrie wrote:
> 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:

OK here is a more thorough 1.4 patch on top of the patch extracted from CVS.

This changes a few things. One it adds the PIXMAN_CFLAGS to the vnc
module such that it can find pixman.h without having to hack the paths
(this part - which is present it two files - should be reverted from the
current VNC branch. Annoyingly as I said above, I can't remember which
two files...)

It also adds in missing libs via configure.ac change (I just copied the
Xnest libs as I didn't really know what was important and what was not.
I have to change the order used in Xnest tho,  due to a linking problem
with libmi)

And finally it two stub functions in hw/vnc/init.c to make it link
properly. I'm not sure if this is correct but it's the approach adopted
by http://lists.freedesktop.org/archives/xorg/2007-September/027935.html
and it made it work for me, so I stopped thinking about whether it was
good or not around about then!

I'm sure Dan's patch probably had this in already, but hopefully this
smaller part can be applied to the CVS vnc?

Col.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0018-vnc-support-1.4.patch
Type: text/x-patch
Size: 1647 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg/attachments/20071019/b7f0bae9/attachment.bin>