CVS commit: src/external/mit/xorg/tools
Module Name:src
Committed By: mrg
Date: Sat Jul 20 03:54:50 UTC 2019
Modified Files:
src/external/mit/xorg/tools/fc-cache: Makefile
src/external/mit/xorg/tools/mkfontscale: Makefile
Log Message:
update for freetype 2.10.0
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/tools/fc-cache/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/tools/mkfontscale/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/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.16 src/external/mit/xorg/tools/fc-cache/Makefile:1.17
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.16 Fri Mar 8 09:58:24 2019
+++ src/external/mit/xorg/tools/fc-cache/Makefile Sat Jul 20 03:54:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/03/08 09:58:24 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2019/07/20 03:54:50 mrg Exp $
.include
@@ -22,7 +22,7 @@ SRCS.fontconfig= fcatomic.c fccache.c fc
ftglue.c
.PATH: ${FREETYPE}/src/base
-SRCS.freetype= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c \
+SRCS.freetype= ftbase.c ftbbox.c ftbdf.c ftdebug.c \
ftglyph.c ftinit.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \
ftsystem.c fttype1.c ftwinfnt.c ftbitmap.c
Index: src/external/mit/xorg/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.14 src/external/mit/xorg/tools/mkfontscale/Makefile:1.15
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.14 Sun Mar 3 09:26:04 2019
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Sat Jul 20 03:54:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/03/03 09:26:04 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2019/07/20 03:54:50 mrg Exp $
.include
@@ -10,7 +10,7 @@ FREETYPE= ${X11SRCDIR.freetype}
SRCS.mkfontscale= mkfontscale.c hash.c ident.c list.c constlist.c
.PATH: ${FREETYPE}/src/base
-SRCS.freetype+= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c \
+SRCS.freetype+= ftbase.c ftbbox.c ftbdf.c ftdebug.c \
ftglyph.c ftinit.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \
ftsystem.c fttype1.c ftwinfnt.c ftbitmap.c
CVS commit: src/external/mit/xorg/tools
Module Name:src Committed By: mrg Date: Sat Jul 20 03:54:50 UTC 2019 Modified Files: src/external/mit/xorg/tools/fc-cache: Makefile src/external/mit/xorg/tools/mkfontscale: Makefile Log Message: update for freetype 2.10.0 To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/tools/fc-cache/Makefile cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/tools/mkfontscale/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: mrg Date: Sat Jul 20 02:06:12 UTC 2019 Modified Files: src/distrib/sets/lists/xbase: shl.mi src/distrib/sets/lists/xdebug: shl.mi src/external/mit/xorg/lib/freetype: Makefile shlib_version Log Message: updates for freetype 2.10.0 To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.87 src/distrib/sets/lists/xbase/shl.mi cvs rdiff -u -r1.51 -r1.52 src/distrib/sets/lists/xdebug/shl.mi cvs rdiff -u -r1.21 -r1.22 src/external/mit/xorg/lib/freetype/Makefile cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/lib/freetype/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: mrg
Date: Sat Jul 20 02:06:12 UTC 2019
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/freetype: Makefile shlib_version
Log Message:
updates for freetype 2.10.0
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.51 -r1.52 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.21 -r1.22 src/external/mit/xorg/lib/freetype/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/lib/freetype/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.86 src/distrib/sets/lists/xbase/shl.mi:1.87
--- src/distrib/sets/lists/xbase/shl.mi:1.86 Tue Jul 9 22:17:33 2019
+++ src/distrib/sets/lists/xbase/shl.mi Sat Jul 20 02:06:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.86 2019/07/09 22:17:33 mrg Exp $
+# $NetBSD: shl.mi,v 1.87 2019/07/20 02:06:12 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -183,8 +183,8 @@
./usr/X11R7/lib/libfontenc.so.2 -unknown- xorg,compatx11file
./usr/X11R7/lib/libfontenc.so.2.0 -unknown- xorg,compatx11file
./usr/X11R7/lib/libfreetype.so -unknown- xorg,compatx11file
-./usr/X11R7/lib/libfreetype.so.18 -unknown- xorg,compatx11file
-./usr/X11R7/lib/libfreetype.so.18.16.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libfreetype.so.19 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libfreetype.so.19.0 -unknown- xorg,compatx11file
./usr/X11R7/lib/libgbm.so -unknown- xorg,compatx11file
./usr/X11R7/lib/libgbm.so.1 -unknown- xorg,compatx11file
./usr/X11R7/lib/libgbm.so.1.0 -unknown- xorg,compatx11file
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.51 src/distrib/sets/lists/xdebug/shl.mi:1.52
--- src/distrib/sets/lists/xdebug/shl.mi:1.51 Tue Jul 9 22:17:34 2019
+++ src/distrib/sets/lists/xdebug/shl.mi Sat Jul 20 02:06:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.51 2019/07/09 22:17:34 mrg Exp $
+# $NetBSD: shl.mi,v 1.52 2019/07/20 02:06:12 mrg Exp $
./usr/libdata/debug/usr/X11R7/lib -unknown- xorg,debug,compatx11dir
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug xorg,obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug xorg,obsolete xorg,obsolete
@@ -62,7 +62,7 @@
./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug xdebug-obsolete xorg,obsolete,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.3.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.18.16.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.19.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libgbm.so.1.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libglapi.so.1.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug -unknown- xorg,debug,compatx11file
Index: src/external/mit/xorg/lib/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/Makefile:1.21 src/external/mit/xorg/lib/freetype/Makefile:1.22
--- src/external/mit/xorg/lib/freetype/Makefile:1.21 Wed Jun 6 02:20:07 2018
+++ src/external/mit/xorg/lib/freetype/Makefile Sat Jul 20 02:06:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2018/06/06 02:20:07 snj Exp $
+# $NetBSD: Makefile,v 1.22 2019/07/20 02:06:12 mrg Exp $
.include
@@ -15,7 +15,7 @@ INCSDIR=${X11INCDIR}/freetype2
INCS= ft2build.h
.PATH: ${FREETYPE}/src/base
-SRCS= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftfstype.c \
+SRCS= ftbase.c ftbbox.c ftbdf.c ftdebug.c ftfstype.c \
ftglyph.c ftinit.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \
ftsystem.c fttype1.c ftwinfnt.c ftbitmap.c ftcid.c \
ftgasp.c ftgxval.c ftotval.c ftpatent.c
@@ -103,7 +103,7 @@ LIBDPLIBS= \
PKGCONFIG= freetype2
PKGDIST.freetype2= ${.CURDIR}
-PKGCONFIG_VERSION.freetype2= 22.1.16
+PKGCONFIG_VERSION.freetype2= 23:0:17
.include
.include
Index: src/external/mit/xorg/lib/freetype/shlib_version
diff -u src/external/mit/xorg/lib/freetype/shlib_version:1.12 src/external/mit/xorg/lib/freetype/shlib_version:1.13
--- src/external/mit/xorg/lib/freetype/shlib_version:1.12 Wed Jun 6 03:09:12 2018
+++ src/external/mit/xorg/lib/freetype/shlib_version Sat Jul 20 02:06:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.12 2018/06/06 03:09:12 snj Exp $
+# $NetBSD: shlib_version,v 1.13 2019/07/20 02:06:12 mrg Exp $
#
# XXX our freetype shlib versioning is insane. the rest of the world
# uses a major of 6. we used to, but it was bumped to 7 for 64 bit
CVS commit: xsrc/external/mit/freetype/dist
Module Name:xsrc Committed By: mrg Date: Sat Jul 20 02:04:53 UTC 2019 Modified Files: xsrc/external/mit/freetype/dist: CMakeLists.txt ChangeLog ChangeLog.20 ChangeLog.21 ChangeLog.22 ChangeLog.23 ChangeLog.24 Jamfile Jamrules Makefile README README.git autogen.sh configure modules.cfg vms_make.com xsrc/external/mit/freetype/dist/builds: detect.mk exports.mk freetype.mk link_dos.mk link_std.mk modules.mk toplevel.mk xsrc/external/mit/freetype/dist/builds/amiga: README makefile makefile.os4 smakefile xsrc/external/mit/freetype/dist/builds/amiga/include/config: ftconfig.h ftmodule.h xsrc/external/mit/freetype/dist/builds/amiga/src/base: ftdebug.c ftsystem.c xsrc/external/mit/freetype/dist/builds/ansi: ansi-def.mk ansi.mk xsrc/external/mit/freetype/dist/builds/beos: beos-def.mk beos.mk detect.mk xsrc/external/mit/freetype/dist/builds/cmake: iOS.cmake xsrc/external/mit/freetype/dist/builds/compiler: ansi-cc.mk bcc-dev.mk bcc.mk emx.mk gcc-dev.mk gcc.mk intelc.mk unix-lcc.mk visualage.mk visualc.mk watcom.mk win-lcc.mk xsrc/external/mit/freetype/dist/builds/dos: detect.mk dos-def.mk dos-emx.mk dos-gcc.mk dos-wat.mk xsrc/external/mit/freetype/dist/builds/mac: ftmac.c xsrc/external/mit/freetype/dist/builds/os2: detect.mk os2-def.mk os2-dev.mk os2-gcc.mk xsrc/external/mit/freetype/dist/builds/symbian: bld.inf freetype.mmp xsrc/external/mit/freetype/dist/builds/unix: config.guess config.sub configure configure.ac configure.raw detect.mk freetype-config.in freetype2.m4 ft-munmap.m4 ftconfig.in ftsystem.c install.mk unix-cc.in unix-def.in unix-dev.mk unix-lcc.mk unix.mk unixddef.mk xsrc/external/mit/freetype/dist/builds/vms: ftconfig.h ftsystem.c xsrc/external/mit/freetype/dist/builds/wince: ftdebug.c xsrc/external/mit/freetype/dist/builds/wince/vc2005-ce: freetype.vcproj index.html xsrc/external/mit/freetype/dist/builds/wince/vc2008-ce: freetype.vcproj index.html xsrc/external/mit/freetype/dist/builds/windows: detect.mk ftdebug.c w32-bcc.mk w32-bccd.mk w32-dev.mk w32-gcc.mk w32-icc.mk w32-intl.mk w32-lcc.mk w32-mingw32.mk w32-vcc.mk w32-wat.mk win32-def.mk xsrc/external/mit/freetype/dist/builds/windows/vc2010: freetype.vcxproj freetype.vcxproj.filters index.html xsrc/external/mit/freetype/dist/builds/windows/visualc: freetype.dsp freetype.vcproj index.html xsrc/external/mit/freetype/dist/builds/windows/visualce: freetype.dsp freetype.vcproj index.html xsrc/external/mit/freetype/dist/devel: ft2build.h ftoption.h xsrc/external/mit/freetype/dist/docs: CHANGES CUSTOMIZE DEBUG INSTALL INSTALL.ANY INSTALL.CROSS INSTALL.GNU INSTALL.UNIX INSTALL.VMS MAKEPP TODO formats.txt freetype-config.1 raster.txt release xsrc/external/mit/freetype/dist/include: ft2build.h xsrc/external/mit/freetype/dist/include/freetype: freetype.h ftadvanc.h ftbbox.h ftbdf.h ftbitmap.h ftbzip2.h ftcache.h ftchapters.h ftcid.h fterrdef.h fterrors.h ftgasp.h ftglyph.h ftgxval.h ftgzip.h ftimage.h ftincrem.h ftlcdfil.h ftlist.h ftlzw.h ftmac.h ftmm.h ftmodapi.h ftmoderr.h ftotval.h ftoutln.h ftpfr.h ftrender.h ftsizes.h ftsnames.h ftstroke.h ftsynth.h ftsystem.h fttrigon.h fttypes.h ftwinfnt.h t1tables.h ttnameid.h tttables.h tttags.h xsrc/external/mit/freetype/dist/include/freetype/config: ftconfig.h ftheader.h ftmodule.h ftoption.h ftstdlib.h xsrc/external/mit/freetype/dist/include/freetype/internal: autohint.h ftcalc.h ftdebug.h ftgloadr.h ftmemory.h ftobjs.h ftrfork.h ftserv.h ftstream.h fttrace.h ftvalid.h internal.h psaux.h pshints.h sfnt.h t1types.h tttypes.h xsrc/external/mit/freetype/dist/include/freetype/internal/services: svbdf.h svcid.h svgldict.h svgxval.h svkern.h svmm.h svotval.h svpfr.h svpostnm.h svprop.h svpscmap.h svpsinfo.h svsfnt.h svttcmap.h svtteng.h svttglyf.h svwinfnt.h xsrc/external/mit/freetype/dist/src: Jamfile xsrc/external/mit/freetype/dist/src/autofit: Jamfile afangles.c afblue.c afblue.cin afblue.dat afblue.h afblue.hin afcjk.c afcjk.h afcover.h afdummy.c afdummy.h aferrors.h afglobal.c afglobal.h afhints.c afhints.h afindic.c afindic.h aflatin.c aflatin.h aflatin2.c aflatin2.h afloader.c afloader.h afmodule.c afmodule.h afranges.c afranges.h afscript.h afstyles.h aftypes.h afwarp.c afwarp.h afwrtsys.h autofit.c module.mk rules.mk
CVS commit: xsrc/external/mit/freetype/dist
Module Name:xsrc Committed By: mrg Date: Sat Jul 20 02:04:53 UTC 2019 Modified Files: xsrc/external/mit/freetype/dist: CMakeLists.txt ChangeLog ChangeLog.20 ChangeLog.21 ChangeLog.22 ChangeLog.23 ChangeLog.24 Jamfile Jamrules Makefile README README.git autogen.sh configure modules.cfg vms_make.com xsrc/external/mit/freetype/dist/builds: detect.mk exports.mk freetype.mk link_dos.mk link_std.mk modules.mk toplevel.mk xsrc/external/mit/freetype/dist/builds/amiga: README makefile makefile.os4 smakefile xsrc/external/mit/freetype/dist/builds/amiga/include/config: ftconfig.h ftmodule.h xsrc/external/mit/freetype/dist/builds/amiga/src/base: ftdebug.c ftsystem.c xsrc/external/mit/freetype/dist/builds/ansi: ansi-def.mk ansi.mk xsrc/external/mit/freetype/dist/builds/beos: beos-def.mk beos.mk detect.mk xsrc/external/mit/freetype/dist/builds/cmake: iOS.cmake xsrc/external/mit/freetype/dist/builds/compiler: ansi-cc.mk bcc-dev.mk bcc.mk emx.mk gcc-dev.mk gcc.mk intelc.mk unix-lcc.mk visualage.mk visualc.mk watcom.mk win-lcc.mk xsrc/external/mit/freetype/dist/builds/dos: detect.mk dos-def.mk dos-emx.mk dos-gcc.mk dos-wat.mk xsrc/external/mit/freetype/dist/builds/mac: ftmac.c xsrc/external/mit/freetype/dist/builds/os2: detect.mk os2-def.mk os2-dev.mk os2-gcc.mk xsrc/external/mit/freetype/dist/builds/symbian: bld.inf freetype.mmp xsrc/external/mit/freetype/dist/builds/unix: config.guess config.sub configure configure.ac configure.raw detect.mk freetype-config.in freetype2.m4 ft-munmap.m4 ftconfig.in ftsystem.c install.mk unix-cc.in unix-def.in unix-dev.mk unix-lcc.mk unix.mk unixddef.mk xsrc/external/mit/freetype/dist/builds/vms: ftconfig.h ftsystem.c xsrc/external/mit/freetype/dist/builds/wince: ftdebug.c xsrc/external/mit/freetype/dist/builds/wince/vc2005-ce: freetype.vcproj index.html xsrc/external/mit/freetype/dist/builds/wince/vc2008-ce: freetype.vcproj index.html xsrc/external/mit/freetype/dist/builds/windows: detect.mk ftdebug.c w32-bcc.mk w32-bccd.mk w32-dev.mk w32-gcc.mk w32-icc.mk w32-intl.mk w32-lcc.mk w32-mingw32.mk w32-vcc.mk w32-wat.mk win32-def.mk xsrc/external/mit/freetype/dist/builds/windows/vc2010: freetype.vcxproj freetype.vcxproj.filters index.html xsrc/external/mit/freetype/dist/builds/windows/visualc: freetype.dsp freetype.vcproj index.html xsrc/external/mit/freetype/dist/builds/windows/visualce: freetype.dsp freetype.vcproj index.html xsrc/external/mit/freetype/dist/devel: ft2build.h ftoption.h xsrc/external/mit/freetype/dist/docs: CHANGES CUSTOMIZE DEBUG INSTALL INSTALL.ANY INSTALL.CROSS INSTALL.GNU INSTALL.UNIX INSTALL.VMS MAKEPP TODO formats.txt freetype-config.1 raster.txt release xsrc/external/mit/freetype/dist/include: ft2build.h xsrc/external/mit/freetype/dist/include/freetype: freetype.h ftadvanc.h ftbbox.h ftbdf.h ftbitmap.h ftbzip2.h ftcache.h ftchapters.h ftcid.h fterrdef.h fterrors.h ftgasp.h ftglyph.h ftgxval.h ftgzip.h ftimage.h ftincrem.h ftlcdfil.h ftlist.h ftlzw.h ftmac.h ftmm.h ftmodapi.h ftmoderr.h ftotval.h ftoutln.h ftpfr.h ftrender.h ftsizes.h ftsnames.h ftstroke.h ftsynth.h ftsystem.h fttrigon.h fttypes.h ftwinfnt.h t1tables.h ttnameid.h tttables.h tttags.h xsrc/external/mit/freetype/dist/include/freetype/config: ftconfig.h ftheader.h ftmodule.h ftoption.h ftstdlib.h xsrc/external/mit/freetype/dist/include/freetype/internal: autohint.h ftcalc.h ftdebug.h ftgloadr.h ftmemory.h ftobjs.h ftrfork.h ftserv.h ftstream.h fttrace.h ftvalid.h internal.h psaux.h pshints.h sfnt.h t1types.h tttypes.h xsrc/external/mit/freetype/dist/include/freetype/internal/services: svbdf.h svcid.h svgldict.h svgxval.h svkern.h svmm.h svotval.h svpfr.h svpostnm.h svprop.h svpscmap.h svpsinfo.h svsfnt.h svttcmap.h svtteng.h svttglyf.h svwinfnt.h xsrc/external/mit/freetype/dist/src: Jamfile xsrc/external/mit/freetype/dist/src/autofit: Jamfile afangles.c afblue.c afblue.cin afblue.dat afblue.h afblue.hin afcjk.c afcjk.h afcover.h afdummy.c afdummy.h aferrors.h afglobal.c afglobal.h afhints.c afhints.h afindic.c afindic.h aflatin.c aflatin.h aflatin2.c aflatin2.h afloader.c afloader.h afmodule.c afmodule.h afranges.c afranges.h afscript.h afstyles.h aftypes.h afwarp.c afwarp.h afwrtsys.h autofit.c module.mk rules.mk
CVS import: xsrc/external/mit/freetype/dist
Module Name:xsrc Committed By: mrg Date: Sat Jul 20 01:54:03 UTC 2019 Update of /cvsroot/xsrc/external/mit/freetype/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12582 Log Message: initial import of freetype-2.10.0 Status: Vendor Tag: xorg Release Tags: freetype-2-10-0 C xsrc/external/mit/freetype/dist/ChangeLog.24 C xsrc/external/mit/freetype/dist/autogen.sh C xsrc/external/mit/freetype/dist/configure C xsrc/external/mit/freetype/dist/modules.cfg U xsrc/external/mit/freetype/dist/ChangeLog.27 U xsrc/external/mit/freetype/dist/version.sed C xsrc/external/mit/freetype/dist/vms_make.com C xsrc/external/mit/freetype/dist/Jamrules U xsrc/external/mit/freetype/dist/ChangeLog.28 C xsrc/external/mit/freetype/dist/CMakeLists.txt U xsrc/external/mit/freetype/dist/ChangeLog.25 U xsrc/external/mit/freetype/dist/ChangeLog.26 C xsrc/external/mit/freetype/dist/ChangeLog C xsrc/external/mit/freetype/dist/ChangeLog.21 C xsrc/external/mit/freetype/dist/Jamfile C xsrc/external/mit/freetype/dist/README C xsrc/external/mit/freetype/dist/ChangeLog.20 C xsrc/external/mit/freetype/dist/ChangeLog.22 C xsrc/external/mit/freetype/dist/Makefile C xsrc/external/mit/freetype/dist/ChangeLog.23 C xsrc/external/mit/freetype/dist/README.git C xsrc/external/mit/freetype/dist/devel/ft2build.h C xsrc/external/mit/freetype/dist/devel/ftoption.h C xsrc/external/mit/freetype/dist/docs/MAKEPP U xsrc/external/mit/freetype/dist/docs/PROBLEMS C xsrc/external/mit/freetype/dist/docs/TODO U xsrc/external/mit/freetype/dist/docs/VERSIONS.TXT C xsrc/external/mit/freetype/dist/docs/formats.txt U xsrc/external/mit/freetype/dist/docs/FTL.TXT U xsrc/external/mit/freetype/dist/docs/GPLv2.TXT U xsrc/external/mit/freetype/dist/docs/CMAKE C xsrc/external/mit/freetype/dist/docs/CUSTOMIZE C xsrc/external/mit/freetype/dist/docs/DEBUG N xsrc/external/mit/freetype/dist/docs/DOCGUIDE C xsrc/external/mit/freetype/dist/docs/INSTALL C xsrc/external/mit/freetype/dist/docs/INSTALL.ANY C xsrc/external/mit/freetype/dist/docs/INSTALL.CROSS C xsrc/external/mit/freetype/dist/docs/INSTALL.GNU U xsrc/external/mit/freetype/dist/docs/INSTALL.MAC C xsrc/external/mit/freetype/dist/docs/INSTALL.UNIX C xsrc/external/mit/freetype/dist/docs/INSTALL.VMS U xsrc/external/mit/freetype/dist/docs/LICENSE.TXT C xsrc/external/mit/freetype/dist/docs/raster.txt C xsrc/external/mit/freetype/dist/docs/release C xsrc/external/mit/freetype/dist/docs/CHANGES C xsrc/external/mit/freetype/dist/docs/freetype-config.1 U xsrc/external/mit/freetype/dist/docs/reference/README N xsrc/external/mit/freetype/dist/docs/reference/site/404.html N xsrc/external/mit/freetype/dist/docs/reference/site/sitemap.xml N xsrc/external/mit/freetype/dist/docs/reference/site/sitemap.xml.gz N xsrc/external/mit/freetype/dist/docs/reference/site/index.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-auto_hinter.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-base_interface.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-basic_types.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-bdf_fonts.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-bitmap_handling.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-bzip2.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-cache_subsystem.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-cff_driver.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-cid_fonts.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-color_management.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-computations.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-error_code_values.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-error_enumerations.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-font_formats.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-gasp_table.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-glyph_management.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-glyph_stroker.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-glyph_variants.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-gx_validation.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-gzip.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-header_file_macros.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-header_inclusion.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-incremental.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-index.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-layer_management.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-lcd_rendering.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-list_processing.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-lzw.html N
CVS import: xsrc/external/mit/freetype/dist
Module Name:xsrc Committed By: mrg Date: Sat Jul 20 01:54:03 UTC 2019 Update of /cvsroot/xsrc/external/mit/freetype/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12582 Log Message: initial import of freetype-2.10.0 Status: Vendor Tag: xorg Release Tags: freetype-2-10-0 C xsrc/external/mit/freetype/dist/ChangeLog.24 C xsrc/external/mit/freetype/dist/autogen.sh C xsrc/external/mit/freetype/dist/configure C xsrc/external/mit/freetype/dist/modules.cfg U xsrc/external/mit/freetype/dist/ChangeLog.27 U xsrc/external/mit/freetype/dist/version.sed C xsrc/external/mit/freetype/dist/vms_make.com C xsrc/external/mit/freetype/dist/Jamrules U xsrc/external/mit/freetype/dist/ChangeLog.28 C xsrc/external/mit/freetype/dist/CMakeLists.txt U xsrc/external/mit/freetype/dist/ChangeLog.25 U xsrc/external/mit/freetype/dist/ChangeLog.26 C xsrc/external/mit/freetype/dist/ChangeLog C xsrc/external/mit/freetype/dist/ChangeLog.21 C xsrc/external/mit/freetype/dist/Jamfile C xsrc/external/mit/freetype/dist/README C xsrc/external/mit/freetype/dist/ChangeLog.20 C xsrc/external/mit/freetype/dist/ChangeLog.22 C xsrc/external/mit/freetype/dist/Makefile C xsrc/external/mit/freetype/dist/ChangeLog.23 C xsrc/external/mit/freetype/dist/README.git C xsrc/external/mit/freetype/dist/devel/ft2build.h C xsrc/external/mit/freetype/dist/devel/ftoption.h C xsrc/external/mit/freetype/dist/docs/MAKEPP U xsrc/external/mit/freetype/dist/docs/PROBLEMS C xsrc/external/mit/freetype/dist/docs/TODO U xsrc/external/mit/freetype/dist/docs/VERSIONS.TXT C xsrc/external/mit/freetype/dist/docs/formats.txt U xsrc/external/mit/freetype/dist/docs/FTL.TXT U xsrc/external/mit/freetype/dist/docs/GPLv2.TXT U xsrc/external/mit/freetype/dist/docs/CMAKE C xsrc/external/mit/freetype/dist/docs/CUSTOMIZE C xsrc/external/mit/freetype/dist/docs/DEBUG N xsrc/external/mit/freetype/dist/docs/DOCGUIDE C xsrc/external/mit/freetype/dist/docs/INSTALL C xsrc/external/mit/freetype/dist/docs/INSTALL.ANY C xsrc/external/mit/freetype/dist/docs/INSTALL.CROSS C xsrc/external/mit/freetype/dist/docs/INSTALL.GNU U xsrc/external/mit/freetype/dist/docs/INSTALL.MAC C xsrc/external/mit/freetype/dist/docs/INSTALL.UNIX C xsrc/external/mit/freetype/dist/docs/INSTALL.VMS U xsrc/external/mit/freetype/dist/docs/LICENSE.TXT C xsrc/external/mit/freetype/dist/docs/raster.txt C xsrc/external/mit/freetype/dist/docs/release C xsrc/external/mit/freetype/dist/docs/CHANGES C xsrc/external/mit/freetype/dist/docs/freetype-config.1 U xsrc/external/mit/freetype/dist/docs/reference/README N xsrc/external/mit/freetype/dist/docs/reference/site/404.html N xsrc/external/mit/freetype/dist/docs/reference/site/sitemap.xml N xsrc/external/mit/freetype/dist/docs/reference/site/sitemap.xml.gz N xsrc/external/mit/freetype/dist/docs/reference/site/index.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-auto_hinter.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-base_interface.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-basic_types.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-bdf_fonts.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-bitmap_handling.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-bzip2.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-cache_subsystem.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-cff_driver.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-cid_fonts.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-color_management.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-computations.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-error_code_values.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-error_enumerations.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-font_formats.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-gasp_table.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-glyph_management.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-glyph_stroker.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-glyph_variants.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-gx_validation.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-gzip.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-header_file_macros.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-header_inclusion.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-incremental.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-index.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-layer_management.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-lcd_rendering.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-list_processing.html N xsrc/external/mit/freetype/dist/docs/reference/site/ft2-lzw.html N
CVS commit: src/sys/arch/arm/fdt
Module Name:src
Committed By: hkenken
Date: Fri Jul 19 12:14:16 UTC 2019
Modified Files:
src/sys/arch/arm/fdt: gic_fdt.c gicv3_fdt.c
Log Message:
Fixed compile error.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/fdt/gic_fdt.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/fdt/gicv3_fdt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/fdt/gic_fdt.c
diff -u src/sys/arch/arm/fdt/gic_fdt.c:1.16 src/sys/arch/arm/fdt/gic_fdt.c:1.17
--- src/sys/arch/arm/fdt/gic_fdt.c:1.16 Sat Jan 26 14:43:46 2019
+++ src/sys/arch/arm/fdt/gic_fdt.c Fri Jul 19 12:14:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gic_fdt.c,v 1.16 2019/01/26 14:43:46 thorpej Exp $ */
+/* $NetBSD: gic_fdt.c,v 1.17 2019/07/19 12:14:15 hkenken Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill
@@ -29,7 +29,7 @@
#include "pci.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: gic_fdt.c,v 1.16 2019/01/26 14:43:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic_fdt.c,v 1.17 2019/07/19 12:14:15 hkenken Exp $");
#include
#include
@@ -59,7 +59,7 @@ struct gic_fdt_irq;
static int gic_fdt_match(device_t, cfdata_t, void *);
static void gic_fdt_attach(device_t, device_t, void *);
-#if NPCI > 0
+#if NPCI > 0 && defined(__HAVE_PCI_MSI_MSIX)
static void gic_fdt_attach_v2m(struct gic_fdt_softc *, bus_space_tag_t, int);
#endif
@@ -179,7 +179,7 @@ gic_fdt_attach(device_t parent, device_t
arm_fdt_irq_set_handler(armgic_irq_handler);
-#if NPCI > 0
+#if NPCI > 0 && defined(__HAVE_PCI_MSI_MSIX)
for (int child = OF_child(phandle); child; child = OF_peer(child)) {
if (!fdtbus_status_okay(child))
continue;
@@ -190,7 +190,7 @@ gic_fdt_attach(device_t parent, device_t
#endif
}
-#if NPCI > 0
+#if NPCI > 0 && defined(__HAVE_PCI_MSI_MSIX)
static void
gic_fdt_attach_v2m(struct gic_fdt_softc *sc, bus_space_tag_t bst, int phandle)
{
Index: src/sys/arch/arm/fdt/gicv3_fdt.c
diff -u src/sys/arch/arm/fdt/gicv3_fdt.c:1.7 src/sys/arch/arm/fdt/gicv3_fdt.c:1.8
--- src/sys/arch/arm/fdt/gicv3_fdt.c:1.7 Sat Jan 26 14:43:46 2019
+++ src/sys/arch/arm/fdt/gicv3_fdt.c Fri Jul 19 12:14:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3_fdt.c,v 1.7 2019/01/26 14:43:46 thorpej Exp $ */
+/* $NetBSD: gicv3_fdt.c,v 1.8 2019/07/19 12:14:15 hkenken Exp $ */
/*-
* Copyright (c) 2015-2018 Jared McNeill
@@ -31,7 +31,7 @@
#define _INTR_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: gicv3_fdt.c,v 1.7 2019/01/26 14:43:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3_fdt.c,v 1.8 2019/07/19 12:14:15 hkenken Exp $");
#include
#include
@@ -61,7 +61,7 @@ static int gicv3_fdt_match(device_t, cfd
static void gicv3_fdt_attach(device_t, device_t, void *);
static int gicv3_fdt_map_registers(struct gicv3_fdt_softc *);
-#if NPCI > 0
+#if NPCI > 0 && defined(__HAVE_PCI_MSI_MSIX)
static void gicv3_fdt_attach_its(struct gicv3_fdt_softc *, bus_space_tag_t, int);
#endif
@@ -158,7 +158,7 @@ gicv3_fdt_attach(device_t parent, device
return;
}
-#if NPCI > 0
+#if NPCI > 0 && defined(__HAVE_PCI_MSI_MSIX)
for (int child = OF_child(phandle); child; child = OF_peer(child)) {
if (!fdtbus_status_okay(child))
continue;
@@ -238,7 +238,7 @@ gicv3_fdt_map_registers(struct gicv3_fdt
return 0;
}
-#if NPCI > 0
+#if NPCI > 0 && defined(__HAVE_PCI_MSI_MSIX)
static void
gicv3_fdt_attach_its(struct gicv3_fdt_softc *sc, bus_space_tag_t bst, int phandle)
{
CVS commit: src/sys/arch/arm/fdt
Module Name:src Committed By: hkenken Date: Fri Jul 19 12:14:16 UTC 2019 Modified Files: src/sys/arch/arm/fdt: gic_fdt.c gicv3_fdt.c Log Message: Fixed compile error. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/fdt/gic_fdt.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/fdt/gicv3_fdt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/sunxi
Module Name:src Committed By: bouyer Date: Fri Jul 19 10:54:26 UTC 2019 Modified Files: src/sys/arch/arm/sunxi: sunxi_hdmi.c Log Message: Don't allocate edid informations on stack, it's too large (struct edid_info is near 3KB), and causes a stack overflow, corrupting proc0's struct pcb. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/sunxi/sunxi_hdmi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/sunxi
Module Name:src
Committed By: bouyer
Date: Fri Jul 19 10:54:26 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi: sunxi_hdmi.c
Log Message:
Don't allocate edid informations on stack, it's too large (struct edid_info is
near 3KB), and causes a stack overflow, corrupting proc0's struct pcb.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/sunxi/sunxi_hdmi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/sunxi_hdmi.c
diff -u src/sys/arch/arm/sunxi/sunxi_hdmi.c:1.6 src/sys/arch/arm/sunxi/sunxi_hdmi.c:1.7
--- src/sys/arch/arm/sunxi/sunxi_hdmi.c:1.6 Sun Jan 27 02:08:37 2019
+++ src/sys/arch/arm/sunxi/sunxi_hdmi.c Fri Jul 19 10:54:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_hdmi.c,v 1.6 2019/01/27 02:08:37 pgoyette Exp $ */
+/* $NetBSD: sunxi_hdmi.c,v 1.7 2019/07/19 10:54:26 bouyer Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill
@@ -29,12 +29,13 @@
#include "opt_ddb.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: sunxi_hdmi.c,v 1.6 2019/01/27 02:08:37 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_hdmi.c,v 1.7 2019/07/19 10:54:26 bouyer Exp $");
#include
#include
#include
#include
+#include
#include
#include
#include
@@ -650,6 +651,8 @@ sunxi_hdmi_do_enable(struct sunxi_hdmi_s
delay(1000);
}
+#define EDID_BLOCK_SIZE 128
+
static int
sunxi_hdmi_read_edid_block(struct sunxi_hdmi_softc *sc, uint8_t *data,
uint8_t block)
@@ -663,27 +666,23 @@ sunxi_hdmi_read_edid_block(struct sunxi_
wbuf[0] = block; /* start address */
- if ((error = iic_exec(tag, I2C_OP_READ_WITH_STOP, DDC_ADDR, wbuf, 1,
- data, 128, I2C_F_POLL)) != 0) {
- iic_release_bus(tag, I2C_F_POLL);
- return error;
- }
+ error = iic_exec(tag, I2C_OP_READ_WITH_STOP, DDC_ADDR, wbuf, 1,
+ data, EDID_BLOCK_SIZE, I2C_F_POLL);
iic_release_bus(tag, I2C_F_POLL);
-
- return 0;
+ return error;
}
static void
sunxi_hdmi_read_edid(struct sunxi_hdmi_softc *sc)
{
const struct videomode *mode;
- char edid[128];
- struct edid_info ei;
+ char *edid;
+ struct edid_info *eip;
int retry = 4;
u_int display_mode;
- memset(edid, 0, sizeof(edid));
- memset(, 0, sizeof(ei));
+ edid = kmem_zalloc(EDID_BLOCK_SIZE, KM_SLEEP);
+ eip = kmem_zalloc(sizeof(struct edid_info), KM_SLEEP);
while (--retry > 0) {
if (!sunxi_hdmi_read_edid_block(sc, edid, 0))
@@ -692,18 +691,18 @@ sunxi_hdmi_read_edid(struct sunxi_hdmi_s
if (retry == 0) {
device_printf(sc->sc_dev, "failed to read EDID\n");
} else {
- if (edid_parse(edid, ) != 0) {
+ if (edid_parse(edid, eip) != 0) {
device_printf(sc->sc_dev, "failed to parse EDID\n");
}
#ifdef SUNXI_HDMI_DEBUG
else {
- edid_print();
+ edid_print(eip);
}
#endif
}
if (sc->sc_display_mode == DISPLAY_MODE_AUTO)
- display_mode = sunxi_hdmi_get_display_mode(sc, );
+ display_mode = sunxi_hdmi_get_display_mode(sc, eip);
else
display_mode = sc->sc_display_mode;
@@ -712,13 +711,13 @@ sunxi_hdmi_read_edid(struct sunxi_hdmi_s
device_printf(sc->sc_dev, "%s mode (%s)\n",
display_mode == DISPLAY_MODE_HDMI ? "HDMI" : "DVI", forced);
- strlcpy(sc->sc_display_vendor, ei.edid_vendorname,
+ strlcpy(sc->sc_display_vendor, eip->edid_vendorname,
sizeof(sc->sc_display_vendor));
- strlcpy(sc->sc_display_product, ei.edid_productname,
+ strlcpy(sc->sc_display_product, eip->edid_productname,
sizeof(sc->sc_display_product));
sc->sc_current_display_mode = display_mode;
- mode = ei.edid_preferred_mode;
+ mode = eip->edid_preferred_mode;
if (mode == NULL)
mode = pick_mode_by_ref(640, 480, 60);
@@ -735,15 +734,18 @@ sunxi_hdmi_read_edid(struct sunxi_hdmi_s
delay(2);
sunxi_hdmi_video_enable(sc, true);
}
+ kmem_free(edid, EDID_BLOCK_SIZE);
+ kmem_free(eip, sizeof(struct edid_info));
}
static u_int
sunxi_hdmi_get_display_mode(struct sunxi_hdmi_softc *sc,
const struct edid_info *ei)
{
- char edid[128];
+ char *edid;
bool found_hdmi = false;
unsigned int n, p;
+ edid = kmem_zalloc(EDID_BLOCK_SIZE, KM_SLEEP);
/*
* Scan through extension blocks, looking for a CEA-861-D v3
@@ -818,6 +820,7 @@ next_block:
}
}
+ kmem_free(edid, EDID_BLOCK_SIZE);
return found_hdmi ? DISPLAY_MODE_HDMI : DISPLAY_MODE_DVI;
}
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: knakahara Date: Fri Jul 19 08:49:44 UTC 2019 Modified Files: src/sys/arch/x86/pci: if_vmx.c Log Message: vmx(4) can be set IFEF_MPSAFE now. I tested bidirectional forwarding with some ioctls. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/x86/pci/if_vmx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/pci/if_vmx.c diff -u src/sys/arch/x86/pci/if_vmx.c:1.34 src/sys/arch/x86/pci/if_vmx.c:1.35 --- src/sys/arch/x86/pci/if_vmx.c:1.34 Fri Jul 19 08:46:32 2019 +++ src/sys/arch/x86/pci/if_vmx.c Fri Jul 19 08:49:44 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_vmx.c,v 1.34 2019/07/19 08:46:32 knakahara Exp $ */ +/* $NetBSD: if_vmx.c,v 1.35 2019/07/19 08:49:44 knakahara Exp $ */ /* $OpenBSD: if_vmx.c,v 1.16 2014/01/22 06:04:17 brad Exp $ */ /* @@ -19,7 +19,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.34 2019/07/19 08:46:32 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.35 2019/07/19 08:49:44 knakahara Exp $"); #include #include @@ -1705,6 +1705,7 @@ vmxnet3_setup_interface(struct vmxnet3_s strlcpy(ifp->if_xname, device_xname(sc->vmx_dev), IFNAMSIZ); ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_MULTICAST | IFF_SIMPLEX; + ifp->if_extflags = IFEF_MPSAFE; ifp->if_ioctl = vmxnet3_ioctl; ifp->if_start = vmxnet3_start; ifp->if_watchdog = NULL;
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: knakahara Date: Fri Jul 19 08:49:44 UTC 2019 Modified Files: src/sys/arch/x86/pci: if_vmx.c Log Message: vmx(4) can be set IFEF_MPSAFE now. I tested bidirectional forwarding with some ioctls. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/x86/pci/if_vmx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: knakahara Date: Fri Jul 19 08:46:32 UTC 2019 Modified Files: src/sys/arch/x86/pci: if_vmx.c Log Message: Store IFF_ALLMULTI in ec->ec_flags instead of ifp->if_flags. See such as if_wm.c:1.636. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/x86/pci/if_vmx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/pci/if_vmx.c diff -u src/sys/arch/x86/pci/if_vmx.c:1.33 src/sys/arch/x86/pci/if_vmx.c:1.34 --- src/sys/arch/x86/pci/if_vmx.c:1.33 Fri Jul 19 08:31:41 2019 +++ src/sys/arch/x86/pci/if_vmx.c Fri Jul 19 08:46:32 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_vmx.c,v 1.33 2019/07/19 08:31:41 knakahara Exp $ */ +/* $NetBSD: if_vmx.c,v 1.34 2019/07/19 08:46:32 knakahara Exp $ */ /* $OpenBSD: if_vmx.c,v 1.16 2014/01/22 06:04:17 brad Exp $ */ /* @@ -19,7 +19,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.33 2019/07/19 08:31:41 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.34 2019/07/19 08:46:32 knakahara Exp $"); #include #include @@ -2820,7 +2820,9 @@ vmxnet3_set_rxfilter(struct vmxnet3_soft uint8_t *p; ds->mcast_tablelen = 0; - CLR(ifp->if_flags, IFF_ALLMULTI); + ETHER_LOCK(ec); + CLR(ec->ec_flags, ETHER_F_ALLMULTI); + ETHER_UNLOCK(ec); /* * Always accept broadcast frames. @@ -2864,7 +2866,9 @@ vmxnet3_set_rxfilter(struct vmxnet3_soft goto setit; allmulti: - SET(ifp->if_flags, IFF_ALLMULTI); + ETHER_LOCK(ec); + SET(ec->ec_flags, ETHER_F_ALLMULTI); + ETHER_UNLOCK(ec); SET(mode, (VMXNET3_RXMODE_ALLMULTI | VMXNET3_RXMODE_MCAST)); if (ifp->if_flags & IFF_PROMISC) SET(mode, VMXNET3_RXMODE_PROMISC);
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: knakahara Date: Fri Jul 19 08:46:32 UTC 2019 Modified Files: src/sys/arch/x86/pci: if_vmx.c Log Message: Store IFF_ALLMULTI in ec->ec_flags instead of ifp->if_flags. See such as if_wm.c:1.636. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/x86/pci/if_vmx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: knakahara Date: Fri Jul 19 08:31:41 UTC 2019 Modified Files: src/sys/arch/x86/pci: if_vmx.c Log Message: vmx(4) enable jumbo frame. I tested 1600 mtu to/from Linux vmxnet3. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/x86/pci/if_vmx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/pci/if_vmx.c diff -u src/sys/arch/x86/pci/if_vmx.c:1.32 src/sys/arch/x86/pci/if_vmx.c:1.33 --- src/sys/arch/x86/pci/if_vmx.c:1.32 Tue Jul 16 10:12:10 2019 +++ src/sys/arch/x86/pci/if_vmx.c Fri Jul 19 08:31:41 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_vmx.c,v 1.32 2019/07/16 10:12:10 knakahara Exp $ */ +/* $NetBSD: if_vmx.c,v 1.33 2019/07/19 08:31:41 knakahara Exp $ */ /* $OpenBSD: if_vmx.c,v 1.16 2014/01/22 06:04:17 brad Exp $ */ /* @@ -19,7 +19,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.32 2019/07/16 10:12:10 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.33 2019/07/19 08:31:41 knakahara Exp $"); #include #include @@ -1721,7 +1721,7 @@ vmxnet3_setup_interface(struct vmxnet3_s sc->vmx_ethercom.ec_if.if_capabilities |= IFCAP_TSOv4 | IFCAP_TSOv6; sc->vmx_ethercom.ec_capabilities |= - ETHERCAP_VLAN_MTU | ETHERCAP_VLAN_HWTAGGING; + ETHERCAP_VLAN_MTU | ETHERCAP_VLAN_HWTAGGING | ETHERCAP_JUMBO_MTU; sc->vmx_ethercom.ec_capenable |= ETHERCAP_VLAN_HWTAGGING; IFQ_SET_MAXLEN(>if_snd, sc->vmx_ntxdescs);
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: knakahara Date: Fri Jul 19 08:31:41 UTC 2019 Modified Files: src/sys/arch/x86/pci: if_vmx.c Log Message: vmx(4) enable jumbo frame. I tested 1600 mtu to/from Linux vmxnet3. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/x86/pci/if_vmx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xinput/dist/src
Module Name:xsrc
Committed By: mrg
Date: Fri Jul 19 07:29:35 UTC 2019
Modified Files:
xsrc/external/mit/xinput/dist/src: xinput.c
Log Message:
merge xinput 1.6.3
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xinput/dist/src/xinput.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xinput/dist/src/xinput.c
diff -u xsrc/external/mit/xinput/dist/src/xinput.c:1.4 xsrc/external/mit/xinput/dist/src/xinput.c:1.5
--- xsrc/external/mit/xinput/dist/src/xinput.c:1.4 Wed Jul 22 08:36:10 2015
+++ xsrc/external/mit/xinput/dist/src/xinput.c Fri Jul 19 07:29:35 2019
@@ -273,7 +273,7 @@ find_device_info(Display *display,
return found;
}
-#ifdef HAVE_XI2
+#if HAVE_XI2
Bool is_pointer(int use)
{
return use == XIMasterPointer || use == XISlavePointer;
@@ -361,6 +361,26 @@ usage(void)
}
}
+static Bool
+is_xwayland(Display *dpy)
+{
+XDeviceInfo *devices;
+int n;
+Bool is_xwayland = False;
+
+devices = XListInputDevices(dpy, );
+while (n-- > 0) {
+if (strncmp(devices[n].name, "xwayland-", 9) == 0) {
+is_xwayland = True;
+break;
+}
+}
+
+XFreeDeviceList(devices);
+
+return is_xwayland;
+}
+
int
main(int argc, char * argv[])
{
@@ -402,6 +422,9 @@ main(int argc, char * argv[])
goto out;
}
+if (is_xwayland(display))
+fprintf(stderr, "WARNING: running xinput against an Xwayland server. See the xinput man page for details.\n");
+
while(driver->func_name) {
if (strcmp(driver->func_name, func) == 0) {
int r = (*driver->func)(display, argc-2, argv+2,
CVS import: xsrc/external/mit/xinput/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 19 07:29:07 UTC 2019 Update of /cvsroot/xsrc/external/mit/xinput/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25993 Log Message: initial import of xinput-1.6.3 Status: Vendor Tag: xorg Release Tags: xinput-1-6-3 U xsrc/external/mit/xinput/dist/configure U xsrc/external/mit/xinput/dist/config.sub U xsrc/external/mit/xinput/dist/configure.ac U xsrc/external/mit/xinput/dist/AUTHORS U xsrc/external/mit/xinput/dist/ChangeLog U xsrc/external/mit/xinput/dist/aclocal.m4 U xsrc/external/mit/xinput/dist/NEWS U xsrc/external/mit/xinput/dist/Makefile.in U xsrc/external/mit/xinput/dist/COPYING U xsrc/external/mit/xinput/dist/config.guess U xsrc/external/mit/xinput/dist/install-sh U xsrc/external/mit/xinput/dist/missing U xsrc/external/mit/xinput/dist/Makefile.am U xsrc/external/mit/xinput/dist/depcomp U xsrc/external/mit/xinput/dist/README U xsrc/external/mit/xinput/dist/INSTALL U xsrc/external/mit/xinput/dist/compile U xsrc/external/mit/xinput/dist/config.h.in U xsrc/external/mit/xinput/dist/src/setptr.c U xsrc/external/mit/xinput/dist/src/list.c U xsrc/external/mit/xinput/dist/src/test_xi2.c U xsrc/external/mit/xinput/dist/src/transform.c C xsrc/external/mit/xinput/dist/src/xinput.c U xsrc/external/mit/xinput/dist/src/xinput.h U xsrc/external/mit/xinput/dist/src/setcp.c U xsrc/external/mit/xinput/dist/src/Makefile.in U xsrc/external/mit/xinput/dist/src/property.c U xsrc/external/mit/xinput/dist/src/setmode.c U xsrc/external/mit/xinput/dist/src/feedback.c U xsrc/external/mit/xinput/dist/src/Makefile.am U xsrc/external/mit/xinput/dist/src/setint.c U xsrc/external/mit/xinput/dist/src/state.c U xsrc/external/mit/xinput/dist/src/hierarchy.c U xsrc/external/mit/xinput/dist/src/test.c U xsrc/external/mit/xinput/dist/src/buttonmap.c U xsrc/external/mit/xinput/dist/man/xinput.man U xsrc/external/mit/xinput/dist/man/Makefile.in U xsrc/external/mit/xinput/dist/man/Makefile.am 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xinput/dist
CVS import: xsrc/external/mit/xinput/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 19 07:29:07 UTC 2019 Update of /cvsroot/xsrc/external/mit/xinput/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25993 Log Message: initial import of xinput-1.6.3 Status: Vendor Tag: xorg Release Tags: xinput-1-6-3 U xsrc/external/mit/xinput/dist/configure U xsrc/external/mit/xinput/dist/config.sub U xsrc/external/mit/xinput/dist/configure.ac U xsrc/external/mit/xinput/dist/AUTHORS U xsrc/external/mit/xinput/dist/ChangeLog U xsrc/external/mit/xinput/dist/aclocal.m4 U xsrc/external/mit/xinput/dist/NEWS U xsrc/external/mit/xinput/dist/Makefile.in U xsrc/external/mit/xinput/dist/COPYING U xsrc/external/mit/xinput/dist/config.guess U xsrc/external/mit/xinput/dist/install-sh U xsrc/external/mit/xinput/dist/missing U xsrc/external/mit/xinput/dist/Makefile.am U xsrc/external/mit/xinput/dist/depcomp U xsrc/external/mit/xinput/dist/README U xsrc/external/mit/xinput/dist/INSTALL U xsrc/external/mit/xinput/dist/compile U xsrc/external/mit/xinput/dist/config.h.in U xsrc/external/mit/xinput/dist/src/setptr.c U xsrc/external/mit/xinput/dist/src/list.c U xsrc/external/mit/xinput/dist/src/test_xi2.c U xsrc/external/mit/xinput/dist/src/transform.c C xsrc/external/mit/xinput/dist/src/xinput.c U xsrc/external/mit/xinput/dist/src/xinput.h U xsrc/external/mit/xinput/dist/src/setcp.c U xsrc/external/mit/xinput/dist/src/Makefile.in U xsrc/external/mit/xinput/dist/src/property.c U xsrc/external/mit/xinput/dist/src/setmode.c U xsrc/external/mit/xinput/dist/src/feedback.c U xsrc/external/mit/xinput/dist/src/Makefile.am U xsrc/external/mit/xinput/dist/src/setint.c U xsrc/external/mit/xinput/dist/src/state.c U xsrc/external/mit/xinput/dist/src/hierarchy.c U xsrc/external/mit/xinput/dist/src/test.c U xsrc/external/mit/xinput/dist/src/buttonmap.c U xsrc/external/mit/xinput/dist/man/xinput.man U xsrc/external/mit/xinput/dist/man/Makefile.in U xsrc/external/mit/xinput/dist/man/Makefile.am 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xinput/dist
CVS commit: xsrc/external/mit/xinput/dist/src
Module Name:xsrc Committed By: mrg Date: Fri Jul 19 07:29:35 UTC 2019 Modified Files: xsrc/external/mit/xinput/dist/src: xinput.c Log Message: merge xinput 1.6.3 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xinput/dist/src/xinput.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
