Mercurial Mercurial > upstream > oracle > x-cons > x-s12-clone / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
open-src/xserver/xvnc/vnc-includes.patch
author Alan Coopersmith <Alan.Coopersmith@Sun.COM>
Thu, 15 Jan 2009 12:55:00 -0800
changeset 606 068c11b419c9
permissions -rw-r--r--
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Includes changes contributed by Liang, Kan <[email protected]>: - G41 support patches - DRM_CAS in libdrm type error can cause deadlock and hang the glxgears. Includes changes contributed by Martin Bochnig <[email protected]>: - Make SUNWxorg-mesa package platform-clean
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
606
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
     1
 
## Patch originally from Fedora - Revision 1.1 of:
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
     2
 
http://cvs.fedoraproject.org/viewvc/rpms/vnc/devel/vnc-includes.patch
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
     3
 
with paths adjusted to match sources in tarball before files are moved
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff changeset 
     4
 












068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




     5


diff -up vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/vncExtInit.cc.includes vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/vncExtInit.cc













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




     6


--- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/vncExtInit.cc.includes	2008-04-04 13:54:24.000000000 +0200













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




     7


+++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/vncExtInit.cc	2008-04-04 13:54:49.000000000 +0200













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




     8


@@ -22,8 +22,8 @@













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




     9


 extern "C" {













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    10


 #define class c_class













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    11


 #define NEED_EVENTS













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    12


-#include "X.h"













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    13


-#include "Xproto.h"













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    14


+#include <X11/X.h>













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    15


+#include <X11/Xproto.h>













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    16


 #include "misc.h"













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    17


 #include "os.h"













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    18


 #include "dixstruct.h"













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    19


diff -up vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/XserverDesktop.cc.includes vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/XserverDesktop.cc













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    20


--- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/XserverDesktop.cc.includes	2008-04-04 13:55:07.000000000 +0200













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    21


+++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/XserverDesktop.cc	2008-04-04 13:55:29.000000000 +0200













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    22


@@ -50,9 +50,9 @@ extern char *display;













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    23


 #include "resource.h"













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    24


 #include "cursorstr.h"













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    25


 #include "windowstr.h"













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    26


-#include "mi/mi.h"













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    27


+#include "mi.h"













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    28


 #define XK_CYRILLIC













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    29


-#include "keysym.h"













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    30


+#include <X11/keysym.h>













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    31


 #undef public













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    32


 #undef class













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    33


 }













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    34


diff -up vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/xvnc.cc.includes vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/xvnc.cc













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    35


--- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.includes	2008-04-04 13:57:34.000000000 +0200













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    36


+++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc	2008-04-04 13:57:44.000000000 +0200













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    37


@@ -68,7 +68,7 @@ extern "C" {













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    38


 #include <X11/XWDFile.h>













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    39


 #include "dix.h"













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    40


 #include "inputstr.h"













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    41


-#include "keysym.h"













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    42


+#include <X11/keysym.h>













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    43


   extern int defaultColorVisualClass;













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    44


 #undef new













068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates



Alan Coopersmith <Alan.Coopersmith@Sun.COM>


parents: 

diff
changeset




    45


 #undef class















upstream/oracle/x-cons/x-s12-clone