Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 20 years ago
parent
commit
ab16ee0ebf
7 changed files with 2428 additions and 2486 deletions
  1. +34
    -0
      package/x11/xfree86/Imakefile.patch.gatos
  2. +7
    -26
      package/x11/xfree86/devfs-vc.patch
  3. +2376
    -2430
      package/x11/xfree86/fontconfig-update.patch
  4. +0
    -0
      package/x11/xfree86/gcc34.patch.gatos
  5. +7
    -26
      package/x11/xfree86/sparc-bus-26headers.patch
  6. +1
    -1
      package/x11/xfree86/xf_config.sh
  7. +3
    -3
      package/x11/xfree86/xfree86.desc

+ 34
- 0
package/x11/xfree86/Imakefile.patch.gatos

@ -0,0 +1,34 @@
diff -dur gatos-ati.4.4.0-2004-08-09/Imakefile src.xfree86.1100824979.11936.2507168007/xc/gatos-ati.4.4.0-2004-08-09/Imakefile
--- gatos-ati.4.4.0-2004-08-09/Imakefile 2004-05-20 03:37:59.000000000 +0200
+++ src.xfree86.1100824979.11936.2507168007/xc/gatos-ati.4.4.0-2004-08-09/Imakefile 2004-11-19 15:29:46.355244728 +0100
@@ -239,18 +239,18 @@
ModuleObjectRule()
-ObjectModuleTarget(ati,$(OBJS1))
-ObjectModuleTarget(atimisc,$(OBJS2))
-ObjectModuleTarget(r128,$(OBJS3))
-ObjectModuleTarget(radeon,$(OBJS4))
-ObjectModuleTarget(fi1236,$(OBJS_FI1236))
-ObjectModuleTarget(msp3430, $(OBJS_MSP3430))
-ObjectModuleTarget(theatre, $(OBJS_THEATRE))
-ObjectModuleTarget(bt829, $(OBJS_BT829))
-ObjectModuleTarget(saa7114, $(OBJS_SAA7114))
-ObjectModuleTarget(tda9850, $(OBJS_TDA9850))
-ObjectModuleTarget(tda8425, $(OBJS_TDA8425))
-ObjectModuleTarget(tda9885, $(OBJS_TDA9885))
+ObjectModuleTarget(ati,$(OBJS1),input)
+ObjectModuleTarget(atimisc,$(OBJS2),input)
+ObjectModuleTarget(r128,$(OBJS3),input)
+ObjectModuleTarget(radeon,$(OBJS4),input)
+ObjectModuleTarget(fi1236,$(OBJS_FI1236),input)
+ObjectModuleTarget(msp3430, $(OBJS_MSP3430),input)
+ObjectModuleTarget(theatre, $(OBJS_THEATRE),input)
+ObjectModuleTarget(bt829, $(OBJS_BT829),input)
+ObjectModuleTarget(saa7114, $(OBJS_SAA7114),input)
+ObjectModuleTarget(tda9850, $(OBJS_TDA9850),input)
+ObjectModuleTarget(tda8425, $(OBJS_TDA8425),input)
+ObjectModuleTarget(tda9885, $(OBJS_TDA9885),input)
InstallObjectModule(ati,$(MODULEDIR),drivers)

+ 7
- 26
package/x11/xfree86/devfs-vc.patch

@ -1,25 +1,6 @@
# --- 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/devfs-vc.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 ---
--- xfree86-cvs-2003-01-08/programs/Xserver/hw/kdrive/linux/linux.c~ 2002-10-08 23:27:55.000000000 +0200
+++ xfree86-cvs-2003-01-08/programs/Xserver/hw/kdrive/linux/linux.c 2003-01-11 21:26:19.000000000 +0100
@@ -79,10 +79,10 @@
--- xc/programs/Xserver/hw/tinyx/linux/linux.c 2004-06-27 13:01:19.000000000 +0200
+++ xc-p/programs/Xserver/hw/tinyx/linux/linux.c 2004-11-11 22:20:32.022231840 +0100
@@ -125,10 +125,10 @@
vtno = kdVirtualTerminal;
else
{
@ -32,16 +13,16 @@
strerror(errno));
}
if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) ||
@@ -93,7 +93,7 @@
@@ -139,7 +139,7 @@
close(fd);
}
close(fd);
- sprintf(vtname,"/dev/tty%d",vtno); /* /dev/tty1-64 */
+ sprintf(vtname,"/dev/vc/%d",vtno); /* /dev/vc/1-64 */
if ((LinuxConsoleFd = open(vtname, O_RDWR|O_NDELAY, 0)) < 0)
{
@@ -110,7 +110,7 @@
@@ -156,7 +156,7 @@
*
* Why is this needed?
*/
@ -50,7 +31,7 @@
/*
* Linux doesn't switch to an active vt after the last close of a vt,
* so we do this ourselves by remembering which is active now.
@@ -441,7 +441,7 @@
@@ -483,7 +483,7 @@
activeVT = -1;
}
close(LinuxConsoleFd); /* make the vt-manager happy */

+ 2376
- 2430
package/x11/xfree86/fontconfig-update.patch
File diff suppressed because it is too large
View File


package/x11/xfree86/gatos-gcc34.diff → package/x11/xfree86/gcc34.patch.gatos


+ 7
- 26
package/x11/xfree86/sparc-bus-26headers.patch

@ -1,29 +1,10 @@
# --- 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/sparc-bus-26headers.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 ---
--- xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h.orig 2004-08-22 23:15:10.000000000 +0200
+++ xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h 2004-08-22 23:15:25.000000000 +0200
@@ -27,6 +27,7 @@
--- xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h 2004-05-12 13:01:59.000000000 +0200
+++ xc-p/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h 2004-11-11 22:45:49.575528672 +0100
@@ -31,6 +31,7 @@
#if defined(linux)
#include <asm/types.h>
+#include <linux/fb.h>
#include <asm/fbio.h>
#include <asm/openpromio.h>
# include <asm/types.h>
+# include <linux/fb.h>
# include <asm/fbio.h>
# include <asm/openpromio.h>
#elif defined(SVR4)

+ 1
- 1
package/x11/xfree86/xf_config.sh

@ -67,7 +67,7 @@ xf_extract_gatos() {
echo "Extracting GATOS drivers (For ATI cards with video in/out) ..."
tar $taropt $archdir/gatos-ati.$gatos_version.tar.bz2
cd gatos-ati.$gatos_version
for x in $confdir/gatos-*.diff ; do
for x in $confdir/*.patch.gatos ; do
if [ -f $x ] ; then
echo "Apply patch $x ..."
patch -Nf -p1 < $x

+ 3
- 3
package/x11/xfree86/xfree86.desc

@ -38,15 +38,15 @@
[L] OpenSource
[S] Stable
[V] 4.4.99.1
[V] 4.4.99.16
[P] X X?---5---9 112.600
[O] mga_version=3.0
[O] gatos_version=4.4.0-2004-08-09
[O] xf_files="XFree86-4.4.99.1.tar.bz2"
[O] xf_files="XFree86-4.4.99.16.tar.bz2"
#[O] xf_patches="4.3.0-4.3.99.1.diff.bz2"
[D] 2439530569 XFree86-4.4.99.1.tar.bz2 ftp://ftp.xfree86.org/pub/XFree86/develsnaps/
[D] 0 XFree86-4.4.99.16.tar.bz2 ftp://ftp.xfree86.org/pub/XFree86/develsnaps/
[D] 1805398117 mgadrivers-3.0-src.tgz ftp://ftp.matrox.com/pub/mga/archive/linux/2003/
[D] 4094582231 mangl.tar.Z ftp://ftp.sgi.com/opengl/doc/

Loading…
Cancel
Save