Revision: 4290
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4290&view=rev
Author: dcommander
Date: 2011-02-16 20:30:28 +0000 (Wed, 16 Feb 2011)
Log Message:
-----------
Add -dridir and -xkbcompdir parameters to Xvnc when it is built with the Xorg
7.4 code base
Modified Paths:
--------------
trunk/unix/build-xorg
Added Paths:
-----------
trunk/unix/xorg-7.4-patches/
trunk/unix/xorg-7.4-patches/0001-Add-dridir-param.patch
trunk/unix/xorg-7.4-patches/0001-Add-xkbcompdir-param.patch
Modified: trunk/unix/build-xorg
===================================================================
--- trunk/unix/build-xorg 2011-02-14 14:21:16 UTC (rev 4289)
+++ trunk/unix/build-xorg 2011-02-16 20:30:28 UTC (rev 4290)
@@ -74,11 +74,11 @@
patch -p1 < $SRCDIR/unix/xserver15.patch
else
patch -p1 < $SRCDIR/unix/xserver18.patch
- for all in `find $SRCDIR/unix/xorg-7.5-patches/ -type f |grep
'.*\.patch$'`; do
- echo Applying $all
- patch -p1 < $all
- done
fi
+ for all in `find $SRCDIR/unix/xorg-$XORG_VERSION-patches/ -type f |grep
'.*\.patch$'`; do
+ echo Applying $all
+ patch -p1 < $all
+ done
popd
popd
Added: trunk/unix/xorg-7.4-patches/0001-Add-dridir-param.patch
===================================================================
--- trunk/unix/xorg-7.4-patches/0001-Add-dridir-param.patch
(rev 0)
+++ trunk/unix/xorg-7.4-patches/0001-Add-dridir-param.patch 2011-02-16
20:30:28 UTC (rev 4290)
@@ -0,0 +1,97 @@
+*** a/glx/glxdri.c 2011-02-16 14:00:53.000000000 -0600
+--- b/glx/glxdri.c 2011-02-16 13:56:09.000000000 -0600
+***************
+*** 838,843 ****
+
+
+- static const char dri_driver_path[] = DRI_DRIVER_PATH;
+-
+ static Bool
+ glxDRIEnterVT (int index, int flags)
+--- 838,841 ----
+diff -r -C2 a/glx/glxdriswrast.c b/glx/glxdriswrast.c
+*** a/glx/glxdriswrast.c 2011-02-16 14:00:53.000000000 -0600
+--- b/glx/glxdriswrast.c 2011-02-16 13:56:29.000000000 -0600
+***************
+*** 448,453 ****
+ }
+
+- static const char dri_driver_path[] = DRI_DRIVER_PATH;
+-
+ static __GLXscreen *
+ __glXDRIscreenProbe(ScreenPtr pScreen)
+--- 448,451 ----
+diff -r -C2 a/glx/glxext.c b/glx/glxext.c
+*** a/glx/glxext.c 2011-02-16 14:00:54.000000000 -0600
+--- b/glx/glxext.c 2011-02-16 13:58:39.000000000 -0600
+***************
+*** 520,521 ****
+--- 520,548 ----
+ return retval;
+ }
++
++ char *dri_driver_path = DRI_DRIVER_PATH;
++
++ int GlxProcessArguments(int argc, char *argv[], int i)
++ {
++ if (strncmp(argv[i], "-dridir", 7) == 0) {
++ if (++i < argc) {
++ #if !defined(WIN32) && !defined(__CYGWIN__)
++ if (getuid() != geteuid()) {
++ LogMessage(X_WARNING, "-dridir is not available for setuid X
servers\n");
++ return -1;
++ } else
++ #endif
++ {
++ if (strlen(argv[i]) < PATH_MAX) {
++ dri_driver_path = argv[i];
++ return 2;
++ } else {
++ LogMessage(X_ERROR, "-dridir pathname too long\n");
++ return -1;
++ }
++ }
++ }
++ }
++
++ return 0;
++ }
+diff -r -C2 a/glx/glxserver.h b/glx/glxserver.h
+*** a/glx/glxserver.h 2011-02-16 14:00:54.000000000 -0600
+--- b/glx/glxserver.h 2011-02-16 14:01:44.000000000 -0600
+***************
+*** 264,266 ****
+--- 264,269 ----
+ GLint alignment);
+
++ extern char *dri_driver_path;
++ extern int GlxProcessArguments(int argc, char *argv[], int i);
++
+ #endif /* !__GLX_server_h__ */
+Only in b/os: ._utils.c
+diff -r -C2 a/os/utils.c b/os/utils.c
+*** a/os/utils.c 2011-02-16 14:01:18.000000000 -0600
+--- b/os/utils.c 2011-02-16 14:04:11.000000000 -0600
+***************
+*** 159,162 ****
+--- 159,163 ----
+ _X_EXPORT Bool noGlxExtension = FALSE;
+ _X_EXPORT Bool noGlxVisualInit = FALSE;
++ extern int GlxProcessArguments(int argc, char *argv[], int i);
+ #endif
+ #ifdef SCREENSAVER
+***************
+*** 854,857 ****
+--- 855,866 ----
+ }
+ #endif
++ #ifdef GLXEXT
++ else if ((skip = GlxProcessArguments(argc,argv,i)) != 0) {
++ if (skip > 0)
++ i += skip - 1;
++ else
++ UseMsg();
++ }
++ #endif
+ #ifdef RLIMIT_DATA
+ else if ( strcmp( argv[i], "-ld") == 0)
Added: trunk/unix/xorg-7.4-patches/0001-Add-xkbcompdir-param.patch
===================================================================
--- trunk/unix/xorg-7.4-patches/0001-Add-xkbcompdir-param.patch
(rev 0)
+++ trunk/unix/xorg-7.4-patches/0001-Add-xkbcompdir-param.patch 2011-02-16
20:30:28 UTC (rev 4290)
@@ -0,0 +1,33 @@
+Only in b/xkb: ._xkbInit.c
+diff -r -C2 a/xkb/xkbInit.c b/xkb/xkbInit.c
+*** a/xkb/xkbInit.c 2011-02-16 14:07:03.000000000 -0600
+--- b/xkb/xkbInit.c 2011-02-16 14:08:08.000000000 -0600
+***************
+*** 875,879 ****
+--- 875,900 ----
+ }
+ return j;
++ } else if (strncmp(argv[i], "-xkbcompdir", 11)==0) {
++ if (++i < argc) {
++ #if !defined(WIN32) && !defined(__CYGWIN__)
++ if (getuid() != geteuid()) {
++ LogMessage(X_WARNING, "-xkbdir is not available for setuid X
servers\n");
++ return -1;
++ } else
++ #endif
++ {
++ if (strlen(argv[i]) < PATH_MAX) {
++ XkbBinDirectory = argv[i];
++ return 2;
++ } else {
++ LogMessage(X_ERROR, "-xkbcompdir pathname too long\n");
++ return -1;
++ }
++ }
++ } else {
++ return -1;
++ }
+ }
++
+ if ((strcmp(argv[i], "-ardelay") == 0) ||
+ (strcmp (argv[i], "-ar1") == 0)) { /* -ardelay int */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
