Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6]: src/external/mit/xorg/server/drivers/xf86-video-mga Pull up f...
details: https://anonhg.NetBSD.org/src/rev/d69864b5295d
branches: netbsd-6
changeset: 776684:d69864b5295d
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Fri Aug 08 05:47:57 2014 +0000
description:
Pull up following revision(s) (requested by mrg in ticket #1106):
src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile 1.10-1.12
xsrc/external/mit/xf86-video-mga/dist/ChangeLog 1.1.1.6-1.1.1.7
xsrc/external/mit/xf86-video-mga/dist/INSTALL 1.1.1.2
xsrc/external/mit/xf86-video-mga/dist/Makefile.in 1.1.1.6-1.1.1.7
xsrc/external/mit/xf86-video-mga/dist/aclocal.m4 1.1.1.6-1.1.1.7
xsrc/external/mit/xf86-video-mga/dist/config.guess 1.1.1.5-1.1.1.6
xsrc/external/mit/xf86-video-mga/dist/config.h.in 1.1.1.5-1.1.1.6
xsrc/external/mit/xf86-video-mga/dist/config.sub 1.1.1.5-1.1.1.6
xsrc/external/mit/xf86-video-mga/dist/configure 1.1.1.6-1.1.1.7
xsrc/external/mit/xf86-video-mga/dist/configure.ac 1.1.1.6-1.1.1.7
xsrc/external/mit/xf86-video-mga/dist/depcomp 1.1.1.5-1.1.1.6
xsrc/external/mit/xf86-video-mga/dist/install-sh 1.1.1.5-1.1.1.6
xsrc/external/mit/xf86-video-mga/dist/ltmain.sh 1.1.1.6
xsrc/external/mit/xf86-video-mga/dist/missing 1.1.1.4-1.1.1.5
xsrc/external/mit/xf86-video-mga/dist/man/Makefile.am 1.1.1.5
xsrc/external/mit/xf86-video-mga/dist/man/Makefile.in 1.1.1.6-1.1.1.7
xsrc/external/mit/xf86-video-mga/dist/man/mga.man 1.1.1.3
xsrc/external/mit/xf86-video-mga/dist/src/Makefile.am 1.1.1.2-1.1.1.3
xsrc/external/mit/xf86-video-mga/dist/src/Makefile.in 1.1.1.6-1.1.1.7
xsrc/external/mit/xf86-video-mga/dist/src/binding.h 1.1.1.2
xsrc/external/mit/xf86-video-mga/dist/src/client.h 1.1.1.2
xsrc/external/mit/xf86-video-mga/dist/src/clientlx.c delete
xsrc/external/mit/xf86-video-mga/dist/src/compat-api.h 1.1.1.1
xsrc/external/mit/xf86-video-mga/dist/src/mga.h 1.1.1.5-1.1.1.6
xsrc/external/mit/xf86-video-mga/dist/src/mga_arc.c 1.1.1.3
xsrc/external/mit/xf86-video-mga/dist/src/mga_bios.c 1.1.1.4
xsrc/external/mit/xf86-video-mga/dist/src/mga_common.h 1.1.1.2
xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c 1.3
xsrc/external/mit/xf86-video-mga/dist/src/mga_dacG.c 1.1.1.4
xsrc/external/mit/xf86-video-mga/dist/src/mga_dga.c 1.1.1.3
xsrc/external/mit/xf86-video-mga/dist/src/mga_dh.c 1.1.1.3
xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c 1.1.1.3-1.1.1.4
xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.h 1.1.1.2
xsrc/external/mit/xf86-video-mga/dist/src/mga_dripriv.h 1.1.1.2
xsrc/external/mit/xf86-video-mga/dist/src/mga_driver.c 1.1.1.6-1.1.1.7
xsrc/external/mit/xf86-video-mga/dist/src/mga_esc.c delete
xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c 1.2
xsrc/external/mit/xf86-video-mga/dist/src/mga_g450pll.c 1.1.1.3
xsrc/external/mit/xf86-video-mga/dist/src/mga_hwcurs.c 1.1.1.3
xsrc/external/mit/xf86-video-mga/dist/src/mga_macros.h 1.1.1.2
xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.c 1.1.1.5
xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.h 1.1.1.2
xsrc/external/mit/xf86-video-mga/dist/src/mga_reg.h 1.1.1.4
xsrc/external/mit/xf86-video-mga/dist/src/mga_sarea.h 1.1.1.2
xsrc/external/mit/xf86-video-mga/dist/src/mga_shadow.c 1.1.1.4
xsrc/external/mit/xf86-video-mga/dist/src/mga_storm.c 1.1.1.4-1.1.1.5
xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.c 1.3
xsrc/external/mit/xf86-video-mga/dist/src/mga_video.c 1.1.1.4
xsrc/external/mit/xf86-video-mga/dist/src/mgareg_flags.h 1.1.1.2
xsrc/external/mit/xf86-video-mga/dist/util/Makefile.in 1.1.1.6-1.1.1.7
xsrc/external/mit/xf86-video-mga/dist/util/stormdwg.c 1.1.1.2
Sync with -current (completely the same as of 2014/08/08):
- Added support for G200ER.
- Added support for G200SE Pilot3.
- Optimize use of bandwidth and increase maximum resolution to 1920x1200.
- Delete support for MGA's proprietary HAL: unifdef USEMGAHAL.
- Add support for Video Memory greater then 8M.
- Expand memory mapping of framebuffer from 8 to 16MB.
- When we can't load the xaa or exa modules, use shadowfb instead.
- Unbreak dual head (xinerama).
- This patch has been used in Debian, Ubuntu and Gentoo for years.
- Disable HW cursor by default on G200 server chips.
diffstat:
external/mit/xorg/server/drivers/xf86-video-mga/Makefile | 18 ++++++++--------
1 files changed, 9 insertions(+), 9 deletions(-)
diffs (49 lines):
diff -r 0e03e3f71189 -r d69864b5295d external/mit/xorg/server/drivers/xf86-video-mga/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-mga/Makefile Fri Aug 08 03:47:21 2014 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-mga/Makefile Fri Aug 08 05:47:57 2014 +0000
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.9 2011/08/11 23:15:40 joerg Exp $
+# $NetBSD: Makefile,v 1.9.4.1 2014/08/08 05:47:57 msaitoh Exp $
.include <bsd.own.mk>
DRIVER= xf86-video-mga
DRIVER_NAME= mga_drv
-SRCS= clientlx.c mga_arc.c mga_bios.c mga_dac3026.c mga_dacG.c
-SRCS+= mga_dga.c mga_dh.c mga_driver.c mga_esc.c mga_g450pll.c
+SRCS= mga_bios.c mga_dac3026.c mga_dacG.c
+SRCS+= mga_dga.c mga_dh.c mga_driver.c mga_g450pll.c
SRCS+= mga_halmod.c mga_hwcurs.c mga_merge.c mga_shadow.c
-SRCS+= mga_vga.c mga_video.c
+SRCS+= mga_vga.c mga_video.c mga_storm.c
MAN= mga.4
.if ${X11DRI} != "no"
-SRCS+= mga_dri.c
+#SRCS+= mga_dri.c
.endif
#if USE_EXA
@@ -21,17 +21,17 @@
#endif
#if USE_XAA
-SRCS+= mga_storm.c
-CPPFLAGS+= -DUSE_XAA
+SRCS+= mga_arc.c
+CPPFLAGS+= -DUSE_XAA -DHAVE_XAA_H
#endif
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
+#CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
CPPFLAGS.mga_driver.c= -Wno-error # XXX fix me please
CPPFLAGS.mga_dacG.c= -Wno-error # XXX fix me please
-CWARNFLAGS.clang+= -Wno-conversion -Wno-format
+CWARNFLAGS.clang+= -Wno-conversion -Wno-format -Wno-empty-body
.include "../Makefile.xf86-driver"
Home |
Main Index |
Thread Index |
Old Index