Bug#377386: A new patch for s3 driver.
I resolved (i hope) the incosistences with the old S3 chipsets. Thanks to
Eugene Konev for his report. Now s3_accel.c compiled twice: with and without
S3_NEWMMIO and then object files s3_accel_newmmio.o and s3_accel_pio.o
are linked together.
Infomation for maintainer. This patch replaces(!!!) my previous patch
01_enable_new_mmio.diff. It should be applied against /src/Makefile.am.
And then 'autoreconf --install --force'. The old patch should be removed
from /debian dir.
I'm waiting for any feedback!
--- xserver-xorg-video-s3.orig/src/Makefile.am 2005-07-26 18:46:49.000000000 +0000
+++ xserver-xorg-video-s3/src/Makefile.am 2006-10-29 13:29:55.000000000 +0000
@@ -30,7 +30,6 @@
s3_drv_la_SOURCES = \
newmmio.h \
- s3_accel.c \
s3_bios.c \
s3_cursor.c \
s3_dga.c \
@@ -41,3 +40,15 @@
s3_Ti.c \
s3_Trio64DAC.c \
s3_video.c
+
+EXTRA_s3_drv_la_SOURCES = s3_accel.c
+s3_drv_la_LIBADD = s3_accel_newmmio.lo s3_accel_pio.lo
+
+s3_accel_newmmio.lo: s3_accel.c
+ if $(LTCOMPILE) -DS3_NEWMMIO=1 -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+
+s3_accel_pio.lo: s3_accel.c
+ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+
Reply to: