Module Name: src
Committed By: ahoka
Date: Fri Jun 5 23:37:55 UTC 2009
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-s3: Makefile
Log Message:
Update s3 driver to 0.6.1.
Also add a missing object file to build a properly working module.
Closes PR xsrc/41206
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.3 Sun Aug 3 09:24:14 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile Fri Jun 5 23:37:55 2009
@@ -1,10 +1,21 @@
-# $NetBSD: Makefile,v 1.3 2008/08/03 09:24:14 rtr Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/05 23:37:55 ahoka Exp $
DRIVER= xf86-video-s3
DRIVER_NAME= s3_drv
+DRIVER_VERSION= 0.6.1
-SRCS= s3_bios.c s3_cursor.c s3_dga.c s3_driver.c s3_IBMRGB.c
-SRCS+= s3_Ti.c s3_Trio64DAC.c s3_video.c
+SRCS= s3_bios.c s3_cursor.c s3_dga.c s3_driver.c s3_IBMRGB.c \
+ s3_Ti.c s3_Trio64DAC.c s3_video.c s3_accel.c \
+ s3_accel_newmmio.c
+
+# PLEASE NOTE: s3_accel.c is compiled two times with different
+# cpp macros for PIO and NEWMMIO support. Check Makefile.am
+# before upgrading the driver.
+#
+BUILDSYMLINKS= s3_accel.c s3_accel_newmmio.c
+CPPFLAGS.s3_accel_newmmio.c+= -DS3_NEWMMIO=1 \
+ -I${X11SRCDIR.xf86-video-s3}/src
+
+CPPFLAGS+= -DPACKAGE_VERSION=\"${PACKAGE_VERSION}\"
-CPPFLAGS.s3_driver.c= -Wno-error # XXX fix me please
.include "../Makefile.xf86-driver"
