Mon Apr 13 19:39:57 2009 UTC ()
Update for 1.2.5:
- Reorder SRCS to match the generated Makefile
- Enable rhd_audio.c and rhd_hdmi.c
- Add r600_shader.c in the default cause
- Add r6xx_accel.c, r600_exa.c and r600_textured_videofuncs.c for DRI


(veego)
diff -r1.4 -r1.5 src/external/mit/xorg/server/drivers/xf86-video-radeonhd/Makefile
cvs diff -r1.4 -r1.5 src/external/mit/xorg/server/drivers/xf86-video-radeonhd/Attic/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/server/drivers/xf86-video-radeonhd/Attic/Makefile 2009/03/30 02:01:11 1.4
+++ src/external/mit/xorg/server/drivers/xf86-video-radeonhd/Attic/Makefile 2009/04/13 19:39:57 1.5
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1# $NetBSD: Makefile,v 1.4 2009/03/30 02:01:11 mrg Exp $ 1# $NetBSD: Makefile,v 1.5 2009/04/13 19:39:57 veego Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5DRIVER= xf86-video-radeonhd 5DRIVER= xf86-video-radeonhd
6DRIVER_NAME= radeonhd_drv 6DRIVER_NAME= radeonhd_drv
7 7
8.PATH: ${X11SRCDIR.${DRIVER}}/src/AtomBios 8.PATH: ${X11SRCDIR.${DRIVER}}/src/AtomBios
9SRCS.ATOMBIOS= CD_Operations.c Decoder.c hwserv_drv.c 9SRCS.ATOMBIOS= CD_Operations.c Decoder.c hwserv_drv.c
10 10
11.if ${X11DRI} != "no" 11.if ${X11DRI} != "no"
12SRCS.DRI= rhd_dri.c 12SRCS.DRI= rhd_dri.c r6xx_accel.c r600_exa.c
 13SRCS.DRI+= r600_textured_videofuncs.c
13CPPFLAGS+= -DUSE_DRI 14CPPFLAGS+= -DUSE_DRI
14CPPFLAGS+= ${X11FLAGS.DRI} 15CPPFLAGS+= ${X11FLAGS.DRI}
15.endif 16.endif
16 17
17SRCS.EXA= r5xx_exa.c radeon_exa_render.c 18SRCS.EXA= r5xx_exa.c radeon_exa_render.c
18 19
19SRCS= rhd_atombios.c rhd_i2c.c rhd_crtc.c rhd_connector.c 20SRCS= r5xx_accel.c r5xx_xaa.c r600_shader.c radeon_3d.c
20SRCS+= rhd_cursor.c rhd_dac.c rhd_driver.c rhd_edid.c 21SRCS+= radeon_textured_videofuncs.c rhd_atombios.c rhd_atomcrtc.c
21SRCS+= rhd_helper.c rhd_id.c rhd_lut.c rhd_lvtma.c rhd_modes.c 22SRCS+= rhd_atomout.c rhd_atompll.c rhd_audio.c rhd_biosscratch.c
22SRCS+= rhd_monitor.c rhd_output.c rhd_pll.c rhd_tmds.c 23SRCS+= rhd_connector.c rhd_crtc.c rhd_cs.c rhd_cursor.c rhd_dac.c
23SRCS+= rhd_vga.c rhd_mc.c rhd_shadow.c rhd_randr.c rhd_dig.c 24SRCS+= rhd_ddia.c rhd_dig.c rhd_driver.c rhd_edid.c rhd_hdmi.c
24SRCS+= rhd_ddia.c rhd_atomout.c rhd_atompll.c rhd_atomcrtc.c 25SRCS+= rhd_helper.c rhd_i2c.c rhd_id.c rhd_lut.c rhd_lvtma.c
25SRCS+= rhd_biosscratch.c 26SRCS+= rhd_mc.c rhd_modes.c rhd_monitor.c rhd_output.c rhd_pll.c
26#SRCS+= rhd_audio.c rhd_hdmi.c 27SRCS+= rhd_randr.c rhd_shadow.c rhd_tmds.c rhd_vga.c rhd_video.c
27SRCS+= rhd_cs.c r5xx_accel.c r5xx_xaa.c radeon_3d.c 28
28SRCS+= rhd_video.c radeon_textured_videofuncs.c 
29SRCS+= $(SRCS.EXA) $(SRCS.DRI) rhd_atomwrapper.c $(SRCS.ATOMBIOS) 29SRCS+= $(SRCS.EXA) $(SRCS.DRI) rhd_atomwrapper.c $(SRCS.ATOMBIOS)
30MAN= radeonhd.4 30MAN= radeonhd.4
31 31
32CPPFLAGS+= -DDRIVER_PARSER -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS 32CPPFLAGS+= -DDRIVER_PARSER -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS
33 33
34CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src/AtomBios/includes 34CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src/AtomBios/includes
35CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include 35CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
36 36
37# XXX 37# XXX
38COPTS= -Wno-error 38COPTS= -Wno-error
39 39
40.include "../Makefile.xf86-driver" 40.include "../Makefile.xf86-driver"