Michael Obster
20 years ago
23 changed files with 1753 additions and 0 deletions
Unified View
Diff Options
-
+30 -0package/x11/xorg/apm.patch
-
+12 -0package/x11/xorg/changeProjectRoot.patch-x
-
+29 -0package/x11/xorg/config.hlp
-
+52 -0package/x11/xorg/config.in
-
+33 -0package/x11/xorg/imake_rules.patch
-
+42 -0package/x11/xorg/imake_tmpl.patch
-
+31 -0package/x11/xorg/imakemdep_ppc.patch
-
+68 -0package/x11/xorg/local.conf.data
-
+89 -0package/x11/xorg/macintosh-xkb-us-de-ibook.patch
-
+48 -0package/x11/xorg/no-fc-cache-run.patch
-
+26 -0package/x11/xorg/parse-config
-
+64 -0package/x11/xorg/startwm.patch
-
+8 -0package/x11/xorg/startxdm.sh
-
+99 -0package/x11/xorg/stone_mod_xorg.sh
-
+138 -0package/x11/xorg/twm-defaults.patch
-
+51 -0package/x11/xorg/xconsole-pty.patch
-
+175 -0package/x11/xorg/xf_config.sh
-
+42 -0package/x11/xorg/xfs.init
-
+42 -0package/x11/xorg/xorg.conf
-
+572 -0package/x11/xorg/xorg.conf.data
-
+16 -0package/x11/xorg/xorg.cron
-
+53 -0package/x11/xorg/xorg.desc
-
+33 -0package/x11/xorg/xterm-ls.patch
@ -0,0 +1,30 @@ |
|||||
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
# |
||||
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
# Please add additional copyright information _after_ the line containing |
||||
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
# |
||||
|
# ROCK Linux: rock-src/package/x11/xfree86/apm.patch |
||||
|
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
# |
||||
|
# This patch file is dual-licensed. It is available under the license the |
||||
|
# patched project is licensed under, as long as it is an OpenSource license |
||||
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
||||
|
# of the GNU General Public License as published by the Free Software |
||||
|
# Foundation; either version 2 of the License, or (at your option) any later |
||||
|
# version. |
||||
|
# |
||||
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
--- ./programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c.org Fri Apr 13 13:03:24 2001
|
||||
|
+++ ./programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c Fri Apr 13 13:04:06 2001
|
||||
|
@@ -15,7 +15,7 @@
|
||||
|
#include <fcntl.h> |
||||
|
|
||||
|
#define APM_PROC "/proc/apm" |
||||
|
-#define APM_DEVICE "/dev/apm_bios"
|
||||
|
+#define APM_DEVICE "/dev/misc/apm_bios"
|
||||
|
|
||||
|
#ifndef APM_STANDBY_FAILED |
||||
|
# define APM_STANDBY_FAILED 0xf000 |
||||
@ -0,0 +1,12 @@ |
|||||
|
diff -Nur xc-vanilla/config/cf/xorgsite.def xc/config/cf/xorgsite.def |
||||
|
--- xc-vanilla/config/cf/xorgsite.def 2004-09-12 12:48:09.077330088 +0200 |
||||
|
+++ xc/config/cf/xorgsite.def 2004-09-12 12:59:27.096255544 +0200 |
||||
|
@@ -699,4 +699,7 @@ |
||||
|
#define X86EMU_LIBPATH /usr/local/lib |
||||
|
*/ |
||||
|
|
||||
|
- |
||||
|
+/* |
||||
|
+ * Install xorg in the special directory /usr/X11R6-xorg |
||||
|
+ */ |
||||
|
+#define ProjectRoot /usr/X11R6-xorg |
||||
@ -0,0 +1,29 @@ |
|||||
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
# |
||||
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
# Please add additional copyright information _after_ the line containing |
||||
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
# |
||||
|
# ROCK Linux: rock-src/package/x11/xfree86/config.hlp |
||||
|
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
# |
||||
|
# This program is free software; you can redistribute it and/or modify |
||||
|
# it under the terms of the GNU General Public License as published by |
||||
|
# the Free Software Foundation; either version 2 of the License, or |
||||
|
# (at your option) any later version. A copy of the GNU General Public |
||||
|
# License can be found at Documentation/COPYING. |
||||
|
# |
||||
|
# Many people helped and are helping developing ROCK Linux. Please |
||||
|
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
||||
|
# file for details. |
||||
|
# |
||||
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
MENU_PKG_XORG |
||||
|
Here you'll find options for X.Org. |
||||
|
|
||||
|
ROCKCFG_PKG_XFREE86_XINERAMA |
||||
|
This options enables support for Xinerama globally - so many packages |
||||
|
are build with special multi-head support. |
||||
|
|
||||
@ -0,0 +1,52 @@ |
|||||
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
# |
||||
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
# Please add additional copyright information _after_ the line containing |
||||
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
# |
||||
|
# ROCK Linux: rock-src/package/x11/xfree86/config.in |
||||
|
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
# |
||||
|
# This program is free software; you can redistribute it and/or modify |
||||
|
# it under the terms of the GNU General Public License as published by |
||||
|
# the Free Software Foundation; either version 2 of the License, or |
||||
|
# (at your option) any later version. A copy of the GNU General Public |
||||
|
# License can be found at Documentation/COPYING. |
||||
|
# |
||||
|
# Many people helped and are helping developing ROCK Linux. Please |
||||
|
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
||||
|
# file for details. |
||||
|
# |
||||
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
if pkgcheck xfree86 X || pkgcheck xorg X; then |
||||
|
menu_begin MENU_PKG_XORG 'X.Org Options' |
||||
|
# bool 'Use a CVS checkout instead of last stable release' \ |
||||
|
# ROCKCFG_PKG_XFREE86_CVS 0 |
||||
|
|
||||
|
# if [ "$ROCKCFG_PKG_XFREE86_CVS" = 1 ] ; then |
||||
|
# pkgenable xfree86-cvs |
||||
|
# pkgremove xfree86 |
||||
|
# else |
||||
|
# pkgenable xfree86 |
||||
|
# pkgremove xfree86-cvs |
||||
|
# fi |
||||
|
|
||||
|
bool 'Build X.Org instead of Xfree86' \ |
||||
|
ROCKCFG_PKG_XORG_BUILD 0 |
||||
|
|
||||
|
if [ $ROCKCFG_PKG_XORG_BUILD = 1 ] ; then |
||||
|
bool 'Enable Xinerama support globally' \ |
||||
|
ROCKCFG_PKG_XFREE86_XINERAMA 1 |
||||
|
|
||||
|
# Enable X.Org packages and disable xfree86 ones |
||||
|
pkgremove xfree86 |
||||
|
pkgremove xfree86-cyrillic-fonts |
||||
|
pkgremove xfree86-doc |
||||
|
pkgenable xorg |
||||
|
fi |
||||
|
|
||||
|
menu_end |
||||
|
fi |
||||
|
|
||||
@ -0,0 +1,33 @@ |
|||||
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
# |
||||
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
# Please add additional copyright information _after_ the line containing |
||||
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
# |
||||
|
# ROCK Linux: rock-src/package/x11/xfree86/imake_rules.patch |
||||
|
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
# |
||||
|
# This patch file is dual-licensed. It is available under the license the |
||||
|
# patched project is licensed under, as long as it is an OpenSource license |
||||
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
||||
|
# of the GNU General Public License as published by the Free Software |
||||
|
# Foundation; either version 2 of the License, or (at your option) any later |
||||
|
# version. |
||||
|
# |
||||
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
--- ./config/cf/Imake.rules.orig 2003-03-23 11:44:47.000000000 +0100
|
||||
|
+++ ./config/cf/Imake.rules 2003-03-23 11:50:43.000000000 +0100
|
||||
|
@@ -1693,8 +1693,9 @@
|
||||
|
(cd Concat($(DESTDIR),npath/mdir); \ @@\ |
||||
|
tar xf -; exit 0); exit 0); \ @@\ |
||||
|
fi; \ @@\ |
||||
|
- $(RM) -r rdir; \ @@\
|
||||
|
- $(LN) Concat($${RELPATH},npath/mdir) ldir; \ @@\
|
||||
|
+ if [ ! -e rdir ]; then \ @@\
|
||||
|
+ $(LN) Concat($${RELPATH},npath/mdir) ldir; \ @@\
|
||||
|
+ fi; \ @@\
|
||||
|
fi |
||||
|
#else |
||||
|
#define LinkConfDirectoryLong(mdir,cdir,rdir,ldir,opath,npath) |
||||
@ -0,0 +1,42 @@ |
|||||
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
# |
||||
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
# Please add additional copyright information _after_ the line containing |
||||
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
# |
||||
|
# ROCK Linux: rock-src/package/x11/xfree86/imake_tmpl.patch |
||||
|
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
# |
||||
|
# This patch file is dual-licensed. It is available under the license the |
||||
|
# patched project is licensed under, as long as it is an OpenSource license |
||||
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
||||
|
# of the GNU General Public License as published by the Free Software |
||||
|
# Foundation; either version 2 of the License, or (at your option) any later |
||||
|
# version. |
||||
|
# |
||||
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
--- ./config/cf/Imake.tmpl.orig Sun Mar 10 22:44:13 2002
|
||||
|
+++ ./config/cf/Imake.tmpl Sun Mar 10 22:44:52 2002
|
||||
|
@@ -1036,10 +1036,10 @@
|
||||
|
#define GzipCmd gzip |
||||
|
#endif |
||||
|
#ifndef CppCmd |
||||
|
-#define CppCmd /LibDirName/cpp
|
||||
|
+#define CppCmd cpp
|
||||
|
#endif |
||||
|
#ifndef RawCppCmd |
||||
|
-#define RawCppCmd CppCmd -undef
|
||||
|
+#define RawCppCmd CppCmd
|
||||
|
#endif |
||||
|
#ifndef CppNoLineInfoOption |
||||
|
#define CppNoLineInfoOption /**/ |
||||
|
@@ -1491,6 +1491,7 @@
|
||||
|
|
||||
|
INCROOT = IncRoot /* base of where to put header files */ |
||||
|
USRLIBDIR = UsrLibDir /* nonshared libraries */ |
||||
|
+ MODULEDIR = $(USRLIBDIR)/modules /* Added by Clifford */
|
||||
|
VARDIR = VarDirectory /* usually /var */ |
||||
|
VARLIBDIR = VarLibDir /* xdm runtime files */ |
||||
|
SYSTEMUSRLIBDIR = SystemUsrLibDir /* system's "/usr/lib" */ |
||||
@ -0,0 +1,31 @@ |
|||||
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
# |
||||
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
# Please add additional copyright information _after_ the line containing |
||||
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
# |
||||
|
# ROCK Linux: rock-src/package/x11/xfree86/imakemdep_ppc.patch |
||||
|
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
# |
||||
|
# This patch file is dual-licensed. It is available under the license the |
||||
|
# patched project is licensed under, as long as it is an OpenSource license |
||||
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
||||
|
# of the GNU General Public License as published by the Free Software |
||||
|
# Foundation; either version 2 of the License, or (at your option) any later |
||||
|
# version. |
||||
|
# |
||||
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
--- ./config/imake/imakemdep.h.orig Wed Nov 29 17:33:50 2000
|
||||
|
+++ ./config/imake/imakemdep.h Thu Dec 28 15:44:10 2000
|
||||
|
@@ -364,6 +364,9 @@
|
||||
|
# ifdef __m68k__ |
||||
|
"-D__m68k__", |
||||
|
# endif |
||||
|
+# ifdef __powerpc__
|
||||
|
+ "-D__powerpc__",
|
||||
|
+# endif
|
||||
|
# ifdef __GNUC__ |
||||
|
"-traditional", |
||||
|
# endif |
||||
@ -0,0 +1,68 @@ |
|||||
|
<?xml version="1.0"?> |
||||
|
<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> |
||||
|
<!-- /etc/fonts.conf file to configure system font access --> |
||||
|
<fontconfig> |
||||
|
|
||||
|
<!-- ROCK Linux system-wide font corrections, defaults. |
||||
|
Maintained by Rene Rebe <rene@rocklinux.org> |
||||
|
--> |
||||
|
|
||||
|
<!-- Overwrite (currently) broken fonts. |
||||
|
--> |
||||
|
|
||||
|
<match target="pattern"> |
||||
|
<test qual="any" name="family"> |
||||
|
<string>Helvetica</string> |
||||
|
</test> |
||||
|
<edit name="family" mode="assign"> |
||||
|
<string>Arial</string> |
||||
|
</edit> |
||||
|
</match> |
||||
|
|
||||
|
<match target="pattern"> |
||||
|
<test qual="any" name="family"> |
||||
|
<string>Lucida</string> |
||||
|
</test> |
||||
|
<edit name="family" mode="assign"> |
||||
|
<string>Arial</string> |
||||
|
</edit> |
||||
|
</match> |
||||
|
|
||||
|
<match target="pattern"> |
||||
|
<test qual="any" name="family"> |
||||
|
<string>Fixed</string> |
||||
|
</test> |
||||
|
<edit name="family" mode="assign"> |
||||
|
<string>Andale Mono</string> |
||||
|
</edit> |
||||
|
</match> |
||||
|
|
||||
|
<match target="pattern"> |
||||
|
<test qual="any" name="family"> |
||||
|
<string>Charter</string> |
||||
|
</test> |
||||
|
<edit name="family" mode="assign"> |
||||
|
<string>Agate</string> |
||||
|
</edit> |
||||
|
</match> |
||||
|
|
||||
|
<match target="pattern"> |
||||
|
<test qual="any" name="family"> |
||||
|
<string>Clean</string> |
||||
|
</test> |
||||
|
<edit name="family" mode="assign"> |
||||
|
<string>Andale Mono</string> |
||||
|
</edit> |
||||
|
</match> |
||||
|
|
||||
|
<match target="pattern"> |
||||
|
<test qual="any" name="family"> |
||||
|
<string>Times</string> |
||||
|
</test> |
||||
|
<edit name="family" mode="assign"> |
||||
|
<string>Times New Roman</string> |
||||
|
</edit> |
||||
|
</match> |
||||
|
|
||||
|
</fontconfig> |
||||
|
|
||||
@ -0,0 +1,89 @@ |
|||||
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
# |
||||
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
# Please add additional copyright information _after_ the line containing |
||||
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
# |
||||
|
# ROCK Linux: rock-src/package/x11/xfree86/macintosh-xkb-us-de-ibook.patch |
||||
|
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
# |
||||
|
# This patch file is dual-licensed. It is available under the license the |
||||
|
# patched project is licensed under, as long as it is an OpenSource license |
||||
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
||||
|
# of the GNU General Public License as published by the Free Software |
||||
|
# Foundation; either version 2 of the License, or (at your option) any later |
||||
|
# version. |
||||
|
# |
||||
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
Otherwise all the third and fourth level symbols are not reachable on |
||||
|
iBooks :-((( |
||||
|
|
||||
|
Rene Rebe <rene@rocklinux.org> |
||||
|
|
||||
|
--- xc/programs/xkbcomp/symbols/macintosh/us_ibook.orig 1970-01-01 01:00:00.000000000 +0100
|
||||
|
+++ xc/programs/xkbcomp/symbols/macintosh/us_ibook 2003-09-04 01:15:45.000000000 +0200
|
||||
|
@@ -0,0 +1,23 @@
|
||||
|
+// $XConsortium: de /main/4 1996/08/31 12:19:20 kaleb $
|
||||
|
+// $XFree86: xc/programs/xkbcomp/symbols/macintosh/de,v 1.1 2000/09/19 12:46:25 eich Exp $
|
||||
|
+
|
||||
|
+// rene@rocklinux.org - make the iBook useable
|
||||
|
+
|
||||
|
+default partial alphanumeric_keys
|
||||
|
+xkb_symbols "basic" {
|
||||
|
+
|
||||
|
+ include "macintosh/us(basic)"
|
||||
|
+
|
||||
|
+ // Describes the differences between a very simple US/ASCII
|
||||
|
+ // keyboard and a very simple iBook keybaord
|
||||
|
+
|
||||
|
+ // Alphanumeric section
|
||||
|
+ name[Group1]= "US/ASCII";
|
||||
|
+ key <BKSP> { [ BackSpace, BackSpace ],
|
||||
|
+ [ Delete ] };
|
||||
|
+ // begin modifier mappings
|
||||
|
+ key <LMTA> { [ Alt_L, Meta_L ] };
|
||||
|
+ key <RMTA> { [ Alt_R, Meta_R ] };
|
||||
|
+
|
||||
|
+};
|
||||
|
+
|
||||
|
--- xc/programs/xkbcomp/symbols/macintosh/de_ibook.orig 1970-01-01 01:00:00.000000000 +0100
|
||||
|
+++ xc/programs/xkbcomp/symbols/macintosh/de_ibook 2003-09-04 01:15:56.000000000 +0200
|
||||
|
@@ -0,0 +1,25 @@
|
||||
|
+// $XConsortium: de /main/4 1996/08/31 12:19:20 kaleb $
|
||||
|
+// $XFree86: xc/programs/xkbcomp/symbols/macintosh/de,v 1.1 2000/09/19 12:46:25 eich Exp $
|
||||
|
+
|
||||
|
+// rene@rocklinux.org - make the iBook useable
|
||||
|
+
|
||||
|
+default partial alphanumeric_keys
|
||||
|
+xkb_symbols "basic" {
|
||||
|
+ include "macintosh/de(basic)"
|
||||
|
+
|
||||
|
+ // Describes the differences between a very simple US/ASCII
|
||||
|
+ // keyboard and a very simple iBook keybaord
|
||||
|
+
|
||||
|
+ // Alphanumeric section
|
||||
|
+ name[Group1]= "German";
|
||||
|
+ key <BKSP> { [ BackSpace, BackSpace ],
|
||||
|
+ [ Delete ] };
|
||||
|
+
|
||||
|
+ // begin modifier mappings
|
||||
|
+ key <LMTA> { [ Alt_L, Meta_L ] };
|
||||
|
+ key <RMTA> { [ Alt_R, Meta_R ] };
|
||||
|
+
|
||||
|
+ key <LALT> { [ Mode_switch, Multi_key ] };
|
||||
|
+
|
||||
|
+};
|
||||
|
+
|
||||
|
--- xc/programs/xkbcomp/symbols/macintosh/Imakefile.orig 2003-12-03 16:48:53.000000000 +0100
|
||||
|
+++ xc/programs/xkbcomp/symbols/macintosh/Imakefile 2003-12-03 16:49:14.000000000 +0100
|
||||
|
@@ -3,7 +3,7 @@
|
||||
|
XCOMM |
||||
|
XCOMM $XFree86: xc/programs/xkbcomp/symbols/macintosh/Imakefile,v 1.3 2000/10/02 02:32:17 tsi Exp $ |
||||
|
|
||||
|
- DATAFILES = de de_CH dk es fi fr fr_CH gb it nl no pt se us
|
||||
|
+ DATAFILES = de de_CH de_ibook dk es fi fr fr_CH gb it nl no pt se us us_ibook
|
||||
|
|
||||
|
all:: |
||||
|
|
||||
@ -0,0 +1,48 @@ |
|||||
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
# |
||||
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
# Please add additional copyright information _after_ the line containing |
||||
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
# |
||||
|
# ROCK Linux: rock-src/package/x11/xfree86/no-fc-cache-run.patch |
||||
|
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
# |
||||
|
# This patch file is dual-licensed. It is available under the license the |
||||
|
# patched project is licensed under, as long as it is an OpenSource license |
||||
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
||||
|
# of the GNU General Public License as published by the Free Software |
||||
|
# Foundation; either version 2 of the License, or (at your option) any later |
||||
|
# version. |
||||
|
# |
||||
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
The run of fc-cache makes X.org depend on any other font package - which |
||||
|
is -well- sub-optimal ... ;-) |
||||
|
|
||||
|
- Rene Rebe <rene@rocklinux.org> |
||||
|
|
||||
|
--- xc/programs/fc-cache/Imakefile.orig 2003-09-19 00:31:32.000000000 +0200
|
||||
|
+++ xc/programs/fc-cache/Imakefile 2003-09-19 00:26:02.000000000 +0200
|
||||
|
@@ -15,7 +15,7 @@
|
||||
|
|
||||
|
install:: |
||||
|
if [ x$${DESTDIR} = x ]; then \ |
||||
|
- $(FCCACHE) -v -f;\
|
||||
|
+ echo "You should run $(FCCACHE) -v -f later ..." ;\
|
||||
|
fi |
||||
|
|
||||
|
LinkSourceFile(fc-cache.c,$(FONTCONFIGDIR)/fc-cache) |
||||
|
--- xc/config/cf/X11.tmpl.orig 2003-09-09 20:05:52.000000000 +0300
|
||||
|
+++ xc/config/cf/X11.tmpl 2003-10-18 15:18:04.000000000 +0300
|
||||
|
@@ -3523,9 +3523,7 @@
|
||||
|
# endif /* MakeFcCache */ |
||||
|
|
||||
|
# ifndef InstallFcCache |
||||
|
-# define InstallFcCache(dest) @@\
|
||||
|
-install:: @@\
|
||||
|
- RunProgram(FCCACHE, $(FCCACHEOPTS) $(DESTDIR)dest)
|
||||
|
+# define InstallFcCache(dest)
|
||||
|
# endif /* InstallFcCache */ |
||||
|
|
||||
|
#else |
||||
@ -0,0 +1,26 @@ |
|||||
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
# |
||||
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
# Please add additional copyright information _after_ the line containing |
||||
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
# |
||||
|
# ROCK Linux: rock-src/package/x11/xfree86/parse-config |
||||
|
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
# |
||||
|
# This program is free software; you can redistribute it and/or modify |
||||
|
# it under the terms of the GNU General Public License as published by |
||||
|
# the Free Software Foundation; either version 2 of the License, or |
||||
|
# (at your option) any later version. A copy of the GNU General Public |
||||
|
# License can be found at Documentation/COPYING. |
||||
|
# |
||||
|
# Many people helped and are helping developing ROCK Linux. Please |
||||
|
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
||||
|
# file for details. |
||||
|
# |
||||
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
if [ "$ROCKCFG_PKG_XFREE86_XINERAMA" = 1 ] ; then |
||||
|
var_append confopt " " "--with-xinerama" |
||||
|
fi |
||||
|
|
||||
@ -0,0 +1,64 @@ |
|||||
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
# |
||||
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
# Please add additional copyright information _after_ the line containing |
||||
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
# |
||||
|
# ROCK Linux: rock-src/package/x11/xfree86/startwm.patch |
||||
|
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
# |
||||
|
# This patch file is dual-licensed. It is available under the license the |
||||
|
# patched project is licensed under, as long as it is an OpenSource license |
||||
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
||||
|
# of the GNU General Public License as published by the Free Software |
||||
|
# Foundation; either version 2 of the License, or (at your option) any later |
||||
|
# version. |
||||
|
# |
||||
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
More flexible root application startup. Kind of ROCK Linux specific. |
||||
|
|
||||
|
--- ./programs/xdm/config/Xsession.orig Sun Jan 11 04:48:32 1998
|
||||
|
+++ ./programs/xdm/config/Xsession Thu Dec 28 15:23:15 2000
|
||||
|
@@ -33,5 +33,14 @@
|
||||
|
if [ -r "$resources" ]; then |
||||
|
xrdb -load "$resources" |
||||
|
fi |
||||
|
+
|
||||
|
+ # we need at least the PATH /opt/*/bin expansion ...
|
||||
|
+ [ -f /etc/profile ] && . /etc/profile
|
||||
|
+
|
||||
|
+ WINDOWMANAGER="${WINDOWMANAGER:-startkde}"
|
||||
|
+ [ "$WINDOWMANAGER" = "gnome" ] && WINDOWMANAGER="gnome-session"
|
||||
|
+ [ "$WINDOWMANAGER" = "kde" ] && WINDOWMANAGER="startkde"
|
||||
|
+ [ "$WINDOWMANAGER" != "twm" ] && exec $WINDOWMANAGER
|
||||
|
+ xsetroot -solid darkcyan ; exec twm ; exec xterm
|
||||
|
exec xsm |
||||
|
fi |
||||
|
--- ./programs/xdm/config/Xsetup_0.orig Wed Apr 27 09:20:03 1994
|
||||
|
+++ ./programs/xdm/config/Xsetup_0 Thu Dec 28 15:23:15 2000
|
||||
|
@@ -1,3 +1,4 @@
|
||||
|
#!/bin/sh |
||||
|
# $XConsortium: Xsetup_0,v 1.3 93/09/28 14:30:31 gildea Exp $ |
||||
|
xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail |
||||
|
+xsetroot -solid black
|
||||
|
--- ./programs/xinit/xinitrc.cpp.orig Wed Apr 27 09:13:07 1994
|
||||
|
+++ ./programs/xinit/xinitrc.cpp Thu Dec 28 15:23:15 2000
|
||||
|
@@ -24,10 +24,10 @@
|
||||
|
xmodmap $usermodmap |
||||
|
fi |
||||
|
|
||||
|
-XCOMM start some nice programs
|
||||
|
+XCOMM start the window manager
|
||||
|
|
||||
|
-twm &
|
||||
|
-xclock -geometry 50x50-1+1 &
|
||||
|
-xterm -geometry 80x50+494+51 &
|
||||
|
-xterm -geometry 80x20+494-0 &
|
||||
|
-exec xterm -geometry 80x66+0+0 -name login
|
||||
|
+WINDOWMANAGER="${WINDOWMANAGER:-startkde}"
|
||||
|
+[ "$WINDOWMANAGER" = "gnome" ] && WINDOWMANAGER="gnome-session"
|
||||
|
+[ "$WINDOWMANAGER" = "kde" ] && WINDOWMANAGER="startkde"
|
||||
|
+[ "$WINDOWMANAGER" != "twm" ] && exec $WINDOWMANAGER
|
||||
|
+xsetroot -solid darkcyan ; exec twm ; exec xterm
|
||||
@ -0,0 +1,8 @@ |
|||||
|
#!/bin/sh |
||||
|
|
||||
|
XDM=/usr/X11/bin/xdm |
||||
|
|
||||
|
[ -e /etc/conf/xdm ] && . /etc/conf/xdm |
||||
|
|
||||
|
$XDM |
||||
|
|
||||
@ -0,0 +1,99 @@ |
|||||
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
# |
||||
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
# Please add additional copyright information _after_ the line containing |
||||
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
# |
||||
|
# ROCK Linux: rock-src/package/x11/xorg/stone_mod_xorg.sh |
||||
|
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
# |
||||
|
# This program is free software; you can redistribute it and/or modify |
||||
|
# it under the terms of the GNU General Public License as published by |
||||
|
# the Free Software Foundation; either version 2 of the License, or |
||||
|
# (at your option) any later version. A copy of the GNU General Public |
||||
|
# License can be found at Documentation/COPYING. |
||||
|
# |
||||
|
# Many people helped and are helping developing ROCK Linux. Please |
||||
|
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
||||
|
# file for details. |
||||
|
# |
||||
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
# |
||||
|
# [MAIN] 50 xorg X11/X.Org (Graphical User Interface) |
||||
|
|
||||
|
set_wm() { |
||||
|
echo "export WINDOWMANAGER=$1" > /etc/profile.d/windowmanager |
||||
|
} |
||||
|
|
||||
|
set_xdm() { |
||||
|
echo "export XDM=$1" > /etc/conf/xdm |
||||
|
} |
||||
|
|
||||
|
main() { |
||||
|
while |
||||
|
WINDOWMANAGER="" |
||||
|
if [ -f /etc/profile.d/windowmanager ]; then |
||||
|
. /etc/profile.d/windowmanager |
||||
|
fi |
||||
|
|
||||
|
XDM="" |
||||
|
if [ -f /etc/conf/xdm ]; then |
||||
|
. /etc/conf/xdm |
||||
|
fi |
||||
|
|
||||
|
cmd="gui_menu xorg 'X.Org Configuration Menu' |
||||
|
|
||||
|
'Run xorgcfg (recommended, new interactive config)' |
||||
|
'gui_cmd xorgcfg xorgcfg -config /etc/X11/xorg.conf' |
||||
|
|
||||
|
'Run X -configure (automated config)' |
||||
|
'gui_cmd Xorg Xorg -configure ; mv /root/xorg.conf.new /etc/X11/xorg.conf' |
||||
|
|
||||
|
'Run xorgconfig (old textual config)' |
||||
|
'gui_cmd xorgconfig xorgconfig'" |
||||
|
|
||||
|
cmd="$cmd '' ''" |
||||
|
|
||||
|
for x in /usr/share/rock-registry/xdm/* ; do |
||||
|
if [ -f $x ] ; then |
||||
|
. $x |
||||
|
|
||||
|
if [ "$XDM" = "$exec" ]; then |
||||
|
pre='[*]' ; else |
||||
|
pre='[ ]' ; fi |
||||
|
|
||||
|
cmd="$cmd |
||||
|
'$pre Use $name in runlevel 5' |
||||
|
'set_xdm $exec'" |
||||
|
fi |
||||
|
done |
||||
|
|
||||
|
cmd="$cmd '' ''" |
||||
|
|
||||
|
for x in /usr/share/rock-registry/wm/* ; do |
||||
|
if [ -f $x ] ; then |
||||
|
. $x |
||||
|
|
||||
|
if [ "$WINDOWMANAGER" = "$exec" ]; then |
||||
|
pre='[*]' ; else |
||||
|
pre='[ ]' ; fi |
||||
|
|
||||
|
cmd="$cmd |
||||
|
'$pre Use $name as default Windowmanager' |
||||
|
'set_wm $exec'" |
||||
|
fi |
||||
|
done |
||||
|
|
||||
|
cmd="$cmd '' ''" |
||||
|
|
||||
|
cmd="$cmd |
||||
|
'Edit/View /etc/X11/xorg.conf' |
||||
|
'gui_edit xorg.conf /etc/X11/xorg.conf' |
||||
|
'Edit/View /etc/profile.d/windowmanager' |
||||
|
'gui_edit WINDOWMANAGER /etc/profile.d/windowmanager'" |
||||
|
|
||||
|
eval $cmd |
||||
|
do : ; done |
||||
|
} |
||||
|
|
||||
@ -0,0 +1,138 @@ |
|||||
|
|
||||
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
# |
||||
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
# Please add additional copyright information _after_ the line containing |
||||
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
# |
||||
|
# ROCK Linux: rock-src/package/x11/xfree86/twm-defaults.patch |
||||
|
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
# |
||||
|
# This patch file is dual-licensed. It is available under the license the |
||||
|
# patched project is licensed under, as long as it is an OpenSource license |
||||
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
||||
|
# of the GNU General Public License as published by the Free Software |
||||
|
# Foundation; either version 2 of the License, or (at your option) any later |
||||
|
# version. |
||||
|
# |
||||
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
Some twm configs Clifford likes more ... |
||||
|
|
||||
|
--- xc/programs/twm/system.twmrc.orig 2003-08-28 02:06:28.000000000 +0200
|
||||
|
+++ xc/programs/twm/system.twmrc 2003-08-28 02:36:46.000000000 +0200
|
||||
|
@@ -12,6 +12,8 @@
|
||||
|
# $XFree86: xc/programs/twm/system.twmrc,v 1.5 2003/08/04 10:32:30 eich Exp $ |
||||
|
# |
||||
|
|
||||
|
+NoDefaults
|
||||
|
+
|
||||
|
NoGrabServer |
||||
|
RestartPreviousState |
||||
|
DecorateTransients |
||||
|
@@ -21,6 +23,9 @@
|
||||
|
IconFont "-adobe-helvetica-bold-r-normal--*-100-*-*-*-*-*-*" |
||||
|
IconManagerFont "-adobe-helvetica-bold-r-normal--*-100-*-*-*" |
||||
|
#ClientBorderWidth |
||||
|
+RandomPlacement
|
||||
|
+AutoRelativeResize
|
||||
|
+IconifyByUnmapping
|
||||
|
|
||||
|
Color |
||||
|
{ |
||||
|
@@ -47,48 +52,65 @@
|
||||
|
MoveDelta 3 |
||||
|
Function "move-or-lower" { f.move f.deltastop f.lower } |
||||
|
Function "move-or-raise" { f.move f.deltastop f.raise } |
||||
|
-Function "move-or-iconify" { f.move f.deltastop f.iconify }
|
||||
|
+Function "xiconify" { f.iconify f.showiconmgr }
|
||||
|
|
||||
|
# |
||||
|
# Set some useful bindings. Sort of uwm-ish, sort of simple-button-ish |
||||
|
# |
||||
|
-Button1 = : root : f.menu "defops"
|
||||
|
|
||||
|
-Button1 = m : window|icon : f.function "move-or-lower"
|
||||
|
-Button2 = m : window|icon : f.iconify
|
||||
|
-Button3 = m : window|icon : f.function "move-or-raise"
|
||||
|
+LeftTitleButton "opendotMask" = f.function "xiconify"
|
||||
|
+RightTitleButton "star" = f.delete
|
||||
|
+
|
||||
|
+Button1 = : root : f.menu "defops"
|
||||
|
+Button2 = : root : f.menu "apps"
|
||||
|
+Button3 = : root : f.exec "xterm &"
|
||||
|
|
||||
|
Button1 = : title : f.function "move-or-raise" |
||||
|
-Button2 = : title : f.raiselower
|
||||
|
+Button2 = : title : f.fullzoom
|
||||
|
+Button3 = : title : f.function "move-or-lower"
|
||||
|
|
||||
|
-Button1 = : icon : f.function "move-or-iconify"
|
||||
|
-Button2 = : icon : f.iconify
|
||||
|
+Button1 = : icon : f.function "xiconify"
|
||||
|
+Button3 = : icon : f.identify
|
||||
|
+
|
||||
|
+Button1 = : iconmgr : f.function "xiconify"
|
||||
|
+Button2 = : iconmgr : f.raise
|
||||
|
+Button3 = : iconmgr : f.identify
|
||||
|
+
|
||||
|
+Button1 = : frame : f.resize
|
||||
|
+Button2 = : frame : f.raiselower
|
||||
|
+Button3 = : frame : f.function "move-or-raise"
|
||||
|
|
||||
|
-Button1 = : iconmgr : f.iconify
|
||||
|
-Button2 = : iconmgr : f.iconify
|
||||
|
|
||||
|
# |
||||
|
# And a menus with the usual things |
||||
|
# |
||||
|
menu "defops" |
||||
|
{ |
||||
|
-"Twm" f.title
|
||||
|
-"Iconify" f.iconify
|
||||
|
-"Resize" f.resize
|
||||
|
-"Move" f.move
|
||||
|
-"Raise" f.raise
|
||||
|
-"Lower" f.lower
|
||||
|
-"" f.nop
|
||||
|
-"Focus" f.focus
|
||||
|
-"Unfocus" f.unfocus
|
||||
|
-"Show Iconmgr" f.showiconmgr
|
||||
|
-"Hide Iconmgr" f.hideiconmgr
|
||||
|
-"" f.nop
|
||||
|
-"Xterm" f.exec "exec xterm &"
|
||||
|
-"" f.nop
|
||||
|
-"Kill" f.destroy
|
||||
|
-"Delete" f.delete
|
||||
|
-"" f.nop
|
||||
|
-"Restart" f.restart
|
||||
|
-"Exit" f.quit
|
||||
|
+ "TWM" f.title
|
||||
|
+ "Iconify" f.iconify
|
||||
|
+ "Resize" f.resize
|
||||
|
+ "Move" f.move
|
||||
|
+ "Raise" f.raise
|
||||
|
+ "Lower" f.lower
|
||||
|
+ "Zoom" f.fullzoom
|
||||
|
+ "" f.nop
|
||||
|
+ "Focus" f.focus
|
||||
|
+ "Unfocus" f.unfocus
|
||||
|
+ "Show Iconmgr" f.showiconmgr
|
||||
|
+ "Hide Iconmgr" f.hideiconmgr
|
||||
|
+ "" f.nop
|
||||
|
+ "Kill" f.destroy
|
||||
|
+ "Delete" f.delete
|
||||
|
+ "" f.nop
|
||||
|
+ "Restart" f.restart
|
||||
|
+ "Exit" f.quit
|
||||
|
+}
|
||||
|
+
|
||||
|
+menu "apps"
|
||||
|
+{
|
||||
|
+ "Applications" f.title
|
||||
|
+ "xTerm" f.exec "xterm &"
|
||||
|
+ "xTerm (black)" f.exec "xterm -fg white -bg black &"
|
||||
|
+ "Mozilla" f.exec "mozilla &"
|
||||
|
+ "Icon Manager" f.showiconmgr
|
||||
|
} |
||||
@ -0,0 +1,51 @@ |
|||||
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
# |
||||
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
# Please add additional copyright information _after_ the line containing |
||||
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
# |
||||
|
# ROCK Linux: rock-src/package/x11/xfree86/xconsole-pty.patch |
||||
|
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
# |
||||
|
# This patch file is dual-licensed. It is available under the license the |
||||
|
# patched project is licensed under, as long as it is an OpenSource license |
||||
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
||||
|
# of the GNU General Public License as published by the Free Software |
||||
|
# Foundation; either version 2 of the License, or (at your option) any later |
||||
|
# version. |
||||
|
# |
||||
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
--- ./programs/xconsole/xconsole.c.orig Sun Mar 21 08:35:37 1999
|
||||
|
+++ ./programs/xconsole/xconsole.c Thu Nov 23 16:15:23 2000
|
||||
|
@@ -786,6 +786,21 @@
|
||||
|
return 0; |
||||
|
} |
||||
|
#else |
||||
|
+#ifdef __GLIBC__ /* The new way to open a Pseudo Terminal */
|
||||
|
+ if ((*pty = getpt()) < 0)
|
||||
|
+ return 1;
|
||||
|
+ strcpy(ttydev, ptsname(*pty));
|
||||
|
+ if ((unlockpt(*pty)) < 0) {
|
||||
|
+ close(*pty);
|
||||
|
+ return(1);
|
||||
|
+ }
|
||||
|
+ if ((grantpt(*pty)) < 0) {
|
||||
|
+ close(*pty);
|
||||
|
+ return(1);
|
||||
|
+ }
|
||||
|
+ if ((*tty = open (ttydev, O_RDWR)) >= 0)
|
||||
|
+ return(0);
|
||||
|
+#else
|
||||
|
strcpy (ttydev, "/dev/ttyxx"); |
||||
|
strcpy (ptydev, "/dev/ptyxx"); |
||||
|
while (PTYCHAR1[letter]) { |
||||
|
@@ -811,6 +826,7 @@
|
||||
|
devindex = 0; |
||||
|
(void) letter++; |
||||
|
} |
||||
|
+#endif
|
||||
|
#endif /* sgi else not sgi */ |
||||
|
#endif /* CRAY else not CRAY */ |
||||
|
#endif /* umips && SYSTYPE_SYSV */ |
||||
@ -0,0 +1,175 @@ |
|||||
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
# |
||||
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
# Please add additional copyright information _after_ the line containing |
||||
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
# |
||||
|
# ROCK Linux: rock-src/package/x11/xorg/xf_config.sh |
||||
|
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
# |
||||
|
# This program is free software; you can redistribute it and/or modify |
||||
|
# it under the terms of the GNU General Public License as published by |
||||
|
# the Free Software Foundation; either version 2 of the License, or |
||||
|
# (at your option) any later version. A copy of the GNU General Public |
||||
|
# License can be found at Documentation/COPYING. |
||||
|
# |
||||
|
# Many people helped and are helping developing ROCK Linux. Please |
||||
|
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
||||
|
# file for details. |
||||
|
# |
||||
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
# extract and patch base |
||||
|
xf_extract() { |
||||
|
echo "Extracting source (for package version $ver) ..." |
||||
|
for x in $xf_files ; do |
||||
|
tar $taropt $archdir/$x |
||||
|
done |
||||
|
|
||||
|
cd xc |
||||
|
|
||||
|
for x in $xf_patches ; do |
||||
|
echo "Patching source ($x) ..." |
||||
|
bunzip2 < $archdir/$x | patch -p1 -E |
||||
|
done |
||||
|
} |
||||
|
|
||||
|
# extract additional gl* stuff |
||||
|
xf_extract_gl() { |
||||
|
mkdir release ; ln -s ../.. release/xc |
||||
|
tar $taropt $archdir/mangl.tar.bz2 |
||||
|
tar $taropt $archdir/manglu.tar.bz2 |
||||
|
tar $taropt $archdir/manglx.tar.bz2 |
||||
|
rm -rf release |
||||
|
} |
||||
|
|
||||
|
# extract the Matrox HALlib (additional TV/DVI out support on x86) |
||||
|
xf_extract_hallib() { |
||||
|
echo "Extracting mgaHALlib (For Matrox (>G400) cards) ..." |
||||
|
tar $taropt $archdir/mgadrivers-$mga_version-src.tbz2 |
||||
|
cp mgadrivers-$mga_version-src/4.2.0/drivers/src/HALlib/mgaHALlib.a \ |
||||
|
programs/Xserver/hw/xfree86/drivers/mga/HALlib/mgaHALlib.a |
||||
|
rm -rf mgadrivers-$mga_version-src |
||||
|
|
||||
|
if [ $arch == "x86" ] ; then |
||||
|
echo "Enabling Matrox HALlib (since this is x86) ..." |
||||
|
cat >> config/cf/host.def << EOT |
||||
|
|
||||
|
/* Additinal TC/DVI support since this is x86 */ |
||||
|
#define HaveMatroxHal YES |
||||
|
EOT |
||||
|
fi |
||||
|
} |
||||
|
|
||||
|
# apply the patches |
||||
|
xf_patch() { |
||||
|
cp -v programs/twm/system.twmrc programs/twm/system.twmrc.orig |
||||
|
for x in $patchfiles ; do |
||||
|
if [ -f $x ] ; then |
||||
|
echo "Apply patch $x ..." |
||||
|
patch -Nf -p1 < $x |
||||
|
fi ; done |
||||
|
find \( -name 'config.guess' -o -name 'config.sub' \) \ |
||||
|
-exec chmod +x '{}' ';' |
||||
|
} |
||||
|
|
||||
|
# build the World |
||||
|
xf_build() { |
||||
|
eval $MAKE World |
||||
|
cd nls ; eval $MAKE ; cd .. |
||||
|
} |
||||
|
|
||||
|
# install the World |
||||
|
xf_install() { |
||||
|
echo "Create /etc/X11 (if it's not already there) ..." |
||||
|
mkdir -p $root/etc/X11 |
||||
|
|
||||
|
eval $MAKE install |
||||
|
eval $MAKE install.man |
||||
|
cd nls ; eval $MAKE install ; cd .. |
||||
|
rm -fv $root/etc/fonts/*.bak |
||||
|
|
||||
|
rm -fv $root/usr/X11 |
||||
|
rm -fv $root/usr/bin/X11 |
||||
|
rm -fv $root/usr/lib/X11 |
||||
|
rm -fv $root/usr/include/X11 |
||||
|
|
||||
|
ln -sv X11R6 $root/usr/X11 |
||||
|
ln -sv ../X11/bin $root/usr/bin/X11 |
||||
|
ln -sv ../X11/lib/X11 $root/usr/lib/X11 |
||||
|
ln -sv ../X11/include/X11 $root/usr/include/X11 |
||||
|
|
||||
|
mkdir -p $root/usr/X11R6/lib/X11/fonts/TrueType |
||||
|
|
||||
|
echo "Copy TWM config files ..." |
||||
|
cp -v programs/twm/system.twmrc.orig \ |
||||
|
programs/twm/sample-twmrc/original.twmrc |
||||
|
cp -v programs/twm/sample-twmrc/*.twmrc $root/usr/X11R6/lib/X11/twm/ |
||||
|
register_wm twm TWM /usr/X11/bin/twm |
||||
|
|
||||
|
echo "Copying default example configs ..." |
||||
|
cp -fv $base/package/x11/${pkg}/xorg.conf.data \ |
||||
|
$root/etc/X11/xorg.conf.example |
||||
|
cp -fv $root/etc/X11/xorg.conf{.example,} |
||||
|
cp -fv $base/package/x11/${pkg}/local.conf.data \ |
||||
|
$root/etc/fonts/local.conf |
||||
|
|
||||
|
echo "Fixing compiled keymaps directory ..." |
||||
|
mkdir -p $root/var/lib/xkb $root/etc/X11/xkb |
||||
|
cp -fu programs/xkbcomp/compiled/README $root/var/lib/xkb |
||||
|
rm -rf $root/etc/X11/xkb/compiled |
||||
|
ln -sf ../../../var/lib/xkb $root/etc/X11/xkb/compiled |
||||
|
|
||||
|
echo "Installing xfs init script ..." |
||||
|
install_init xfs $base/package/x11/${pkg}/xfs.init |
||||
|
|
||||
|
register_xdm xdm 'X11 dislay manager' /usr/X11R6/bin/xdm |
||||
|
|
||||
|
|
||||
|
echo "Installing the xdm start script (multiplexer) ..." |
||||
|
cp $confdir/startxdm.sh $root/usr/X11R6/bin/startxdm |
||||
|
chmod +x $root/usr/X11R6/bin/startxdm |
||||
|
|
||||
|
echo "Installing X-Windows Setup Script ..." |
||||
|
cp -fv $base/package/x11/${pkg}/stone_mod_${pkg}.sh $root/etc/stone.d/mod_${pkg}.sh |
||||
|
echo "export WINDOWMANAGER=kde" > $root/etc/profile.d/windowmanager |
||||
|
|
||||
|
echo "Installing X-Windows Cron Script ..." |
||||
|
cp -fv $base/package/x11/${pkg}/${pkg}.cron \ |
||||
|
$root/etc/cron.daily/80-${pkg} |
||||
|
chmod +x $root/etc/cron.daily/80-${pkg} |
||||
|
} |
||||
|
|
||||
|
# configure the World |
||||
|
xf_config() { |
||||
|
echo "Configuring X-Windows ..." |
||||
|
cat >> config/cf/host.def << EOT |
||||
|
/* Disable the internal zlib to use the system installed one */ |
||||
|
#define HasZlib YES |
||||
|
/* Disable the internal expat library to use the system installed one */ |
||||
|
#define HasExpat YES |
||||
|
|
||||
|
/* Less warnings with recent gccs ... */ |
||||
|
#define DefaultCCOptions -ansi GccWarningOptions |
||||
|
|
||||
|
/* Make sure config files are allways installed ... */ |
||||
|
#define InstallXinitConfig YES |
||||
|
#define InstallXdmConfig YES |
||||
|
#define InstallFSConfig YES |
||||
|
|
||||
|
/* do not install duplicate crap in /etc/X11 */ |
||||
|
#define UseSeparateConfDir NO |
||||
|
|
||||
|
EOT |
||||
|
|
||||
|
if [ $arch == "x86" ] ; then |
||||
|
echo "Enabling Matrox HALlib (since this is x86) ..." |
||||
|
cat >> config/cf/host.def << EOT |
||||
|
|
||||
|
/* Additinal TV/DVI support since this is x86 */ |
||||
|
#define HaveMatroxHal YES |
||||
|
EOT |
||||
|
fi |
||||
|
} |
||||
|
|
||||
@ -0,0 +1,42 @@ |
|||||
|
#!/bin/sh |
||||
|
# |
||||
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
# |
||||
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
# Please add additional copyright information _after_ the line containing |
||||
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
# |
||||
|
# ROCK Linux: rock-src/package/x11/xorg/xfs.init |
||||
|
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
# |
||||
|
# This program is free software; you can redistribute it and/or modify |
||||
|
# it under the terms of the GNU General Public License as published by |
||||
|
# the Free Software Foundation; either version 2 of the License, or |
||||
|
# (at your option) any later version. A copy of the GNU General Public |
||||
|
# License can be found at Documentation/COPYING. |
||||
|
# |
||||
|
# Many people helped and are helping developing ROCK Linux. Please |
||||
|
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
||||
|
# file for details. |
||||
|
# |
||||
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
# |
||||
|
# ROCK Linux: /etc/rc.d/init.d/xfs |
||||
|
# |
||||
|
# Desc: X Font Server |
||||
|
# Runlevel: 80 rcX |
||||
|
# |
||||
|
|
||||
|
main_begin |
||||
|
|
||||
|
block_begin(start, `Starting xfs.') |
||||
|
check(`/usr/X11/bin/xfs -daemon') |
||||
|
block_end |
||||
|
|
||||
|
block_begin(stop, `Stopping xfs') |
||||
|
check(`killall -15 /usr/X11/bin/xfs') |
||||
|
block_end |
||||
|
|
||||
|
main_end |
||||
|
|
||||
@ -0,0 +1,42 @@ |
|||||
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
# |
||||
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
# Please add additional copyright information _after_ the line containing |
||||
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
# |
||||
|
# ROCK Linux: rock-src/package/x11/xorg/xorg.conf |
||||
|
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
# |
||||
|
# This program is free software; you can redistribute it and/or modify |
||||
|
# it under the terms of the GNU General Public License as published by |
||||
|
# the Free Software Foundation; either version 2 of the License, or |
||||
|
# (at your option) any later version. A copy of the GNU General Public |
||||
|
# License can be found at Documentation/COPYING. |
||||
|
# |
||||
|
# Many people helped and are helping developing ROCK Linux. Please |
||||
|
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
||||
|
# file for details. |
||||
|
# |
||||
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
# include the configuration script for X ... |
||||
|
. package/x11/xorg/xf_config.sh |
||||
|
|
||||
|
x11base_main() { |
||||
|
xf_extract |
||||
|
|
||||
|
xf_extract_gl |
||||
|
xf_extract_hallib |
||||
|
xf_patch |
||||
|
|
||||
|
xf_config |
||||
|
|
||||
|
xf_build |
||||
|
xf_install |
||||
|
} |
||||
|
|
||||
|
custmain=x11base_main |
||||
|
autoextract=0 |
||||
|
createdocs=0 |
||||
|
|
||||
@ -0,0 +1,572 @@ |
|||||
|
# File generated by xf86config. |
||||
|
# and additional hand edited by Rene Rebe - ROCK Linux Project |
||||
|
# |
||||
|
# YOU MUST ONLY ADD A CARD SECTION AND MODIFY SOME MONITOR SETTINGS |
||||
|
# TO GET A WORKING X CONFIGURATION. |
||||
|
# |
||||
|
|
||||
|
# |
||||
|
# Copyright (c) 1999 by The XFree86 Project, Inc. |
||||
|
# |
||||
|
# Permission is hereby granted, free of charge, to any person obtaining a |
||||
|
# copy of this software and associated documentation files (the "Software"), |
||||
|
# to deal in the Software without restriction, including without limitation |
||||
|
# the rights to use, copy, modify, merge, publish, distribute, sublicense, |
||||
|
# and/or sell copies of the Software, and to permit persons to whom the |
||||
|
# Software is furnished to do so, subject to the following conditions: |
||||
|
# |
||||
|
# The above copyright notice and this permission notice shall be included in |
||||
|
# all copies or substantial portions of the Software. |
||||
|
# |
||||
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
||||
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
||||
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
||||
|
# THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
||||
|
# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF |
||||
|
# OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
||||
|
# SOFTWARE. |
||||
|
# |
||||
|
# Except as contained in this notice, the name of the XFree86 Project shall |
||||
|
# not be used in advertising or otherwise to promote the sale, use or other |
||||
|
# dealings in this Software without prior written authorization from the |
||||
|
# XFree86 Project. |
||||
|
# |
||||
|
|
||||
|
# ********************************************************************** |
||||
|
# Refer to the XF86Config(4/5) man page for details about the format of |
||||
|
# this file. |
||||
|
# ********************************************************************** |
||||
|
|
||||
|
# ********************************************************************** |
||||
|
# Module section -- this section is used to specify |
||||
|
# which dynamically loadable modules to load. |
||||
|
# ********************************************************************** |
||||
|
# |
||||
|
Section "Module" |
||||
|
|
||||
|
Load "dbe" # DBE (double buffer extension) |
||||
|
Load "ddc" # Display Data Channel extension |
||||
|
|
||||
|
# This loads the miscellaneous extensions module |
||||
|
SubSection "extmod" |
||||
|
# Option "omit xfree86-dga" # don't initialise the DGA extension |
||||
|
# Option "omit XFree86-VidModeExtension" # disable mode-switching-supoprt |
||||
|
EndSubSection |
||||
|
|
||||
|
# This loads the Type1 and FreeType font modules |
||||
|
Load "type1" |
||||
|
Load "freetype" |
||||
|
|
||||
|
# Load "glx" # GLX extension (OpenGL visuals) |
||||
|
# Load "dri" # Direct Rendering Interface extension (OpenGL) |
||||
|
|
||||
|
# Load "v4l" # Video 4 Linux extension (provides a xv adapter) |
||||
|
EndSection |
||||
|
|
||||
|
# this enabled normal users to use DRI - the Direct Rendering Extension. |
||||
|
# it is also possible to use a group to control access. |
||||
|
# |
||||
|
Section "DRI" |
||||
|
Mode 0666 |
||||
|
EndSection |
||||
|
|
||||
|
# ********************************************************************** |
||||
|
# Files section. This allows default font and rgb paths to be set |
||||
|
# ********************************************************************** |
||||
|
|
||||
|
Section "Files" |
||||
|
|
||||
|
# The location of the RGB database. Note, this is the name of the |
||||
|
# file minus the extension (like ".txt" or ".db"). There is normally |
||||
|
# no need to change the default. |
||||
|
|
||||
|
RgbPath "/usr/X11R6/lib/X11/rgb" |
||||
|
|
||||
|
# Multiple FontPath entries are allowed (which are concatenated together), |
||||
|
# as well as specifying multiple comma-separated entries in one FontPath |
||||
|
# command (or a combination of both methods) |
||||
|
# |
||||
|
# If you don't have a floating point coprocessor and emacs, Mosaic or other |
||||
|
# programs take long to start up, try moving the Type1 and Speedo directory |
||||
|
# to the end of this list (or comment them out). |
||||
|
# |
||||
|
|
||||
|
FontPath "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled" |
||||
|
FontPath "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled" |
||||
|
FontPath "/usr/X11R6/lib/X11/fonts/CID/" |
||||
|
FontPath "/usr/X11R6/lib/X11/fonts/PEX/" |
||||
|
FontPath "/usr/X11R6/lib/X11/fonts/Speedo/" |
||||
|
FontPath "/usr/X11R6/lib/X11/fonts/Type1/" |
||||
|
FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/" |
||||
|
FontPath "/usr/X11R6/lib/X11/fonts/encodings/" |
||||
|
FontPath "/usr/X11R6/lib/X11/fonts/freefont/" |
||||
|
FontPath "/usr/X11R6/lib/X11/fonts/latin2/" |
||||
|
FontPath "/usr/X11R6/lib/X11/fonts/local/" |
||||
|
FontPath "/usr/X11R6/lib/X11/fonts/misc/" |
||||
|
FontPath "/usr/X11R6/lib/X11/fonts/sharefont" |
||||
|
FontPath "/usr/X11R6/lib/X11/fonts/TrueType" |
||||
|
|
||||
|
FontPath "/usr/share/ghostscript/fonts/" |
||||
|
|
||||
|
# The module search path. The default path is shown here. |
||||
|
|
||||
|
# ModulePath "/usr/X11R6/lib/modules" |
||||
|
|
||||
|
EndSection |
||||
|
|
||||
|
# ********************************************************************** |
||||
|
# Server flags section. |
||||
|
# ********************************************************************** |
||||
|
|
||||
|
Section "ServerFlags" |
||||
|
|
||||
|
# Uncomment this to cause a core dump at the spot where a signal is |
||||
|
# received. This may leave the console in an unusable state, but may |
||||
|
# provide a better stack trace in the core dump to aid in debugging |
||||
|
|
||||
|
# Option "NoTrapSignals" |
||||
|
|
||||
|
# Uncomment this to disable the <Crtl><Alt><BS> server abort sequence |
||||
|
# This allows clients to receive this key event. |
||||
|
|
||||
|
# Option "DontZap" |
||||
|
|
||||
|
# Uncomment this to disable the <Crtl><Alt><KP_+>/<KP_-> mode switching |
||||
|
# sequences. This allows clients to receive these key events. |
||||
|
|
||||
|
# Option "Dont Zoom" |
||||
|
|
||||
|
# Uncomment this to disable tuning with the xvidtune client. With |
||||
|
# it the client can still run and fetch card and monitor attributes, |
||||
|
# but it will not be allowed to change them. If it tries it will |
||||
|
# receive a protocol error. |
||||
|
|
||||
|
# Option "DisableVidModeExtension" |
||||
|
|
||||
|
# Uncomment this to enable the use of a non-local xvidtune client. |
||||
|
|
||||
|
# Option "AllowNonLocalXvidtune" |
||||
|
|
||||
|
# Uncomment this to disable dynamically modifying the input device |
||||
|
# (mouse and keyboard) settings. |
||||
|
|
||||
|
# Option "DisableModInDev" |
||||
|
|
||||
|
# Uncomment this to enable the use of a non-local client to |
||||
|
# change the keyboard or mouse settings (currently only xset). |
||||
|
|
||||
|
# Option "AllowNonLocalModInDev" |
||||
|
|
||||
|
EndSection |
||||
|
|
||||
|
# ********************************************************************** |
||||
|
# Input devices |
||||
|
# ********************************************************************** |
||||
|
|
||||
|
# ********************************************************************** |
||||
|
# Core keyboard's InputDevice section |
||||
|
# ********************************************************************** |
||||
|
|
||||
|
Section "InputDevice" |
||||
|
|
||||
|
Identifier "Keyboard1" |
||||
|
Driver "Keyboard" |
||||
|
|
||||
|
# For most OSs the protocol can be omitted (it defaults to "Standard"). |
||||
|
# When using XQUEUE (only for SVR3 and SVR4, but not Solaris), |
||||
|
# uncomment the following line. |
||||
|
|
||||
|
# Option "Protocol" "Xqueue" |
||||
|
|
||||
|
Option "AutoRepeat" "250 30" |
||||
|
|
||||
|
# Specify which keyboard LEDs can be user-controlled (eg, with xset(1)) |
||||
|
# Option "Xleds" "1 2 3" |
||||
|
|
||||
|
# Option "LeftAlt" "Meta" |
||||
|
# Option "RightAlt" "ModeShift" |
||||
|
|
||||
|
# To customise the XKB settings to suit your keyboard, modify the |
||||
|
# lines below (which are the defaults). For example, for a non-U.S. |
||||
|
# keyboard, you will probably want to use: |
||||
|
# Option "XkbModel" "pc102" |
||||
|
# If you have a US Microsoft Natural keyboard, you can use: |
||||
|
# Option "XkbModel" "microsoft" |
||||
|
# |
||||
|
# Then to change the language, change the Layout setting. |
||||
|
# For example, a german layout can be obtained with: |
||||
|
# Option "XkbLayout" "de" |
||||
|
# or: |
||||
|
# Option "XkbLayout" "de" |
||||
|
# Option "XkbVariant" "nodeadkeys" |
||||
|
# |
||||
|
# If you'd like to switch the positions of your capslock and |
||||
|
# control keys, use: |
||||
|
# Option "XkbOptions" "ctrl:swapcaps" |
||||
|
|
||||
|
# These are the default XKB settings for XFree86 |
||||
|
# Option "XkbRules" "xfree86" |
||||
|
# Option "XkbModel" "pc101" |
||||
|
# Option "XkbLayout" "us" |
||||
|
# Option "XkbVariant" "" |
||||
|
# Option "XkbOptions" "" |
||||
|
|
||||
|
# Option "XkbDisable" |
||||
|
|
||||
|
Option "XkbRules" "xfree86" |
||||
|
Option "XkbModel" "pc105" |
||||
|
# Option "XkbLayout" "de" # german keyboard layout |
||||
|
# Option "XkbVariant" "nodeadkeys" # normally not wanted |
||||
|
|
||||
|
EndSection |
||||
|
|
||||
|
|
||||
|
# ********************************************************************** |
||||
|
# Core Pointer's InputDevice section |
||||
|
# ********************************************************************** |
||||
|
|
||||
|
# auto-detected mouse |
||||
|
Section "InputDevice" |
||||
|
|
||||
|
# Identifier and driver |
||||
|
|
||||
|
Identifier "Mouse1" |
||||
|
Driver "mouse" |
||||
|
Option "Protocol" "Auto" |
||||
|
Option "Device" "/dev/mouse" |
||||
|
|
||||
|
#Option "Emulate3Buttons" "true" # for a two button touch-pad |
||||
|
EndSection |
||||
|
|
||||
|
# for a normal ps2 mouse: |
||||
|
#Section "InputDevice" |
||||
|
# |
||||
|
# Identifier and driver |
||||
|
# |
||||
|
# Identifier "Mouse1" |
||||
|
# Driver "mouse" |
||||
|
# Option "Protocol" "PS/2" |
||||
|
# Option "Device" "/dev/misc/psaux" |
||||
|
# |
||||
|
# #Option "Emulate3Buttons" "true" # for a two button touch-pad |
||||
|
#EndSection |
||||
|
|
||||
|
# for a normal serial mouse |
||||
|
#Section "InputDevice" |
||||
|
# |
||||
|
# Identifier "Mouse1" |
||||
|
# Driver "mouse" |
||||
|
# Option "Protocol" "Microsoft" |
||||
|
# Option "Device" "/dev/tts/0" |
||||
|
# |
||||
|
# #Option "Emulate3Buttons" "true" # for a two button touch-pad |
||||
|
#EndSection |
||||
|
|
||||
|
# for a usb Logitech wheel mouse |
||||
|
#Section "InputDevice" |
||||
|
# |
||||
|
# Identifier "Mouse1" |
||||
|
# Driver "mouse" |
||||
|
# Option "Protocol" "IMPS/2" |
||||
|
# Option "Device" "/dev/input/mouse0" |
||||
|
# Option "Buttons" "5" |
||||
|
# Option "ZaxisMapping" "4 5" |
||||
|
# |
||||
|
#EndSection |
||||
|
|
||||
|
|
||||
|
# ********************************************************************** |
||||
|
# Other input device sections |
||||
|
# this is optional and is required only if you |
||||
|
# are using extended input devices. This is for example only. Refer |
||||
|
# to the XF86Config man page for a description of the options. |
||||
|
# ********************************************************************** |
||||
|
# |
||||
|
# Section "InputDevice" |
||||
|
# Identifier "Mouse2" |
||||
|
# Driver "mouse" |
||||
|
# Option "Protocol" "MouseMan" |
||||
|
# Option "Device" "/dev/mouse2" |
||||
|
# EndSection |
||||
|
# |
||||
|
# Section "InputDevice" |
||||
|
# Identifier "Spaceball" |
||||
|
# Driver "magellan" |
||||
|
# Option "Device" "/dev/cua0" |
||||
|
# EndSection |
||||
|
# |
||||
|
# Section "InputDevice" |
||||
|
# Identifier "Spaceball2" |
||||
|
# Driver "spaceorb" |
||||
|
# Option "Device" "/dev/cua0" |
||||
|
# EndSection |
||||
|
# |
||||
|
# Section "InputDevice" |
||||
|
# Identifier "Touchscreen0" |
||||
|
# Driver "microtouch" |
||||
|
# Option "Device" "/dev/ttyS0" |
||||
|
# Option "MinX" "1412" |
||||
|
# Option "MaxX" "15184" |
||||
|
# Option "MinY" "15372" |
||||
|
# Option "MaxY" "1230" |
||||
|
# Option "ScreenNumber" "0" |
||||
|
# Option "ReportingMode" "Scaled" |
||||
|
# Option "ButtonNumber" "1" |
||||
|
# Option "SendCoreEvents" |
||||
|
# EndSection |
||||
|
# |
||||
|
# Section "InputDevice" |
||||
|
# Identifier "Touchscreen1" |
||||
|
# Driver "elo2300" |
||||
|
# Option "Device" "/dev/ttyS0" |
||||
|
# Option "MinX" "231" |
||||
|
# Option "MaxX" "3868" |
||||
|
# Option "MinY" "3858" |
||||
|
# Option "MaxY" "272" |
||||
|
# Option "ScreenNumber" "0" |
||||
|
# Option "ReportingMode" "Scaled" |
||||
|
# Option "ButtonThreshold" "17" |
||||
|
# Option "ButtonNumber" "1" |
||||
|
# Option "SendCoreEvents" |
||||
|
# EndSection |
||||
|
|
||||
|
# Section "InputDevice" |
||||
|
# Identifier "Tablet1" |
||||
|
# Driver "summa" |
||||
|
# Option "Device" "/dev/ttyS0" |
||||
|
# Option "MinX" "231" |
||||
|
# Option "MaxX" "3868" |
||||
|
# Option "MinY" "3858" |
||||
|
# Option "MaxY" "272" |
||||
|
# Option "ScreenNumber" "0" |
||||
|
# Option "ReportingMode" "Scaled" |
||||
|
# Option "ButtonThreshold" "17" |
||||
|
# Option "ButtonNumber" "1" |
||||
|
# Option "SendCoreEvents" |
||||
|
# Option "BaudRate" "19200" |
||||
|
# Option "DataBits" "8" |
||||
|
# Option "StopBits" "1" |
||||
|
# Option "Parity" "Odd" |
||||
|
# Option "FlowControl" "Xoff" |
||||
|
# Option "VTime" "10" |
||||
|
# Option "VMin" "1" |
||||
|
# EndSection |
||||
|
|
||||
|
|
||||
|
# ********************************************************************** |
||||
|
# Monitor section |
||||
|
# ********************************************************************** |
||||
|
|
||||
|
# Any number of monitor sections may be present |
||||
|
|
||||
|
Section "Monitor" |
||||
|
|
||||
|
Identifier "Monitor1" |
||||
|
|
||||
|
# NOTE: THE VALUES HERE ARE EXAMPLES ONLY. REFER TO YOUR MONITOR'S |
||||
|
# USER MANUAL FOR THE CORRECT NUMBERS !! |
||||
|
|
||||
|
# normally uncomment this lines |
||||
|
# HorizSync 24.0 - 80.0 |
||||
|
# VertRefresh 50-100 |
||||
|
|
||||
|
# overwrite the screen dimensions (in mm) e.g. to get another virtual dpi |
||||
|
# value |
||||
|
# DisplaySize 345 260 |
||||
|
|
||||
|
# HorizSync is in kHz unless units are specified. |
||||
|
# HorizSync may be a comma separated list of discrete values, or a |
||||
|
# comma separated list of ranges of values. |
||||
|
# HorizSync 30-64 # multisync |
||||
|
# HorizSync 31.5, 35.2 # multiple fixed sync frequencies |
||||
|
# HorizSync 15-25, 30-50 # multiple ranges of sync frequencies |
||||
|
|
||||
|
# VertRefresh is in Hz unless units are specified. |
||||
|
# VertRefresh may be a comma separated list of discrete values, or a |
||||
|
# comma separated list of ranges of values. |
||||
|
# VertRefresh 50-100 |
||||
|
|
||||
|
# some mode examples 1,2 selfmade - 3 from fbset |
||||
|
# (only needed for low-level tricks, exotic Laptops or other LCD's) |
||||
|
# |
||||
|
# Mode "1152x900" |
||||
|
# DotClock 120 |
||||
|
# HTimings 1152 1200 1312 1528 |
||||
|
# VTimings 900 910 946 985 |
||||
|
# EndMode |
||||
|
# Mode "1152x900-2" |
||||
|
# DotClock 100 |
||||
|
# HTimings 1152 1200 1312 1528 |
||||
|
# VTimings 900 910 946 985 |
||||
|
# EndMode |
||||
|
# Mode "1152x864" |
||||
|
# DotClock 105.810 |
||||
|
# HTimings 1152 1184 1312 1504 |
||||
|
# VTimings 864 868 872 902 |
||||
|
# Flags "-HSync" "-VSync" |
||||
|
# EndMode |
||||
|
|
||||
|
# for framebuffer devices you might want to simply add |
||||
|
# the 'fbset -x' output here. |
||||
|
|
||||
|
EndSection |
||||
|
|
||||
|
|
||||
|
# ********************************************************************** |
||||
|
# Graphics device section |
||||
|
# ********************************************************************** |
||||
|
|
||||
|
# Any number of graphics device sections may be present |
||||
|
|
||||
|
Section "Device" |
||||
|
Identifier "Card1" |
||||
|
|
||||
|
# Use this for framebuffer devices - should work on most systems. |
||||
|
Driver "fbdev" |
||||
|
Option "fbdev" "/dev/fb/0" |
||||
|
|
||||
|
# Driver "vga" # mga, ati, nv, sis, vesa ... |
||||
|
# # Option "BackingStore" |
||||
|
|
||||
|
# # Some driver accept an UseFBDev option (e.g. radeon) to switch the |
||||
|
# # mode via the Linux framebuffer layer. Needed e.g. as workaround for |
||||
|
# # iBooks. |
||||
|
# # Option "UseFBDev" |
||||
|
|
||||
|
# # The BuID is only required for multi-monitor configs or some fbdev drivers |
||||
|
# # BusID "PCI:1:5:0" |
||||
|
# # Screen 0 # Screen of a dual-head mga card |
||||
|
|
||||
|
# # Option "NoHal" # do not use the binary-only Matrox HAL library |
||||
|
# # Option "AGPMode2x" |
||||
|
|
||||
|
EndSection |
||||
|
|
||||
|
# Matrox Millenium 4xx, Ati or NVidia second-head |
||||
|
#Section "Device" |
||||
|
# Identifier "Card2" |
||||
|
# Driver "mga" # or other dual-able cards like ati, nv |
||||
|
# # Option "BackingStore" |
||||
|
|
||||
|
# BusID "PCI:1:5:0" |
||||
|
# Screen 1 |
||||
|
# |
||||
|
# # Option "NoHal" # do not use the binary-only Matrox HAL library |
||||
|
# # Option "AGPMode2x" |
||||
|
|
||||
|
# # Option "Tv" "yes" |
||||
|
# # Option "TVStandard" "PAL" |
||||
|
# # Option "CableType" "SCART_COMPOSITE" |
||||
|
#EndSection |
||||
|
|
||||
|
# ********************************************************************** |
||||
|
# Screen sections |
||||
|
# ********************************************************************** |
||||
|
|
||||
|
# Any number of screen sections may be present. Each describes |
||||
|
# the configuration of a single screen. A single specific screen section |
||||
|
# may be specified from the X server command line with the "-screen" |
||||
|
# option. |
||||
|
Section "Screen" |
||||
|
Identifier "Screen1" |
||||
|
Device "Card1" |
||||
|
Monitor "Monitor1" |
||||
|
DefaultDepth 24 |
||||
|
|
||||
|
Subsection "Display" |
||||
|
Depth 4 |
||||
|
Modes "1024x768" "800x600" "640x480" |
||||
|
ViewPort 0 0 |
||||
|
EndSubsection |
||||
|
Subsection "Display" |
||||
|
Depth 8 |
||||
|
Modes "1024x768" "800x600" "640x400" |
||||
|
ViewPort 0 0 |
||||
|
EndSubsection |
||||
|
Subsection "Display" |
||||
|
Depth 16 |
||||
|
Modes "1024x768" "800x600" "640x480" |
||||
|
ViewPort 0 0 |
||||
|
EndSubsection |
||||
|
Subsection "Display" |
||||
|
Depth 24 |
||||
|
Modes "1024x768" "800x600" "640x480" |
||||
|
ViewPort 0 0 |
||||
|
EndSubsection |
||||
|
Subsection "Display" |
||||
|
Depth 32 |
||||
|
Modes "1024x768" "800x600" "640x480" |
||||
|
ViewPort 0 0 |
||||
|
EndSubsection |
||||
|
EndSection |
||||
|
|
||||
|
#Section "Screen" |
||||
|
# Identifier "Screen2" |
||||
|
# Device "Card2" |
||||
|
# Monitor "Monitor1" |
||||
|
# DefaultDepth 16 |
||||
|
# |
||||
|
# Subsection "Display" |
||||
|
# Depth 16 |
||||
|
# Modes "1024x768" "800x600" "640x480" |
||||
|
# ViewPort 0 0 |
||||
|
# EndSubsection |
||||
|
#EndSection |
||||
|
|
||||
|
#Section "Screen" |
||||
|
# Identifier "ScreenTV" |
||||
|
# Device "CardTV" |
||||
|
# Monitor "Monitor1" |
||||
|
# DefaultDepth 16 |
||||
|
# |
||||
|
# Subsection "Display" |
||||
|
# Depth 16 |
||||
|
# Modes "640x480" |
||||
|
# ViewPort 0 0 |
||||
|
# EndSubsection |
||||
|
#EndSection |
||||
|
|
||||
|
|
||||
|
# ********************************************************************** |
||||
|
# ServerLayout sections. |
||||
|
# ********************************************************************** |
||||
|
|
||||
|
# Any number of ServerLayout sections may be present. Each describes |
||||
|
# the way multiple screens are organised. A specific ServerLayout |
||||
|
# section may be specified from the X server command line with the |
||||
|
# "-layout" option. In the absence of this, the first section is used. |
||||
|
# When now ServerLayout section is present, the first Screen section |
||||
|
# is used alone. |
||||
|
|
||||
|
Section "ServerLayout" |
||||
|
|
||||
|
# The Identifier line must be present |
||||
|
Identifier "Simple Layout" |
||||
|
|
||||
|
# Each Screen line specifies a Screen section name, and optionally |
||||
|
# the relative position of other screens. The four names after |
||||
|
# primary screen name are the screens to the top, bottom, left and right |
||||
|
# of the primary screen. In this example, screen 2 is located to the |
||||
|
# right of screen 1. |
||||
|
|
||||
|
Screen "Screen1" #LeftOf "Screen2" |
||||
|
#Screen "Screen2" |
||||
|
#Screen "ScreenTV" |
||||
|
|
||||
|
# Each InputDevice line specifies an InputDevice section name and |
||||
|
# optionally some options to specify the way the device is to be |
||||
|
# used. Those options include "CorePointer", "CoreKeyboard" and |
||||
|
# "SendCoreEvents". |
||||
|
|
||||
|
InputDevice "Mouse1" "CorePointer" |
||||
|
InputDevice "Keyboard1" "CoreKeyboard" |
||||
|
|
||||
|
# It is possible to specify secondary input devices which might not |
||||
|
# be pressend on X startup. Nice for laptops with temporary external |
||||
|
# mices ;-)! |
||||
|
|
||||
|
# InputDevice "Mouse2" "SendCoreEvents" |
||||
|
# InputDevice "Tablet1" |
||||
|
|
||||
|
EndSection |
||||
|
|
||||
@ -0,0 +1,16 @@ |
|||||
|
#!/bin/sh |
||||
|
|
||||
|
echo "Running mkfontscale / mkfontdir ..." |
||||
|
for dir in /usr/X11R6/lib/X11/fonts/* ; do |
||||
|
[ -d $dir ] || continue |
||||
|
echo -n "$dir " |
||||
|
mkfontscale $dir |
||||
|
mkfontdir $dir |
||||
|
done ; unset dir |
||||
|
echo |
||||
|
|
||||
|
if [ "`which fc-cache`" ] ; then |
||||
|
echo "Running fc-cache ..." |
||||
|
fc-cache -v |
||||
|
fi |
||||
|
|
||||
@ -0,0 +1,53 @@ |
|||||
|
|
||||
|
[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
[COPY] |
||||
|
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
[COPY] Please add additional copyright information _after_ the line containing |
||||
|
[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
[COPY] |
||||
|
[COPY] ROCK Linux: rock-src/package/x11/xorg/xorg.desc |
||||
|
[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
[COPY] |
||||
|
[COPY] This program is free software; you can redistribute it and/or modify |
||||
|
[COPY] it under the terms of the GNU General Public License as published by |
||||
|
[COPY] the Free Software Foundation; either version 2 of the License, or |
||||
|
[COPY] (at your option) any later version. A copy of the GNU General Public |
||||
|
[COPY] License can be found at Documentation/COPYING. |
||||
|
[COPY] |
||||
|
[COPY] Many people helped and are helping developing ROCK Linux. Please |
||||
|
[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
||||
|
[COPY] file for details. |
||||
|
[COPY] |
||||
|
[COPY] --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
[I] The X.Org X11 Server and all base X11 files/programs |
||||
|
|
||||
|
[T] This is the X.Org's X11R6.x release that |
||||
|
[T] supports several UNIX(R) and UNIX-like (such as Linux, the BSDs and |
||||
|
[T] Solaris x86) operating systems on Intel and other platforms. |
||||
|
|
||||
|
[U] http://www.x.org/ |
||||
|
|
||||
|
[A] The X.Org Foundation {The X.Org Sourcecode} |
||||
|
[A] The Open Group X Project Team {Original Sourcecode} |
||||
|
[M] Michael Obster <michael@obster.org> |
||||
|
|
||||
|
[C] base/x11 |
||||
|
[E] group x11 |
||||
|
|
||||
|
[L] OpenSource |
||||
|
[S] Stable |
||||
|
[V] 6.8.1 |
||||
|
[P] O X?---5---9 112.600 |
||||
|
|
||||
|
[O] mga_version=2.1 |
||||
|
[O] xf_files=X11R6.8.1-src.tar.bz2 |
||||
|
|
||||
|
[D] 3746320608 X11R6.8.1-src.tar.bz2 http://freedesktop.org/~xorg/X11R6.8.1/src-single/ |
||||
|
|
||||
|
[D] 2803589536 mgadrivers-2.1-src.tgz ftp://ftp.matrox.com/pub/mga/archive/linux/2003/ |
||||
|
[D] 4094582231 mangl.tar.Z ftp://ftp.sgi.com/opengl/doc/ |
||||
|
[D] 1558312024 manglu.tar.Z ftp://ftp.sgi.com/opengl/doc/ |
||||
|
[D] 432442308 manglx.tar.Z ftp://ftp.sgi.com/opengl/doc/ |
||||
|
|
||||
@ -0,0 +1,33 @@ |
|||||
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
# |
||||
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
# Please add additional copyright information _after_ the line containing |
||||
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
# |
||||
|
# ROCK Linux: rock-src/package/x11/xfree86/xterm-ls.patch |
||||
|
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
# |
||||
|
# This patch file is dual-licensed. It is available under the license the |
||||
|
# patched project is licensed under, as long as it is an OpenSource license |
||||
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
||||
|
# of the GNU General Public License as published by the Free Software |
||||
|
# Foundation; either version 2 of the License, or (at your option) any later |
||||
|
# version. |
||||
|
# |
||||
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
A new xTerm should (= must!) have a login shell. |
||||
|
|
||||
|
- Clifford, June 2000 |
||||
|
|
||||
|
--- ./programs/xterm/XTerm.ad~ 2003-11-02 05:46:48.000000000 +0100
|
||||
|
+++ ./programs/xterm/XTerm.ad 2003-11-19 21:49:00.000000000 +0100
|
||||
|
@@ -110,3 +110,7 @@
|
||||
|
*tek4014*font2: 8x13 |
||||
|
*tek4014*font3: 6x13 |
||||
|
*tek4014*fontSmall: 6x10 |
||||
|
+
|
||||
|
+! A new xTerm should (= must!) have a login shell. (Clifford)
|
||||
|
+*loginShell: on
|
||||
|
+
|
||||