Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 20 years ago
parent
commit
e58108862f
4 changed files with 54 additions and 3 deletions
  1. +22
    -0
      package/x11/xfree86/gatos-gcc34.diff
  2. +28
    -3
      package/x11/xfree86/xf_config.sh
  3. +2
    -0
      package/x11/xfree86/xfree86.conf
  4. +2
    -0
      package/x11/xfree86/xfree86.desc

+ 22
- 0
package/x11/xfree86/gatos-gcc34.diff

@ -0,0 +1,22 @@
diff -dur ati.4.4.0/fi1236.h ../src.xfree86.1097053505.16606.2407344815/xc/gatos-ati.4.4.0-2004-08-09/ati.4.4.0/fi1236.h
--- ati.4.4.0/fi1236.h 2004-07-14 07:38:24.000000000 +0200
+++ ../src.xfree86.1097053505.16606.2407344815/xc/gatos-ati.4.4.0-2004-08-09/ati.4.4.0/fi1236.h 2004-10-06 12:42:16.588955600 +0200
@@ -89,6 +89,7 @@
int FI1236_AFC(FI1236Ptr f);
int TUNER_get_afc_hint(FI1236Ptr f);
void fi1236_dump_status(FI1236Ptr f);
+static void MT2032_dump_status(FI1236Ptr f);
#define FI1236SymbolsList \
"Detect_FI1236", \
diff -dur ati.4.4.0/theatre.h ../src.xfree86.1097053505.16606.2407344815/xc/gatos-ati.4.4.0-2004-08-09/ati.4.4.0/theatre.h
--- ati.4.4.0/theatre.h 2004-05-20 03:37:59.000000000 +0200
+++ ../src.xfree86.1097053505.16606.2407344815/xc/gatos-ati.4.4.0-2004-08-09/ati.4.4.0/theatre.h 2004-10-06 12:45:01.497885632 +0200
@@ -53,6 +53,7 @@
void RageTheatreDebugGain(TheatrePtr t, Bool on, CARD32 gain);
void ShutdownTheatre(TheatrePtr t);
void DumpRageTheatreRegs(TheatrePtr t);
+void DumpRageTheatreRegsByName(TheatrePtr t);
void ResetTheatreRegsForTVout(TheatrePtr t);

+ 28
- 3
package/x11/xfree86/xf_config.sh

@ -56,12 +56,37 @@ xf_extract_hallib() {
echo "Enabling Matrox HALlib (since this is x86) ..."
cat >> config/cf/host.def << EOT
/* Additinal TC/DVI support since this is x86 */
/* Additional TV/DVI support since this is x86 */
#define HaveMatroxHal YES
EOT
fi
}
# extract the GATOS drivers
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
if [ -f $x ] ; then
echo "Apply patch $x ..."
patch -Nf -p1 < $x
fi
done
cd ..
}
# build and install the GATOS drivers
xf_build_install_gatos() {
cd gatos-ati.$gatos_version
# imake has to be in the path for xmkmf
PATH="$PATH:/usr/X11/bin"
../config/util/xmkmf ..
eval $MAKE
eval $MAKE install
cd ..
}
# apply the patches
xf_patch() {
cp -v programs/twm/system.twmrc programs/twm/system.twmrc.orig
@ -148,7 +173,7 @@ xf_config() {
/* Less warnings with recent gccs ... */
#define DefaultCCOptions -ansi GccWarningOptions
/* Make sure config files are allways installed ... */
/* Make sure config files are always installed ... */
#define InstallXinitConfig YES
#define InstallXdmConfig YES
#define InstallFSConfig YES
@ -162,7 +187,7 @@ EOT
echo "Enabling Matrox HALlib (since this is x86) ..."
cat >> config/cf/host.def << EOT
/* Additinal TV/DVI support since this is x86 */
/* Additional TV/DVI support since this is x86 */
#define HaveMatroxHal YES
EOT
fi

+ 2
- 0
package/x11/xfree86/xfree86.conf

@ -29,12 +29,14 @@ x11base_main() {
xf_extract_gl
xf_extract_hallib
xf_extract_gatos
xf_patch
xf_config
xf_build
xf_install
xf_build_install_gatos
}
x11base_stage0() {

+ 2
- 0
package/x11/xfree86/xfree86.desc

@ -42,6 +42,7 @@
[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_patches="4.3.0-4.3.99.1.diff.bz2"
@ -51,4 +52,5 @@
[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/
[D] X gatos-ati.4.4.0-2004-08-09.tar.bz2 cvs://pserver:anonymous@cvs.gatos.sourceforge.net:/cvsroot/gatos::ati.4.4.0/!2004-08-09/

Loading…
Cancel
Save