Module Name: src
Committed By: snj
Date: Tue Jun 9 17:26:27 UTC 2009
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-s3 [netbsd-5-0]:
Makefile
Log Message:
Apply patch (requested by ahoka in ticket #795):
Add missing object file to build a properly working s3 module.
Fixes PR xsrc/41206.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.12.1 \
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.3.12.1
--- 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 Tue Jun 9 17:26:27 2009
@@ -1,10 +1,19 @@
-# $NetBSD: Makefile,v 1.3 2008/08/03 09:24:14 rtr Exp $
+# $NetBSD: Makefile,v 1.3.12.1 2009/06/09 17:26:27 snj Exp $
DRIVER= xf86-video-s3
DRIVER_NAME= s3_drv
-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.s3_driver.c= -Wno-error # XXX fix me please
.include "../Makefile.xf86-driver"
