mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
xorg-server:
- update to xorg-server-1.7.99.901
This commit is contained in:
Stephan Raue
parent
3212db44b0
commit
85671b2163
@ -1,370 +0,0 @@
|
||||
diff -Naur xorg-server-20091215/config.log xorg-server-20091215.patch/config.log
|
||||
diff -Naur xorg-server-20091215/configure xorg-server-20091215.patch/configure
|
||||
--- xorg-server-20091215/configure 2009-12-15 20:09:57.000000000 +0100
|
||||
+++ xorg-server-20091215.patch/configure 2009-12-15 20:16:28.266446508 +0100
|
||||
@@ -2220,7 +2220,7 @@
|
||||
Comma separated list of font dirs
|
||||
--with-xkb-path=PATH Path to XKB base dir (default: ${datadir}/X11/xkb)
|
||||
--with-xkb-output=PATH Path to XKB output dir (default:
|
||||
- ${datadir}/X11/xkb/compiled)
|
||||
+ ${localstatedir}/cache/xkb)
|
||||
--with-default-xkb-rules=RULES
|
||||
Keyboard ruleset (default: base/evdev)
|
||||
--with-default-xkb-model=MODEL
|
||||
@@ -21165,7 +21165,7 @@
|
||||
if test "${with_xkb_output+set}" = set; then
|
||||
withval=$with_xkb_output; XKBOUTPUT="$withval"
|
||||
else
|
||||
- XKBOUTPUT="compiled"
|
||||
+ XKBOUTPUT="${localstatedir}/cache/xkb"
|
||||
fi
|
||||
|
||||
|
||||
@@ -25279,7 +25279,9 @@
|
||||
|
||||
XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
|
||||
if [ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ] ; then
|
||||
- XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT"
|
||||
+ { { $as_echo "$as_me:$LINENO: error: xkb-output must be an absolute path." >&5
|
||||
+$as_echo "$as_me: error: xkb-output must be an absolute path." >&2;}
|
||||
+ { (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
|
||||
diff -Naur xorg-server-20091215/configure.ac xorg-server-20091215.patch/configure.ac
|
||||
--- xorg-server-20091215/configure.ac 2009-12-14 23:34:15.000000000 +0100
|
||||
+++ xorg-server-20091215.patch/configure.ac 2009-12-15 20:15:56.495321458 +0100
|
||||
@@ -519,9 +519,9 @@
|
||||
AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]),
|
||||
[ XKBPATH="$withval" ],
|
||||
[ XKBPATH="${datadir}/X11/xkb" ])
|
||||
-AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]),
|
||||
+AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${localstatedir}/cache/xkb)]),
|
||||
[ XKBOUTPUT="$withval" ],
|
||||
- [ XKBOUTPUT="compiled" ])
|
||||
+ [ XKBOUTPUT="${localstatedir}/cache/xkb" ])
|
||||
AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES],
|
||||
[Keyboard ruleset (default: base/evdev)]),
|
||||
[ XKB_DFLT_RULES="$withval" ],
|
||||
@@ -1117,7 +1117,7 @@
|
||||
dnl Make sure XKM_OUTPUT_DIR is an absolute path
|
||||
XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
|
||||
if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then
|
||||
- XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT"
|
||||
+ AC_MSG_ERROR([xkb-output must be an absolute path.])
|
||||
fi
|
||||
|
||||
dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
|
||||
diff -Naur xorg-server-20091215/configure.ac.orig xorg-server-20091215.patch/configure.ac.orig
|
||||
diff -Naur xorg-server-20091215/include/do-not-use-config.h.in~ xorg-server-20091215.patch/include/do-not-use-config.h.in~
|
||||
diff -Naur xorg-server-20091215/xkb/ddxLoad.c xorg-server-20091215.patch/xkb/ddxLoad.c
|
||||
--- xorg-server-20091215/xkb/ddxLoad.c 2009-12-14 23:34:15.000000000 +0100
|
||||
+++ xorg-server-20091215.patch/xkb/ddxLoad.c 2009-12-15 20:15:56.496321229 +0100
|
||||
@@ -30,6 +30,13 @@
|
||||
|
||||
#include <xkb-config.h>
|
||||
|
||||
+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */
|
||||
+# include <sha1.h>
|
||||
+#else /* Use OpenSSL's libcrypto */
|
||||
+# include <stddef.h> /* buggy openssl/sha.h wants size_t */
|
||||
+# include <openssl/sha.h>
|
||||
+#endif
|
||||
+
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
#include <X11/X.h>
|
||||
@@ -43,24 +50,13 @@
|
||||
#define XKBSRV_NEED_FILE_FUNCS
|
||||
#include <xkbsrv.h>
|
||||
#include <X11/extensions/XI.h>
|
||||
+#include <errno.h>
|
||||
#include "xkb.h"
|
||||
|
||||
#if defined(CSRG_BASED) || defined(linux) || defined(__GNU__)
|
||||
#include <paths.h>
|
||||
#endif
|
||||
|
||||
- /*
|
||||
- * If XKM_OUTPUT_DIR specifies a path without a leading slash, it is
|
||||
- * relative to the top-level XKB configuration directory.
|
||||
- * Making the server write to a subdirectory of that directory
|
||||
- * requires some work in the general case (install procedure
|
||||
- * has to create links to /var or somesuch on many machines),
|
||||
- * so we just compile into /usr/tmp for now.
|
||||
- */
|
||||
-#ifndef XKM_OUTPUT_DIR
|
||||
-#define XKM_OUTPUT_DIR "compiled/"
|
||||
-#endif
|
||||
-
|
||||
#define PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\""
|
||||
#define ERROR_PREFIX "\"> \""
|
||||
#define POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\""
|
||||
@@ -175,6 +171,45 @@
|
||||
}
|
||||
|
||||
static Bool
|
||||
+Sha1Asc(char sha1Asc[SHA_DIGEST_LENGTH*2+1], const char * input)
|
||||
+{
|
||||
+ int i;
|
||||
+ unsigned char sha1[SHA_DIGEST_LENGTH];
|
||||
+
|
||||
+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */
|
||||
+ SHA1_CTX ctx;
|
||||
+
|
||||
+ SHA1Init (&ctx);
|
||||
+ SHA1Update (&ctx, input, strlen(input));
|
||||
+ SHA1Final (sha1, &ctx);
|
||||
+#else /* Use OpenSSL's libcrypto */
|
||||
+ SHA_CTX ctx;
|
||||
+ int success;
|
||||
+
|
||||
+ success = SHA1_Init (&ctx);
|
||||
+ if (! success)
|
||||
+ return BadAlloc;
|
||||
+
|
||||
+ success = SHA1_Update (&ctx, input, strlen(input));
|
||||
+ if (! success)
|
||||
+ return BadAlloc;
|
||||
+
|
||||
+ success = SHA1_Final (sha1, &ctx);
|
||||
+ if (! success)
|
||||
+ return BadAlloc;
|
||||
+#endif
|
||||
+
|
||||
+ /* convert sha1 to sha1_asc */
|
||||
+ for(i=0; i<SHA_DIGEST_LENGTH; ++i) {
|
||||
+ sprintf(sha1Asc+i*2, "%02X", sha1[i]);
|
||||
+ }
|
||||
+
|
||||
+ return Success;
|
||||
+}
|
||||
+
|
||||
+/* call xkbcomp and compile XKB keymap, return xkm file name in
|
||||
+ nameRtrn */
|
||||
+static Bool
|
||||
XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
|
||||
XkbComponentNamesPtr names,
|
||||
unsigned want,
|
||||
@@ -183,7 +218,11 @@
|
||||
int nameRtrnLen)
|
||||
{
|
||||
FILE * out;
|
||||
- char *buf = NULL, keymap[PATH_MAX], xkm_output_dir[PATH_MAX];
|
||||
+ char * buf = NULL, xkmfile[PATH_MAX], xkm_output_dir[PATH_MAX];
|
||||
+ char * tmpXkmFile = NULL;
|
||||
+ char * canonicalXkmFileName = NULL;
|
||||
+ char sha1Asc[SHA_DIGEST_LENGTH*2+1], xkbKeyMapBuf[100*1024];
|
||||
+ int ret, result;
|
||||
|
||||
const char *emptystring = "";
|
||||
const char *xkbbasedirflag = emptystring;
|
||||
@@ -194,15 +233,69 @@
|
||||
/* WIN32 has no popen. The input must be stored in a file which is
|
||||
used as input for xkbcomp. xkbcomp does not read from stdin. */
|
||||
char tmpname[PATH_MAX];
|
||||
- const char *xkmfile = tmpname;
|
||||
+ const char *xkbfile = tmpname;
|
||||
#else
|
||||
- const char *xkmfile = "-";
|
||||
+ const char *xkbfile = "-";
|
||||
+#endif
|
||||
+
|
||||
+ /* Write keymap source (xkbfile) to memory buffer `xkbKeyMapBuf',
|
||||
+ of which SHA1 is generated and used as result xkm file name */
|
||||
+ memset(xkbKeyMapBuf, 0, sizeof(xkbKeyMapBuf));
|
||||
+ out = fmemopen(xkbKeyMapBuf, sizeof(xkbKeyMapBuf), "w");
|
||||
+ if (NULL == out) {
|
||||
+ ErrorF("[xkb] Open xkbKeyMapBuf for writing failed\n");
|
||||
+ return False;
|
||||
+ }
|
||||
+ ret = XkbWriteXKBKeymapForNames(out, names, xkb, want, need);
|
||||
+ if (fclose(out) !=0)
|
||||
+ {
|
||||
+ ErrorF("[xkb] XkbWriteXKBKeymapForNames error, perhaps xkbKeyMapBuf is too small\n");
|
||||
+ return False;
|
||||
+ }
|
||||
+#ifdef DEBUG
|
||||
+ if (xkbDebugFlags) {
|
||||
+ ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n");
|
||||
+ fputs(xkbKeyMapBuf, stderr);
|
||||
+ }
|
||||
#endif
|
||||
+ if (!ret) {
|
||||
+ ErrorF("[xkb] Generating XKB Keymap failed, giving up compiling keymap\n");
|
||||
+ return False;
|
||||
+ }
|
||||
|
||||
- snprintf(keymap, sizeof(keymap), "server-%s", display);
|
||||
+ DebugF("[xkb] computing SHA1 of keymap\n");
|
||||
+ if (Success == Sha1Asc(sha1Asc, xkbKeyMapBuf)) {
|
||||
+ snprintf(xkmfile, sizeof(xkmfile), "server-%s", sha1Asc);
|
||||
+ }
|
||||
+ else {
|
||||
+ ErrorF("[xkb] Computing SHA1 of keymap failed, "
|
||||
+ "using display name instead as xkm file name\n");
|
||||
+ snprintf(xkmfile, sizeof(xkmfile), "server-%s", display);
|
||||
+ }
|
||||
|
||||
OutputDirectory(xkm_output_dir, sizeof(xkm_output_dir));
|
||||
|
||||
+ /* set nameRtrn, fail if it's too small */
|
||||
+ if ((strlen(xkmfile)+1 > nameRtrnLen) && nameRtrn) {
|
||||
+ ErrorF("[xkb] nameRtrn too small to hold xkmfile name\n");
|
||||
+ return False;
|
||||
+ }
|
||||
+ strncpy(nameRtrn, xkmfile, nameRtrnLen);
|
||||
+
|
||||
+ /* if the xkm file already exists, reuse it */
|
||||
+ canonicalXkmFileName = Xprintf("%s%s.xkm", xkm_output_dir, xkmfile);
|
||||
+ if (access(canonicalXkmFileName, R_OK) == 0) {
|
||||
+ /* yes, we can reuse the old xkm file */
|
||||
+ LogMessage(X_INFO, "XKB: reuse xkmfile %s\n", canonicalXkmFileName);
|
||||
+ result = True;
|
||||
+ goto _ret;
|
||||
+ }
|
||||
+ LogMessage(X_INFO, "XKB: generating xkmfile %s\n", canonicalXkmFileName);
|
||||
+
|
||||
+ /* continue to call xkbcomp to compile the keymap. to avoid race
|
||||
+ condition, we compile it to a tmpfile then rename it to
|
||||
+ xkmfile */
|
||||
+
|
||||
#ifdef WIN32
|
||||
strcpy(tmpname, Win32TempDir());
|
||||
strcat(tmpname, "\\xkb_XXXXXX");
|
||||
@@ -225,19 +318,30 @@
|
||||
}
|
||||
}
|
||||
|
||||
+ if ( (tmpXkmFile = tempnam(xkm_output_dir, NULL)) == NULL ) {
|
||||
+ ErrorF("[xkb] Can't generate temp xkm file name");
|
||||
+ result = False;
|
||||
+ goto _ret;
|
||||
+ }
|
||||
+
|
||||
buf = Xprintf("\"%s%sxkbcomp\" -w %d %s -xkm \"%s\" "
|
||||
- "-em1 %s -emp %s -eml %s \"%s%s.xkm\"",
|
||||
+ "-em1 %s -emp %s -eml %s \"%s\"",
|
||||
xkbbindir, xkbbindirsep,
|
||||
( (xkbDebugFlags < 2) ? 1 :
|
||||
((xkbDebugFlags > 10) ? 10 : (int)xkbDebugFlags) ),
|
||||
- xkbbasedirflag, xkmfile,
|
||||
+ xkbbasedirflag, xkbfile,
|
||||
PRE_ERROR_MSG, ERROR_PREFIX, POST_ERROR_MSG1,
|
||||
- xkm_output_dir, keymap);
|
||||
+ tmpXkmFile);
|
||||
|
||||
if (xkbbasedirflag != emptystring) {
|
||||
xfree(xkbbasedirflag);
|
||||
}
|
||||
|
||||
+ /* there's a potential race condition between calling tempnam()
|
||||
+ and invoking xkbcomp to write the result file (potential temp
|
||||
+ file name conflicts), but since xkbcomp is a standalone
|
||||
+ program, we have to live with this */
|
||||
+
|
||||
#ifndef WIN32
|
||||
out= Popen(buf,"w");
|
||||
#else
|
||||
@@ -245,31 +349,43 @@
|
||||
#endif
|
||||
|
||||
if (out!=NULL) {
|
||||
-#ifdef DEBUG
|
||||
- if (xkbDebugFlags) {
|
||||
- ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n");
|
||||
- XkbWriteXKBKeymapForNames(stderr,names,xkb,want,need);
|
||||
+ /* write XKBKeyMapBuf to xkbcomp */
|
||||
+ if (EOF==fputs(xkbKeyMapBuf, out))
|
||||
+ {
|
||||
+ ErrorF("[xkb] Sending keymap to xkbcomp failed\n");
|
||||
+ result = False;
|
||||
+ goto _ret;
|
||||
}
|
||||
-#endif
|
||||
- XkbWriteXKBKeymapForNames(out,names,xkb,want,need);
|
||||
#ifndef WIN32
|
||||
if (Pclose(out)==0)
|
||||
#else
|
||||
if (fclose(out)==0 && System(buf) >= 0)
|
||||
#endif
|
||||
{
|
||||
+ /* xkbcomp success */
|
||||
if (xkbDebugFlags)
|
||||
DebugF("[xkb] xkb executes: %s\n",buf);
|
||||
- if (nameRtrn) {
|
||||
- strncpy(nameRtrn,keymap,nameRtrnLen);
|
||||
- nameRtrn[nameRtrnLen-1]= '\0';
|
||||
+
|
||||
+ /* if canonicalXkmFileName already exists now, we simply
|
||||
+ overwrite it, this is OK */
|
||||
+ ret = rename(tmpXkmFile, canonicalXkmFileName);
|
||||
+ if (0 != ret) {
|
||||
+ ErrorF("[xkb] Can't rename %s to %s, error: %s\n",
|
||||
+ tmpXkmFile, canonicalXkmFileName,
|
||||
+ strerror(errno));
|
||||
+
|
||||
+ /* in case of error, don't unlink tmpXkmFile, leave it
|
||||
+ for debugging */
|
||||
+
|
||||
+ result = False;
|
||||
+ goto _ret;
|
||||
}
|
||||
- if (buf != NULL)
|
||||
- xfree (buf);
|
||||
- return True;
|
||||
+
|
||||
+ result = True;
|
||||
+ goto _ret;
|
||||
}
|
||||
else
|
||||
- LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap);
|
||||
+ LogMessage(X_ERROR, "Error compiling keymap (%s)\n", xkbfile);
|
||||
#ifdef WIN32
|
||||
/* remove the temporary file */
|
||||
unlink(tmpname);
|
||||
@@ -284,9 +400,17 @@
|
||||
}
|
||||
if (nameRtrn)
|
||||
nameRtrn[0]= '\0';
|
||||
+ result = False;
|
||||
+
|
||||
+_ret:
|
||||
+ if (tmpXkmFile)
|
||||
+ free(tmpXkmFile);
|
||||
+ if (canonicalXkmFileName)
|
||||
+ xfree(canonicalXkmFileName);
|
||||
if (buf != NULL)
|
||||
xfree (buf);
|
||||
- return False;
|
||||
+
|
||||
+ return result;
|
||||
}
|
||||
|
||||
static FILE *
|
||||
@@ -370,7 +494,6 @@
|
||||
DebugF("Loaded XKB keymap %s, defined=0x%x\n",fileName,(*xkbRtrn)->defined);
|
||||
}
|
||||
fclose(file);
|
||||
- (void) unlink (fileName);
|
||||
return (need|want)&(~missing);
|
||||
}
|
||||
|
||||
diff -Naur xorg-server-20091215/xkb/README.compiled xorg-server-20091215.patch/xkb/README.compiled
|
||||
--- xorg-server-20091215/xkb/README.compiled 2009-12-14 23:34:15.000000000 +0100
|
||||
+++ xorg-server-20091215.patch/xkb/README.compiled 2009-12-15 20:15:56.496321229 +0100
|
||||
@@ -4,10 +4,10 @@
|
||||
or some other tool might destroy or replace the files in this directory,
|
||||
so it is not a safe place to store compiled keymaps for long periods of
|
||||
time. The default keymap for any server is usually stored in:
|
||||
- X<num>-default.xkm
|
||||
-where <num> is the display number of the server in question, which makes
|
||||
-it possible for several servers *on the same host* to share the same
|
||||
-directory.
|
||||
+ server-<SHA1>.xkm
|
||||
+
|
||||
+where <SHA1> is the SHA1 hash of keymap source, so that compiled
|
||||
+keymap of different keymap sources are stored in different files.
|
||||
|
||||
Unless the X server is modified, sharing this directory between servers on
|
||||
different hosts could cause problems.
|
||||
@ -1,85 +0,0 @@
|
||||
From: Adam Jackson <ajax@redhat.com>
|
||||
Date: Sun, 28 Oct 2007 09:37:52 +0100
|
||||
Subject: [PATCH] Fedora extra modes list
|
||||
|
||||
---
|
||||
Index: xorg-server/hw/xfree86/common/extramodes
|
||||
===================================================================
|
||||
--- xorg-server.orig/hw/xfree86/common/extramodes
|
||||
+++ xorg-server/hw/xfree86/common/extramodes
|
||||
@@ -3,16 +3,75 @@
|
||||
//
|
||||
// $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.5 2002/06/05 19:43:05 dawes Exp $
|
||||
//
|
||||
+// NOTE: Please keep all video modes sorted in order of X res, then Y res for
|
||||
+// ease of maintenance and readability.
|
||||
|
||||
# 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz
|
||||
ModeLine "832x624" 57.284 832 864 928 1152 624 625 628 667 -Hsync -Vsync
|
||||
|
||||
+# 1152x864 @ 60.00 Hz (GTF) hsync: 53.70 kHz; pclk: 81.62 MHz
|
||||
+Modeline "1152x864" 81.62 1152 1216 1336 1520 864 865 868 895 -HSync +Vsync
|
||||
+
|
||||
+# 1152x864 @ 70.00 Hz (GTF) hsync: 63.00 kHz; pclk: 96.77 MHz
|
||||
+Modeline "1152x864" 96.77 1152 1224 1344 1536 864 865 868 900 -HSync +Vsync
|
||||
+
|
||||
+# 1152x864 @ 75.00 Hz (GTF) hsync: 67.65 kHz; pclk: 104.99 MHz
|
||||
+Modeline "1152x864" 104.99 1152 1224 1352 1552 864 865 868 902 -HSync +Vsync
|
||||
+
|
||||
+# 1152x864 @ 85.00 Hz (GTF) hsync: 77.10 kHz; pclk: 119.65 MHz
|
||||
+Modeline "1152x864" 119.65 1152 1224 1352 1552 864 865 868 907 -HSync +Vsync
|
||||
+
|
||||
+# 1152x864 @ 85Hz (Red Hat custom modeline)
|
||||
+ModeLine "1152x864" 121.5 1152 1216 1344 1568 864 865 868 911 +hsync -vsync
|
||||
+
|
||||
+# 1152x864 @ 100.00 Hz (GTF) hsync: 91.50 kHz; pclk: 143.47 MHz
|
||||
+Modeline "1152x864" 143.47 1152 1232 1360 1568 864 865 868 915 -HSync +Vsync
|
||||
+
|
||||
+# 1360x768 59.96 Hz (CVT) hsync: 47.37 kHz; pclk: 72.00 MHz
|
||||
+Modeline "1360x768" 72.00 1360 1408 1440 1520 768 771 781 790 +hsync -vsync
|
||||
+
|
||||
+# 1360x768 59.80 Hz (CVT) hsync: 47.72 kHz; pclk: 84.75 MHz
|
||||
+Modeline "1360x768" 84.75 1360 1432 1568 1776 768 771 781 798 -hsync +vsync
|
||||
+
|
||||
# 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz
|
||||
ModeLine "1400x1050" 122.0 1400 1488 1640 1880 1050 1052 1064 1082 +hsync +vsync
|
||||
|
||||
+# 1400x1050 @ 70.00 Hz (GTF) hsync: 76.51 kHz; pclk: 145.06 MHz
|
||||
+Modeline "1400x1050" 145.06 1400 1496 1648 1896 1050 1051 1054 1093 -HSync +Vsync
|
||||
+
|
||||
# 1400x1050 @ 75Hz (VESA GTF) hsync: 82.2kHz
|
||||
ModeLine "1400x1050" 155.8 1400 1464 1784 1912 1050 1052 1064 1090 +hsync +vsync
|
||||
|
||||
+# 1400x1050 @ 85.00 Hz (GTF) hsync: 93.76 kHz; pclk: 179.26 MHz
|
||||
+Modeline "1400x1050" 179.26 1400 1504 1656 1912 1050 1051 1054 1103 -HSync +Vsync
|
||||
+
|
||||
+# 1440x900 @ 60.00 Hz (CVT) field rate 59.89 Hz; hsync: 55.93 kHz; pclk: 106.50 MHz
|
||||
+Modeline "1440x900" 106.50 1440 1520 1672 1904 900 903 909 934 -HSync +Vsync
|
||||
+
|
||||
+# 1600x1024 for SGI 1600 SW
|
||||
+ModeLine "1600x1024" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 +Hsync +Vsync
|
||||
+
|
||||
+# 1680x1050 59.88 Hz (CVT 1.76MA-R) hsync: 64.67 kHz; pclk: 119.00 MHz
|
||||
+Modeline "1680x1050" 119.00 1680 1728 1760 1840 1050 1053 1059 1080 +hsync -vsync
|
||||
+
|
||||
+# 1680x1050 59.95 Hz (CVT 1.76MA) hsync: 65.29 kHz; pclk: 146.25 MHz
|
||||
+Modeline "1680x1050" 146.25 1680 1784 1960 2240 1050 1053 1059 1089 -hsync +vsync
|
||||
+
|
||||
+# 1680x1050 69.88 Hz (CVT) hsync: 76.58 kHz; pclk: 174.00 MHz
|
||||
+Modeline "1680x1050" 174.00 1680 1800 1976 2272 1050 1053 1059 1096 -hsync +vsync
|
||||
+
|
||||
+# 1680x1050 74.89 Hz (CVT 1.76MA) hsync: 82.31 kHz; pclk: 187.00 MHz
|
||||
+Modeline "1680x1050" 187.00 1680 1800 1976 2272 1050 1053 1059 1099 -hsync +vsync
|
||||
+
|
||||
+# 1680x1050 84.94 Hz (CVT 1.76MA) hsync: 93.86 kHz; pclk: 214.75 MHz
|
||||
+Modeline "1680x1050" 214.75 1680 1808 1984 2288 1050 1053 1059 1105 -hsync +vsync
|
||||
+
|
||||
+# 1920x1080 59.93 Hz (CVT 2.07M9-R) hsync: 66.59 kHz; pclk: 138.50 MHz
|
||||
+Modeline "1920x1080" 138.50 1920 1968 2000 2080 1080 1083 1088 1111 +hsync -vsync
|
||||
+
|
||||
+# 1920x1200 59.95 Hz (CVT 2.30MA-R) hsync: 74.04 kHz; pclk: 154.00 MHz
|
||||
+Modeline "1920x1200" 154.00 1920 1968 2000 2080 1200 1203 1209 1235 +hsync -vsync
|
||||
+
|
||||
# 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz
|
||||
Modeline "1920x1440" 341.35 1920 2072 2288 2656 1440 1441 1444 1512 -hsync +vsync
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -Naur xorg-server-1.4.0.90/hw/xfree86/os-support/linux/lnx_apm.c xorg-server-1.4.0.90.edit/hw/xfree86/os-support/linux/lnx_apm.c
|
||||
--- xorg-server-1.4.0.90/hw/xfree86/os-support/linux/lnx_apm.c 2007-12-14 00:38:23.000000000 +0100
|
||||
+++ xorg-server-1.4.0.90.edit/hw/xfree86/os-support/linux/lnx_apm.c 2007-12-14 00:38:18.000000000 +0100
|
||||
@@ -35,6 +35,8 @@
|
||||
# define APM_SUSPEND_FAILED 0xf001
|
||||
#endif
|
||||
|
||||
+typedef unsigned short apm_event_t;
|
||||
+
|
||||
static PMClose lnxAPMOpen(void);
|
||||
static void lnxCloseAPM(void);
|
||||
static pointer APMihPtr = NULL;
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,12 @@
|
||||
--- xorg-server-1.6.1.901/hw/xfree86/common/xf86AutoConfig.c~ 2009-07-03 11:59:30.000000000 -0700
|
||||
+++ xorg-server-1.6.1.901/hw/xfree86/common/xf86AutoConfig.c 2009-07-03 11:59:30.000000000 -0700
|
||||
@@ -516,7 +516,8 @@
|
||||
/* Fallback to platform default hardware */
|
||||
if (i < (nmatches - 1)) {
|
||||
#if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
|
||||
- matches[i++] = xnfstrdup("vesa");
|
||||
+ if (geteuid() == 0)
|
||||
+ matches[i++] = xnfstrdup("vesa");
|
||||
#elif defined(__sparc__) && !defined(sun)
|
||||
matches[i++] = xnfstrdup("sunffb");
|
||||
#endif
|
||||
@ -1,42 +0,0 @@
|
||||
diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c
|
||||
index b80fbfb..8e37aef 100644
|
||||
--- a/hw/xfree86/parser/scan.c
|
||||
+++ b/hw/xfree86/parser/scan.c
|
||||
@@ -227,13 +227,15 @@ xf86getNextLine(void)
|
||||
configFiles[curFileIndex].file);
|
||||
|
||||
if (!ret) {
|
||||
- /* stop if there are no more files */
|
||||
- if (++curFileIndex >= numFiles) {
|
||||
- curFileIndex = 0;
|
||||
+ /*
|
||||
+ * if the file doesn't end in a newline, add one
|
||||
+ * and trigger another read
|
||||
+ */
|
||||
+ if (pos != 0) {
|
||||
+ strcpy(&configBuf[pos], "\n");
|
||||
+ ret = configBuf;
|
||||
+ } else
|
||||
break;
|
||||
- }
|
||||
- configLineNo = 0;
|
||||
- continue;
|
||||
}
|
||||
|
||||
/* search for EOL in the new block of chars */
|
||||
@@ -338,7 +340,14 @@ again:
|
||||
}
|
||||
if (ret == NULL)
|
||||
{
|
||||
- return (pushToken = EOF_TOKEN);
|
||||
+ /* move to the next file if necessary */
|
||||
+ if (curFileIndex + 1 < numFiles) {
|
||||
+ curFileIndex++;
|
||||
+ configLineNo = 0;
|
||||
+ goto again;
|
||||
+ }
|
||||
+ else
|
||||
+ return (pushToken = EOF_TOKEN);
|
||||
}
|
||||
configLineNo++;
|
||||
configPos = 0;
|
||||
@ -1,48 +0,0 @@
|
||||
diff -Nurb xorg-server-1.7.3.orig/os/log.c xorg-server-1.7.3/os/log.c
|
||||
--- xorg-server-1.7.3.orig/os/log.c 2009-10-27 23:56:24.000000000 -0700
|
||||
+++ xorg-server-1.7.3/os/log.c 2010-01-26 11:26:25.683679988 -0800
|
||||
@@ -259,6 +259,36 @@
|
||||
static char tmpBuffer[1024];
|
||||
int len = 0;
|
||||
|
||||
+ struct timeval time;
|
||||
+ time_t tv_sec;
|
||||
+ suseconds_t tv_usec;
|
||||
+ static Bool first = TRUE;
|
||||
+ static Bool newline = TRUE;
|
||||
+ static time_t start_tv_sec;
|
||||
+ static suseconds_t start_usec;
|
||||
+ int diff_sec, diff_usec;
|
||||
+
|
||||
+ gettimeofday(&time, NULL);
|
||||
+ tv_sec = time.tv_sec;
|
||||
+ tv_usec = time.tv_usec;
|
||||
+ if (first == TRUE) {
|
||||
+ start_tv_sec = tv_sec;
|
||||
+ start_usec = tv_usec;
|
||||
+ first = FALSE;
|
||||
+ }
|
||||
+ diff_sec = (int)difftime(tv_sec, start_tv_sec);
|
||||
+ diff_usec = (tv_usec - start_usec);
|
||||
+ if (diff_usec < 0) {
|
||||
+ diff_sec--;
|
||||
+ diff_usec += 1000000;
|
||||
+ }
|
||||
+ if (newline) {
|
||||
+ sprintf(tmpBuffer, "[%d.%03d] ", diff_sec , diff_usec / 1000);
|
||||
+ len = strlen(tmpBuffer);
|
||||
+ if (logFile)
|
||||
+ fwrite(tmpBuffer, len, 1, logFile);
|
||||
+ }
|
||||
+
|
||||
/*
|
||||
* Since a va_list can only be processed once, write the string to a
|
||||
* buffer, and then write the buffer out to the appropriate output
|
||||
@@ -268,6 +298,7 @@
|
||||
vsnprintf(tmpBuffer, sizeof(tmpBuffer), f, args);
|
||||
len = strlen(tmpBuffer);
|
||||
}
|
||||
+ newline = (tmpBuffer[len-1] == '\n');
|
||||
if ((verb < 0 || logVerbosity >= verb) && len > 0)
|
||||
fwrite(tmpBuffer, len, 1, stderr);
|
||||
if ((verb < 0 || logFileVerbosity >= verb) && len > 0) {
|
||||
@ -0,0 +1,53 @@
|
||||
diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
|
||||
index 297e7a6..8671231 100644
|
||||
--- a/hw/xfree86/os-support/linux/lnx_init.c
|
||||
+++ b/hw/xfree86/os-support/linux/lnx_init.c
|
||||
@@ -42,6 +42,7 @@ static Bool KeepTty = FALSE;
|
||||
static int VTnum = -1;
|
||||
static Bool VTSwitch = TRUE;
|
||||
static Bool ShareVTs = FALSE;
|
||||
+Bool NoHwAccess = FALSE;
|
||||
static int activeVT = -1;
|
||||
|
||||
static int vtPermSave[4];
|
||||
@@ -377,6 +378,11 @@ xf86ProcessArgument(int argc, char *argv[], int i)
|
||||
ShareVTs = TRUE;
|
||||
return(1);
|
||||
}
|
||||
+ if (!strcmp(argv[i], "-nohwaccess"))
|
||||
+ {
|
||||
+ NoHwAccess = TRUE;
|
||||
+ return(1);
|
||||
+ }
|
||||
if ((argv[i][0] == 'v') && (argv[i][1] == 't'))
|
||||
{
|
||||
if (sscanf(argv[i], "vt%2d", &VTnum) == 0)
|
||||
@@ -397,5 +403,6 @@ xf86UseMsg(void)
|
||||
ErrorF("-keeptty ");
|
||||
ErrorF("don't detach controlling tty (for debugging only)\n");
|
||||
ErrorF("-novtswitch don't immediately switch to new VT\n");
|
||||
+ ErrorF("-nohwaccess don't access hardware ports directly\n");
|
||||
ErrorF("-sharevts share VTs with another X server\n");
|
||||
}
|
||||
diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
|
||||
index 26a1742..c34bb85 100644
|
||||
--- a/hw/xfree86/os-support/linux/lnx_video.c
|
||||
+++ b/hw/xfree86/os-support/linux/lnx_video.c
|
||||
@@ -50,6 +50,7 @@
|
||||
#define MAP_FAILED ((void *)-1)
|
||||
#endif
|
||||
|
||||
+extern Bool NoHwAccess;
|
||||
static Bool ExtendedEnabled = FALSE;
|
||||
|
||||
#ifdef __ia64__
|
||||
@@ -496,6 +497,9 @@ xf86EnableIO(void)
|
||||
int fd;
|
||||
unsigned int ioBase_phys;
|
||||
#endif
|
||||
+ /* Fake it... */
|
||||
+ if (NoHwAccess)
|
||||
+ return TRUE;
|
||||
|
||||
if (ExtendedEnabled)
|
||||
return TRUE;
|
||||
@ -1 +1 @@
|
||||
http://sources.openelec.tv/svn/xorg-server-20100108.tar.bz2
|
||||
http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.7.99.901.tar.bz2
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user