CVS commit: [netbsd-6] src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: msaitoh
Date: Fri Dec 26 07:29:34 UTC 2014
Modified Files:
src/external/mit/xorg/server/xorg-server [netbsd-6]: Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1222):
external/mit/xorg/server/xorg-server/Makefile patch
Fix conversion of SDK_REQUIRED_MODULES which was reported by John D. Baker
in PR#49500.
To generate a diff of this commit:
cvs rdiff -u -r1.19.8.1 -r1.19.8.2 \
src/external/mit/xorg/server/xorg-server/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/xorg-server/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Makefile:1.19.8.1 src/external/mit/xorg/server/xorg-server/Makefile:1.19.8.2
--- src/external/mit/xorg/server/xorg-server/Makefile:1.19.8.1 Thu Dec 25 05:05:02 2014
+++ src/external/mit/xorg/server/xorg-server/Makefile Fri Dec 26 07:29:34 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19.8.1 2014/12/25 05:05:02 msaitoh Exp $
+# $NetBSD: Makefile,v 1.19.8.2 2014/12/26 07:29:34 msaitoh Exp $
.include bsd.own.mk
@@ -35,6 +35,7 @@ PKGCONFIG= xorg-server
# Use -fvisibility=hidden for symbol_visibility?
PKGCONFIG_SED_FLAGS= \
-e s,@sysconfigdir@,${X11ETCDIR},; \
+ s,@SDK_REQUIRED_MODULES@,xproto = 7.0.17 randrproto = 1.2.99.3 renderproto = 0.11 xextproto = 7.1.99 inputproto = 1.9.99.902 kbproto = 1.0.3 fontsproto,; \
s,@symbol_visibility@,,
.include bsd.x11.mk
CVS commit: [netbsd-6] src/external/mit/xorg
Module Name:src
Committed By: msaitoh
Date: Thu Dec 25 05:05:02 UTC 2014
Modified Files:
src/external/mit/xorg/include/xcb-proto [netbsd-6]: Makefile
src/external/mit/xorg/lib/fontconfig/src [netbsd-6]: Makefile
src/external/mit/xorg/server/xorg-server [netbsd-6]: Makefile
Log Message:
Pullup additional patches requested by mrg in ticket #1178:
external/mit/xorg/include/xcb-proto/Makefilepatch
external/mit/xorg/lib/fontconfig/src/Makefile patch
external/mit/xorg/server/xorg-server/Makefile patch
xsrc/external/mit/fontconfig/include/config.h patch
- Fix compile error on non x86 archs.
- Fix unexpanded @@ in .pc files.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.8.1 src/external/mit/xorg/include/xcb-proto/Makefile
cvs rdiff -u -r1.7.4.2 -r1.7.4.3 \
src/external/mit/xorg/lib/fontconfig/src/Makefile
cvs rdiff -u -r1.19 -r1.19.8.1 \
src/external/mit/xorg/server/xorg-server/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/include/xcb-proto/Makefile
diff -u src/external/mit/xorg/include/xcb-proto/Makefile:1.1 src/external/mit/xorg/include/xcb-proto/Makefile:1.1.8.1
--- src/external/mit/xorg/include/xcb-proto/Makefile:1.1 Sat Jul 17 23:44:29 2010
+++ src/external/mit/xorg/include/xcb-proto/Makefile Thu Dec 25 05:05:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/07/17 23:44:29 mrg Exp $
+# $NetBSD: Makefile,v 1.1.8.1 2014/12/25 05:05:02 msaitoh Exp $
.include bsd.own.mk
@@ -13,6 +13,8 @@ FILES= bigreq.xml composite.xml damage.x
FILESDIR=${X11SHAREDIR}/xcb
PKGCONFIG= xcb-proto
+PKGCONFIG_SED_FLAGS= \
+ -e s,@pythondir@,,
NOPROG= # defined
Index: src/external/mit/xorg/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.7.4.2 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.7.4.3
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.7.4.2 Sun Dec 21 19:12:10 2014
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Thu Dec 25 05:05:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7.4.2 2014/12/21 19:12:10 msaitoh Exp $
+# $NetBSD: Makefile,v 1.7.4.3 2014/12/25 05:05:02 msaitoh Exp $
.include bsd.own.mk
@@ -119,13 +119,28 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/free
.include Makefile.fcarch
+.if ${MACHINE} == amd64 || ${MACHINE} == i386
+CPPFLAGS+= -DHAVE_INTEL_ATOMIC_PRIMITIVES=1
+.endif
+
+.if ${MACHINE} == amd64 || ${MACHINE} == i386
+CPPFLAGS+= -DHAVE_INTEL_ATOMIC_PRIMITIVES=1
+.endif
+
CLEANFILES+= fcarch.h
PKGCONFIG= fontconfig
PKGCONFIG_SED_FLAGS= \
-e s,@sysconfdir@,${X11ETCDIR},; \
s,@localstatedir@,/var,; \
+ s,@PACKAGE@,${PKGDIST},; \
s,@BASECONFIGDIR@,/etc/fonts,; \
+ s,@PKGCONFIG_REQUIRES@,${PKGCONFIG_REQUIRES},; \
+ s,@PKGCONFIG_REQUIRES_PRIVATELY@,${PKGCONFIG_REQUIRES_PRIVATELY},; \
+ s,@EXPAT_CFLAGS@,,; \
+ s,@FREETYPE_CFLAGS@,-I${X11ROOTDIR}/include/freetype2 -I${X11ROOTDIR}/include,; \
+ s,@ICONV_CFLAGS@,,; \
+ s,@LIBXML2_CFLAGS@,,; \
s,@fc_cachedir@,${FONTCONFIG_PATH},
# XXX
Index: src/external/mit/xorg/server/xorg-server/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Makefile:1.19 src/external/mit/xorg/server/xorg-server/Makefile:1.19.8.1
--- src/external/mit/xorg/server/xorg-server/Makefile:1.19 Thu Jun 11 05:43:15 2009
+++ src/external/mit/xorg/server/xorg-server/Makefile Thu Dec 25 05:05:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/06/11 05:43:15 mrg Exp $
+# $NetBSD: Makefile,v 1.19.8.1 2014/12/25 05:05:02 msaitoh Exp $
.include bsd.own.mk
@@ -32,6 +32,10 @@ SUBDIR+= hw
.PATH: ${X11SRCDIR.xorg-server}
PKGCONFIG= xorg-server
+# Use -fvisibility=hidden for symbol_visibility?
+PKGCONFIG_SED_FLAGS= \
+ -e s,@sysconfigdir@,${X11ETCDIR},; \
+ s,@symbol_visibility@,,
.include bsd.x11.mk
.include bsd.man.mk
CVS commit: [netbsd-6] src/external/mit/xorg/server/xorg-server/Xi
Module Name:src
Committed By: snj
Date: Sun Dec 21 19:03:40 UTC 2014
Modified Files:
src/external/mit/xorg/server/xorg-server/Xi [netbsd-6]: Makefile
Log Message:
Apply patch (requested by mrg in ticket 1208):
Pass -Wno-error to work around a build failure on vax with gcc 4.1
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.4.1 \
src/external/mit/xorg/server/xorg-server/Xi/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/xorg-server/Xi/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.4 src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.4.4.1
--- src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.4 Thu Aug 11 23:15:41 2011
+++ src/external/mit/xorg/server/xorg-server/Xi/Makefile Sun Dec 21 19:03:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/08/11 23:15:41 joerg Exp $
+# $NetBSD: Makefile,v 1.4.4.1 2014/12/21 19:03:40 snj Exp $
.include ../Makefile.serverlib
.include ../Makefile.servermod
@@ -38,5 +38,8 @@ CPPFLAGS+= ${X11FLAGS.DIX}
CWARNFLAGS.clang+= -Wno-tautological-compare
+# XXX: uint16 vs INT_MAX
+COPTS.xichangehierarchy.c+= -Wno-error
+
.include bsd.x11.mk
.include bsd.lib.mk
CVS commit: [netbsd-6] src/external/mit/xorg
Module Name:src Committed By: msaitoh Date: Sun Dec 21 19:12:10 UTC 2014 Modified Files: src/external/mit/xorg/lib/fontconfig/etc [netbsd-6]: fonts.conf src/external/mit/xorg/lib/fontconfig/etc/conf.avail [netbsd-6]: Makefile src/external/mit/xorg/lib/fontconfig/etc/conf.d [netbsd-6]: Makefile src/external/mit/xorg/lib/fontconfig/src [netbsd-6]: Makefile Makefile.fcarch shlib_version src/external/mit/xorg/tools/fc-cache [netbsd-6]: Makefile Log Message: Pull up following revision(s) (requested by mrg in ticket #1178): external/mit/xorg/lib/fontconfig/etc/fonts.conf patch external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile patch external/mit/xorg/lib/fontconfig/etc/conf.d/Makefilepatch external/mit/xorg/lib/fontconfig/src/Makefile patch external/mit/xorg/lib/fontconfig/src/Makefile.fcarchpatch external/mit/xorg/lib/fontconfig/src/shlib_version patch external/mit/xorg/tools/fc-cache/Makefile patch xsrc/external/mit/fontconfig/Makefile.ampatch xsrc/external/mit/fontconfig/Makefile.inpatch xsrc/external/mit/fontconfig/ac_check_symbol.m4 patch xsrc/external/mit/fontconfig/ax_cc_for_build.m4 patch xsrc/external/mit/fontconfig/ax_create_stdint_h.m4 patch xsrc/external/mit/fontconfig/ax_pthread.m4 patch xsrc/external/mit/fontconfig/fc-pattern.1 patch xsrc/external/mit/fontconfig/fc-pattern.c patch xsrc/external/mit/fontconfig/fc-pattern.sgmlpatch xsrc/external/mit/fontconfig/fc-validate.1 patch xsrc/external/mit/fontconfig/fc-validate.c patch xsrc/external/mit/fontconfig/fc-validate.sgml patch xsrc/external/mit/fontconfig/libtool.m4 patch xsrc/external/mit/fontconfig/ltoptions.m4 patch xsrc/external/mit/fontconfig/ltsugar.m4 patch xsrc/external/mit/fontconfig/ltversion.m4 patch xsrc/external/mit/fontconfig/lt~obsolete.m4 patch xsrc/external/mit/fontconfig/dist/Tools.mk patch xsrc/external/mit/fontconfig/dist/compile patch xsrc/external/mit/fontconfig/dist/config-fixups.h patch xsrc/external/mit/fontconfig/dist/configure.ac patch xsrc/external/mit/fontconfig/dist/test-driver patch xsrc/external/mit/fontconfig/dist/conf.d/10-scale-bitmap-fonts.conf patch xsrc/external/mit/fontconfig/dist/conf.d/11-lcdfilter-default.conf patch xsrc/external/mit/fontconfig/dist/conf.d/11-lcdfilter-legacy.conf patch xsrc/external/mit/fontconfig/dist/conf.d/11-lcdfilter-light.confpatch xsrc/external/mit/fontconfig/dist/conf.d/README.in patch xsrc/external/mit/fontconfig/dist/doc/FcCacheCreateTagFile.3patch xsrc/external/mit/fontconfig/dist/doc/FcCharSetDelChar.3patch xsrc/external/mit/fontconfig/dist/doc/FcConfigGetSysRoot.3 patch xsrc/external/mit/fontconfig/dist/doc/FcConfigSetSysRoot.3 patch xsrc/external/mit/fontconfig/dist/doc/FcDirCacheClean.3 patch xsrc/external/mit/fontconfig/dist/doc/FcDirCacheRescan.3patch xsrc/external/mit/fontconfig/dist/doc/FcGetDefaultLangs.3 patch xsrc/external/mit/fontconfig/dist/doc/FcLangNormalize.3 patch xsrc/external/mit/fontconfig/dist/doc/FcLangSetDel.3patch xsrc/external/mit/fontconfig/dist/doc/FcLangSetSubtract.3 patch xsrc/external/mit/fontconfig/dist/doc/FcLangSetUnion.3 patch xsrc/external/mit/fontconfig/dist/doc/FcStrListFirst.3 patch xsrc/external/mit/fontconfig/dist/doc/fcatomic.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcblanks.sgml patch xsrc/external/mit/fontconfig/dist/doc/fccache.sgml patch xsrc/external/mit/fontconfig/dist/doc/fccharset.sgmlpatch xsrc/external/mit/fontconfig/dist/doc/fcconfig.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcconstant.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcdircache.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcfile.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcfontset.sgmlpatch xsrc/external/mit/fontconfig/dist/doc/fcformat.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcfreetype.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcinit.sgml patch xsrc/external/mit/fontconfig/dist/doc/fclangset.sgmlpatch xsrc/external/mit/fontconfig/dist/doc/fcmatrix.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcobjectset.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcobjecttype.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcpattern.sgmlpatch xsrc/external/mit/fontconfig/dist/doc/fcstring.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcstrset.sgml patch xsrc/external/mit/fontconfig/dist/doc/fcvalue.sgml patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccachecreatetagfile.html patch xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fccharsetdelchar.html patch
CVS commit: [netbsd-6] src/external/mit/xorg/lib/fontconfig/etc
Module Name:src Committed By: msaitoh Date: Wed Jun 11 15:46:39 UTC 2014 Modified Files: src/external/mit/xorg/lib/fontconfig/etc [netbsd-6]: fonts.conf Log Message: Pull up following revision(s) (requested by wiz in ticket #1077): external/mit/xorg/lib/fontconfig/etc/fonts.conf: revision 1.7 via patch Also look in new pkgsrc default path, /usr/pkg/share/fonts. Noted by tsutsui. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.6.1 \ src/external/mit/xorg/lib/fontconfig/etc/fonts.conf 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/lib/fontconfig/etc/fonts.conf diff -u src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.5 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.5.6.1 --- src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.5 Sat Feb 12 04:49:19 2011 +++ src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Wed Jun 11 15:46:39 2014 @@ -1,6 +1,6 @@ ?xml version=1.0? !DOCTYPE fontconfig SYSTEM fonts.dtd -!-- $NetBSD: fonts.conf,v 1.5 2011/02/12 04:49:19 jmcneill Exp $ -- +!-- $NetBSD: fonts.conf,v 1.5.6.1 2014/06/11 15:46:39 msaitoh Exp $ -- !-- /etc/fonts/fonts.conf file to configure system font access -- fontconfig @@ -26,6 +26,7 @@ dir/usr/X11R7/lib/X11/fonts/dir dir/usr/pkg/lib/X11/fonts/dir + dir/usr/pkg/share/fonts/dir dir~/.fonts/dir !--
CVS commit: [netbsd-6] src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src Committed By: bouyer Date: Sun Oct 20 13:40:00 UTC 2013 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-intel [netbsd-6]: Makefile Log Message: Pull up following revision(s) (requested by martin in ticket #971): external/mit/xorg/server/drivers/xf86-video-intel/Makefile: revision 1.11 Add missing i810_dri.c file to SRCS. PR xsrc/48315. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.4.1 \ src/external/mit/xorg/server/drivers/xf86-video-intel/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-intel/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.10 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.10.4.1 --- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.10 Thu Aug 11 23:15:40 2011 +++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Sun Oct 20 13:40:00 2013 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.10 2011/08/11 23:15:40 joerg Exp $ +# $NetBSD: Makefile,v 1.10.4.1 2013/10/20 13:40:00 bouyer Exp $ DRIVER= xf86-video-intel DRIVER_NAME= intel_drv SRCS= drmmode_display.c i810_accel.c i810_cursor.c i810_dga.c -SRCS+= i810_driver.c i810_io.c i810_memory.c i810_video.c +SRCS+= i810_dri.c i810_driver.c i810_io.c i810_memory.c i810_video.c SRCS+= i810_wmark.c i830_3d.c i830_accel.c i830_bios.c SRCS+= i830_batchbuffer.c i830_crt.c i830_cursor.c i830_debug.c SRCS+= i830_display.c i830_quirks.c i830_driver.c i830_dvo.c
CVS commit: [netbsd-6] src/external/mit/xorg/lib/libX11
Module Name:src
Committed By: msaitoh
Date: Wed Jun 12 03:52:39 UTC 2013
Modified Files:
src/external/mit/xorg/lib/libX11 [netbsd-6]: Makefile.libx11
Log Message:
Pull up following revision(s) (requested by mrg in ticket #901):
external/mit/xorg/lib/libX11/Makefile.libx11: revision 1.11
hack for old gcc.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.6.1 src/external/mit/xorg/lib/libX11/Makefile.libx11
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/lib/libX11/Makefile.libx11
diff -u src/external/mit/xorg/lib/libX11/Makefile.libx11:1.8 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.8.6.1
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.8 Wed Feb 23 07:53:29 2011
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11 Wed Jun 12 03:52:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libx11,v 1.8 2011/02/23 07:53:29 mrg Exp $
+# $NetBSD: Makefile.libx11,v 1.8.6.1 2013/06/12 03:52:39 msaitoh Exp $
LIB= X11
.PATH: ${X11SRCDIR.${LIB}}/src
@@ -461,5 +461,9 @@ COPTS.lcUTF8.c+= -Wno-error
COPTS.Font.c+= -Wno-error # XXX xf86bigfstr.h
COPTS.OpenDis.c+= -Wno-error # XXX xf86bigfstr.h
COPTS.XlibInt.c+= -Wno-error # XXX xcmiscstr.h
+.if ${HAVE_GCC} 45
+COPTS.LiHosts.c+= -Wno-error # XXX: old gcc figures out that const
+ # cond because nHosts max_hosts
+.endif
.include ${NETBSDSRCDIR}/external/mit/xorg/tools/makekeys/Makefile.makekeys
CVS commit: [netbsd-6] src/external/mit/xorg/lib/libXi
Module Name:src
Committed By: msaitoh
Date: Wed Jun 12 04:32:51 UTC 2013
Modified Files:
src/external/mit/xorg/lib/libXi [netbsd-6]: Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #902):
external/mit/xorg/lib/libXi/Makefile: revision 1.10
fix vax build issues - GCC 4.1 warns about always true comparisons
more than GCC 4.5 does.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.4.1 src/external/mit/xorg/lib/libXi/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/lib/libXi/Makefile
diff -u src/external/mit/xorg/lib/libXi/Makefile:1.8 src/external/mit/xorg/lib/libXi/Makefile:1.8.4.1
--- src/external/mit/xorg/lib/libXi/Makefile:1.8 Thu Aug 11 23:15:39 2011
+++ src/external/mit/xorg/lib/libXi/Makefile Wed Jun 12 04:32:51 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:39 joerg Exp $
+# $NetBSD: Makefile,v 1.8.4.1 2013/06/12 04:32:51 msaitoh Exp $
.include bsd.own.mk
@@ -79,6 +79,10 @@ PKGDIST= ${LIB}
COPTS.XExtInt.c+= -Wno-error # XXX
COPTS.XSndExEv.c+= -Wno-error # XXX
+.if ${HAVE_GCC} 45
+COPTS.XGetFCtl.c+= -Wno-error # XXX
+.endif
+
CWARNFLAGS.clang+= -Wno-pointer-sign
.include bsd.x11.mk
CVS commit: [netbsd-6] src/external/mit/xorg/server/drivers/xf86-input-keyboard
Module Name:src
Committed By: riz
Date: Thu Feb 14 21:43:10 UTC 2013
Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard [netbsd-6]:
Makefile
Log Message:
Apply revision 1.15 via patch as part of a fix for ticket 818.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.4.1 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/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-input-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.13 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.13.4.1
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.13 Tue Jun 21 11:42:20 2011
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile Thu Feb 14 21:43:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2011/06/21 11:42:20 nonaka Exp $
+# $NetBSD: Makefile,v 1.13.4.1 2013/02/14 21:43:10 riz Exp $
DRIVER= xf86-input-keyboard
DRIVER_NAME= kbd_drv
@@ -15,7 +15,7 @@ CPPFLAGS+= -DPCVT_SUPPORT
.if ${MACHINE_ARCH} == powerpc || ${MACHINE} == sparc || \
${MACHINE} == sparc64 || ${MACHINE} == sgimips || \
-${MACHINE} == shark
+${MACHINE} == shark || ${MACHINE} == evbarm
CPPFLAGS+= -DDEFAULT_TO_WSKBD
.endif
CVS commit: [netbsd-6] src/external/mit/xorg/server/drivers/xf86-video-radeon
Module Name:src Committed By: riz Date: Mon Feb 11 21:04:46 UTC 2013 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-radeon [netbsd-6]: Makefile Log Message: Pull up following revision(s) (requested by veego in ticket #812): external/mit/xorg/server/drivers/xf86-video-radeon/Makefile patch xsrc/external/mit/xf86-video-ati/dist/ChangeLog patch xsrc/external/mit/xf86-video-ati/dist/INSTALL patch xsrc/external/mit/xf86-video-ati/dist/Makefile.in patch xsrc/external/mit/xf86-video-ati/dist/aclocal.m4patch xsrc/external/mit/xf86-video-ati/dist/config.h.in patch xsrc/external/mit/xf86-video-ati/dist/configure patch xsrc/external/mit/xf86-video-ati/dist/configure.ac patch xsrc/external/mit/xf86-video-ati/dist/ltmain.sh patch xsrc/external/mit/xf86-video-ati/dist/man/Makefile.in patch xsrc/external/mit/xf86-video-ati/dist/man/radeon.manpatch xsrc/external/mit/xf86-video-ati/dist/src/Makefile.am patch xsrc/external/mit/xf86-video-ati/dist/src/Makefile.in patch xsrc/external/mit/xf86-video-ati/dist/src/ati.c patch xsrc/external/mit/xf86-video-ati/dist/src/ati.h patch xsrc/external/mit/xf86-video-ati/dist/src/ati_pciids_gen.h patch xsrc/external/mit/xf86-video-ati/dist/src/atipciids.h patch xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c patch xsrc/external/mit/xf86-video-ati/dist/src/atombios_output.c patch xsrc/external/mit/xf86-video-ati/dist/src/cayman_reg.h patch xsrc/external/mit/xf86-video-ati/dist/src/cayman_shader.c patch xsrc/external/mit/xf86-video-ati/dist/src/compat-api.h patch xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.c patch xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.h patch xsrc/external/mit/xf86-video-ati/dist/src/evergreen_accel.c patch xsrc/external/mit/xf86-video-ati/dist/src/evergreen_exa.c patch xsrc/external/mit/xf86-video-ati/dist/src/evergreen_reg.h patch xsrc/external/mit/xf86-video-ati/dist/src/evergreen_shader.cpatch xsrc/external/mit/xf86-video-ati/dist/src/evergreen_state.h patch xsrc/external/mit/xf86-video-ati/dist/src/evergreen_textured_videofuncs.c patch xsrc/external/mit/xf86-video-ati/dist/src/generic_bus.h patch xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c patch xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.cpatch xsrc/external/mit/xf86-video-ati/dist/src/r600_reg.hpatch xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.c patch xsrc/external/mit/xf86-video-ati/dist/src/r600_state.h patch xsrc/external/mit/xf86-video-ati/dist/src/r600_textured_videofuncs.cpatch xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon.h patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_accel.cpatch xsrc/external/mit/xf86-video-ati/dist/src/radeon_accelfuncs.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.h patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_bios.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipinfo_gen.h patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipset_gen.h patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_commonfuncs.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_cursor.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri2.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_drm.h patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_funcs.cpatch xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_render.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.h patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_kms.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_legacy_memory.cpatch
CVS commit: [netbsd-6] src/external/mit/xorg/server/drivers/xf86-video-nv
Module Name:src
Committed By: riz
Date: Thu Dec 13 17:38:07 UTC 2012
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nv [netbsd-6]: Makefile
Log Message:
Pull up following revision(s) (requested by macallan in ticket #739):
external/mit/xorg/server/drivers/xf86-video-nv/Makefile: revision 1.5
set AVOID_VGAHW on macppc, now this driver works out of the box
should probably be set on all machines where we never use VGA text mode
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.24.1 \
src/external/mit/xorg/server/drivers/xf86-video-nv/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-nv/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.4.24.1
--- src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.4 Sun Aug 3 14:47:26 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile Thu Dec 13 17:38:07 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/08/03 14:47:26 rtr Exp $
+# $NetBSD: Makefile,v 1.4.24.1 2012/12/13 17:38:07 riz Exp $
DRIVER= xf86-video-nv
DRIVER_NAME= nv_drv
@@ -11,4 +11,8 @@ SRCS+= g80_dac.c g80_display.c g80_dma.
SRCS+= g80_output.c g80_sor.c g80_xaa.c
MAN= nv.4
+.if ${MACHINE} == macppc
+CPPFLAGS+= -DAVOID_VGAHW
+.endif
+
.include ../Makefile.xf86-driver
