CVS commit: xsrc/external/mit/xf86-video-ati-kms/include
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 03:39:46 UTC 2017 Modified Files: xsrc/external/mit/xf86-video-ati-kms/include: config.h Log Message: update properly for xf86-vide-ati 7.8.0. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xf86-video-ati-kms/include/config.h 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/xf86-video-ati-kms/include/config.h diff -u xsrc/external/mit/xf86-video-ati-kms/include/config.h:1.3 xsrc/external/mit/xf86-video-ati-kms/include/config.h:1.4 --- xsrc/external/mit/xf86-video-ati-kms/include/config.h:1.3 Sun Mar 5 03:09:28 2017 +++ xsrc/external/mit/xf86-video-ati-kms/include/config.h Sun Mar 5 03:39:46 2017 @@ -89,7 +89,7 @@ #define PACKAGE_NAME "xf86-video-ati" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "xf86-video-ati 7.7.0" +#define PACKAGE_STRING "xf86-video-ati 7.8.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "xf86-video-ati" @@ -98,13 +98,13 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "7.7.0" +#define PACKAGE_VERSION "7.8.0" /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 7 /* Minor version of this package */ -#define PACKAGE_VERSION_MINOR 7 +#define PACKAGE_VERSION_MINOR 8 /* Patch version of this package */ #define PACKAGE_VERSION_PATCHLEVEL 0 @@ -119,7 +119,7 @@ #define USE_SYS_ENDIAN_H 1 /* Version number of package */ -#define VERSION "7.7.0" +#define VERSION "7.8.0" /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE
CVS commit: xsrc/external/mit/xf86-video-ati-kms/dist/src
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 03:38:40 UTC 2017 Removed Files: xsrc/external/mit/xf86-video-ati-kms/dist/src: atombios_crtc.c atombios_output.c generic_bus.h legacy_crtc.c legacy_output.c radeon_accelfuncs.c radeon_atombios.c radeon_atombios.h radeon_atomwrapper.c radeon_atomwrapper.h radeon_bios.c radeon_commonfuncs.c radeon_crtc.c radeon_cursor.c radeon_dri.c radeon_dri.h radeon_driver.c radeon_drm.h radeon_dummy_bufmgr.h radeon_legacy_memory.c radeon_macros.h radeon_mm_i2c.c radeon_modes.c radeon_output.c radeon_pm.c radeon_render.c radeon_tv.c radeon_tv.h radeon_vip.c theatre.c theatre.h theatre200.c theatre200.h theatre200_module.c theatre_detect.c theatre_detect.h theatre_detect_module.c theatre_module.c theatre_reg.h xsrc/external/mit/xf86-video-ati-kms/dist/src/AtomBios: CD_Operations.c Decoder.c hwserv_drv.c xsrc/external/mit/xf86-video-ati-kms/dist/src/AtomBios/includes: CD_Common_Types.h CD_Definitions.h CD_Opcodes.h CD_Structs.h CD_binding.h CD_hw_services.h Decoder.h ObjectID.h atombios.h regsdef.h Log Message: now, merge xf86-video-ati 7.8.0 properly. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-ati-kms/dist/src/atombios_crtc.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/atombios_output.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/generic_bus.h \ xsrc/external/mit/xf86-video-ati-kms/dist/src/legacy_crtc.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/legacy_output.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_accelfuncs.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_atombios.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_atombios.h \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_atomwrapper.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_atomwrapper.h \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bios.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_commonfuncs.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_crtc.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_cursor.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_dri.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_dri.h \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_driver.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_drm.h \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_dummy_bufmgr.h \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_legacy_memory.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_macros.h \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_mm_i2c.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_modes.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_output.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_pm.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_render.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_tv.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_tv.h \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_vip.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/theatre.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/theatre.h \ xsrc/external/mit/xf86-video-ati-kms/dist/src/theatre200.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/theatre200.h \ xsrc/external/mit/xf86-video-ati-kms/dist/src/theatre200_module.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/theatre_detect.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/theatre_detect.h \ xsrc/external/mit/xf86-video-ati-kms/dist/src/theatre_detect_module.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/theatre_module.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/theatre_reg.h cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-ati-kms/dist/src/AtomBios/CD_Operations.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/AtomBios/Decoder.c \ xsrc/external/mit/xf86-video-ati-kms/dist/src/AtomBios/hwserv_drv.c cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-ati-kms/dist/src/AtomBios/includes/CD_Common_Types.h \ xsrc/external/mit/xf86-video-ati-kms/dist/src/AtomBios/includes/CD_Definitions.h \ xsrc/external/mit/xf86-video-ati-kms/dist/src/AtomBios/includes/CD_Opcodes.h \ xsrc/external/mit/xf86-video-ati-kms/dist/src/AtomBios/includes/CD_Structs.h \ xsrc/external/mit/xf86-video-ati-kms/dist/src/AtomBios/includes/CD_binding.h \ xsrc/external/mit/xf86-video-ati-kms/dist/src/AtomBios/includes/CD_hw_services.h \ xsrc/external/mit/xf86-video-ati-kms/dist/src/AtomBios/includes/Decoder.h \ xsrc/external/mit/xf86-video-ati-kms/dist/src/AtomBios/includes/ObjectID.h
CVS import: xsrc/external/mit/xf86-video-ati-kms/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 03:35:32 UTC 2017 Update of /cvsroot/xsrc/external/mit/xf86-video-ati-kms/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19068 Log Message: initial import of xf86-video-ati-7.8.0 Status: Vendor Tag: xorg Release Tags: xf86-video-ati-7-8-0 U xsrc/external/mit/xf86-video-ati-kms/dist/README U xsrc/external/mit/xf86-video-ati-kms/dist/ChangeLog U xsrc/external/mit/xf86-video-ati-kms/dist/missing U xsrc/external/mit/xf86-video-ati-kms/dist/COPYING U xsrc/external/mit/xf86-video-ati-kms/dist/ltmain.sh U xsrc/external/mit/xf86-video-ati-kms/dist/Makefile.in U xsrc/external/mit/xf86-video-ati-kms/dist/install-sh U xsrc/external/mit/xf86-video-ati-kms/dist/configure.ac U xsrc/external/mit/xf86-video-ati-kms/dist/config.h.in U xsrc/external/mit/xf86-video-ati-kms/dist/config.sub U xsrc/external/mit/xf86-video-ati-kms/dist/compile U xsrc/external/mit/xf86-video-ati-kms/dist/depcomp U xsrc/external/mit/xf86-video-ati-kms/dist/configure U xsrc/external/mit/xf86-video-ati-kms/dist/config.guess U xsrc/external/mit/xf86-video-ati-kms/dist/aclocal.m4 U xsrc/external/mit/xf86-video-ati-kms/dist/Makefile.am U xsrc/external/mit/xf86-video-ati-kms/dist/INSTALL U xsrc/external/mit/xf86-video-ati-kms/dist/man/Makefile.in U xsrc/external/mit/xf86-video-ati-kms/dist/man/ati.man U xsrc/external/mit/xf86-video-ati-kms/dist/man/radeon.man U xsrc/external/mit/xf86-video-ati-kms/dist/man/Makefile.am U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_pci_chipset_gen.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_shader.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_video.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/compat-api.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_dri2.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_exa.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_glamor_wrappers.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_shader.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/cayman_accel.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_exa_render.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_reg.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_state.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg_r6xx.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_accel.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_exa_shared.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_shader.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_sync.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg_r7xx.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/atipcirename.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_exa.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/atipciids.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_drm_queue.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_exa.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_misc.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/ati.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_textured_videofuncs.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/ati_pciids_gen.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/cayman_shader.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/Makefile.in U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_textured_videofuncs.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_accel.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_chipset_gen.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_chipinfo_gen.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_pci_device_match_gen.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/simple_list.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_reg_auto.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/bicubic_table.py U xsrc/external/mit/xf86-video-ati-kms/dist/src/bicubic_table.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_glamor.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/ati.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_dri3.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/r6xx_accel.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/atimodule.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_textured_videofuncs.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_exa_funcs.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_present.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_exa_shared.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/ativersion.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg_auto_r6
CVS commit: xsrc/external/mit/xf86-video-ati/dist/src
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 03:18:38 UTC 2017 Modified Files: xsrc/external/mit/xf86-video-ati/dist/src: compat-api.h r600_shader.c Log Message: un-merge the new ati driver from the old location. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xf86-video-ati/dist/src/compat-api.h cvs rdiff -u -r1.1.1.8 -r1.2 \ xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.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/xf86-video-ati/dist/src/compat-api.h diff -u xsrc/external/mit/xf86-video-ati/dist/src/compat-api.h:1.1.1.2 xsrc/external/mit/xf86-video-ati/dist/src/compat-api.h:1.2 --- xsrc/external/mit/xf86-video-ati/dist/src/compat-api.h:1.1.1.2 Sun Mar 5 03:02:38 2017 +++ xsrc/external/mit/xf86-video-ati/dist/src/compat-api.h Sun Mar 5 03:18:38 2017 @@ -73,13 +73,8 @@ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv -#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) -#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout -#define BLOCKHANDLER_ARGS arg, pTimeout -#else #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask -#endif #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen #define CLOSE_SCREEN_ARGS pScreen Index: xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.c diff -u xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.c:1.1.1.8 xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.c:1.2 --- xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.c:1.1.1.8 Sun Mar 5 03:02:38 2017 +++ xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.c Sun Mar 5 03:18:38 2017 @@ -2318,10 +2318,9 @@ int R600_comp_ps(RADEONChipFamily ChipSe int i = 0; /* 0 */ -/* call fetch-mask if boolean1 == true */ -shader[i++] = CF_DWORD0(ADDR(10)); +shader[i++] = CF_DWORD0(ADDR(3)); shader[i++] = CF_DWORD1(POP_COUNT(0), -CF_CONST(1), +CF_CONST(0), COND(SQ_CF_COND_BOOL), I_COUNT(0), CALL_COUNT(0), @@ -2331,10 +2330,9 @@ int R600_comp_ps(RADEONChipFamily ChipSe WHOLE_QUAD_MODE(0), BARRIER(0)); /* 1 */ -/* call read-constant-mask if boolean1 == false */ -shader[i++] = CF_DWORD0(ADDR(12)); +shader[i++] = CF_DWORD0(ADDR(7)); shader[i++] = CF_DWORD1(POP_COUNT(0), -CF_CONST(1), +CF_CONST(0), COND(SQ_CF_COND_NOT_BOOL), I_COUNT(0), CALL_COUNT(0), @@ -2344,36 +2342,33 @@ int R600_comp_ps(RADEONChipFamily ChipSe WHOLE_QUAD_MODE(0), BARRIER(0)); /* 2 */ -/* call fetch-src if boolean0 == true */ -shader[i++] = CF_DWORD0(ADDR(6)); +shader[i++] = CF_DWORD0(ADDR(0)); shader[i++] = CF_DWORD1(POP_COUNT(0), CF_CONST(0), -COND(SQ_CF_COND_BOOL), +COND(SQ_CF_COND_ACTIVE), I_COUNT(0), CALL_COUNT(0), -END_OF_PROGRAM(0), +END_OF_PROGRAM(1), VALID_PIXEL_MODE(0), -CF_INST(SQ_CF_INST_CALL), +CF_INST(SQ_CF_INST_NOP), WHOLE_QUAD_MODE(0), -BARRIER(0)); +BARRIER(1)); -/* 3 */ -/* call read-constant-src if boolean0 == false */ -shader[i++] = CF_DWORD0(ADDR(8)); +/* 3 - mask sub */ +shader[i++] = CF_DWORD0(ADDR(14)); shader[i++] = CF_DWORD1(POP_COUNT(0), CF_CONST(0), - COND(SQ_CF_COND_NOT_BOOL), - I_COUNT(0), + COND(SQ_CF_COND_ACTIVE), + I_COUNT(2), CALL_COUNT(0), END_OF_PROGRAM(0), VALID_PIXEL_MODE(0), - CF_INST(SQ_CF_INST_CALL), + CF_INST(SQ_CF_INST_TEX), WHOLE_QUAD_MODE(0), - BARRIER(0)); + BARRIER(1)); /* 4 */ -/* src IN mask (GPR0 := GPR1 .* GPR0) */ -shader[i++] = CF_ALU_DWORD0(ADDR(14), +shader[i++] = CF_ALU_DWORD0(ADDR(10), KCACHE_BANK0(0), KCACHE_BANK1(0), KCACHE_MODE0(SQ_CF_KCACHE_NOP)); @@ -2387,10 +2382,9 @@ int R600_comp_ps(RADEONChipFamily ChipSe BARRIER(1)); /* 5 */ -/* export pixel data */ shader[i++] = CF_ALLOC_IMP_EXP_DWORD0(ARRAY_BASE(CF_PIXEL_MRT0), TYPE(SQ_EXPORT_PIXEL), - RW_GPR(0), + RW_GPR(2), RW_REL(ABSOLUTE), INDEX_GPR(0), ELEM_SIZE(1)); @@ -2400,57 +2394,55 @@ int R600_co
CVS import: xsrc/external/mit/xf86-video-ati-kms/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 03:15:51 UTC 2017 Update of /cvsroot/xsrc/external/mit/xf86-video-ati-kms/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21412 Log Message: initial import of xf86-video-ati-6.14.6 Status: Vendor Tag: xorg Release Tags: xf86-video-ati-6-14-6 U xsrc/external/mit/xf86-video-ati-kms/dist/depcomp U xsrc/external/mit/xf86-video-ati-kms/dist/configure.ac U xsrc/external/mit/xf86-video-ati-kms/dist/Makefile.in U xsrc/external/mit/xf86-video-ati-kms/dist/COPYING U xsrc/external/mit/xf86-video-ati-kms/dist/INSTALL U xsrc/external/mit/xf86-video-ati-kms/dist/config.h.in U xsrc/external/mit/xf86-video-ati-kms/dist/aclocal.m4 U xsrc/external/mit/xf86-video-ati-kms/dist/config.guess U xsrc/external/mit/xf86-video-ati-kms/dist/config.sub U xsrc/external/mit/xf86-video-ati-kms/dist/compile U xsrc/external/mit/xf86-video-ati-kms/dist/ChangeLog U xsrc/external/mit/xf86-video-ati-kms/dist/ltmain.sh U xsrc/external/mit/xf86-video-ati-kms/dist/missing U xsrc/external/mit/xf86-video-ati-kms/dist/configure U xsrc/external/mit/xf86-video-ati-kms/dist/Makefile.am U xsrc/external/mit/xf86-video-ati-kms/dist/install-sh U xsrc/external/mit/xf86-video-ati-kms/dist/README U xsrc/external/mit/xf86-video-ati-kms/dist/man/Makefile.in U xsrc/external/mit/xf86-video-ati-kms/dist/man/radeon.man U xsrc/external/mit/xf86-video-ati-kms/dist/man/Makefile.am U xsrc/external/mit/xf86-video-ati-kms/dist/man/ati.man U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_shader.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_xvmc.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_dri2.c N xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_accelfuncs.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg_r7xx.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_exa.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_probe.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/r6xx_accel.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/cayman_reg_auto.h N xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_dri.c N xsrc/external/mit/xf86-video-ati-kms/dist/src/theatre200_module.c N xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_atombios.h N xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_vip.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_state.h N xsrc/external/mit/xf86-video-ati-kms/dist/src/atombios_crtc.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/Makefile.in U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_vbo.h N xsrc/external/mit/xf86-video-ati-kms/dist/src/theatre.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_reg.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/compat-api.h N xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_cursor.c N xsrc/external/mit/xf86-video-ati-kms/dist/src/theatre200.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg_r6xx.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg.h N xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_atomwrapper.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_probe.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/cayman_shader.c N xsrc/external/mit/xf86-video-ati-kms/dist/src/legacy_crtc.c N xsrc/external/mit/xf86-video-ati-kms/dist/src/generic_bus.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.c N xsrc/external/mit/xf86-video-ati-kms/dist/src/theatre_detect.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/cayman_accel.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_pci_device_match_gen.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/simple_list.h N xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_dri.h N xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_driver.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_textured_videofuncs.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_textured_videofuncs.c N xsrc/external/mit/xf86-video-ati-kms/dist/src/theatre_detect.h N xsrc/external/mit/xf86-video-ati-kms/dist/src/theatre200.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_video.c N xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_drm.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/atipciids.h N xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bios.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/ati.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_accel.c N xsrc/external/mit/xf86-video-ati-kms/dist/src/theatre_module.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_video.h C xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c N xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_atombios.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/Makefile.am U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_textured_video.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_shader.c
CVS commit: xsrc/external/mit/xf86-video-ati-kms
Module Name:xsrc
Committed By: mrg
Date: Sun Mar 5 03:09:28 UTC 2017
Modified Files:
xsrc/external/mit/xf86-video-ati-kms/dist/src: radeon_kms.c
xsrc/external/mit/xf86-video-ati-kms/include: config.h
Log Message:
merge xf86-video-ati 7.8.0.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-ati-kms/include/config.h
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/xf86-video-ati-kms/dist/src/radeon_kms.c
diff -u xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c:1.3 xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c:1.4
--- xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c:1.3 Wed Aug 17 00:08:36 2016
+++ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c Sun Mar 5 03:09:28 2017
@@ -40,6 +40,7 @@
#include "radeon_version.h"
#include "shadow.h"
+#include
#include "atipciids.h"
@@ -51,12 +52,16 @@
#include
#endif
+#include
+
#include "radeon_chipinfo_gen.h"
#include "radeon_bo_gem.h"
#include "radeon_cs_gem.h"
#include "radeon_vbo.h"
+static DevScreenPrivateKeyRec radeon_client_private_key;
+
extern SymTabRec RADEONChipsets[];
static Bool radeon_setup_kernel_mem(ScreenPtr pScreen);
@@ -91,10 +96,11 @@ void radeon_cs_flush_indirect(ScrnInfoPt
struct radeon_accel_state *accel_state;
int ret;
+info->gpu_flushed++;
+
#ifdef USE_GLAMOR
if (info->use_glamor) {
glamor_block_handler(pScrn->pScreen);
- info->gpu_flushed++;
return;
}
#endif
@@ -237,11 +243,68 @@ radeonUpdatePacked(ScreenPtr pScreen, sh
shadowUpdatePacked(pScreen, pBuf);
}
+static Bool
+callback_needs_flush(RADEONInfoPtr info, struct radeon_client_priv *client_priv)
+{
+return (int)(client_priv->needs_flush - info->gpu_flushed) > 0;
+}
+
+static void
+radeon_event_callback(CallbackListPtr *list,
+ pointer user_data, pointer call_data)
+{
+EventInfoRec *eventinfo = call_data;
+ScrnInfoPtr pScrn = user_data;
+ScreenPtr pScreen = pScrn->pScreen;
+struct radeon_client_priv *client_priv =
+ dixLookupScreenPrivate(&eventinfo->client->devPrivates,
+ &radeon_client_private_key, pScreen);
+struct radeon_client_priv *server_priv =
+ dixLookupScreenPrivate(&serverClient->devPrivates,
+ &radeon_client_private_key, pScreen);
+RADEONInfoPtr info = RADEONPTR(pScrn);
+int i;
+
+if (callback_needs_flush(info, client_priv) ||
+ callback_needs_flush(info, server_priv))
+ return;
+
+/* Don't let gpu_flushed get too far ahead of needs_flush, in order
+ * to prevent false positives in callback_needs_flush()
+ */
+client_priv->needs_flush = info->gpu_flushed;
+server_priv->needs_flush = info->gpu_flushed;
+
+for (i = 0; i < eventinfo->count; i++) {
+ if (eventinfo->events[i].u.u.type == info->callback_event_type) {
+ client_priv->needs_flush++;
+ server_priv->needs_flush++;
+ return;
+ }
+}
+}
+
+static void
+radeon_flush_callback(CallbackListPtr *list,
+ pointer user_data, pointer call_data)
+{
+ScrnInfoPtr pScrn = user_data;
+ScreenPtr pScreen = pScrn->pScreen;
+ClientPtr client = call_data ? call_data : serverClient;
+struct radeon_client_priv *client_priv =
+ dixLookupScreenPrivate(&client->devPrivates,
+ &radeon_client_private_key, pScreen);
+RADEONInfoPtr info = RADEONPTR(pScrn);
+
+if (pScrn->vtSema && callback_needs_flush(info, client_priv))
+radeon_cs_flush_indirect(pScrn);
+}
+
static Bool RADEONCreateScreenResources_KMS(ScreenPtr pScreen)
{
+ExtensionEntry *damage_ext = CheckExtension("DAMAGE");
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
RADEONInfoPtr info = RADEONPTR(pScrn);
-rrScrPrivPtr rrScrPriv = rrGetScrPriv(pScreen);
PixmapPtr pixmap;
struct radeon_surface *surface;
@@ -251,17 +314,21 @@ static Bool RADEONCreateScreenResources_
pScreen->CreateScreenResources = RADEONCreateScreenResources_KMS;
/* Set the RandR primary output if Xorg hasn't */
-if (
+if (dixPrivateKeyRegistered(rrPrivKey)) {
+ rrScrPrivPtr rrScrPriv = rrGetScrPriv(pScreen);
+
+ if (
#ifdef RADEON_PIXMAP_SHARING
- !pScreen->isGPU &&
+ !pScreen->isGPU &&
#endif
- !rrScrPriv->primaryOutput)
-{
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+ !rrScrPriv->primaryOutput)
+ {
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
- rrScrPriv->primaryOutput = xf86_config->output[0]->randr_output;
- RROutputChanged(rrScrPriv->primaryOutput, FALSE);
- rrScrPriv->layoutChanged = TRUE;
+ rrScrPriv->primaryOutput = xf86_config->output[0]->randr_output;
+ RROutputChanged(rrScrPriv->primaryOutput, FALSE);
+ rrScrPriv->layoutChanged = TRUE;
+ }
}
if (!drmmode_set
CVS import: xsrc/external/mit/xf86-video-ati-kms/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 03:07:12 UTC 2017 Update of /cvsroot/xsrc/external/mit/xf86-video-ati-kms/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7955 Log Message: initial import of xf86-video-ati-7.8.0 Status: Vendor Tag: xorg Release Tags: xf86-video-ati-7-8-0 U xsrc/external/mit/xf86-video-ati-kms/dist/README U xsrc/external/mit/xf86-video-ati-kms/dist/ChangeLog U xsrc/external/mit/xf86-video-ati-kms/dist/missing U xsrc/external/mit/xf86-video-ati-kms/dist/COPYING U xsrc/external/mit/xf86-video-ati-kms/dist/ltmain.sh U xsrc/external/mit/xf86-video-ati-kms/dist/Makefile.in U xsrc/external/mit/xf86-video-ati-kms/dist/install-sh U xsrc/external/mit/xf86-video-ati-kms/dist/configure.ac U xsrc/external/mit/xf86-video-ati-kms/dist/config.h.in U xsrc/external/mit/xf86-video-ati-kms/dist/config.sub U xsrc/external/mit/xf86-video-ati-kms/dist/compile U xsrc/external/mit/xf86-video-ati-kms/dist/depcomp U xsrc/external/mit/xf86-video-ati-kms/dist/configure U xsrc/external/mit/xf86-video-ati-kms/dist/config.guess U xsrc/external/mit/xf86-video-ati-kms/dist/aclocal.m4 U xsrc/external/mit/xf86-video-ati-kms/dist/Makefile.am U xsrc/external/mit/xf86-video-ati-kms/dist/INSTALL U xsrc/external/mit/xf86-video-ati-kms/dist/man/Makefile.in U xsrc/external/mit/xf86-video-ati-kms/dist/man/ati.man U xsrc/external/mit/xf86-video-ati-kms/dist/man/radeon.man U xsrc/external/mit/xf86-video-ati-kms/dist/man/Makefile.am U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_pci_chipset_gen.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_shader.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_video.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/compat-api.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_dri2.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_exa.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_glamor_wrappers.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_shader.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/cayman_accel.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_exa_render.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_reg.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_state.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg_r6xx.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_accel.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_exa_shared.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_shader.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_sync.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg_r7xx.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/atipcirename.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_exa.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/atipciids.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_drm_queue.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_exa.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_misc.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/ati.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_textured_videofuncs.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/ati_pciids_gen.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/cayman_shader.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/Makefile.in U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_textured_videofuncs.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_accel.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_chipset_gen.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_chipinfo_gen.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_pci_device_match_gen.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/simple_list.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_reg_auto.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/bicubic_table.py U xsrc/external/mit/xf86-video-ati-kms/dist/src/bicubic_table.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_glamor.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/ati.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_dri3.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/r6xx_accel.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/atimodule.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_textured_videofuncs.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_exa_funcs.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_present.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_exa_shared.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/ativersion.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg_auto_r6x
CVS import: xsrc/external/mit/xf86-video-ati/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 03:02:40 UTC 2017 Update of /cvsroot/xsrc/external/mit/xf86-video-ati/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21604 Log Message: initial import of xf86-video-ati-7.8.0 Status: Vendor Tag: xorg Release Tags: xf86-video-ati-7-8-0 U xsrc/external/mit/xf86-video-ati/dist/README C xsrc/external/mit/xf86-video-ati/dist/ChangeLog U xsrc/external/mit/xf86-video-ati/dist/missing U xsrc/external/mit/xf86-video-ati/dist/COPYING C xsrc/external/mit/xf86-video-ati/dist/ltmain.sh C xsrc/external/mit/xf86-video-ati/dist/Makefile.in U xsrc/external/mit/xf86-video-ati/dist/install-sh C xsrc/external/mit/xf86-video-ati/dist/configure.ac C xsrc/external/mit/xf86-video-ati/dist/config.h.in C xsrc/external/mit/xf86-video-ati/dist/config.sub U xsrc/external/mit/xf86-video-ati/dist/compile U xsrc/external/mit/xf86-video-ati/dist/depcomp C xsrc/external/mit/xf86-video-ati/dist/configure C xsrc/external/mit/xf86-video-ati/dist/config.guess C xsrc/external/mit/xf86-video-ati/dist/aclocal.m4 U xsrc/external/mit/xf86-video-ati/dist/Makefile.am U xsrc/external/mit/xf86-video-ati/dist/INSTALL C xsrc/external/mit/xf86-video-ati/dist/man/Makefile.in U xsrc/external/mit/xf86-video-ati/dist/man/ati.man C xsrc/external/mit/xf86-video-ati/dist/man/radeon.man U xsrc/external/mit/xf86-video-ati/dist/man/Makefile.am U xsrc/external/mit/xf86-video-ati/dist/src/radeon_pci_chipset_gen.h C xsrc/external/mit/xf86-video-ati/dist/src/radeon_bo_helper.c U xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.h C xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.h U xsrc/external/mit/xf86-video-ati/dist/src/compat-api.h C xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri2.c C xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c C xsrc/external/mit/xf86-video-ati/dist/src/radeon_glamor_wrappers.c U xsrc/external/mit/xf86-video-ati/dist/src/evergreen_shader.c U xsrc/external/mit/xf86-video-ati/dist/src/cayman_accel.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_render.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_reg.h U xsrc/external/mit/xf86-video-ati/dist/src/evergreen_state.h U xsrc/external/mit/xf86-video-ati/dist/src/r600_reg_r6xx.h U xsrc/external/mit/xf86-video-ati/dist/src/evergreen_accel.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c U xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_sync.c U xsrc/external/mit/xf86-video-ati/dist/src/r600_reg_r7xx.h U xsrc/external/mit/xf86-video-ati/dist/src/atipcirename.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa.c U xsrc/external/mit/xf86-video-ati/dist/src/atipciids.h C xsrc/external/mit/xf86-video-ati/dist/src/radeon_drm_queue.h U xsrc/external/mit/xf86-video-ati/dist/src/evergreen_exa.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_misc.c U xsrc/external/mit/xf86-video-ati/dist/src/ati.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_videofuncs.c U xsrc/external/mit/xf86-video-ati/dist/src/ati_pciids_gen.h U xsrc/external/mit/xf86-video-ati/dist/src/cayman_shader.c C xsrc/external/mit/xf86-video-ati/dist/src/Makefile.in U xsrc/external/mit/xf86-video-ati/dist/src/evergreen_textured_videofuncs.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_accel.c C xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipset_gen.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipinfo_gen.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_pci_device_match_gen.h U xsrc/external/mit/xf86-video-ati/dist/src/simple_list.h U xsrc/external/mit/xf86-video-ati/dist/src/evergreen_reg_auto.h U xsrc/external/mit/xf86-video-ati/dist/src/bicubic_table.py U xsrc/external/mit/xf86-video-ati/dist/src/bicubic_table.h C xsrc/external/mit/xf86-video-ati/dist/src/radeon_glamor.h U xsrc/external/mit/xf86-video-ati/dist/src/ati.c C xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri3.c U xsrc/external/mit/xf86-video-ati/dist/src/r600_reg.h C xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c U xsrc/external/mit/xf86-video-ati/dist/src/atimodule.c U xsrc/external/mit/xf86-video-ati/dist/src/r600_textured_videofuncs.c C xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_funcs.c C xsrc/external/mit/xf86-video-ati/dist/src/radeon_bo_helper.h C xsrc/external/mit/xf86-video-ati/dist/src/radeon_present.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.h U xsrc/external/mit/xf86-video-ati/dist/src/ativersion.h U xsrc/external/mit/xf86-video-ati/dist/src/r600_reg_auto_r6xx.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_version.h C xsrc/external/mit/xf86-video-ati/dist/src/radeon_glamor.c U xsrc/external/mit/xf86-video-ati/dist/src/cayman_reg.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_vbo.c C xsrc/external/mit/xf86-video-ati/dist/src/radeon_kms.c U xsrc/
CVS commit: xsrc/external/mit/xf86-video-nouveau/dist/src
Module Name:xsrc
Committed By: mrg
Date: Sun Mar 5 02:04:10 UTC 2017
Modified Files:
xsrc/external/mit/xf86-video-nouveau/dist/src: drmmode_display.c
Log Message:
merge xf86-video-nouveau 1.0.13.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.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/xf86-video-nouveau/dist/src/drmmode_display.c
diff -u xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c:1.4 xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c:1.5
--- xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c:1.4 Tue Aug 16 07:43:03 2016
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c Sun Mar 5 02:04:10 2017
@@ -682,10 +682,16 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr c
PixmapPtr screenpix = screen->GetScreenPixmap(screen);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+ drmmode_ptr drmmode = drmmode_crtc->drmmode;
int c, total_width = 0, max_height = 0, this_x = 0;
if (!ppix) {
- if (crtc->randr_crtc->scanout_pixmap)
+ if (crtc->randr_crtc->scanout_pixmap) {
PixmapStopDirtyTracking(crtc->randr_crtc->scanout_pixmap, screenpix);
+ if (drmmode && drmmode->fb_id) {
+drmModeRmFB(drmmode->fd, drmmode->fb_id);
+drmmode->fb_id = 0;
+ }
+ }
drmmode_crtc->scanout_pixmap_x = 0;
return TRUE;
}
@@ -706,7 +712,7 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr c
if (max_height < iter->mode.VDisplay)
max_height = iter->mode.VDisplay;
}
-#ifndef HAS_DIRTYTRACKING2
+#if !defined(HAS_DIRTYTRACKING_ROTATION) && !defined(HAS_DIRTYTRACKING2)
if (iter != crtc) {
ErrorF("Cannot do multiple crtcs without X server dirty tracking 2 interface\n");
return FALSE;
@@ -1533,6 +1539,15 @@ drmmode_handle_uevents(ScrnInfoPtr scrn)
}
#endif
+#if HAVE_NOTIFY_FD
+static void
+drmmode_udev_notify(int fd, int notify, void *data)
+{
+ ScrnInfoPtr scrn = data;
+ drmmode_handle_uevents(scrn);
+}
+#endif
+
static void
drmmode_uevent_init(ScrnInfoPtr scrn)
{
@@ -1559,7 +1574,11 @@ drmmode_uevent_init(ScrnInfoPtr scrn)
return;
}
+#if HAVE_NOTIFY_FD
+ SetNotifyFd(udev_monitor_get_fd(mon), drmmode_udev_notify, X_NOTIFY_READ, scrn);
+#else
AddGeneralSocket(udev_monitor_get_fd(mon));
+#endif
drmmode->uevent_monitor = mon;
#endif
}
@@ -1573,13 +1592,27 @@ drmmode_uevent_fini(ScrnInfoPtr scrn)
if (drmmode->uevent_monitor) {
struct udev *u = udev_monitor_get_udev(drmmode->uevent_monitor);
+#if HAVE_NOTIFY_FD
+ RemoveNotifyFd(udev_monitor_get_fd(drmmode->uevent_monitor));
+#else
RemoveGeneralSocket(udev_monitor_get_fd(drmmode->uevent_monitor));
+#endif
udev_monitor_unref(drmmode->uevent_monitor);
udev_unref(u);
}
#endif
}
+#if HAVE_NOTIFY_FD
+static void
+drmmode_notify_fd(int fd, int notify, void *data)
+{
+ ScrnInfoPtr scrn = data;
+ drmmode_ptr drmmode = drmmode_from_scrn(scrn);
+ drmHandleEvent(drmmode->fd, &drmmode->event_context);
+}
+#else
+
static void
drmmode_wakeup_handler(pointer data, int err, pointer p)
{
@@ -1598,6 +1631,7 @@ drmmode_wakeup_handler(pointer data, int
drmmode_handle_uevents(scrn);
#endif
}
+#endif
void
drmmode_screen_init(ScreenPtr pScreen)
@@ -1615,9 +1649,13 @@ drmmode_screen_init(ScreenPtr pScreen)
/* Register wakeup handler only once per servergen, so ZaphodHeads work */
if (pNVEnt->fd_wakeup_registered != serverGeneration) {
/* Register a wakeup handler to get informed on DRM events */
+#if HAVE_NOTIFY_FD
+ SetNotifyFd(drmmode->fd, drmmode_notify_fd, X_NOTIFY_READ, scrn);
+#else
AddGeneralSocket(drmmode->fd);
RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA,
drmmode_wakeup_handler, scrn);
+#endif
pNVEnt->fd_wakeup_registered = serverGeneration;
pNVEnt->fd_wakeup_ref = 1;
}
@@ -1636,10 +1674,14 @@ drmmode_screen_fini(ScreenPtr pScreen)
if (pNVEnt->fd_wakeup_registered == serverGeneration &&
!--pNVEnt->fd_wakeup_ref) {
+#if HAVE_NOTIFY_FD
+ RemoveNotifyFd(drmmode->fd);
+#else
/* Unregister wakeup handler */
RemoveBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA,
drmmode_wakeup_handler, scrn);
RemoveGeneralSocket(drmmode->fd);
+#endif
}
/* Tear down udev event handler */
CVS import: xsrc/external/mit/xf86-video-nouveau/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 02:03:33 UTC 2017 Update of /cvsroot/xsrc/external/mit/xf86-video-nouveau/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19940 Log Message: initial import of xf86-video-nouveau-1.0.13 Status: Vendor Tag: xorg Release Tags: xf86-video-nouveau-1-0-13 U xsrc/external/mit/xf86-video-nouveau/dist/missing U xsrc/external/mit/xf86-video-nouveau/dist/ltmain.sh U xsrc/external/mit/xf86-video-nouveau/dist/config.guess U xsrc/external/mit/xf86-video-nouveau/dist/install-sh U xsrc/external/mit/xf86-video-nouveau/dist/ChangeLog U xsrc/external/mit/xf86-video-nouveau/dist/INSTALL U xsrc/external/mit/xf86-video-nouveau/dist/Makefile.am U xsrc/external/mit/xf86-video-nouveau/dist/config.h.in U xsrc/external/mit/xf86-video-nouveau/dist/configure.ac U xsrc/external/mit/xf86-video-nouveau/dist/COPYING U xsrc/external/mit/xf86-video-nouveau/dist/depcomp U xsrc/external/mit/xf86-video-nouveau/dist/compile U xsrc/external/mit/xf86-video-nouveau/dist/Makefile.in U xsrc/external/mit/xf86-video-nouveau/dist/config.sub U xsrc/external/mit/xf86-video-nouveau/dist/configure U xsrc/external/mit/xf86-video-nouveau/dist/aclocal.m4 U xsrc/external/mit/xf86-video-nouveau/dist/man/nouveau.man U xsrc/external/mit/xf86-video-nouveau/dist/man/Makefile.am U xsrc/external/mit/xf86-video-nouveau/dist/man/Makefile.in U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_type.h C xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv40_exa.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_proto.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_dri2.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_xv.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv30_exa.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_xv_ovl.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv10_xv_ovl.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_include.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_exa.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_exa.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_accel.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_dma.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_exa.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_local.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_const.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_present.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copya0b5.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_accel.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_exa.c U xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.h U xsrc/external/mit/xf86-video-nouveau/dist/src/Makefile.am U xsrc/external/mit/xf86-video-nouveau/dist/src/nv40_xv_tex.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_accel_common.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_accel.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_xv.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_rop.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy85b5.c U xsrc/external/mit/xf86-video-nouveau/dist/src/Makefile.in U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_wfb.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_accel.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_sync.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_sync.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_accel.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_xv_blit.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_present.h U xsrc/external/mit/xf86-video-nouveau/dist/src/compat-api.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_xv.c U xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv30_xv_tex.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_shadow.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy90b5.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv10_exa.c U xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs/nv50_3d.xml.h U xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs/nv50_defs.xml.h U xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs/nv_object.xml.h U xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs/nv_3ddefs.xml.h U xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs/nv_m2mf.xml.h U xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs/nvc0_3d.xml.h U xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs/nv30-40_3d.xml.h U xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs/nv50_2d.xml.h U xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs/nv10_3d.xml.h U xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs/nvc0_m2mf.xml.h U xsrc/external/mit
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Sun Mar 5 01:57:26 UTC 2017
Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_driver.c
xsrc/external/mit/xf86-video-vmware/include: config.h
Log Message:
merge xf86-video-nv 2.1.21 and xf86-video-vmware 13.2.1.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xf86-video-vmware/include/config.h
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/xf86-video-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.8 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.9
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.8 Tue Aug 16 01:27:47 2016
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c Sun Mar 5 01:57:26 2017
@@ -2076,7 +2076,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
/* Load shadowfb if needed */
if (pNv->ShadowFB) {
- if (!xf86LoadSubModule(pScrn, "shadowfb")) {
+ if (!xf86LoadSubModule(pScrn, "shadow")) {
xf86FreeInt10(pNv->pInt);
NVFreeRec(pScrn);
return FALSE;
@@ -2384,6 +2384,44 @@ NVDPMSSet(ScrnInfoPtr pScrn, int PowerMa
hwp->writeCrtc(hwp, 0x1A, crtc1A);
}
+static Bool
+NVCreateScreenResources(ScreenPtr pScreen)
+{
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ NVPtr pNv = NVPTR(pScrn);
+ PixmapPtr pPixmap;
+ Bool ret;
+
+ pScreen->CreateScreenResources = pNv->CreateScreenResources;
+ ret = pScreen->CreateScreenResources(pScreen);
+ pScreen->CreateScreenResources = NVCreateScreenResources;
+
+ if (!ret)
+ return FALSE;
+
+ pPixmap = pScreen->GetScreenPixmap(pScreen);
+
+ if (!shadowAdd(pScreen, pPixmap, NVShadowUpdate,
+ NULL, 0, NULL)) {
+ return FALSE;
+ }
+ return TRUE;
+}
+
+static Bool
+NVShadowInit(ScreenPtr pScreen)
+{
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ NVPtr pNv = NVPTR(pScrn);
+
+ if (!shadowSetup(pScreen))
+ return FALSE;
+ pNv->CreateScreenResources = pScreen->CreateScreenResources;
+ pScreen->CreateScreenResources = NVCreateScreenResources;
+
+ return TRUE;
+}
+
/* Mandatory */
@@ -2607,8 +2645,8 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
"Driver rotation enabled, RandR disabled\n");
}
}
-
- ShadowFBInit(pScreen, refreshArea);
+pNv->refreshArea = refreshArea;
+ NVShadowInit(pScreen);
}
if(pNv->FlatPanel)
Index: xsrc/external/mit/xf86-video-vmware/include/config.h
diff -u xsrc/external/mit/xf86-video-vmware/include/config.h:1.12 xsrc/external/mit/xf86-video-vmware/include/config.h:1.13
--- xsrc/external/mit/xf86-video-vmware/include/config.h:1.12 Sat Oct 8 10:24:07 2016
+++ xsrc/external/mit/xf86-video-vmware/include/config.h Sun Mar 5 01:57:26 2017
@@ -74,7 +74,7 @@
#define PACKAGE_NAME "xf86-video-vmware"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xf86-video-vmware 13.1.0"
+#define PACKAGE_STRING "xf86-video-vmware 13.2.1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xf86-video-vmware"
@@ -83,22 +83,22 @@
#undef PACKAGE_URL
/* Define to the version of this package. */
-#define PACKAGE_VERSION "13.1.0"
+#define PACKAGE_VERSION "13.2.1"
/* Major version of this package */
#define PACKAGE_VERSION_MAJOR 13
/* Minor version of this package */
-#define PACKAGE_VERSION_MINOR 1
+#define PACKAGE_VERSION_MINOR 2
/* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 0
+#define PACKAGE_VERSION_PATCHLEVEL 1
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "13.1.0"
+#define VERSION "13.2.1"
/* Number of bits in a file offset, on hosts where this is settable. */
#undef _FILE_OFFSET_BITS
CVS import: xsrc/external/mit/xf86-video-vmware/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 01:55:48 UTC 2017 Update of /cvsroot/xsrc/external/mit/xf86-video-vmware/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19973 Log Message: initial import of xf86-video-vmware-13.2.1 Status: Vendor Tag: xorg Release Tags: xf86-video-vmware-13-2-1 U xsrc/external/mit/xf86-video-vmware/dist/compile U xsrc/external/mit/xf86-video-vmware/dist/install-sh U xsrc/external/mit/xf86-video-vmware/dist/config.sub U xsrc/external/mit/xf86-video-vmware/dist/config.h.in U xsrc/external/mit/xf86-video-vmware/dist/INSTALL U xsrc/external/mit/xf86-video-vmware/dist/COPYING U xsrc/external/mit/xf86-video-vmware/dist/ChangeLog U xsrc/external/mit/xf86-video-vmware/dist/Makefile.in U xsrc/external/mit/xf86-video-vmware/dist/missing U xsrc/external/mit/xf86-video-vmware/dist/config.guess U xsrc/external/mit/xf86-video-vmware/dist/ltmain.sh U xsrc/external/mit/xf86-video-vmware/dist/Makefile.am U xsrc/external/mit/xf86-video-vmware/dist/aclocal.m4 U xsrc/external/mit/xf86-video-vmware/dist/README U xsrc/external/mit/xf86-video-vmware/dist/configure.ac U xsrc/external/mit/xf86-video-vmware/dist/configure U xsrc/external/mit/xf86-video-vmware/dist/depcomp U xsrc/external/mit/xf86-video-vmware/dist/man/Makefile.in U xsrc/external/mit/xf86-video-vmware/dist/man/Makefile.am U xsrc/external/mit/xf86-video-vmware/dist/man/vmware.man U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarectrlproto.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_overlay.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_limits.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarexinerama.c U xsrc/external/mit/xf86-video-vmware/dist/src/bits2pixels.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_modes.h U xsrc/external/mit/xf86-video-vmware/dist/src/bits2pixels.c U xsrc/external/mit/xf86-video-vmware/dist/src/vm_device_version.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodes.c U xsrc/external/mit/xf86-video-vmware/dist/src/vmware_common.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmware.c U xsrc/external/mit/xf86-video-vmware/dist/src/vm_basic_types.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmware_common.c U xsrc/external/mit/xf86-video-vmware/dist/src/guest_os.h U xsrc/external/mit/xf86-video-vmware/dist/src/includeCheck.h U xsrc/external/mit/xf86-video-vmware/dist/src/compat-api.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_escape.h U xsrc/external/mit/xf86-video-vmware/dist/src/Makefile.in U xsrc/external/mit/xf86-video-vmware/dist/src/vmware_bootstrap.c U xsrc/external/mit/xf86-video-vmware/dist/src/vmware.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarecurs.c U xsrc/external/mit/xf86-video-vmware/dist/src/Makefile.am U xsrc/external/mit/xf86-video-vmware/dist/src/svga_reg.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarectrl.c U xsrc/external/mit/xf86-video-vmware/dist/src/vmware_bootstrap.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarectrl.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_struct.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarevideo.c U xsrc/external/mit/xf86-video-vmware/dist/saa/saa_unaccel.c U xsrc/external/mit/xf86-video-vmware/dist/saa/saa_render.c U xsrc/external/mit/xf86-video-vmware/dist/saa/saa_accel.c U xsrc/external/mit/xf86-video-vmware/dist/saa/saa.h U xsrc/external/mit/xf86-video-vmware/dist/saa/saa_pixmap.c U xsrc/external/mit/xf86-video-vmware/dist/saa/Makefile.in U xsrc/external/mit/xf86-video-vmware/dist/saa/saa.c U xsrc/external/mit/xf86-video-vmware/dist/saa/Makefile.am U xsrc/external/mit/xf86-video-vmware/dist/saa/saa_priv.h U xsrc/external/mit/xf86-video-vmware/dist/vmwarectrl/libvmwarectrl.h U xsrc/external/mit/xf86-video-vmware/dist/vmwarectrl/Makefile.in U xsrc/external/mit/xf86-video-vmware/dist/vmwarectrl/Makefile.am U xsrc/external/mit/xf86-video-vmware/dist/vmwarectrl/libvmwarectrl.c U xsrc/external/mit/xf86-video-vmware/dist/vmwarectrl/vmwarectrl.c U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_xa_surface.c U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_driver.c U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_xa_composite.c U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_ctrl.h U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_hosted.c U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_hosted_priv.h U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_drmi.c U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_driver.h U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_ctrl.c U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_saa_priv.h U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_crtc.c U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_dri2.c U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/Makefile.in U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_xmir.c U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_output.c U xsrc/ex
CVS import: xsrc/external/mit/xf86-video-nv/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 01:55:43 UTC 2017 Update of /cvsroot/xsrc/external/mit/xf86-video-nv/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18577 Log Message: initial import of xf86-video-nv-2.1.21 Status: Vendor Tag: xorg Release Tags: xf86-video-nv-2-1-21 U xsrc/external/mit/xf86-video-nv/dist/missing U xsrc/external/mit/xf86-video-nv/dist/ltmain.sh U xsrc/external/mit/xf86-video-nv/dist/aclocal.m4 U xsrc/external/mit/xf86-video-nv/dist/config.sub U xsrc/external/mit/xf86-video-nv/dist/INSTALL U xsrc/external/mit/xf86-video-nv/dist/Makefile.am U xsrc/external/mit/xf86-video-nv/dist/configure.ac U xsrc/external/mit/xf86-video-nv/dist/Makefile.in N xsrc/external/mit/xf86-video-nv/dist/compile U xsrc/external/mit/xf86-video-nv/dist/README U xsrc/external/mit/xf86-video-nv/dist/README.G80 U xsrc/external/mit/xf86-video-nv/dist/configure U xsrc/external/mit/xf86-video-nv/dist/config.h.in U xsrc/external/mit/xf86-video-nv/dist/config.guess U xsrc/external/mit/xf86-video-nv/dist/install-sh U xsrc/external/mit/xf86-video-nv/dist/COPYING U xsrc/external/mit/xf86-video-nv/dist/ChangeLog U xsrc/external/mit/xf86-video-nv/dist/depcomp U xsrc/external/mit/xf86-video-nv/dist/src/riva_cursor.c U xsrc/external/mit/xf86-video-nv/dist/src/compat-api.h U xsrc/external/mit/xf86-video-nv/dist/src/nv_type.h U xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.c U xsrc/external/mit/xf86-video-nv/dist/src/nv_setup.c U xsrc/external/mit/xf86-video-nv/dist/src/g80_cursor.h U xsrc/external/mit/xf86-video-nv/dist/src/riva_shadow.c U xsrc/external/mit/xf86-video-nv/dist/src/nv_dac.c U xsrc/external/mit/xf86-video-nv/dist/src/riva_hw.h U xsrc/external/mit/xf86-video-nv/dist/src/nv_dma.h U xsrc/external/mit/xf86-video-nv/dist/src/g80_display.h U xsrc/external/mit/xf86-video-nv/dist/src/g80_output.c U xsrc/external/mit/xf86-video-nv/dist/src/nv_shadow.c C xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c C xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h U xsrc/external/mit/xf86-video-nv/dist/src/nv_xaa.c U xsrc/external/mit/xf86-video-nv/dist/src/g80_type.h U xsrc/external/mit/xf86-video-nv/dist/src/Makefile.am U xsrc/external/mit/xf86-video-nv/dist/src/riva_tbl.h U xsrc/external/mit/xf86-video-nv/dist/src/nv_const.h U xsrc/external/mit/xf86-video-nv/dist/src/riva_proto.h C xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c U xsrc/external/mit/xf86-video-nv/dist/src/riva_local.h U xsrc/external/mit/xf86-video-nv/dist/src/riva_dac.c U xsrc/external/mit/xf86-video-nv/dist/src/Makefile.in U xsrc/external/mit/xf86-video-nv/dist/src/nv_dga.c C xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h U xsrc/external/mit/xf86-video-nv/dist/src/nv_cursor.c U xsrc/external/mit/xf86-video-nv/dist/src/riva_dga.c U xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.c U xsrc/external/mit/xf86-video-nv/dist/src/riva_type.h U xsrc/external/mit/xf86-video-nv/dist/src/riva_setup.c U xsrc/external/mit/xf86-video-nv/dist/src/g80_cursor.c U xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c U xsrc/external/mit/xf86-video-nv/dist/src/riva_xaa.c U xsrc/external/mit/xf86-video-nv/dist/src/g80_exa.h U xsrc/external/mit/xf86-video-nv/dist/src/g80_display.c U xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c U xsrc/external/mit/xf86-video-nv/dist/src/nv_video.c U xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.h C xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c U xsrc/external/mit/xf86-video-nv/dist/src/riva_const.h U xsrc/external/mit/xf86-video-nv/dist/src/riva_hw.c U xsrc/external/mit/xf86-video-nv/dist/src/g80_dma.c U xsrc/external/mit/xf86-video-nv/dist/src/nv_proto.h U xsrc/external/mit/xf86-video-nv/dist/src/g80_output.h U xsrc/external/mit/xf86-video-nv/dist/src/nv_hw.c U xsrc/external/mit/xf86-video-nv/dist/src/g80_xaa.h U xsrc/external/mit/xf86-video-nv/dist/src/nv_local.h U xsrc/external/mit/xf86-video-nv/dist/man/Makefile.am U xsrc/external/mit/xf86-video-nv/dist/man/Makefile.in U xsrc/external/mit/xf86-video-nv/dist/man/nv.man 5 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-nv/dist
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Sun Mar 5 01:42:55 UTC 2017
Modified Files:
xsrc/external/mit/xf86-video-siliconmotion/dist/src: smi.h smi_driver.c
xsrc/external/mit/xf86-video-sis/dist/src: sis_driver.c
xsrc/external/mit/xf86-video-sis/include: config.h
xsrc/external/mit/xf86-video-sunleo/dist/src: leo_accel.c
Log Message:
merge xf86-video-siliconmotion 1.7.9, xf86-video-sis 0.10.9, and
xf86-video-sunleo 1.2.2.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xf86-video-sis/include/config.h
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.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/xf86-video-siliconmotion/dist/src/smi.h
diff -u xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h:1.7 xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h:1.8
--- xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h:1.7 Sat Aug 20 00:27:22 2016
+++ xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h Sun Mar 5 01:42:54 2017
@@ -34,6 +34,7 @@ authorization from the XFree86 Project a
#include
#include
+#include
#include "xf86.h"
#include "xf86_OSproc.h"
Index: xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c
diff -u xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c:1.8 xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c:1.9
--- xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c:1.8 Sun Oct 9 19:04:06 2016
+++ xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c Sun Mar 5 01:42:54 2017
@@ -486,8 +486,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags
if (pScrn->depth > 8) {
/* The defaults are OK for us */
rgb zeros = {0, 0, 0};
-
-#if __BYTE_ORDER == __BIG_ENDIAN
+#if X_BYTE_ORDER == X_BIG_ENDIAN
rgb masks = {0xff00,0xff,0xff00};
#else
rgb masks = {0, 0, 0};
Index: xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c
diff -u xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.6 xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.7
--- xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.6 Mon Aug 15 17:42:06 2016
+++ xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c Sun Mar 5 01:42:55 2017
@@ -9395,7 +9395,7 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg,
y = (int)dy;
}
#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 13
- miPointerSetPosition(inputInfo.pointer, Absolute, x, y);
+ miPointerSetPosition(inputInfo.pointer, Absolute, &x, &y);
#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
miPointerSetPosition(inputInfo.pointer, &x, &y);
#else
Index: xsrc/external/mit/xf86-video-sis/include/config.h
diff -u xsrc/external/mit/xf86-video-sis/include/config.h:1.8 xsrc/external/mit/xf86-video-sis/include/config.h:1.9
--- xsrc/external/mit/xf86-video-sis/include/config.h:1.8 Mon Aug 15 17:44:03 2016
+++ xsrc/external/mit/xf86-video-sis/include/config.h Sun Mar 5 01:42:55 2017
@@ -55,7 +55,7 @@
#define PACKAGE_NAME "xf86-video-sis"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xf86-video-sis 0.10.8"
+#define PACKAGE_STRING "xf86-video-sis 0.10.9"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xf86-video-sis"
@@ -65,7 +65,7 @@
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.10.8"
+#define PACKAGE_VERSION "0.10.9"
/* Major version of this package */
#define PACKAGE_VERSION_MAJOR 0
@@ -74,7 +74,7 @@
#define PACKAGE_VERSION_MINOR 10
/* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 8
+#define PACKAGE_VERSION_PATCHLEVEL 9
/* Enable DRI driver support */
#undef SISDRI
@@ -86,7 +86,7 @@
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "0.10.8"
+#define VERSION "0.10.9"
/* Build support for Exa */
#define XF86EXA 1
Index: xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c
diff -u xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c:1.6 xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c:1.7
--- xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c:1.6 Tue Jun 4 22:20:42 2013
+++ xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c Sun Mar 5 01:42:55 2017
@@ -34,8 +34,6 @@
#include
#include "dixfontstr.h"
#include "fb.h"
-#include "mifillarc.h"
-#include "miwideline.h"
#include "mi.h"
#include "leo.h"
CVS import: xsrc/external/mit/xf86-video-savage/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 01:40:00 UTC 2017 Update of /cvsroot/xsrc/external/mit/xf86-video-savage/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28595 Log Message: initial import of xf86-video-savage-2.3.9 Status: Vendor Tag: xorg Release Tags: xf86-video-savage-2-3-9 U xsrc/external/mit/xf86-video-savage/dist/missing U xsrc/external/mit/xf86-video-savage/dist/ltmain.sh U xsrc/external/mit/xf86-video-savage/dist/aclocal.m4 U xsrc/external/mit/xf86-video-savage/dist/config.sub U xsrc/external/mit/xf86-video-savage/dist/INSTALL U xsrc/external/mit/xf86-video-savage/dist/Makefile.am U xsrc/external/mit/xf86-video-savage/dist/configure.ac U xsrc/external/mit/xf86-video-savage/dist/Makefile.in U xsrc/external/mit/xf86-video-savage/dist/compile U xsrc/external/mit/xf86-video-savage/dist/README U xsrc/external/mit/xf86-video-savage/dist/configure U xsrc/external/mit/xf86-video-savage/dist/config.h.in U xsrc/external/mit/xf86-video-savage/dist/config.guess U xsrc/external/mit/xf86-video-savage/dist/install-sh U xsrc/external/mit/xf86-video-savage/dist/COPYING U xsrc/external/mit/xf86-video-savage/dist/ChangeLog U xsrc/external/mit/xf86-video-savage/dist/depcomp U xsrc/external/mit/xf86-video-savage/dist/src/savage_streams.h U xsrc/external/mit/xf86-video-savage/dist/src/compat-api.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_drm.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_accel.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_shadow.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_i2c.c U xsrc/external/mit/xf86-video-savage/dist/src/Makefile.am U xsrc/external/mit/xf86-video-savage/dist/src/savage_pciids.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_dripriv.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_vbe.h U xsrc/external/mit/xf86-video-savage/dist/src/Makefile.in U xsrc/external/mit/xf86-video-savage/dist/src/savage_sarea.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_xaa.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_vbe.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_bci.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_video.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_regs.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_dga.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_hwmc.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_cursor.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_streams.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_dri.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_common.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_dri.c U xsrc/external/mit/xf86-video-savage/dist/man/Makefile.am U xsrc/external/mit/xf86-video-savage/dist/man/savage.man U xsrc/external/mit/xf86-video-savage/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xf86-video-trident/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 01:40:17 UTC 2017 Update of /cvsroot/xsrc/external/mit/xf86-video-trident/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9260 Log Message: initial import of xf86-video-trident-1.3.8 Status: Vendor Tag: xorg Release Tags: xf86-video-trident-1-3-8 U xsrc/external/mit/xf86-video-trident/dist/missing U xsrc/external/mit/xf86-video-trident/dist/ltmain.sh U xsrc/external/mit/xf86-video-trident/dist/aclocal.m4 U xsrc/external/mit/xf86-video-trident/dist/config.sub U xsrc/external/mit/xf86-video-trident/dist/INSTALL U xsrc/external/mit/xf86-video-trident/dist/Makefile.am U xsrc/external/mit/xf86-video-trident/dist/configure.ac U xsrc/external/mit/xf86-video-trident/dist/Makefile.in U xsrc/external/mit/xf86-video-trident/dist/compile U xsrc/external/mit/xf86-video-trident/dist/README U xsrc/external/mit/xf86-video-trident/dist/configure U xsrc/external/mit/xf86-video-trident/dist/config.h.in U xsrc/external/mit/xf86-video-trident/dist/config.guess U xsrc/external/mit/xf86-video-trident/dist/install-sh U xsrc/external/mit/xf86-video-trident/dist/COPYING U xsrc/external/mit/xf86-video-trident/dist/ChangeLog U xsrc/external/mit/xf86-video-trident/dist/depcomp U xsrc/external/mit/xf86-video-trident/dist/src/trident_dga.c U xsrc/external/mit/xf86-video-trident/dist/src/compat-api.h U xsrc/external/mit/xf86-video-trident/dist/src/tridentpcirename.h U xsrc/external/mit/xf86-video-trident/dist/src/trident_dac.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_regs.h U xsrc/external/mit/xf86-video-trident/dist/src/blade_accel_exa.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_video.c U xsrc/external/mit/xf86-video-trident/dist/src/Makefile.am U xsrc/external/mit/xf86-video-trident/dist/src/xp4_accel_exa.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_shadow.c U xsrc/external/mit/xf86-video-trident/dist/src/image_accel.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_tv.c U xsrc/external/mit/xf86-video-trident/dist/src/Makefile.in U xsrc/external/mit/xf86-video-trident/dist/src/trident.h U xsrc/external/mit/xf86-video-trident/dist/src/trident_accel.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_i2c.c U xsrc/external/mit/xf86-video-trident/dist/src/tvga_dac.c U xsrc/external/mit/xf86-video-trident/dist/src/xp_accel.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_bank.c U xsrc/external/mit/xf86-video-trident/dist/src/tridenthelper.c U xsrc/external/mit/xf86-video-trident/dist/src/blade_accel.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_driver.c U xsrc/external/mit/xf86-video-trident/dist/src/xp4_accel.c U xsrc/external/mit/xf86-video-trident/dist/man/Makefile.am U xsrc/external/mit/xf86-video-trident/dist/man/Makefile.in U xsrc/external/mit/xf86-video-trident/dist/man/trident.man No conflicts created by this import
CVS import: xsrc/external/mit/xf86-video-sunleo/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 01:40:10 UTC 2017 Update of /cvsroot/xsrc/external/mit/xf86-video-sunleo/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7605 Log Message: initial import of xf86-video-sunleo-1.2.2 Status: Vendor Tag: xorg Release Tags: xf86-video-sunleo-1-2-2 U xsrc/external/mit/xf86-video-sunleo/dist/missing U xsrc/external/mit/xf86-video-sunleo/dist/ltmain.sh U xsrc/external/mit/xf86-video-sunleo/dist/aclocal.m4 U xsrc/external/mit/xf86-video-sunleo/dist/config.sub U xsrc/external/mit/xf86-video-sunleo/dist/INSTALL U xsrc/external/mit/xf86-video-sunleo/dist/Makefile.am U xsrc/external/mit/xf86-video-sunleo/dist/configure.ac U xsrc/external/mit/xf86-video-sunleo/dist/Makefile.in N xsrc/external/mit/xf86-video-sunleo/dist/compile U xsrc/external/mit/xf86-video-sunleo/dist/README U xsrc/external/mit/xf86-video-sunleo/dist/configure U xsrc/external/mit/xf86-video-sunleo/dist/config.h.in U xsrc/external/mit/xf86-video-sunleo/dist/config.guess U xsrc/external/mit/xf86-video-sunleo/dist/install-sh U xsrc/external/mit/xf86-video-sunleo/dist/COPYING U xsrc/external/mit/xf86-video-sunleo/dist/ChangeLog U xsrc/external/mit/xf86-video-sunleo/dist/depcomp U xsrc/external/mit/xf86-video-sunleo/dist/src/compat-api.h U xsrc/external/mit/xf86-video-sunleo/dist/src/leo_regs.h U xsrc/external/mit/xf86-video-sunleo/dist/src/Makefile.am U xsrc/external/mit/xf86-video-sunleo/dist/src/Makefile.in U xsrc/external/mit/xf86-video-sunleo/dist/src/leo_driver.c C xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c U xsrc/external/mit/xf86-video-sunleo/dist/src/leo_cursor.c U xsrc/external/mit/xf86-video-sunleo/dist/src/leo.h U xsrc/external/mit/xf86-video-sunleo/dist/man/Makefile.am U xsrc/external/mit/xf86-video-sunleo/dist/man/Makefile.in U xsrc/external/mit/xf86-video-sunleo/dist/man/sunleo.man 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-sunleo/dist
CVS import: xsrc/external/mit/xf86-video-tdfx/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 01:40:13 UTC 2017 Update of /cvsroot/xsrc/external/mit/xf86-video-tdfx/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11076 Log Message: initial import of xf86-video-tdfx-1.4.7 Status: Vendor Tag: xorg Release Tags: xf86-video-tdfx-1-4-7 U xsrc/external/mit/xf86-video-tdfx/dist/missing U xsrc/external/mit/xf86-video-tdfx/dist/ltmain.sh U xsrc/external/mit/xf86-video-tdfx/dist/aclocal.m4 U xsrc/external/mit/xf86-video-tdfx/dist/config.sub U xsrc/external/mit/xf86-video-tdfx/dist/INSTALL U xsrc/external/mit/xf86-video-tdfx/dist/Makefile.am U xsrc/external/mit/xf86-video-tdfx/dist/configure.ac U xsrc/external/mit/xf86-video-tdfx/dist/Makefile.in N xsrc/external/mit/xf86-video-tdfx/dist/compile U xsrc/external/mit/xf86-video-tdfx/dist/README U xsrc/external/mit/xf86-video-tdfx/dist/configure U xsrc/external/mit/xf86-video-tdfx/dist/config.h.in U xsrc/external/mit/xf86-video-tdfx/dist/config.guess U xsrc/external/mit/xf86-video-tdfx/dist/install-sh U xsrc/external/mit/xf86-video-tdfx/dist/COPYING U xsrc/external/mit/xf86-video-tdfx/dist/ChangeLog U xsrc/external/mit/xf86-video-tdfx/dist/depcomp U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_hwcurs.c U xsrc/external/mit/xf86-video-tdfx/dist/src/compat-api.h U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.h U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx.h U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_video.c U xsrc/external/mit/xf86-video-tdfx/dist/src/Makefile.am U xsrc/external/mit/xf86-video-tdfx/dist/src/Makefile.in U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfxdefs.h U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dga.c U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dripriv.h U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_io.c U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_sli.c U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_priv.c U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_accel.c U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_priv.h U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c U xsrc/external/mit/xf86-video-tdfx/dist/man/Makefile.am U xsrc/external/mit/xf86-video-tdfx/dist/man/Makefile.in U xsrc/external/mit/xf86-video-tdfx/dist/man/tdfx.man No conflicts created by this import
CVS import: xsrc/external/mit/xf86-video-sis/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 01:40:06 UTC 2017 Update of /cvsroot/xsrc/external/mit/xf86-video-sis/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18443 Log Message: initial import of xf86-video-sis-0.10.9 Status: Vendor Tag: xorg Release Tags: xf86-video-sis-0-10-9 U xsrc/external/mit/xf86-video-sis/dist/missing U xsrc/external/mit/xf86-video-sis/dist/ltmain.sh U xsrc/external/mit/xf86-video-sis/dist/aclocal.m4 U xsrc/external/mit/xf86-video-sis/dist/config.sub U xsrc/external/mit/xf86-video-sis/dist/INSTALL U xsrc/external/mit/xf86-video-sis/dist/Makefile.am U xsrc/external/mit/xf86-video-sis/dist/configure.ac U xsrc/external/mit/xf86-video-sis/dist/Makefile.in N xsrc/external/mit/xf86-video-sis/dist/compile U xsrc/external/mit/xf86-video-sis/dist/README U xsrc/external/mit/xf86-video-sis/dist/configure U xsrc/external/mit/xf86-video-sis/dist/config.h.in U xsrc/external/mit/xf86-video-sis/dist/config.guess U xsrc/external/mit/xf86-video-sis/dist/install-sh U xsrc/external/mit/xf86-video-sis/dist/COPYING U xsrc/external/mit/xf86-video-sis/dist/ChangeLog U xsrc/external/mit/xf86-video-sis/dist/depcomp U xsrc/external/mit/xf86-video-sis/dist/src/sis310_accel.c U xsrc/external/mit/xf86-video-sis/dist/src/compat-api.h U xsrc/external/mit/xf86-video-sis/dist/src/initdef.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_dac.h U xsrc/external/mit/xf86-video-sis/dist/src/init.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_cursor.h U xsrc/external/mit/xf86-video-sis/dist/src/osdef.h U xsrc/external/mit/xf86-video-sis/dist/src/sis6326_video.c U xsrc/external/mit/xf86-video-sis/dist/src/sis_setup.c U xsrc/external/mit/xf86-video-sis/dist/src/sis_common.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_videostr.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_accel.c U xsrc/external/mit/xf86-video-sis/dist/src/sis_video.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_vga.c U xsrc/external/mit/xf86-video-sis/dist/src/Makefile.am U xsrc/external/mit/xf86-video-sis/dist/src/oem310.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_dga.c U xsrc/external/mit/xf86-video-sis/dist/src/sis_opt.c U xsrc/external/mit/xf86-video-sis/dist/src/oem300.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_accel.h U xsrc/external/mit/xf86-video-sis/dist/src/init301.c U xsrc/external/mit/xf86-video-sis/dist/src/Makefile.in U xsrc/external/mit/xf86-video-sis/dist/src/sispcirename.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_video.c U xsrc/external/mit/xf86-video-sis/dist/src/sis300_accel.h U xsrc/external/mit/xf86-video-sis/dist/src/initextx.h U xsrc/external/mit/xf86-video-sis/dist/src/init301.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_regs.h U xsrc/external/mit/xf86-video-sis/dist/src/sis310_accel.h U xsrc/external/mit/xf86-video-sis/dist/src/vstruct.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_cursor.c U xsrc/external/mit/xf86-video-sis/dist/src/sis_utility.c U xsrc/external/mit/xf86-video-sis/dist/src/initextx.c U xsrc/external/mit/xf86-video-sis/dist/src/sis_dri.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_shadow.c U xsrc/external/mit/xf86-video-sis/dist/src/300vtbl.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_memcpy.c U xsrc/external/mit/xf86-video-sis/dist/src/310vtbl.h U xsrc/external/mit/xf86-video-sis/dist/src/sis300_accel.c U xsrc/external/mit/xf86-video-sis/dist/src/sis.h U xsrc/external/mit/xf86-video-sis/dist/src/sis_dac.c U xsrc/external/mit/xf86-video-sis/dist/src/sis_vb.c U xsrc/external/mit/xf86-video-sis/dist/src/sis_dri.c U xsrc/external/mit/xf86-video-sis/dist/src/init.c U xsrc/external/mit/xf86-video-sis/dist/src/vgatypes.h C xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c U xsrc/external/mit/xf86-video-sis/dist/man/Makefile.am U xsrc/external/mit/xf86-video-sis/dist/man/Makefile.in U xsrc/external/mit/xf86-video-sis/dist/man/sis.man 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-sis/dist
CVS import: xsrc/external/mit/xf86-video-siliconmotion/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 01:40:03 UTC 2017 Update of /cvsroot/xsrc/external/mit/xf86-video-siliconmotion/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16373 Log Message: initial import of xf86-video-siliconmotion-1.7.9 Status: Vendor Tag: xorg Release Tags: xf86-video-siliconmotion-1-7-9 U xsrc/external/mit/xf86-video-siliconmotion/dist/missing U xsrc/external/mit/xf86-video-siliconmotion/dist/ltmain.sh U xsrc/external/mit/xf86-video-siliconmotion/dist/aclocal.m4 U xsrc/external/mit/xf86-video-siliconmotion/dist/config.sub U xsrc/external/mit/xf86-video-siliconmotion/dist/INSTALL U xsrc/external/mit/xf86-video-siliconmotion/dist/Makefile.am U xsrc/external/mit/xf86-video-siliconmotion/dist/configure.ac U xsrc/external/mit/xf86-video-siliconmotion/dist/Makefile.in U xsrc/external/mit/xf86-video-siliconmotion/dist/compile U xsrc/external/mit/xf86-video-siliconmotion/dist/README U xsrc/external/mit/xf86-video-siliconmotion/dist/Release.txt U xsrc/external/mit/xf86-video-siliconmotion/dist/configure U xsrc/external/mit/xf86-video-siliconmotion/dist/config.h.in U xsrc/external/mit/xf86-video-siliconmotion/dist/config.guess U xsrc/external/mit/xf86-video-siliconmotion/dist/CALLMAP U xsrc/external/mit/xf86-video-siliconmotion/dist/install-sh U xsrc/external/mit/xf86-video-siliconmotion/dist/COPYING U xsrc/external/mit/xf86-video-siliconmotion/dist/ChangeLog U xsrc/external/mit/xf86-video-siliconmotion/dist/depcomp U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi501_crtc.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/compat-api.h C xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_dac.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smilynx_crtc.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_501.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smilynx_output.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_output.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/Makefile.am U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_xaa.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smilynx_hw.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/Makefile.in U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_video.h U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_501.h U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_video.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_accel.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_i2c.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smilynx.h U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_crtc.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_exa.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_crtc.h U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_pcirename.h C xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/regsmi.h U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi501_output.c U xsrc/external/mit/xf86-video-siliconmotion/dist/man/siliconmotion.man U xsrc/external/mit/xf86-video-siliconmotion/dist/man/Makefile.am U xsrc/external/mit/xf86-video-siliconmotion/dist/man/Makefile.in 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-siliconmotion/dist
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Sun Mar 5 01:32:03 UTC 2017
Modified Files:
xsrc/external/mit/xf86-video-chips/dist/src: ct_accel.c
xsrc/external/mit/xf86-video-glint/dist/src: glint_driver.c pm2_dac.c
xsrc/external/mit/xf86-video-glint/include: config.h
xsrc/external/mit/xf86-video-mga/dist/src: mga_dac3026.c mga_dacG.c
mga_driver.c mga_exa.c mga_merge.c mga_storm.c
xsrc/external/mit/xf86-video-r128/dist/src: r128_driver.c r128_output.c
Log Message:
merge xf86-video-chips 1.2.7, xf86-video-glint 1.2.9, xf86-video-mga 1.6.5,
and xf86-video-r128 6.10.2.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_accel.c
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-glint/dist/src/pm2_dac.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xf86-video-glint/include/config.h
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-mga/dist/src/mga_dacG.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-mga/dist/src/mga_driver.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.c \
xsrc/external/mit/xf86-video-mga/dist/src/mga_storm.c
cvs rdiff -u -r1.17 -r1.18 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_output.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/xf86-video-chips/dist/src/ct_accel.c
diff -u xsrc/external/mit/xf86-video-chips/dist/src/ct_accel.c:1.4 xsrc/external/mit/xf86-video-chips/dist/src/ct_accel.c:1.5
--- xsrc/external/mit/xf86-video-chips/dist/src/ct_accel.c:1.4 Sat Aug 20 16:21:08 2016
+++ xsrc/external/mit/xf86-video-chips/dist/src/ct_accel.c Sun Mar 5 01:32:02 2017
@@ -25,8 +25,6 @@
#include "config.h"
#endif
-#ifdef HAVE_XAA_H
-
/*
* When monochrome tiles/stipples are cached on the HiQV chipsets the
* pitch of the monochrome data is the displayWidth. The HiQV manuals
@@ -69,6 +67,8 @@
#define CTNAME(subname) CATNAME(CHIPS,subname)
#endif
+#ifdef HAVE_XAA_H
+
#ifdef DEBUG
# define DEBUG_P(x) ErrorF(x"\n");
#elif defined X_DEBUG
@@ -164,7 +164,7 @@ static void CTNAME(ReadPixmap)(ScrnInfo
# define BE_SWAPON(pScrn,cPtr)
# define BE_SWAPOFF(pScrn,cPtr)
#endif
-
+#endif
Bool
CTNAME(AccelInit)(ScreenPtr pScreen)
{
@@ -1741,8 +1741,6 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, in
}
#endif /* ReadPixmap */
-#endif /* writepixmap */
-
#endif
-#endif /* HAVE_XAA_H */
+#endif
Index: xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c
diff -u xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c:1.11 xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c:1.12
--- xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c:1.11 Fri Dec 23 06:52:17 2016
+++ xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c Sun Mar 5 01:32:02 2017
@@ -947,7 +947,9 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flag
if (FBDevProbed) {
int default_depth, fbbpp;
- if (!fbdevHWInit(pScrn,NULL,xf86FindOptionValue(pGlint->pEnt->device->options,"fbdev"))) {
+ if (!fbdevHWInit(pScrn, pGlint->PciInfo,
+ xf86FindOptionValue(pGlint->pEnt->device->options,
+ "fbdev"))) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "fbdevHWInit failed!\n");
return FALSE;
}
@@ -1086,7 +1088,9 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flag
return FALSE;
}
- if (!fbdevHWInit(pScrn,NULL,xf86FindOptionValue(pGlint->pEnt->device->options,"fbdev")))
+ if (!fbdevHWInit(pScrn, pGlint->PciInfo,
+ xf86FindOptionValue(pGlint->pEnt->device->options,
+ "fbdev")))
{
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "fbdevHWInit failed!\n");
return FALSE;
Index: xsrc/external/mit/xf86-video-glint/dist/src/pm2_dac.c
diff -u xsrc/external/mit/xf86-video-glint/dist/src/pm2_dac.c:1.4 xsrc/external/mit/xf86-video-glint/dist/src/pm2_dac.c:1.5
--- xsrc/external/mit/xf86-video-glint/dist/src/pm2_dac.c:1.4 Fri Dec 9 23:13:14 2016
+++ xsrc/external/mit/xf86-video-glint/dist/src/pm2_dac.c Sun Mar 5 01:32:02 2017
@@ -477,14 +477,9 @@ Permedia2I2CPutBits(I2CBusPtr b, int scl
{
GLINTPtr pGlint = (GLINTPtr) b->DriverPrivate.ptr;
int r = (pGlint->DDCBus == b) ? PMDDCData : VSSerialBusControl;
-/*
-This is bogus.
-All this line does is to preserve the USE_MONID bit if set which prevents
-the i2c bits from doing anything
-CARD32 v = GLINT_READ_REG(r) & ~(ClkOut | DataOut);
-*/
+
CARD32 v = 0;
-
+
if (scl > 0) v |= ClkOut;
if (sda > 0) v |= DataOut;
Index: xsrc/external/mit/xf86-video-glint/include/config.h
diff -u xsrc/external/mit/xf86-video-glint/include/c
CVS import: xsrc/external/mit/xf86-video-r128/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 01:19:57 UTC 2017 Update of /cvsroot/xsrc/external/mit/xf86-video-r128/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28509 Log Message: initial import of xf86-video-r128-6.10.2 Status: Vendor Tag: xorg Release Tags: xf86-video-r128-6-10-2 U xsrc/external/mit/xf86-video-r128/dist/missing U xsrc/external/mit/xf86-video-r128/dist/ltmain.sh U xsrc/external/mit/xf86-video-r128/dist/aclocal.m4 U xsrc/external/mit/xf86-video-r128/dist/config.sub U xsrc/external/mit/xf86-video-r128/dist/INSTALL U xsrc/external/mit/xf86-video-r128/dist/Makefile.am U xsrc/external/mit/xf86-video-r128/dist/configure.ac U xsrc/external/mit/xf86-video-r128/dist/Makefile.in U xsrc/external/mit/xf86-video-r128/dist/compile U xsrc/external/mit/xf86-video-r128/dist/README U xsrc/external/mit/xf86-video-r128/dist/configure U xsrc/external/mit/xf86-video-r128/dist/config.h.in U xsrc/external/mit/xf86-video-r128/dist/config.guess U xsrc/external/mit/xf86-video-r128/dist/install-sh U xsrc/external/mit/xf86-video-r128/dist/COPYING U xsrc/external/mit/xf86-video-r128/dist/ChangeLog U xsrc/external/mit/xf86-video-r128/dist/depcomp U xsrc/external/mit/xf86-video-r128/dist/src/r128_version.h U xsrc/external/mit/xf86-video-r128/dist/src/compat-api.h U xsrc/external/mit/xf86-video-r128/dist/src/r128.h U xsrc/external/mit/xf86-video-r128/dist/src/r128_sarea.h U xsrc/external/mit/xf86-video-r128/dist/src/r128_misc.c U xsrc/external/mit/xf86-video-r128/dist/src/r128_video.c U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.am U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.in U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa_render.c U xsrc/external/mit/xf86-video-r128/dist/src/r128_crtc.c U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h U xsrc/external/mit/xf86-video-r128/dist/src/r128_reg.h C xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.c U xsrc/external/mit/xf86-video-r128/dist/src/r128_dripriv.h U xsrc/external/mit/xf86-video-r128/dist/src/atipcirename.h U xsrc/external/mit/xf86-video-r128/dist/src/r128_cursor.c U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.h U xsrc/external/mit/xf86-video-r128/dist/src/r128_accel.c U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.c U xsrc/external/mit/xf86-video-r128/dist/src/r128_common.h C xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.am U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.in U xsrc/external/mit/xf86-video-r128/dist/man/r128.man 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-r128/dist
CVS import: xsrc/external/mit/xf86-video-i740/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 01:19:52 UTC 2017 Update of /cvsroot/xsrc/external/mit/xf86-video-i740/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3337 Log Message: initial import of xf86-video-i740-1.3.6 Status: Vendor Tag: xorg Release Tags: xf86-video-i740-1-3-6 U xsrc/external/mit/xf86-video-i740/dist/missing U xsrc/external/mit/xf86-video-i740/dist/ltmain.sh U xsrc/external/mit/xf86-video-i740/dist/aclocal.m4 U xsrc/external/mit/xf86-video-i740/dist/config.sub U xsrc/external/mit/xf86-video-i740/dist/INSTALL U xsrc/external/mit/xf86-video-i740/dist/Makefile.am U xsrc/external/mit/xf86-video-i740/dist/configure.ac U xsrc/external/mit/xf86-video-i740/dist/Makefile.in N xsrc/external/mit/xf86-video-i740/dist/compile U xsrc/external/mit/xf86-video-i740/dist/README U xsrc/external/mit/xf86-video-i740/dist/configure U xsrc/external/mit/xf86-video-i740/dist/config.h.in U xsrc/external/mit/xf86-video-i740/dist/config.guess U xsrc/external/mit/xf86-video-i740/dist/install-sh U xsrc/external/mit/xf86-video-i740/dist/COPYING U xsrc/external/mit/xf86-video-i740/dist/ChangeLog U xsrc/external/mit/xf86-video-i740/dist/depcomp U xsrc/external/mit/xf86-video-i740/dist/src/i740_macros.h U xsrc/external/mit/xf86-video-i740/dist/src/compat-api.h U xsrc/external/mit/xf86-video-i740/dist/src/i740.h U xsrc/external/mit/xf86-video-i740/dist/src/i740_dga.h U xsrc/external/mit/xf86-video-i740/dist/src/i740_accel.c U xsrc/external/mit/xf86-video-i740/dist/src/i740_video.c U xsrc/external/mit/xf86-video-i740/dist/src/i740_pcirename.h U xsrc/external/mit/xf86-video-i740/dist/src/Makefile.am U xsrc/external/mit/xf86-video-i740/dist/src/Makefile.in U xsrc/external/mit/xf86-video-i740/dist/src/i740_dga.c U xsrc/external/mit/xf86-video-i740/dist/src/i740_cursor.c U xsrc/external/mit/xf86-video-i740/dist/src/i740_driver.c U xsrc/external/mit/xf86-video-i740/dist/src/i740_io.c U xsrc/external/mit/xf86-video-i740/dist/src/i740_reg.h U xsrc/external/mit/xf86-video-i740/dist/src/i740_i2c.c U xsrc/external/mit/xf86-video-i740/dist/man/Makefile.am U xsrc/external/mit/xf86-video-i740/dist/man/Makefile.in U xsrc/external/mit/xf86-video-i740/dist/man/i740.man No conflicts created by this import
CVS import: xsrc/external/mit/xf86-video-geode/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 01:19:47 UTC 2017 Update of /cvsroot/xsrc/external/mit/xf86-video-geode/dist In directory ivanova.netbsd.org:/tmp/cvs-serv872 Log Message: initial import of xf86-video-geode-2.11.19 Status: Vendor Tag: xorg Release Tags: xf86-video-geode-2-11-19 U xsrc/external/mit/xf86-video-geode/dist/NEWS U xsrc/external/mit/xf86-video-geode/dist/Makefile.in U xsrc/external/mit/xf86-video-geode/dist/COPYING U xsrc/external/mit/xf86-video-geode/dist/autogen.sh U xsrc/external/mit/xf86-video-geode/dist/configure.ac U xsrc/external/mit/xf86-video-geode/dist/aclocal.m4 U xsrc/external/mit/xf86-video-geode/dist/configure U xsrc/external/mit/xf86-video-geode/dist/TODO U xsrc/external/mit/xf86-video-geode/dist/ChangeLog U xsrc/external/mit/xf86-video-geode/dist/Makefile.am U xsrc/external/mit/xf86-video-geode/dist/INSTALL U xsrc/external/mit/xf86-video-geode/dist/config.h.in U xsrc/external/mit/xf86-video-geode/dist/README U xsrc/external/mit/xf86-video-geode/dist/build-aux/install-sh U xsrc/external/mit/xf86-video-geode/dist/build-aux/compile U xsrc/external/mit/xf86-video-geode/dist/build-aux/config.sub U xsrc/external/mit/xf86-video-geode/dist/build-aux/depcomp U xsrc/external/mit/xf86-video-geode/dist/build-aux/config.guess U xsrc/external/mit/xf86-video-geode/dist/build-aux/missing U xsrc/external/mit/xf86-video-geode/dist/build-aux/ltmain.sh U xsrc/external/mit/xf86-video-geode/dist/m4/lt~obsolete.m4 U xsrc/external/mit/xf86-video-geode/dist/m4/ltsugar.m4 U xsrc/external/mit/xf86-video-geode/dist/m4/ltoptions.m4 U xsrc/external/mit/xf86-video-geode/dist/m4/ltversion.m4 U xsrc/external/mit/xf86-video-geode/dist/m4/libtool.m4 U xsrc/external/mit/xf86-video-geode/dist/src/geode_blend.h U xsrc/external/mit/xf86-video-geode/dist/src/lx_panel.c U xsrc/external/mit/xf86-video-geode/dist/src/gx_accel.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_vga.c U xsrc/external/mit/xf86-video-geode/dist/src/Makefile.in U xsrc/external/mit/xf86-video-geode/dist/src/durango.c U xsrc/external/mit/xf86-video-geode/dist/src/cimarron.c U xsrc/external/mit/xf86-video-geode/dist/src/panel.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_exa.c U xsrc/external/mit/xf86-video-geode/dist/src/geode_fourcc.h U xsrc/external/mit/xf86-video-geode/dist/src/lx_video.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_display.c U xsrc/external/mit/xf86-video-geode/dist/src/gx_rotate.c U xsrc/external/mit/xf86-video-geode/dist/src/geode.h U xsrc/external/mit/xf86-video-geode/dist/src/gx_video.c U xsrc/external/mit/xf86-video-geode/dist/src/cim_dev.h U xsrc/external/mit/xf86-video-geode/dist/src/geode_ddc.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_cursor.c U xsrc/external/mit/xf86-video-geode/dist/src/geode_pcirename.h U xsrc/external/mit/xf86-video-geode/dist/src/gx_cursor.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_memory.c U xsrc/external/mit/xf86-video-geode/dist/src/gx_randr.c U xsrc/external/mit/xf86-video-geode/dist/src/gx_regacc.c U xsrc/external/mit/xf86-video-geode/dist/src/geode_common.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_output.c U xsrc/external/mit/xf86-video-geode/dist/src/geode_msr.c U xsrc/external/mit/xf86-video-geode/dist/src/geode_driver.c U xsrc/external/mit/xf86-video-geode/dist/src/geode_dcon.c U xsrc/external/mit/xf86-video-geode/dist/src/z4l.c U xsrc/external/mit/xf86-video-geode/dist/src/Makefile.am U xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c U xsrc/external/mit/xf86-video-geode/dist/src/compat-api.h U xsrc/external/mit/xf86-video-geode/dist/src/gx_vga.c U xsrc/external/mit/xf86-video-geode/dist/src/panel/drac9210.h U xsrc/external/mit/xf86-video-geode/dist/src/panel/panel.h U xsrc/external/mit/xf86-video-geode/dist/src/panel/gx2_9211.h U xsrc/external/mit/xf86-video-geode/dist/src/panel/drac9210.c U xsrc/external/mit/xf86-video-geode/dist/src/panel/pnl_bios.c U xsrc/external/mit/xf86-video-geode/dist/src/panel/panel.c U xsrc/external/mit/xf86-video-geode/dist/src/panel/pnl_defs.h U xsrc/external/mit/xf86-video-geode/dist/src/panel/gx2_9211.c U xsrc/external/mit/xf86-video-geode/dist/src/panel/cen9211.c U xsrc/external/mit/xf86-video-geode/dist/src/panel/cen9211.h U xsrc/external/mit/xf86-video-geode/dist/src/panel/92xx.h U xsrc/external/mit/xf86-video-geode/dist/src/panel/dora9211.c U xsrc/external/mit/xf86-video-geode/dist/src/panel/dora9211.h U xsrc/external/mit/xf86-video-geode/dist/src/panel/pnl_init.c U xsrc/external/mit/xf86-video-geode/dist/src/panel/readme.txt U xsrc/external/mit/xf86-video-geode/dist/src/panel/platform.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/init_gu2.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_tv.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_priv.h U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_mode.h U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_rtns.h U xsrc/ex
CVS import: xsrc/external/mit/xf86-video-mga/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 01:19:55 UTC 2017 Update of /cvsroot/xsrc/external/mit/xf86-video-mga/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3855 Log Message: initial import of xf86-video-mga-1.6.5 Status: Vendor Tag: xorg Release Tags: xf86-video-mga-1-6-5 U xsrc/external/mit/xf86-video-mga/dist/missing U xsrc/external/mit/xf86-video-mga/dist/ltmain.sh U xsrc/external/mit/xf86-video-mga/dist/aclocal.m4 U xsrc/external/mit/xf86-video-mga/dist/config.sub U xsrc/external/mit/xf86-video-mga/dist/INSTALL U xsrc/external/mit/xf86-video-mga/dist/Makefile.am U xsrc/external/mit/xf86-video-mga/dist/configure.ac U xsrc/external/mit/xf86-video-mga/dist/mga_PInS.txt U xsrc/external/mit/xf86-video-mga/dist/Makefile.in U xsrc/external/mit/xf86-video-mga/dist/compile U xsrc/external/mit/xf86-video-mga/dist/README U xsrc/external/mit/xf86-video-mga/dist/README_HALLIB U xsrc/external/mit/xf86-video-mga/dist/configure U xsrc/external/mit/xf86-video-mga/dist/config.h.in U xsrc/external/mit/xf86-video-mga/dist/config.guess U xsrc/external/mit/xf86-video-mga/dist/install-sh U xsrc/external/mit/xf86-video-mga/dist/COPYING U xsrc/external/mit/xf86-video-mga/dist/ChangeLog U xsrc/external/mit/xf86-video-mga/dist/depcomp U xsrc/external/mit/xf86-video-mga/dist/src/mga_g450pll.c C xsrc/external/mit/xf86-video-mga/dist/src/mga_driver.c U xsrc/external/mit/xf86-video-mga/dist/src/compat-api.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_halmod.c C xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_macros.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_arc.c C xsrc/external/mit/xf86-video-mga/dist/src/mga_storm.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_shadow.c U xsrc/external/mit/xf86-video-mga/dist/src/client.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_reg.h U xsrc/external/mit/xf86-video-mga/dist/src/binding.h C xsrc/external/mit/xf86-video-mga/dist/src/mga_dacG.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_common.h U xsrc/external/mit/xf86-video-mga/dist/src/Makefile.am U xsrc/external/mit/xf86-video-mga/dist/src/mga_video.c U xsrc/external/mit/xf86-video-mga/dist/src/Makefile.in U xsrc/external/mit/xf86-video-mga/dist/src/mga.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.h C xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_dh.c U xsrc/external/mit/xf86-video-mga/dist/src/mgareg_flags.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_dga.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_sarea.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_hwcurs.c C xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_maven.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_dripriv.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_ucode.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_bios.c U xsrc/external/mit/xf86-video-mga/dist/util/stormdwg.c U xsrc/external/mit/xf86-video-mga/dist/util/Makefile.am U xsrc/external/mit/xf86-video-mga/dist/util/Makefile.in U xsrc/external/mit/xf86-video-mga/dist/util/README U xsrc/external/mit/xf86-video-mga/dist/man/Makefile.am U xsrc/external/mit/xf86-video-mga/dist/man/mga.man U xsrc/external/mit/xf86-video-mga/dist/man/Makefile.in 6 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-mga/dist
CVS import: xsrc/external/mit/xf86-video-chips/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 01:19:44 UTC 2017 Update of /cvsroot/xsrc/external/mit/xf86-video-chips/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4243 Log Message: initial import of xf86-video-chips-1.2.7 Status: Vendor Tag: xorg Release Tags: xf86-video-chips-1-2-7 U xsrc/external/mit/xf86-video-chips/dist/missing U xsrc/external/mit/xf86-video-chips/dist/ltmain.sh U xsrc/external/mit/xf86-video-chips/dist/aclocal.m4 U xsrc/external/mit/xf86-video-chips/dist/config.sub U xsrc/external/mit/xf86-video-chips/dist/INSTALL U xsrc/external/mit/xf86-video-chips/dist/Makefile.am U xsrc/external/mit/xf86-video-chips/dist/configure.ac U xsrc/external/mit/xf86-video-chips/dist/Makefile.in U xsrc/external/mit/xf86-video-chips/dist/compile U xsrc/external/mit/xf86-video-chips/dist/README U xsrc/external/mit/xf86-video-chips/dist/configure U xsrc/external/mit/xf86-video-chips/dist/config.h.in U xsrc/external/mit/xf86-video-chips/dist/config.guess U xsrc/external/mit/xf86-video-chips/dist/install-sh U xsrc/external/mit/xf86-video-chips/dist/COPYING U xsrc/external/mit/xf86-video-chips/dist/ChangeLog U xsrc/external/mit/xf86-video-chips/dist/depcomp U xsrc/external/mit/xf86-video-chips/dist/src/ct_pcirename.h U xsrc/external/mit/xf86-video-chips/dist/src/compat-api.h U xsrc/external/mit/xf86-video-chips/dist/src/ct_accel.c U xsrc/external/mit/xf86-video-chips/dist/src/ct_video.c U xsrc/external/mit/xf86-video-chips/dist/src/ct_BltHiQV.h U xsrc/external/mit/xf86-video-chips/dist/src/Makefile.am U xsrc/external/mit/xf86-video-chips/dist/src/ct_cursor.c U xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c U xsrc/external/mit/xf86-video-chips/dist/src/ct_BlitMM.h U xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.h U xsrc/external/mit/xf86-video-chips/dist/src/ct_regs.c U xsrc/external/mit/xf86-video-chips/dist/src/Makefile.in U xsrc/external/mit/xf86-video-chips/dist/src/ct_ddc.c U xsrc/external/mit/xf86-video-chips/dist/src/ct_bank.c U xsrc/external/mit/xf86-video-chips/dist/src/ct_dga.c U xsrc/external/mit/xf86-video-chips/dist/src/ct_Blitter.h U xsrc/external/mit/xf86-video-chips/dist/src/ct_shadow.c U xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h U xsrc/external/mit/xf86-video-chips/dist/util/dRegs.c U xsrc/external/mit/xf86-video-chips/dist/util/Makefile.am U xsrc/external/mit/xf86-video-chips/dist/util/mRegs.c U xsrc/external/mit/xf86-video-chips/dist/util/iopl.h U xsrc/external/mit/xf86-video-chips/dist/util/Makefile.in U xsrc/external/mit/xf86-video-chips/dist/util/modClock.c U xsrc/external/mit/xf86-video-chips/dist/man/Makefile.am U xsrc/external/mit/xf86-video-chips/dist/man/chips.man U xsrc/external/mit/xf86-video-chips/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xf86-video-glint/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 01:19:50 UTC 2017 Update of /cvsroot/xsrc/external/mit/xf86-video-glint/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5394 Log Message: initial import of xf86-video-glint-1.2.9 Status: Vendor Tag: xorg Release Tags: xf86-video-glint-1-2-9 U xsrc/external/mit/xf86-video-glint/dist/missing U xsrc/external/mit/xf86-video-glint/dist/ltmain.sh U xsrc/external/mit/xf86-video-glint/dist/aclocal.m4 U xsrc/external/mit/xf86-video-glint/dist/config.sub U xsrc/external/mit/xf86-video-glint/dist/INSTALL U xsrc/external/mit/xf86-video-glint/dist/Makefile.am U xsrc/external/mit/xf86-video-glint/dist/configure.ac U xsrc/external/mit/xf86-video-glint/dist/Makefile.in N xsrc/external/mit/xf86-video-glint/dist/compile U xsrc/external/mit/xf86-video-glint/dist/README U xsrc/external/mit/xf86-video-glint/dist/configure U xsrc/external/mit/xf86-video-glint/dist/config.h.in U xsrc/external/mit/xf86-video-glint/dist/config.guess U xsrc/external/mit/xf86-video-glint/dist/README.pm3 U xsrc/external/mit/xf86-video-glint/dist/install-sh U xsrc/external/mit/xf86-video-glint/dist/COPYING U xsrc/external/mit/xf86-video-glint/dist/ChangeLog U xsrc/external/mit/xf86-video-glint/dist/depcomp U xsrc/external/mit/xf86-video-glint/dist/src/glint_shadow.c U xsrc/external/mit/xf86-video-glint/dist/src/compat-api.h U xsrc/external/mit/xf86-video-glint/dist/src/pm3_regs.h U xsrc/external/mit/xf86-video-glint/dist/src/pm3_video.c U xsrc/external/mit/xf86-video-glint/dist/src/glintpcirename.h U xsrc/external/mit/xf86-video-glint/dist/src/glint_dga.c U xsrc/external/mit/xf86-video-glint/dist/src/pm2ramdac.c U xsrc/external/mit/xf86-video-glint/dist/src/tx_dac.c U xsrc/external/mit/xf86-video-glint/dist/src/pm2_video.c U xsrc/external/mit/xf86-video-glint/dist/src/glint_regs.h C xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c U xsrc/external/mit/xf86-video-glint/dist/src/pm_dac.c U xsrc/external/mit/xf86-video-glint/dist/src/Makefile.am C xsrc/external/mit/xf86-video-glint/dist/src/pm2_dac.c U xsrc/external/mit/xf86-video-glint/dist/src/Makefile.in U xsrc/external/mit/xf86-video-glint/dist/src/IBMramdac.c U xsrc/external/mit/xf86-video-glint/dist/src/sx_accel.c U xsrc/external/mit/xf86-video-glint/dist/src/pm2v_dac.c U xsrc/external/mit/xf86-video-glint/dist/src/TIramdac.c U xsrc/external/mit/xf86-video-glint/dist/src/tx_accel.c U xsrc/external/mit/xf86-video-glint/dist/src/glint.h U xsrc/external/mit/xf86-video-glint/dist/src/pm3_dac.c U xsrc/external/mit/xf86-video-glint/dist/src/pm2vramdac.c U xsrc/external/mit/xf86-video-glint/dist/src/pm2_accel.c U xsrc/external/mit/xf86-video-glint/dist/src/pm_accel.c U xsrc/external/mit/xf86-video-glint/dist/src/pm3_accel.c U xsrc/external/mit/xf86-video-glint/dist/man/Makefile.am U xsrc/external/mit/xf86-video-glint/dist/man/Makefile.in U xsrc/external/mit/xf86-video-glint/dist/man/glint.man 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-glint/dist
CVS commit: xsrc/external/mit/libXfont
Module Name:xsrc
Committed By: mrg
Date: Sun Mar 5 01:07:05 UTC 2017
Modified Files:
xsrc/external/mit/libXfont/dist/src/FreeType: ftfuncs.c
xsrc/external/mit/libXfont/dist/src/bitmap: bdfread.c pcfread.c
xsrc/external/mit/libXfont/dist/src/fc: fserve.c
xsrc/external/mit/libXfont/include: config.h
Log Message:
merge libXfont 1.5.2.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXfont/dist/src/fc/fserve.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libXfont/include/config.h
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/libXfont/dist/src/FreeType/ftfuncs.c
diff -u xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.6 xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.7
--- xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.6 Wed Feb 25 19:59:36 2015
+++ xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c Sun Mar 5 01:07:05 2017
@@ -474,7 +474,7 @@ FreeTypeOpenInstance(FTInstancePtr *inst
if( FT_IS_SFNT( face->face ) ) {
#if 1
FT_F26Dot6 tt_char_width, tt_char_height, tt_dim_x, tt_dim_y;
-FT_UInt nn;
+FT_Int nn;
instance->strike_index=0xU;
@@ -622,7 +622,7 @@ FreeTypeInstanceFindGlyph(unsigned idx_i
offset = idx - segment * FONTSEGMENTSIZE;
if((*available)[segment] == NULL) {
-(*available)[segment] = calloc(FONTSEGMENTSIZE, sizeof(int *));
+(*available)[segment] = calloc(FONTSEGMENTSIZE, sizeof(int));
if((*available)[segment] == NULL)
return AllocError;
}
@@ -1454,7 +1454,7 @@ FreeTypeRasteriseGlyph(unsigned idx, int
}
for( i = MAX(0, dy) ; irows <= i-dy ) break;
+ if( bitmap->rows <= (unsigned) (i-dy) ) break;
current_buffer=(unsigned char *)(bitmap->buffer+bitmap->pitch*(i-dy));
current_raster=(unsigned char *)(raster+i*bpr);
j = MAX(0,div_dx);
@@ -2061,7 +2061,7 @@ restrict_code_range_by_str(int count,uns
long val;
/* skip comma and/or space */
-while (',' == *p || isspace(*p))
+while (',' == *p || isspace((unsigned char)*p))
p++;
/* begin point */
@@ -2079,7 +2079,7 @@ restrict_code_range_by_str(int count,uns
}
/* skip space */
-while (isspace(*p))
+while (isspace((unsigned char)*p))
p++;
if (',' != *p && '\0' != *p) {
@@ -2092,7 +2092,7 @@ restrict_code_range_by_str(int count,uns
break;
/* skip space */
-while (isspace(*p))
+while (isspace((unsigned char)*p))
p++;
val = strtol(p, (char **)&q, 0);
@@ -2985,13 +2985,13 @@ ft_compute_bounds(FTFontPtr font, FontIn
c = row<<8|col;
flags=0;
if ( !force_c_outside ) {
- if ( c <= instance->ttcap.forceConstantSpacingEnd
- && instance->ttcap.forceConstantSpacingBegin <= c )
+ if ( (signed) c <= instance->ttcap.forceConstantSpacingEnd
+ && instance->ttcap.forceConstantSpacingBegin <= (signed) c )
flags|=FT_FORCE_CONSTANT_SPACING;
}
else {/* for GB18030 proportional */
- if ( c <= instance->ttcap.forceConstantSpacingEnd
- || instance->ttcap.forceConstantSpacingBegin <= c )
+ if ( (signed) c <= instance->ttcap.forceConstantSpacingEnd
+ || instance->ttcap.forceConstantSpacingBegin <= (signed) c )
flags|=FT_FORCE_CONSTANT_SPACING;
}
#if 0
Index: xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c
diff -u xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c:1.4 xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c:1.5
--- xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c:1.4 Tue Mar 17 18:11:17 2015
+++ xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c Sun Mar 5 01:07:05 2017
@@ -298,7 +298,7 @@ bdfReadCharacters(FontFilePtr file, Font
bdfError("invalid number of CHARS in BDF file\n");
return (FALSE);
}
-if (nchars > INT32_MAX / sizeof(CharInfoRec)) {
+if (nchars > (signed) (INT32_MAX / sizeof(CharInfoRec))) {
bdfError("Couldn't allocate pCI (%d*%d)\n", nchars,
(int) sizeof(CharInfoRec));
goto BAILOUT;
@@ -426,7 +426,7 @@ bdfReadCharacters(FontFilePtr file, Font
goto BAILOUT;
}
/* xCharInfo metrics are stored as INT16 */
- if ((wx < 0) || (wx > INT16_MAX)) {
+ if ((wx < INT16_MIN) || (wx > INT16_MAX)) {
bdfError("character '%s' has out of range width, %d\n",
charName, wx);
goto BAILOUT;
@@ -631,7 +631,7 @@ bdfReadProperties(FontFilePtr file, F
CVS import: xsrc/external/mit/libXfont/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 01:03:38 UTC 2017 Update of /cvsroot/xsrc/external/mit/libXfont/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6558 Log Message: initial import of libXfont-1.5.2 Status: Vendor Tag: xorg Release Tags: libXfont-1-5-2 U xsrc/external/mit/libXfont/dist/README U xsrc/external/mit/libXfont/dist/aclocal.m4 U xsrc/external/mit/libXfont/dist/depcomp U xsrc/external/mit/libXfont/dist/INSTALL U xsrc/external/mit/libXfont/dist/config.h.in U xsrc/external/mit/libXfont/dist/configure U xsrc/external/mit/libXfont/dist/devbook.am U xsrc/external/mit/libXfont/dist/Makefile.am U xsrc/external/mit/libXfont/dist/missing U xsrc/external/mit/libXfont/dist/configure.ac U xsrc/external/mit/libXfont/dist/install-sh U xsrc/external/mit/libXfont/dist/xfont.pc.in U xsrc/external/mit/libXfont/dist/ChangeLog U xsrc/external/mit/libXfont/dist/compile U xsrc/external/mit/libXfont/dist/ltmain.sh U xsrc/external/mit/libXfont/dist/COPYING U xsrc/external/mit/libXfont/dist/Makefile.in U xsrc/external/mit/libXfont/dist/config.guess U xsrc/external/mit/libXfont/dist/config.sub U xsrc/external/mit/libXfont/dist/AUTHORS U xsrc/external/mit/libXfont/dist/src/Makefile.am U xsrc/external/mit/libXfont/dist/src/dummy.c U xsrc/external/mit/libXfont/dist/src/Makefile.in U xsrc/external/mit/libXfont/dist/src/fc/Makefile.am U xsrc/external/mit/libXfont/dist/src/fc/fsio.c U xsrc/external/mit/libXfont/dist/src/fc/fserve.h U xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c U xsrc/external/mit/libXfont/dist/src/fc/fsio.h U xsrc/external/mit/libXfont/dist/src/fc/fslibos.h U xsrc/external/mit/libXfont/dist/src/fc/fservestr.h C xsrc/external/mit/libXfont/dist/src/fc/fserve.c U xsrc/external/mit/libXfont/dist/src/fc/fstrans.c U xsrc/external/mit/libXfont/dist/src/fc/Makefile.in U xsrc/external/mit/libXfont/dist/src/util/utilbitmap.c U xsrc/external/mit/libXfont/dist/src/util/atom.c U xsrc/external/mit/libXfont/dist/src/util/patcache.c U xsrc/external/mit/libXfont/dist/src/util/fontaccel.c U xsrc/external/mit/libXfont/dist/src/util/Makefile.am U xsrc/external/mit/libXfont/dist/src/util/fontutil.c U xsrc/external/mit/libXfont/dist/src/util/fontxlfd.c U xsrc/external/mit/libXfont/dist/src/util/Makefile.in U xsrc/external/mit/libXfont/dist/src/util/fontnames.c U xsrc/external/mit/libXfont/dist/src/util/miscutil.c U xsrc/external/mit/libXfont/dist/src/util/private.c U xsrc/external/mit/libXfont/dist/src/util/format.c U xsrc/external/mit/libXfont/dist/src/builtins/builtin.h U xsrc/external/mit/libXfont/dist/src/builtins/render.c U xsrc/external/mit/libXfont/dist/src/builtins/fonts.c U xsrc/external/mit/libXfont/dist/src/builtins/file.c U xsrc/external/mit/libXfont/dist/src/builtins/Makefile.am U xsrc/external/mit/libXfont/dist/src/builtins/fpe.c U xsrc/external/mit/libXfont/dist/src/builtins/dir.c U xsrc/external/mit/libXfont/dist/src/builtins/Makefile.in U xsrc/external/mit/libXfont/dist/src/builtins/buildfont U xsrc/external/mit/libXfont/dist/src/fontfile/fontscale.c U xsrc/external/mit/libXfont/dist/src/fontfile/filewr.c U xsrc/external/mit/libXfont/dist/src/fontfile/decompress.c U xsrc/external/mit/libXfont/dist/src/fontfile/fontfile.c U xsrc/external/mit/libXfont/dist/src/fontfile/Makefile.am U xsrc/external/mit/libXfont/dist/src/fontfile/defaults.c U xsrc/external/mit/libXfont/dist/src/fontfile/bufio.c U xsrc/external/mit/libXfont/dist/src/fontfile/renderers.c U xsrc/external/mit/libXfont/dist/src/fontfile/bitsource.c U xsrc/external/mit/libXfont/dist/src/fontfile/gunzip.c U xsrc/external/mit/libXfont/dist/src/fontfile/fontdir.c U xsrc/external/mit/libXfont/dist/src/fontfile/fontencc.c U xsrc/external/mit/libXfont/dist/src/fontfile/catalogue.c U xsrc/external/mit/libXfont/dist/src/fontfile/Makefile.in U xsrc/external/mit/libXfont/dist/src/fontfile/register.c U xsrc/external/mit/libXfont/dist/src/fontfile/bunzip2.c U xsrc/external/mit/libXfont/dist/src/fontfile/fileio.c U xsrc/external/mit/libXfont/dist/src/fontfile/dirfile.c C xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c U xsrc/external/mit/libXfont/dist/src/FreeType/ft.h U xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.h U xsrc/external/mit/libXfont/dist/src/FreeType/xttcap.c U xsrc/external/mit/libXfont/dist/src/FreeType/Makefile.am U xsrc/external/mit/libXfont/dist/src/FreeType/fttools.c U xsrc/external/mit/libXfont/dist/src/FreeType/ftenc.c U xsrc/external/mit/libXfont/dist/src/FreeType/Makefile.in U xsrc/external/mit/libXfont/dist/src/FreeType/xttcap.h U xsrc/external/mit/libXfont/dist/src/stubs/getnewfntcid.c U xsrc/external/mit/libXfont/dist/src/stubs/setfntauth.c U xsrc/external/mit/libXfont/dist/src/stubs/stfntcfnt.c U xsrc/external/mit/libXfont/dist/src/stubs/initfshdl.c U xsrc/external/mit/libXfont/dist/src/stubs/stubsinit.c U xsrc/external/mit/libXfont/dist/src/stubs/rmfshdl.c U xsrc/external/mit/libXfont/dist/src/stubs/stubs.h U xsrc/external/mit/libXfont/dist/src/stubs/servclient.c U
CVS commit: xsrc/external/mit/xorg-cf-files/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 00:59:48 UTC 2017 Modified Files: xsrc/external/mit/xorg-cf-files/dist: Imake.cf Removed Files: xsrc/external/mit/xorg-cf-files/dist: os2def.db Log Message: merge xorg-cf-files 1.0.6 To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-cf-files/dist/Imake.cf cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xorg-cf-files/dist/os2def.db 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/xorg-cf-files/dist/Imake.cf diff -u xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.6 xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.7 --- xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.6 Wed Dec 14 16:05:34 2016 +++ xsrc/external/mit/xorg-cf-files/dist/Imake.cf Sun Mar 5 00:59:48 2017 @@ -932,6 +932,12 @@ XCOMM Keep cpp from replacing path eleme # define PpcArchitecture # undef powerpc # endif +# if defined(__or1k__) +# ifndef OpenRISC1000Architecture +# define OpenRISC1000Architecture +# endif +# undef __or1k__ +# endif # if defined (__powerpc__) && !defined(__powerpc64__) && !defined (powerpc64) # ifndef PpcArchitecture # define PpcArchitecture
CVS import: xsrc/external/mit/xorg-cf-files/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 00:57:54 UTC 2017 Update of /cvsroot/xsrc/external/mit/xorg-cf-files/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11768 Log Message: initial import of xorg-cf-files-1.0.6 Status: Vendor Tag: xorg Release Tags: xorg-cf-files-1-0-6 U xsrc/external/mit/xorg-cf-files/dist/darwinLib.rules U xsrc/external/mit/xorg-cf-files/dist/lnxLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/svr3.cf U xsrc/external/mit/xorg-cf-files/dist/bsdi.cf U xsrc/external/mit/xorg-cf-files/dist/config.sub U xsrc/external/mit/xorg-cf-files/dist/sv3Lib.tmpl U xsrc/external/mit/xorg-cf-files/dist/xf86.tmpl U xsrc/external/mit/xorg-cf-files/dist/gnu.cf U xsrc/external/mit/xorg-cf-files/dist/os2.rules U xsrc/external/mit/xorg-cf-files/dist/bsdiLib.rules U xsrc/external/mit/xorg-cf-files/dist/Motif.rules U xsrc/external/mit/xorg-cf-files/dist/os2Lib.tmpl U xsrc/external/mit/xorg-cf-files/dist/lynx.cf U xsrc/external/mit/xorg-cf-files/dist/mingw.cf U xsrc/external/mit/xorg-cf-files/dist/missing U xsrc/external/mit/xorg-cf-files/dist/sco.cf U xsrc/external/mit/xorg-cf-files/dist/config.guess U xsrc/external/mit/xorg-cf-files/dist/Makefile.in U xsrc/external/mit/xorg-cf-files/dist/sco5.cf U xsrc/external/mit/xorg-cf-files/dist/osfLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/ibmLib.rules U xsrc/external/mit/xorg-cf-files/dist/cygwin.rules U xsrc/external/mit/xorg-cf-files/dist/pegasus.cf U xsrc/external/mit/xorg-cf-files/dist/gnuLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/sony.cf U xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl U xsrc/external/mit/xorg-cf-files/dist/FreeBSD.cf U xsrc/external/mit/xorg-cf-files/dist/xf86site.def U xsrc/external/mit/xorg-cf-files/dist/fujitsu.cf U xsrc/external/mit/xorg-cf-files/dist/gnuLib.rules U xsrc/external/mit/xorg-cf-files/dist/mingw.rules U xsrc/external/mit/xorg-cf-files/dist/Win32.cf C xsrc/external/mit/xorg-cf-files/dist/Imake.cf U xsrc/external/mit/xorg-cf-files/dist/QNX4.cf U xsrc/external/mit/xorg-cf-files/dist/sv3Lib.rules U xsrc/external/mit/xorg-cf-files/dist/site.def U xsrc/external/mit/xorg-cf-files/dist/hpLib.rules U xsrc/external/mit/xorg-cf-files/dist/svr4.cf U xsrc/external/mit/xorg-cf-files/dist/compile U xsrc/external/mit/xorg-cf-files/dist/sequentLib.rules U xsrc/external/mit/xorg-cf-files/dist/site.sample U xsrc/external/mit/xorg-cf-files/dist/xorg.cf U xsrc/external/mit/xorg-cf-files/dist/COPYING U xsrc/external/mit/xorg-cf-files/dist/OpenBSD.cf U xsrc/external/mit/xorg-cf-files/dist/sv4Lib.rules U xsrc/external/mit/xorg-cf-files/dist/necLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/hp.cf U xsrc/external/mit/xorg-cf-files/dist/darwin.cf U xsrc/external/mit/xorg-cf-files/dist/necLib.rules U xsrc/external/mit/xorg-cf-files/dist/linux.cf U xsrc/external/mit/xorg-cf-files/dist/bsd.cf U xsrc/external/mit/xorg-cf-files/dist/sunLib.rules U xsrc/external/mit/xorg-cf-files/dist/macII.cf U xsrc/external/mit/xorg-cf-files/dist/convex.cf U xsrc/external/mit/xorg-cf-files/dist/usl.cf U xsrc/external/mit/xorg-cf-files/dist/DGUX.cf C xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf U xsrc/external/mit/xorg-cf-files/dist/xorgsite.def U xsrc/external/mit/xorg-cf-files/dist/Makefile.am U xsrc/external/mit/xorg-cf-files/dist/nto.cf U xsrc/external/mit/xorg-cf-files/dist/bsdLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/WinLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/cde.tmpl U xsrc/external/mit/xorg-cf-files/dist/Threads.tmpl U xsrc/external/mit/xorg-cf-files/dist/sgi.cf U xsrc/external/mit/xorg-cf-files/dist/os2.cf U xsrc/external/mit/xorg-cf-files/dist/OpenBSDLib.rules U xsrc/external/mit/xorg-cf-files/dist/scoLib.rules U xsrc/external/mit/xorg-cf-files/dist/README U xsrc/external/mit/xorg-cf-files/dist/Library.tmpl U xsrc/external/mit/xorg-cf-files/dist/cygwin.tmpl U xsrc/external/mit/xorg-cf-files/dist/noop.rules U xsrc/external/mit/xorg-cf-files/dist/osf1.cf U xsrc/external/mit/xorg-cf-files/dist/darwinLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/QNX4.rules U xsrc/external/mit/xorg-cf-files/dist/luna.cf U xsrc/external/mit/xorg-cf-files/dist/ServerLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/hpLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/osfLib.rules U xsrc/external/mit/xorg-cf-files/dist/Mips.cf U xsrc/external/mit/xorg-cf-files/dist/nto.rules U xsrc/external/mit/xorg-cf-files/dist/sv4Lib.tmpl U xsrc/external/mit/xorg-cf-files/dist/sunLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/xfree86.cf U xsrc/external/mit/xorg-cf-files/dist/DragonFly.cf U xsrc/external/mit/xorg-cf-files/dist/isc.cf U xsrc/external/mit/xorg-cf-files/dist/aclocal.m4 U xsrc/external/mit/xorg-cf-files/dist/lnxdoc.rules U xsrc/external/mit/xorg-cf-files/dist/cde.rules U xsrc/external/mit/xorg-cf-files/dist/minix.cf U xsrc/external/mit/xorg-cf-files/dist/apollo.cf U xsrc/external/mit/xorg-cf-files/dist/generic.cf U xsrc/external/mit/xorg-cf-files/dist/ibmLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/ultrix.cf U
CVS import: xsrc/external/mit/util-macros/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 5 00:57:51 UTC 2017 Update of /cvsroot/xsrc/external/mit/util-macros/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18676 Log Message: initial import of util-macros-1.19.1 Status: Vendor Tag: xorg Release Tags: util-macros-1-19-1 U xsrc/external/mit/util-macros/dist/xorgversion.m4 U xsrc/external/mit/util-macros/dist/ChangeLog U xsrc/external/mit/util-macros/dist/configure.ac U xsrc/external/mit/util-macros/dist/configure U xsrc/external/mit/util-macros/dist/Makefile.am U xsrc/external/mit/util-macros/dist/Makefile.in U xsrc/external/mit/util-macros/dist/README U xsrc/external/mit/util-macros/dist/COPYING U xsrc/external/mit/util-macros/dist/missing U xsrc/external/mit/util-macros/dist/xorg-macros.m4.in U xsrc/external/mit/util-macros/dist/xorg-macros.pc.in U xsrc/external/mit/util-macros/dist/install-sh U xsrc/external/mit/util-macros/dist/aclocal.m4 U xsrc/external/mit/util-macros/dist/INSTALL No conflicts created by this import
CVS commit: src/external/mit/xorg/bin/xauth
Module Name:src
Committed By: mrg
Date: Sat Mar 4 23:23:21 UTC 2017
Modified Files:
src/external/mit/xorg/bin/xauth: Makefile
Log Message:
define HAVE_STRLCPY.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xauth/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/bin/xauth/Makefile
diff -u src/external/mit/xorg/bin/xauth/Makefile:1.5 src/external/mit/xorg/bin/xauth/Makefile:1.6
--- src/external/mit/xorg/bin/xauth/Makefile:1.5 Sun Jul 13 16:35:49 2014
+++ src/external/mit/xorg/bin/xauth/Makefile Sat Mar 4 23:23:21 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/07/13 16:35:49 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2017/03/04 23:23:21 mrg Exp $
.include
@@ -6,6 +6,7 @@ PROG= xauth
SRCS= xauth.c gethost.c process.c parsedpy.c
CPPFLAGS+= -DRETSIGTYPE=void -DPACKAGE_VERSION=\"1.0.8\"
+CPPFLAGS+= -DHAVE_STRLCPY
CPPFLAGS.gethost.c= ${X11FLAGS.CONNECTION}
CPPFLAGS.parsedpy.c= ${X11FLAGS.CONNECTION}
CVS commit: xsrc/external/mit/pixman/include
Module Name:xsrc Committed By: mrg Date: Sat Mar 4 23:24:29 UTC 2017 Modified Files: xsrc/external/mit/pixman/include: config.h Log Message: update for pixman 0.34.0 To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/pixman/include/config.h 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/pixman/include/config.h diff -u xsrc/external/mit/pixman/include/config.h:1.19 xsrc/external/mit/pixman/include/config.h:1.20 --- xsrc/external/mit/pixman/include/config.h:1.19 Sat Jul 12 04:31:43 2014 +++ xsrc/external/mit/pixman/include/config.h Sat Mar 4 23:24:29 2017 @@ -13,6 +13,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 +/* Whether we have FE_DIVBYZERO */ +#undef HAVE_FEDIVBYZERO + /* Whether the tool chain supports __float128 */ #undef HAVE_FLOAT128 @@ -76,8 +79,7 @@ /* Define to 1 if you have the header file. */ #define HAVE_UNISTD_H 1 -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Name of package */ @@ -90,7 +92,7 @@ #define PACKAGE_NAME "pixman" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "pixman 0.32.6" +#define PACKAGE_STRING "pixman 0.34.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "pixman" @@ -102,7 +104,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.32.6" +#define PACKAGE_VERSION "0.34.0" /* enable TIMER_BEGIN/TIMER_END macros */ /* #undef PIXMAN_TIMERS */ @@ -155,7 +157,7 @@ /* #undef USE_X86_MMX */ /* Version number of package */ -#define VERSION "0.32.6" +#define VERSION "0.34.0" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */
CVS commit: src
Module Name:src
Committed By: mrg
Date: Sat Mar 4 23:24:51 UTC 2017
Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/lib/libdrm: Makefile
Log Message:
install libsync.h. new in libdrm 2.4.75.
To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.190 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/libdrm/Makefile
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/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.189 src/distrib/sets/lists/xcomp/mi:1.190
--- src/distrib/sets/lists/xcomp/mi:1.189 Thu Jan 5 13:45:51 2017
+++ src/distrib/sets/lists/xcomp/mi Sat Mar 4 23:24:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.189 2017/01/05 13:45:51 wiz Exp $
+# $NetBSD: mi,v 1.190 2017/03/04 23:24:50 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -758,6 +758,7 @@
./usr/X11R7/include/xcb/xvmc.h-unknown- xorg
./usr/X11R7/include/xf86drm.h-unknown- xorg
./usr/X11R7/include/xf86drmMode.h -unknown- xorg
+./usr/X11R7/include/libsync.h-unknown- xorg
./usr/X11R7/include/xorg/BT.h-unknown- xorg
./usr/X11R7/include/xorg/IBM.h-unknown- xorg
./usr/X11R7/include/xorg/TI.h-unknown- xorg
Index: src/external/mit/xorg/lib/libdrm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/Makefile:1.14 src/external/mit/xorg/lib/libdrm/Makefile:1.15
--- src/external/mit/xorg/lib/libdrm/Makefile:1.14 Sat Aug 20 20:19:08 2016
+++ src/external/mit/xorg/lib/libdrm/Makefile Sat Mar 4 23:24:51 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/08/20 20:19:08 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2017/03/04 23:24:51 mrg Exp $
.include
@@ -7,7 +7,7 @@ LIB= drm
SRCS= xf86drm.c xf86drmHash.c xf86drmMode.c xf86drmRandom.c xf86drmSL.c
-INCS= xf86drm.h xf86drmMode.h
+INCS= xf86drm.h xf86drmMode.h libsync.h
INCSDIR=${X11INCDIR}
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Sat Mar 4 23:22:49 UTC 2017
Modified Files:
xsrc/external/mit/libdrm/dist: xf86drm.c xf86drm.h xf86drmMode.c
xf86drmMode.h
xsrc/external/mit/libdrm/dist/include/drm: drm.h i915_drm.h
xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c
xsrc/external/mit/libdrm/dist/radeon: radeon_cs_gem.c radeon_surface.c
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
xsrc/external/mit/pixman/dist/pixman: pixman-inlines.h pixman-mmx.c
pixman-private.h
Removed Files:
xsrc/external/mit/libdrm/dist/tests: dristat.c drmstat.c drmtest.c
drmtest.h getclient.c getstats.c getversion.c name_from_fd.c
openclose.c setversion.c updatedraw.c
Log Message:
merge libdrm 2.4.75 and pixman 0.34.0
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libdrm/dist/xf86drm.h \
xsrc/external/mit/libdrm/dist/xf86drmMode.h
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libdrm/dist/include/drm/drm.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libdrm/dist/radeon/radeon_cs_gem.c
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c
cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libdrm/dist/tests/dristat.c
cvs rdiff -u -r1.1.1.5 -r0 xsrc/external/mit/libdrm/dist/tests/drmstat.c
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/libdrm/dist/tests/drmtest.c \
xsrc/external/mit/libdrm/dist/tests/getversion.c \
xsrc/external/mit/libdrm/dist/tests/name_from_fd.c \
xsrc/external/mit/libdrm/dist/tests/setversion.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libdrm/dist/tests/drmtest.h \
xsrc/external/mit/libdrm/dist/tests/openclose.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libdrm/dist/tests/getclient.c \
xsrc/external/mit/libdrm/dist/tests/getstats.c \
xsrc/external/mit/libdrm/dist/tests/updatedraw.c
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/pixman/dist/pixman/pixman-inlines.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/pixman/dist/pixman/pixman-mmx.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/pixman/dist/pixman/pixman-private.h
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/libdrm/dist/xf86drm.c
diff -u xsrc/external/mit/libdrm/dist/xf86drm.c:1.13 xsrc/external/mit/libdrm/dist/xf86drm.c:1.14
--- xsrc/external/mit/libdrm/dist/xf86drm.c:1.13 Fri Jan 13 04:24:01 2017
+++ xsrc/external/mit/libdrm/dist/xf86drm.c Sat Mar 4 23:22:48 2017
@@ -62,6 +62,10 @@
#endif
#include
+/* Not all systems have MAP_FAILED defined */
+#ifndef MAP_FAILED
+#define MAP_FAILED ((void *)-1)
+#endif
#include "xf86drm.h"
#include "libdrm_macros.h"
@@ -99,9 +103,20 @@
#define DRM_MAJOR 226 /* Linux */
#endif
-/* Not all systems have MAP_FAILED defined */
-#ifndef MAP_FAILED
-#define MAP_FAILED ((void *)-1)
+#ifdef __OpenBSD__
+struct drm_pciinfo {
+ uint16_t domain;
+ uint8_t bus;
+ uint8_t dev;
+ uint8_t func;
+ uint16_t vendor_id;
+ uint16_t device_id;
+ uint16_t subvendor_id;
+ uint16_t subdevice_id;
+ uint8_t revision_id;
+};
+
+#define DRM_IOCTL_GET_PCIINFO DRM_IOR(0x15, struct drm_pciinfo)
#endif
#define DRM_MSG_VERBOSITY 3
@@ -2820,7 +2835,44 @@ static char *drmGetMinorNameForFD(int fd
out_close_dir:
closedir(sysdir);
#else
-#warning "Missing implementation of drmGetMinorNameForFD"
+struct stat sbuf;
+char buf[PATH_MAX + 1];
+const char *dev_name;
+unsigned int maj, min;
+int n, base;
+
+if (fstat(fd, &sbuf))
+return NULL;
+
+maj = major(sbuf.st_rdev);
+min = minor(sbuf.st_rdev);
+
+if (maj != DRM_MAJOR || !S_ISCHR(sbuf.st_mode))
+return NULL;
+
+switch (type) {
+case DRM_NODE_PRIMARY:
+dev_name = DRM_DEV_NAME;
+break;
+case DRM_NODE_CONTROL:
+dev_name = DRM_CONTROL_DEV_NAME;
+break;
+case DRM_NODE_RENDER:
+dev_name = DRM_RENDER_DEV_NAME;
+break;
+default:
+return NULL;
+};
+
+base = drmGetMinorBase(type);
+if (base < 0)
+return NULL;
+
+n = snprintf(buf, sizeof(buf), dev_name, DRM_DIR_NAME, min - base);
+if (n == -1 || n >= sizeof(buf))
+return NULL;
+
+return strdup(buf);
#endif
return NULL;
}
@@ -2835,6 +2887,50 @@ char *drmGetRenderDeviceNameFromFd(int f
return drmGetMinorNameForFD(fd, DRM_NODE_RENDER);
}
+#ifdef __linux__
+static char * DRM_PRINTFLIKE(2, 3)
+sysfs_uevent_get(const char *path, const char *fmt, ...)
+{
CVS import: xsrc/external/mit/pixman/dist
Module Name:xsrc Committed By: mrg Date: Sat Mar 4 23:15:57 UTC 2017 Update of /cvsroot/xsrc/external/mit/pixman/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3749 Log Message: initial import of pixman-0.34.0 Status: Vendor Tag: xorg Release Tags: pixman-0-34-0 U xsrc/external/mit/pixman/dist/configure U xsrc/external/mit/pixman/dist/config.sub U xsrc/external/mit/pixman/dist/config.h.in U xsrc/external/mit/pixman/dist/pixman-1.pc.in U xsrc/external/mit/pixman/dist/Makefile.in U xsrc/external/mit/pixman/dist/ltmain.sh U xsrc/external/mit/pixman/dist/configure.ac U xsrc/external/mit/pixman/dist/README U xsrc/external/mit/pixman/dist/pixman-1-uninstalled.pc.in U xsrc/external/mit/pixman/dist/Makefile.win32.common U xsrc/external/mit/pixman/dist/aclocal.m4 U xsrc/external/mit/pixman/dist/NEWS U xsrc/external/mit/pixman/dist/ChangeLog U xsrc/external/mit/pixman/dist/COPYING U xsrc/external/mit/pixman/dist/missing U xsrc/external/mit/pixman/dist/config.guess N xsrc/external/mit/pixman/dist/compile U xsrc/external/mit/pixman/dist/INSTALL U xsrc/external/mit/pixman/dist/Makefile.am U xsrc/external/mit/pixman/dist/AUTHORS U xsrc/external/mit/pixman/dist/Makefile.win32 U xsrc/external/mit/pixman/dist/depcomp U xsrc/external/mit/pixman/dist/test-driver U xsrc/external/mit/pixman/dist/install-sh U xsrc/external/mit/pixman/dist/demos/linear-gradient.c U xsrc/external/mit/pixman/dist/demos/clip-test.c U xsrc/external/mit/pixman/dist/demos/checkerboard.c U xsrc/external/mit/pixman/dist/demos/Makefile.in U xsrc/external/mit/pixman/dist/demos/clip-in.c U xsrc/external/mit/pixman/dist/demos/convolution-test.c U xsrc/external/mit/pixman/dist/demos/trap-test.c U xsrc/external/mit/pixman/dist/demos/tri-test.c U xsrc/external/mit/pixman/dist/demos/gtk-utils.h U xsrc/external/mit/pixman/dist/demos/scale.c U xsrc/external/mit/pixman/dist/demos/srgb-test.c U xsrc/external/mit/pixman/dist/demos/gradient-test.c U xsrc/external/mit/pixman/dist/demos/scale.ui U xsrc/external/mit/pixman/dist/demos/parrot.jpg U xsrc/external/mit/pixman/dist/demos/parrot.c U xsrc/external/mit/pixman/dist/demos/srgb-trap-test.c U xsrc/external/mit/pixman/dist/demos/conical-test.c U xsrc/external/mit/pixman/dist/demos/Makefile.am U xsrc/external/mit/pixman/dist/demos/composite-test.c U xsrc/external/mit/pixman/dist/demos/quad2quad.c U xsrc/external/mit/pixman/dist/demos/screen-test.c U xsrc/external/mit/pixman/dist/demos/alpha-test.c U xsrc/external/mit/pixman/dist/demos/radial-test.c U xsrc/external/mit/pixman/dist/demos/gtk-utils.c U xsrc/external/mit/pixman/dist/test/Makefile.in U xsrc/external/mit/pixman/dist/test/utils.h U xsrc/external/mit/pixman/dist/test/scaling-helpers-test.c U xsrc/external/mit/pixman/dist/test/blitters-test.c U xsrc/external/mit/pixman/dist/test/check-formats.c U xsrc/external/mit/pixman/dist/test/radial-perf-test.c U xsrc/external/mit/pixman/dist/test/region-translate-test.c U xsrc/external/mit/pixman/dist/test/oob-test.c U xsrc/external/mit/pixman/dist/test/alphamap.c U xsrc/external/mit/pixman/dist/test/pdf-op-test.c U xsrc/external/mit/pixman/dist/test/scaling-crash-test.c U xsrc/external/mit/pixman/dist/test/pixel-test.c U xsrc/external/mit/pixman/dist/test/affine-test.c U xsrc/external/mit/pixman/dist/test/composite-traps-test.c N xsrc/external/mit/pixman/dist/test/fence-image-self-test.c U xsrc/external/mit/pixman/dist/test/region-test.c N xsrc/external/mit/pixman/dist/test/cover-test.c U xsrc/external/mit/pixman/dist/test/fetch-test.c U xsrc/external/mit/pixman/dist/test/rotate-test.c U xsrc/external/mit/pixman/dist/test/a1-trap-test.c U xsrc/external/mit/pixman/dist/test/glyph-test.c U xsrc/external/mit/pixman/dist/test/composite.c U xsrc/external/mit/pixman/dist/test/utils-prng.c U xsrc/external/mit/pixman/dist/test/utils-prng.h U xsrc/external/mit/pixman/dist/test/infinite-loop.c U xsrc/external/mit/pixman/dist/test/region-contains-test.c U xsrc/external/mit/pixman/dist/test/matrix-test.c U xsrc/external/mit/pixman/dist/test/combiner-test.c N xsrc/external/mit/pixman/dist/test/affine-bench.c U xsrc/external/mit/pixman/dist/test/thread-test.c U xsrc/external/mit/pixman/dist/test/scaling-test.c U xsrc/external/mit/pixman/dist/test/alpha-loop.c U xsrc/external/mit/pixman/dist/test/Makefile.am U xsrc/external/mit/pixman/dist/test/utils.c U xsrc/external/mit/pixman/dist/test/stress-test.c U xsrc/external/mit/pixman/dist/test/Makefile.sources U xsrc/external/mit/pixman/dist/test/lowlevel-blt-bench.c N xsrc/external/mit/pixman/dist/test/tolerance-test.c N xsrc/external/mit/pixman/dist/test/solid-test.c U xsrc/external/mit/pixman/dist/test/scaling-bench.c U xsrc/external/mit/pixman/dist/test/trap-crasher.c U xsrc/external/mit/pixman/dist/test/prng-test.c U xsrc/external/mit/pixman/dist/test/gradient-crash-test.c N xsrc/external/mit/pixman/dist/test/radial-invalid.c U xsrc/external/mit/pixman/dist/pixman/pixman-trap.c U xsrc/external/mit/pixman/dist/pixman/pixman.c U xsrc/extern
CVS import: xsrc/external/mit/libdrm/dist
Module Name:xsrc Committed By: mrg Date: Sat Mar 4 23:15:53 UTC 2017 Update of /cvsroot/xsrc/external/mit/libdrm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7325 Log Message: initial import of libdrm-2.4.75 Status: Vendor Tag: xorg Release Tags: libdrm-2-4-75 C xsrc/external/mit/libdrm/dist/xf86drmMode.h U xsrc/external/mit/libdrm/dist/Makefile.sources U xsrc/external/mit/libdrm/dist/util_math.h U xsrc/external/mit/libdrm/dist/configure.ac U xsrc/external/mit/libdrm/dist/util_double_list.h U xsrc/external/mit/libdrm/dist/xf86atomic.h U xsrc/external/mit/libdrm/dist/libdrm_lists.h U xsrc/external/mit/libdrm/dist/xf86drmHash.c U xsrc/external/mit/libdrm/dist/Makefile.am U xsrc/external/mit/libdrm/dist/xf86drmRandom.c U xsrc/external/mit/libdrm/dist/xf86drmRandom.h C xsrc/external/mit/libdrm/dist/xf86drmMode.c N xsrc/external/mit/libdrm/dist/libsync.h U xsrc/external/mit/libdrm/dist/configure U xsrc/external/mit/libdrm/dist/Makefile.in U xsrc/external/mit/libdrm/dist/aclocal.m4 U xsrc/external/mit/libdrm/dist/libdrm_macros.h U xsrc/external/mit/libdrm/dist/xf86drmSL.c U xsrc/external/mit/libdrm/dist/libdrm.pc.in C xsrc/external/mit/libdrm/dist/xf86drm.h C xsrc/external/mit/libdrm/dist/xf86drm.c U xsrc/external/mit/libdrm/dist/config.h.in U xsrc/external/mit/libdrm/dist/README U xsrc/external/mit/libdrm/dist/xf86drmHash.h U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.h U xsrc/external/mit/libdrm/dist/freedreno/Makefile.sources U xsrc/external/mit/libdrm/dist/freedreno/freedreno-symbol-check U xsrc/external/mit/libdrm/dist/freedreno/freedreno_drmif.h U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_pipe.c U xsrc/external/mit/libdrm/dist/freedreno/Makefile.am U xsrc/external/mit/libdrm/dist/freedreno/freedreno_priv.h U xsrc/external/mit/libdrm/dist/freedreno/Makefile.in U xsrc/external/mit/libdrm/dist/freedreno/freedreno_device.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo_cache.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo.c U xsrc/external/mit/libdrm/dist/freedreno/libdrm_freedreno.pc.in U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_device.c U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_bo.c U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_drm.h U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_pipe.c U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_ringbuffer.c U xsrc/external/mit/libdrm/dist/freedreno/kgsl/msm_kgsl.h U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_priv.h U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_ringbuffer.c U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_bo.c U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_priv.h U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_pipe.c U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_drm.h U xsrc/external/mit/libdrm/dist/freedreno/msm/msm_device.c U xsrc/external/mit/libdrm/dist/radeon/Makefile.sources U xsrc/external/mit/libdrm/dist/radeon/radeon_bo.c U xsrc/external/mit/libdrm/dist/radeon/libdrm_radeon.pc.in U xsrc/external/mit/libdrm/dist/radeon/r600_pci_ids.h U xsrc/external/mit/libdrm/dist/radeon/bof.c U xsrc/external/mit/libdrm/dist/radeon/bof.h C xsrc/external/mit/libdrm/dist/radeon/radeon_cs_gem.c U xsrc/external/mit/libdrm/dist/radeon/radeon_cs.h U xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c U xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.h U xsrc/external/mit/libdrm/dist/radeon/Makefile.am U xsrc/external/mit/libdrm/dist/radeon/Makefile.in U xsrc/external/mit/libdrm/dist/radeon/radeon_bo_int.h U xsrc/external/mit/libdrm/dist/radeon/radeon_surface.h U xsrc/external/mit/libdrm/dist/radeon/radeon_cs_int.h U xsrc/external/mit/libdrm/dist/radeon/radeon_cs_gem.h C xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c U xsrc/external/mit/libdrm/dist/radeon/radeon_bo.h U xsrc/external/mit/libdrm/dist/radeon/radeon_cs.c U xsrc/external/mit/libdrm/dist/radeon/radeon_cs_space.c U xsrc/external/mit/libdrm/dist/radeon/radeon-symbol-check U xsrc/external/mit/libdrm/dist/tests/drmsl.c U xsrc/external/mit/libdrm/dist/tests/drmdevice.c U xsrc/external/mit/libdrm/dist/tests/hash.c U xsrc/external/mit/libdrm/dist/tests/Makefile.am U xsrc/external/mit/libdrm/dist/tests/Makefile.in U xsrc/external/mit/libdrm/dist/tests/random.c U xsrc/external/mit/libdrm/dist/tests/modetest/Makefile.sources C xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c U xsrc/external/mit/libdrm/dist/tests/modetest/buffers.c U xsrc/external/mit/libdrm/dist/tests/modetest/buffers.h U xsrc/external/mit/libdrm/dist/tests/modetest/Makefile.am U xsrc/external/mit/libdrm/dist/tests/modetest/Makefile.in U xsrc/external/mit/libdrm/dist/tests/modetest/cursor.h U xsrc/external/mit/libdrm/dist/tests/modetest/cursor.c U xsrc/external/mit/libdrm/dist/tests/radeon/Makefile.am U xsrc/external/mit/libdrm/dist/tests/radeon/rbo.c U xsrc/external/mit/libdrm/dist/tests/radeon/Makefile.in U xsrc/external/m
CVS commit: xsrc/external/mit/xauth/dist
Module Name:xsrc
Committed By: mrg
Date: Sat Mar 4 23:01:34 UTC 2017
Modified Files:
xsrc/external/mit/xauth/dist: process.c
Log Message:
merge xauth 1.0.10.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xauth/dist/process.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/xauth/dist/process.c
diff -u xsrc/external/mit/xauth/dist/process.c:1.5 xsrc/external/mit/xauth/dist/process.c:1.6
--- xsrc/external/mit/xauth/dist/process.c:1.5 Fri Jul 11 18:22:49 2014
+++ xsrc/external/mit/xauth/dist/process.c Sat Mar 4 23:01:34 2017
@@ -844,7 +844,10 @@ write_auth_file(char *tmp_nam)
}
}
-(void) fclose (fp);
+if (fclose(fp)) {
+ return -1;
+}
+
return 0;
}
CVS import: xsrc/external/mit/sessreg/dist
Module Name:xsrc Committed By: mrg Date: Sat Mar 4 23:00:27 UTC 2017 Update of /cvsroot/xsrc/external/mit/sessreg/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8842 Log Message: initial import of sessreg-1.1.1 Status: Vendor Tag: xorg Release Tags: sessreg-1-1-1 U xsrc/external/mit/sessreg/dist/aclocal.m4 U xsrc/external/mit/sessreg/dist/AUTHORS U xsrc/external/mit/sessreg/dist/config.sub U xsrc/external/mit/sessreg/dist/INSTALL U xsrc/external/mit/sessreg/dist/Makefile.am U xsrc/external/mit/sessreg/dist/configure.ac U xsrc/external/mit/sessreg/dist/Makefile.in U xsrc/external/mit/sessreg/dist/compile U xsrc/external/mit/sessreg/dist/sessreg.c U xsrc/external/mit/sessreg/dist/README U xsrc/external/mit/sessreg/dist/configure U xsrc/external/mit/sessreg/dist/config.h.in U xsrc/external/mit/sessreg/dist/sessreg.h U xsrc/external/mit/sessreg/dist/missing U xsrc/external/mit/sessreg/dist/config.guess U xsrc/external/mit/sessreg/dist/install-sh U xsrc/external/mit/sessreg/dist/COPYING U xsrc/external/mit/sessreg/dist/ChangeLog U xsrc/external/mit/sessreg/dist/depcomp U xsrc/external/mit/sessreg/dist/man/filenames.sed.c U xsrc/external/mit/sessreg/dist/man/Makefile.am U xsrc/external/mit/sessreg/dist/man/Makefile.in U xsrc/external/mit/sessreg/dist/man/sessreg.man No conflicts created by this import
CVS import: xsrc/external/mit/xconsole/dist
Module Name:xsrc Committed By: mrg Date: Sat Mar 4 23:00:30 UTC 2017 Update of /cvsroot/xsrc/external/mit/xconsole/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8555 Log Message: initial import of xconsole-1.0.7 Status: Vendor Tag: xorg Release Tags: xconsole-1-0-7 U xsrc/external/mit/xconsole/dist/ChangeLog U xsrc/external/mit/xconsole/dist/compile U xsrc/external/mit/xconsole/dist/configure.ac U xsrc/external/mit/xconsole/dist/configure U xsrc/external/mit/xconsole/dist/INSTALL U xsrc/external/mit/xconsole/dist/Makefile.am U xsrc/external/mit/xconsole/dist/README U xsrc/external/mit/xconsole/dist/COPYING U xsrc/external/mit/xconsole/dist/xconsole.c U xsrc/external/mit/xconsole/dist/depcomp U xsrc/external/mit/xconsole/dist/config.guess U xsrc/external/mit/xconsole/dist/missing U xsrc/external/mit/xconsole/dist/Makefile.in U xsrc/external/mit/xconsole/dist/config.sub U xsrc/external/mit/xconsole/dist/config.h.in U xsrc/external/mit/xconsole/dist/install-sh U xsrc/external/mit/xconsole/dist/aclocal.m4 U xsrc/external/mit/xconsole/dist/app-defaults/XConsole U xsrc/external/mit/xconsole/dist/man/xconsole.man U xsrc/external/mit/xconsole/dist/man/Makefile.am U xsrc/external/mit/xconsole/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xauth/dist
Module Name:xsrc Committed By: mrg Date: Sat Mar 4 23:00:29 UTC 2017 Update of /cvsroot/xsrc/external/mit/xauth/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23470 Log Message: initial import of xauth-1.0.10 Status: Vendor Tag: xorg Release Tags: xauth-1-0-10 U xsrc/external/mit/xauth/dist/test-driver N xsrc/external/mit/xauth/dist/compile U xsrc/external/mit/xauth/dist/ChangeLog U xsrc/external/mit/xauth/dist/configure.ac U xsrc/external/mit/xauth/dist/configure U xsrc/external/mit/xauth/dist/Makefile.am U xsrc/external/mit/xauth/dist/xauth.h U xsrc/external/mit/xauth/dist/README U xsrc/external/mit/xauth/dist/COPYING U xsrc/external/mit/xauth/dist/parsedpy.c U xsrc/external/mit/xauth/dist/gethost.c U xsrc/external/mit/xauth/dist/depcomp U xsrc/external/mit/xauth/dist/xauth.c C xsrc/external/mit/xauth/dist/process.c U xsrc/external/mit/xauth/dist/config.guess U xsrc/external/mit/xauth/dist/missing U xsrc/external/mit/xauth/dist/Makefile.in U xsrc/external/mit/xauth/dist/config.sub U xsrc/external/mit/xauth/dist/config.h.in U xsrc/external/mit/xauth/dist/install-sh U xsrc/external/mit/xauth/dist/aclocal.m4 U xsrc/external/mit/xauth/dist/INSTALL U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.stdout U xsrc/external/mit/xauth/dist/tests/test_xauth.c U xsrc/external/mit/xauth/dist/tests/Makefile.am U xsrc/external/mit/xauth/dist/tests/010-xauth-add-inet.script U xsrc/external/mit/xauth/dist/tests/020-xauth-add-local.stdout U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.script U xsrc/external/mit/xauth/dist/tests/010-xauth-add-inet.stdout U xsrc/external/mit/xauth/dist/tests/040-xauth-source.script U xsrc/external/mit/xauth/dist/tests/setup-sourced U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.stderr U xsrc/external/mit/xauth/dist/tests/030-xauth-extract.script U xsrc/external/mit/xauth/dist/tests/Makefile.in U xsrc/external/mit/xauth/dist/tests/040-xauth-source.stdout U xsrc/external/mit/xauth/dist/tests/020-xauth-add-local.script U xsrc/external/mit/xauth/dist/tests/030-xauth-extract.stdout U xsrc/external/mit/xauth/dist/man/Makefile.am U xsrc/external/mit/xauth/dist/man/xauth.man U xsrc/external/mit/xauth/dist/man/Makefile.in 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xauth/dist
CVS commit: xsrc/external/mit/xproto/dist
Module Name:xsrc
Committed By: mrg
Date: Sat Mar 4 22:07:14 UTC 2017
Modified Files:
xsrc/external/mit/xproto/dist: Xpoll.h.in
Log Message:
merge our local change to ensure FD_SETSIZE is set before
is included, using the new version of the code to set XFD_SETSIZE.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xproto/dist/Xpoll.h.in
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/xproto/dist/Xpoll.h.in
diff -u xsrc/external/mit/xproto/dist/Xpoll.h.in:1.3 xsrc/external/mit/xproto/dist/Xpoll.h.in:1.4
--- xsrc/external/mit/xproto/dist/Xpoll.h.in:1.3 Fri Jul 17 07:02:40 2015
+++ xsrc/external/mit/xproto/dist/Xpoll.h.in Sat Mar 4 22:07:14 2017
@@ -54,10 +54,13 @@ from The Open Group.
#ifndef USE_POLL
-#define XFD_SETSIZE 512
-
-#ifndef FD_SETSIZE
-#define FD_SETSIZE XFD_SETSIZE
+#if defined(FD_SETSIZE) && FD_SETSIZE < 512
+# define XFD_SETSIZE FD_SETSIZE
+#else
+# define XFD_SETSIZE 512
+# ifndef FD_SETSIZE
+# define FD_SETSIZE XFD_SETSIZE
+# endif
#endif
#include
@@ -165,7 +168,7 @@ typedef struct fd_set {
#else /* WIN32 */
-#define XFD_SETSIZE 256
+#define XFD_SETSIZE 512
#ifndef FD_SETSIZE
#define FD_SETSIZE XFD_SETSIZE
#endif
CVS import: xsrc/external/mit/xproto/dist
Module Name:xsrc Committed By: mrg Date: Sat Mar 4 22:03:12 UTC 2017 Update of /cvsroot/xsrc/external/mit/xproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29586 Log Message: initial import of xproto-7.0.31 Status: Vendor Tag: xorg Release Tags: xproto-7-0-31 U xsrc/external/mit/xproto/dist/Xfuncproto.h.in U xsrc/external/mit/xproto/dist/Makefile.am U xsrc/external/mit/xproto/dist/README U xsrc/external/mit/xproto/dist/ChangeLog U xsrc/external/mit/xproto/dist/ap_keysym.h U xsrc/external/mit/xproto/dist/do-not-use-config.h.in U xsrc/external/mit/xproto/dist/Xalloca.h U xsrc/external/mit/xproto/dist/Xos_r.h U xsrc/external/mit/xproto/dist/configure U xsrc/external/mit/xproto/dist/Xprotostr.h U xsrc/external/mit/xproto/dist/X.h U xsrc/external/mit/xproto/dist/xproto.pc.in U xsrc/external/mit/xproto/dist/Xw32defs.h U xsrc/external/mit/xproto/dist/aclocal.m4 U xsrc/external/mit/xproto/dist/compile U xsrc/external/mit/xproto/dist/docbook.am U xsrc/external/mit/xproto/dist/Xos.h U xsrc/external/mit/xproto/dist/install-sh U xsrc/external/mit/xproto/dist/config.sub U xsrc/external/mit/xproto/dist/Xdefs.h U xsrc/external/mit/xproto/dist/missing U xsrc/external/mit/xproto/dist/Xosdefs.h U xsrc/external/mit/xproto/dist/Xmd.h U xsrc/external/mit/xproto/dist/DECkeysym.h U xsrc/external/mit/xproto/dist/Sunkeysym.h U xsrc/external/mit/xproto/dist/XWDFile.h U xsrc/external/mit/xproto/dist/keysym.h U xsrc/external/mit/xproto/dist/INSTALL U xsrc/external/mit/xproto/dist/config.guess U xsrc/external/mit/xproto/dist/Xwinsock.h U xsrc/external/mit/xproto/dist/Xarch.h U xsrc/external/mit/xproto/dist/Xatom.h U xsrc/external/mit/xproto/dist/Makefile.in U xsrc/external/mit/xproto/dist/configure.ac U xsrc/external/mit/xproto/dist/XF86keysym.h C xsrc/external/mit/xproto/dist/Xpoll.h.in U xsrc/external/mit/xproto/dist/COPYING U xsrc/external/mit/xproto/dist/AUTHORS U xsrc/external/mit/xproto/dist/keysymdef.h U xsrc/external/mit/xproto/dist/Xwindows.h U xsrc/external/mit/xproto/dist/Xthreads.h U xsrc/external/mit/xproto/dist/Xfuncs.h U xsrc/external/mit/xproto/dist/HPkeysym.h U xsrc/external/mit/xproto/dist/Xproto.h U xsrc/external/mit/xproto/dist/specs/encoding.xml U xsrc/external/mit/xproto/dist/specs/Makefile.am U xsrc/external/mit/xproto/dist/specs/x11protocol.xml U xsrc/external/mit/xproto/dist/specs/Makefile.in U xsrc/external/mit/xproto/dist/specs/sect1-9.xml U xsrc/external/mit/xproto/dist/specs/glossary.xml U xsrc/external/mit/xproto/dist/specs/keysyms.xml U xsrc/external/mit/xproto/dist/specs/SIAddresses/localuser.txt U xsrc/external/mit/xproto/dist/specs/SIAddresses/Makefile.am U xsrc/external/mit/xproto/dist/specs/SIAddresses/README U xsrc/external/mit/xproto/dist/specs/SIAddresses/hostname.txt U xsrc/external/mit/xproto/dist/specs/SIAddresses/Makefile.in U xsrc/external/mit/xproto/dist/specs/SIAddresses/IPv6.txt 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xproto/dist
CVS import: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Sat Mar 4 21:57:03 UTC 2017 Update of /cvsroot/xsrc/external/mit/libX11/dist In directory ivanova.netbsd.org:/tmp/cvs-serv693 Log Message: initial import of libX11-1.6.5 Status: Vendor Tag: xorg Release Tags: libX11-1-6-5 U xsrc/external/mit/libX11/dist/ltmain.sh U xsrc/external/mit/libX11/dist/AUTHORS U xsrc/external/mit/libX11/dist/aclocal.m4 U xsrc/external/mit/libX11/dist/docbook.am U xsrc/external/mit/libX11/dist/NEWS U xsrc/external/mit/libX11/dist/config.sub U xsrc/external/mit/libX11/dist/x11.pc.in U xsrc/external/mit/libX11/dist/INSTALL U xsrc/external/mit/libX11/dist/Makefile.am U xsrc/external/mit/libX11/dist/cpprules.in U xsrc/external/mit/libX11/dist/x11-xcb.pc.in U xsrc/external/mit/libX11/dist/configure.ac U xsrc/external/mit/libX11/dist/Makefile.in U xsrc/external/mit/libX11/dist/compile U xsrc/external/mit/libX11/dist/README U xsrc/external/mit/libX11/dist/install-sh U xsrc/external/mit/libX11/dist/configure U xsrc/external/mit/libX11/dist/depcomp U xsrc/external/mit/libX11/dist/test-driver U xsrc/external/mit/libX11/dist/missing U xsrc/external/mit/libX11/dist/config.guess U xsrc/external/mit/libX11/dist/COPYING U xsrc/external/mit/libX11/dist/ChangeLog U xsrc/external/mit/libX11/dist/nls/locale.dir.pre U xsrc/external/mit/libX11/dist/nls/Makefile.am U xsrc/external/mit/libX11/dist/nls/Makefile.in U xsrc/external/mit/libX11/dist/nls/compose-check.pl U xsrc/external/mit/libX11/dist/nls/compose.dir.pre U xsrc/external/mit/libX11/dist/nls/locale.alias.pre U xsrc/external/mit/libX11/dist/nls/ja/XLC_LOCALE.pre U xsrc/external/mit/libX11/dist/nls/ja/XI18N_OBJS U xsrc/external/mit/libX11/dist/nls/ja/Compose.pre U xsrc/external/mit/libX11/dist/nls/iso8859-6/XLC_LOCALE.pre U xsrc/external/mit/libX11/dist/nls/iso8859-6/XI18N_OBJS U xsrc/external/mit/libX11/dist/nls/iso8859-6/Compose.pre U xsrc/external/mit/libX11/dist/nls/ko_KR.UTF-8/XLC_LOCALE.pre U xsrc/external/mit/libX11/dist/nls/ko_KR.UTF-8/XI18N_OBJS U xsrc/external/mit/libX11/dist/nls/ko_KR.UTF-8/Compose.pre U xsrc/external/mit/libX11/dist/nls/pt_PT.UTF-8/XLC_LOCALE.pre U xsrc/external/mit/libX11/dist/nls/pt_PT.UTF-8/XI18N_OBJS U xsrc/external/mit/libX11/dist/nls/pt_PT.UTF-8/Compose.pre U xsrc/external/mit/libX11/dist/nls/iso8859-9e/XLC_LOCALE.pre U xsrc/external/mit/libX11/dist/nls/iso8859-9e/XI18N_OBJS U xsrc/external/mit/libX11/dist/nls/iso8859-9e/Compose.pre U xsrc/external/mit/libX11/dist/nls/pt_BR.UTF-8/XLC_LOCALE.pre U xsrc/external/mit/libX11/dist/nls/pt_BR.UTF-8/XI18N_OBJS U xsrc/external/mit/libX11/dist/nls/pt_BR.UTF-8/Compose.pre U xsrc/external/mit/libX11/dist/nls/armscii-8/XLC_LOCALE.pre U xsrc/external/mit/libX11/dist/nls/armscii-8/XI18N_OBJS U xsrc/external/mit/libX11/dist/nls/armscii-8/Compose.pre U xsrc/external/mit/libX11/dist/nls/iso8859-10/XLC_LOCALE.pre U xsrc/external/mit/libX11/dist/nls/iso8859-10/XI18N_OBJS U xsrc/external/mit/libX11/dist/nls/iso8859-10/Compose.pre U xsrc/external/mit/libX11/dist/nls/zh_HK.big5/XLC_LOCALE.pre U xsrc/external/mit/libX11/dist/nls/zh_HK.big5/XI18N_OBJS U xsrc/external/mit/libX11/dist/nls/zh_HK.big5/Compose.pre U xsrc/external/mit/libX11/dist/nls/th_TH.UTF-8/XLC_LOCALE.pre U xsrc/external/mit/libX11/dist/nls/th_TH.UTF-8/XI18N_OBJS U xsrc/external/mit/libX11/dist/nls/th_TH.UTF-8/Compose.pre U xsrc/external/mit/libX11/dist/nls/iso8859-2/XLC_LOCALE.pre U xsrc/external/mit/libX11/dist/nls/iso8859-2/XI18N_OBJS U xsrc/external/mit/libX11/dist/nls/iso8859-2/Compose.pre U xsrc/external/mit/libX11/dist/nls/nokhchi-1/XLC_LOCALE.pre U xsrc/external/mit/libX11/dist/nls/nokhchi-1/XI18N_OBJS U xsrc/external/mit/libX11/dist/nls/nokhchi-1/Compose.pre U xsrc/external/mit/libX11/dist/nls/mulelao-1/XLC_LOCALE.pre U xsrc/external/mit/libX11/dist/nls/mulelao-1/XI18N_OBJS U xsrc/external/mit/libX11/dist/nls/mulelao-1/Compose.pre U xsrc/external/mit/libX11/dist/nls/iso8859-14/XLC_LOCALE.pre U xsrc/external/mit/libX11/dist/nls/iso8859-14/XI18N_OBJS U xsrc/external/mit/libX11/dist/nls/iso8859-14/Compose.pre U xsrc/external/mit/libX11/dist/nls/zh_TW.big5/XLC_LOCALE.pre U xsrc/external/mit/libX11/dist/nls/zh_TW.big5/XI18N_OBJS U xsrc/external/mit/libX11/dist/nls/zh_TW.big5/Compose.pre U xsrc/external/mit/libX11/dist/nls/sr_CS.UTF-8/XLC_LOCALE.pre U xsrc/external/mit/libX11/dist/nls/sr_CS.UTF-8/XI18N_OBJS U xsrc/external/mit/libX11/dist/nls/sr_CS.UTF-8/Compose.pre U xsrc/external/mit/libX11/dist/nls/iscii-dev/XLC_LOCALE.pre U xsrc/external/mit/libX11/dist/nls/iscii-dev/XI18N_OBJS U xsrc/external/mit/libX11/dist/nls/iscii-dev/Compose.pre U xsrc/external/mit/libX11/dist/nls/microsoft-cp1251/XLC_LOCALE.pre U xsrc/external/mit/libX11/dist/nls/microsoft-cp1251/XI18N_OBJS U xsrc/external/mit/libX11/dist/nls/microsoft-cp1251/Compose.pre U xsrc/external/mit/libX11/dist/nls/ko/XLC_LOCALE.pre U xsrc/external/mit/libX11/dist/nls/ko/XI18N_OBJS U xsrc/external/mit/libX11/dist/nls/ko/Compose.pre U xsrc/external/mit/libX11/dist/nls/iso8859-5/XLC_L
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Sat Mar 4 21:48:03 UTC 2017 Modified Files: xsrc/external/mit/libXi/dist: INSTALL xsrc/external/mit/libXi/dist/src: XIQueryDevice.c XListDev.c xsrc/external/mit/libXpm/dist/src: create.c Log Message: merge libXi 1.7.9 and libXpm 3.5.12: merge a local patch. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXi/dist/INSTALL cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXi/dist/src/XIQueryDevice.c cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXi/dist/src/XListDev.c cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXpm/dist/src/create.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/libXi/dist/INSTALL diff -u xsrc/external/mit/libXi/dist/INSTALL:1.5 xsrc/external/mit/libXi/dist/INSTALL:1.6 --- xsrc/external/mit/libXi/dist/INSTALL:1.5 Tue Oct 4 22:01:49 2016 +++ xsrc/external/mit/libXi/dist/INSTALL Sat Mar 4 21:48:03 2017 @@ -1,11 +1,13 @@ Installation Instructions * -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation == @@ -13,7 +15,11 @@ Basic Installation Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ may remove or edit it. you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -53,12 +59,22 @@ The simplest way to compile this package 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and - documentation. + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. - 5. You can remove the program binaries and object files from the + 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -67,8 +83,15 @@ The simplest way to compile this package all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. Compilers and Options = @@ -93,7 +116
CVS import: xsrc/external/mit/libXi/dist
Module Name:xsrc Committed By: mrg Date: Sat Mar 4 21:43:43 UTC 2017 Update of /cvsroot/xsrc/external/mit/libXi/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11036 Log Message: initial import of libXi-1.7.9 Status: Vendor Tag: xorg Release Tags: libXi-1-7-9 U xsrc/external/mit/libXi/dist/configure U xsrc/external/mit/libXi/dist/config.sub U xsrc/external/mit/libXi/dist/docbook.am U xsrc/external/mit/libXi/dist/configure.ac U xsrc/external/mit/libXi/dist/ChangeLog U xsrc/external/mit/libXi/dist/aclocal.m4 U xsrc/external/mit/libXi/dist/Makefile.in U xsrc/external/mit/libXi/dist/xi.pc.in U xsrc/external/mit/libXi/dist/ltmain.sh U xsrc/external/mit/libXi/dist/COPYING U xsrc/external/mit/libXi/dist/config.guess U xsrc/external/mit/libXi/dist/install-sh U xsrc/external/mit/libXi/dist/missing U xsrc/external/mit/libXi/dist/Makefile.am U xsrc/external/mit/libXi/dist/depcomp U xsrc/external/mit/libXi/dist/README C xsrc/external/mit/libXi/dist/INSTALL U xsrc/external/mit/libXi/dist/compile U xsrc/external/mit/libXi/dist/specs/encoding.xml U xsrc/external/mit/libXi/dist/specs/Makefile.in U xsrc/external/mit/libXi/dist/specs/library.xml U xsrc/external/mit/libXi/dist/specs/Makefile.am U xsrc/external/mit/libXi/dist/specs/inputlib.xml U xsrc/external/mit/libXi/dist/src/XIGrabDevice.c C xsrc/external/mit/libXi/dist/src/XListDev.c U xsrc/external/mit/libXi/dist/src/XISetCPtr.c U xsrc/external/mit/libXi/dist/src/XGtSelect.c U xsrc/external/mit/libXi/dist/src/XGetProp.c U xsrc/external/mit/libXi/dist/src/XIWarpPointer.c U xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c U xsrc/external/mit/libXi/dist/src/XExtInt.c U xsrc/external/mit/libXi/dist/src/XChgKMap.c U xsrc/external/mit/libXi/dist/src/XDevBell.c U xsrc/external/mit/libXi/dist/src/XFreeLst.c U xsrc/external/mit/libXi/dist/src/XGetFCtl.c U xsrc/external/mit/libXi/dist/src/XIQueryPointer.c U xsrc/external/mit/libXi/dist/src/XGMotion.c U xsrc/external/mit/libXi/dist/src/XDelDProp.c U xsrc/external/mit/libXi/dist/src/XUngrDev.c U xsrc/external/mit/libXi/dist/src/XChgKbd.c U xsrc/external/mit/libXi/dist/src/XChgPnt.c U xsrc/external/mit/libXi/dist/src/XGrDvKey.c U xsrc/external/mit/libXi/dist/src/XIQueryVersion.c U xsrc/external/mit/libXi/dist/src/XCloseDev.c U xsrc/external/mit/libXi/dist/src/XChDProp.c U xsrc/external/mit/libXi/dist/src/XSetMode.c U xsrc/external/mit/libXi/dist/src/XGetMMap.c U xsrc/external/mit/libXi/dist/src/XIGetDevFocus.c U xsrc/external/mit/libXi/dist/src/XSelect.c U xsrc/external/mit/libXi/dist/src/XSetMMap.c U xsrc/external/mit/libXi/dist/src/XIint.h U xsrc/external/mit/libXi/dist/src/XGrDvBut.c U xsrc/external/mit/libXi/dist/src/XListDProp.c U xsrc/external/mit/libXi/dist/src/XOpenDev.c U xsrc/external/mit/libXi/dist/src/Makefile.in C xsrc/external/mit/libXi/dist/src/XIQueryDevice.c U xsrc/external/mit/libXi/dist/src/XIProperties.c U xsrc/external/mit/libXi/dist/src/XChgFCtl.c U xsrc/external/mit/libXi/dist/src/XChgDCtl.c U xsrc/external/mit/libXi/dist/src/XGetBMap.c U xsrc/external/mit/libXi/dist/src/XIAllowEvents.c U xsrc/external/mit/libXi/dist/src/XGetKMap.c U xsrc/external/mit/libXi/dist/src/XExtToWire.c U xsrc/external/mit/libXi/dist/src/XIBarrier.c U xsrc/external/mit/libXi/dist/src/XIHierarchy.c U xsrc/external/mit/libXi/dist/src/XChgProp.c U xsrc/external/mit/libXi/dist/src/XIDefineCursor.c U xsrc/external/mit/libXi/dist/src/XQueryDv.c U xsrc/external/mit/libXi/dist/src/XSetBMap.c U xsrc/external/mit/libXi/dist/src/XSetDVal.c U xsrc/external/mit/libXi/dist/src/XGtFocus.c U xsrc/external/mit/libXi/dist/src/XGetVers.c U xsrc/external/mit/libXi/dist/src/XGrabDev.c U xsrc/external/mit/libXi/dist/src/Makefile.am U xsrc/external/mit/libXi/dist/src/XISelEv.c U xsrc/external/mit/libXi/dist/src/XUngrDvB.c U xsrc/external/mit/libXi/dist/src/XStFocus.c U xsrc/external/mit/libXi/dist/src/XGetDProp.c U xsrc/external/mit/libXi/dist/src/XGetCPtr.c U xsrc/external/mit/libXi/dist/src/config.h.in U xsrc/external/mit/libXi/dist/src/XSndExEv.c U xsrc/external/mit/libXi/dist/src/XGetDCtl.c U xsrc/external/mit/libXi/dist/src/XISetDevFocus.c U xsrc/external/mit/libXi/dist/src/XAllowDv.c U xsrc/external/mit/libXi/dist/src/XUngrDvK.c U xsrc/external/mit/libXi/dist/include/X11/extensions/XInput2.h U xsrc/external/mit/libXi/dist/include/X11/extensions/XInput.h U xsrc/external/mit/libXi/dist/man/XGetDeviceDontPropagateList.man U xsrc/external/mit/libXi/dist/man/XIUngrabTouchBegin.man U xsrc/external/mit/libXi/dist/man/XIUngrabEnter.man U xsrc/external/mit/libXi/dist/man/XISetClientPointer.man U xsrc/external/mit/libXi/dist/man/XIGetSelectedEvents.man U xsrc/external/mit/libXi/dist/man/XIGrabButton.man U xsrc/external/mit/libXi/dist/man/XISetClientPointer.txt U xsrc/external/mit/libXi/dist/man/XIGrabDevice.txt U xsrc/external/mit/libXi/dist/man/XChangeDeviceControl.man U xsrc/external/mit/libXi/dist/man/XChangeDeviceDontPropagateList.man U xsrc/external/mit/libXi/dist/man/XIQueryVersion.txt U xsrc/external/mit/libX
CVS import: xsrc/external/mit/libXpm/dist
Module Name:xsrc Committed By: mrg Date: Sat Mar 4 21:43:45 UTC 2017 Update of /cvsroot/xsrc/external/mit/libXpm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10808 Log Message: initial import of libXpm-3.5.12 Status: Vendor Tag: xorg Release Tags: libXpm-3-5-12 U xsrc/external/mit/libXpm/dist/xpm.pc.in U xsrc/external/mit/libXpm/dist/configure U xsrc/external/mit/libXpm/dist/config.sub U xsrc/external/mit/libXpm/dist/INSTALL U xsrc/external/mit/libXpm/dist/AUTHORS U xsrc/external/mit/libXpm/dist/ltmain.sh U xsrc/external/mit/libXpm/dist/ChangeLog U xsrc/external/mit/libXpm/dist/compile U xsrc/external/mit/libXpm/dist/README U xsrc/external/mit/libXpm/dist/COPYRIGHT U xsrc/external/mit/libXpm/dist/missing U xsrc/external/mit/libXpm/dist/install-sh U xsrc/external/mit/libXpm/dist/Makefile.am U xsrc/external/mit/libXpm/dist/COPYING U xsrc/external/mit/libXpm/dist/Makefile.in U xsrc/external/mit/libXpm/dist/configure.ac U xsrc/external/mit/libXpm/dist/config.h.in U xsrc/external/mit/libXpm/dist/config.guess U xsrc/external/mit/libXpm/dist/aclocal.m4 U xsrc/external/mit/libXpm/dist/depcomp U xsrc/external/mit/libXpm/dist/include/Makefile.am U xsrc/external/mit/libXpm/dist/include/Makefile.in U xsrc/external/mit/libXpm/dist/include/X11/xpm.h U xsrc/external/mit/libXpm/dist/m4/ax_define_dir.m4 N xsrc/external/mit/libXpm/dist/m4/ltoptions.m4 N xsrc/external/mit/libXpm/dist/m4/ltsugar.m4 N xsrc/external/mit/libXpm/dist/m4/libtool.m4 N xsrc/external/mit/libXpm/dist/m4/lt~obsolete.m4 N xsrc/external/mit/libXpm/dist/m4/ltversion.m4 U xsrc/external/mit/libXpm/dist/src/CrPFrDat.c U xsrc/external/mit/libXpm/dist/src/RdFToI.c U xsrc/external/mit/libXpm/dist/src/WrFFrDat.c U xsrc/external/mit/libXpm/dist/src/misc.c U xsrc/external/mit/libXpm/dist/src/Info.c U xsrc/external/mit/libXpm/dist/src/hashtab.c U xsrc/external/mit/libXpm/dist/src/data.c U xsrc/external/mit/libXpm/dist/src/amigax.h U xsrc/external/mit/libXpm/dist/src/CrDatFrI.c U xsrc/external/mit/libXpm/dist/src/CrDatFrP.c U xsrc/external/mit/libXpm/dist/src/scan.c U xsrc/external/mit/libXpm/dist/src/CrPFrI.c U xsrc/external/mit/libXpm/dist/src/simx.h U xsrc/external/mit/libXpm/dist/src/XpmI.h U xsrc/external/mit/libXpm/dist/src/amigax.c U xsrc/external/mit/libXpm/dist/src/Attrib.c U xsrc/external/mit/libXpm/dist/src/CrIFrDat.c U xsrc/external/mit/libXpm/dist/src/RdFToDat.c U xsrc/external/mit/libXpm/dist/src/CrPFrBuf.c U xsrc/external/mit/libXpm/dist/src/Image.c U xsrc/external/mit/libXpm/dist/src/CrBufFrI.c U xsrc/external/mit/libXpm/dist/src/RdFToBuf.c U xsrc/external/mit/libXpm/dist/src/CrBufFrP.c U xsrc/external/mit/libXpm/dist/src/Makefile.am U xsrc/external/mit/libXpm/dist/src/WrFFrI.c U xsrc/external/mit/libXpm/dist/src/RdFToP.c C xsrc/external/mit/libXpm/dist/src/create.c U xsrc/external/mit/libXpm/dist/src/WrFFrBuf.c U xsrc/external/mit/libXpm/dist/src/Makefile.in U xsrc/external/mit/libXpm/dist/src/rgb.c U xsrc/external/mit/libXpm/dist/src/parse.c U xsrc/external/mit/libXpm/dist/src/CrIFrP.c U xsrc/external/mit/libXpm/dist/src/rgbtab.h U xsrc/external/mit/libXpm/dist/src/WrFFrP.c U xsrc/external/mit/libXpm/dist/src/simx.c U xsrc/external/mit/libXpm/dist/src/CrIFrBuf.c U xsrc/external/mit/libXpm/dist/man/Makefile.am U xsrc/external/mit/libXpm/dist/man/cxpm.man U xsrc/external/mit/libXpm/dist/man/sxpm.man U xsrc/external/mit/libXpm/dist/man/Makefile.in U xsrc/external/mit/libXpm/dist/sxpm/plaid_mask.xpm U xsrc/external/mit/libXpm/dist/sxpm/plaid.xpm U xsrc/external/mit/libXpm/dist/sxpm/Makefile.am U xsrc/external/mit/libXpm/dist/sxpm/Makefile.in U xsrc/external/mit/libXpm/dist/sxpm/sxpm.c U xsrc/external/mit/libXpm/dist/sxpm/plaid_ext.xpm U xsrc/external/mit/libXpm/dist/cxpm/Makefile.am U xsrc/external/mit/libXpm/dist/cxpm/cxpm.c U xsrc/external/mit/libXpm/dist/cxpm/Makefile.in U xsrc/external/mit/libXpm/dist/doc/README.AMIGA U xsrc/external/mit/libXpm/dist/doc/xpm.PS.gz U xsrc/external/mit/libXpm/dist/doc/Makefile.am U xsrc/external/mit/libXpm/dist/doc/Makefile.in U xsrc/external/mit/libXpm/dist/doc/FAQ.html U xsrc/external/mit/libXpm/dist/doc/README.MSW U xsrc/external/mit/libXpm/dist/doc/README.html 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libXpm/dist
CVS import: xsrc/external/mit/presentproto/dist
Module Name:xsrc Committed By: mrg Date: Sat Mar 4 21:30:22 UTC 2017 Update of /cvsroot/xsrc/external/mit/presentproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv22315 Log Message: initial import of presentproto-1.1 Status: Vendor Tag: xorg Release Tags: presentproto-1-1 U xsrc/external/mit/presentproto/dist/presentproto.pc.in U xsrc/external/mit/presentproto/dist/presenttokens.h N xsrc/external/mit/presentproto/dist/README U xsrc/external/mit/presentproto/dist/config.sub U xsrc/external/mit/presentproto/dist/configure U xsrc/external/mit/presentproto/dist/presentproto.txt U xsrc/external/mit/presentproto/dist/INSTALL N xsrc/external/mit/presentproto/dist/compile U xsrc/external/mit/presentproto/dist/ChangeLog U xsrc/external/mit/presentproto/dist/Makefile.am U xsrc/external/mit/presentproto/dist/presentproto.h U xsrc/external/mit/presentproto/dist/install-sh U xsrc/external/mit/presentproto/dist/config.guess N xsrc/external/mit/presentproto/dist/COPYING U xsrc/external/mit/presentproto/dist/aclocal.m4 U xsrc/external/mit/presentproto/dist/missing U xsrc/external/mit/presentproto/dist/configure.ac U xsrc/external/mit/presentproto/dist/Makefile.in No conflicts created by this import
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: bouyer
Date: Sat Mar 4 19:11:01 UTC 2017
Modified Files:
src/sys/arch/xen/xen: if_xennet_xenbus.c
Log Message:
Try to be smarted in the rx path: if the packet is small enough copy the
data to the mbuf's data area instead of allocating a new page from the pool.
While there fix a struct xennet_rxreq leak if xennet_checksum_fill()
fails with ENOMEM.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/xen/xen/if_xennet_xenbus.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/xen/xen/if_xennet_xenbus.c
diff -u src/sys/arch/xen/xen/if_xennet_xenbus.c:1.69 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.70
--- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.69 Thu Dec 15 09:28:04 2016
+++ src/sys/arch/xen/xen/if_xennet_xenbus.c Sat Mar 4 19:11:01 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xennet_xenbus.c,v 1.69 2016/12/15 09:28:04 ozaki-r Exp $ */
+/* $NetBSD: if_xennet_xenbus.c,v 1.70 2017/03/04 19:11:01 bouyer Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -85,7 +85,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.69 2016/12/15 09:28:04 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.70 2017/03/04 19:11:01 bouyer Exp $");
#include "opt_xen.h"
#include "opt_nfs_boot.h"
@@ -1074,26 +1074,35 @@ again:
MCLAIM(m, &sc->sc_ethercom.ec_rx_mowner);
m_set_rcvif(m, ifp);
- req->rxreq_va = (vaddr_t)pool_cache_get_paddr(
- if_xennetrxbuf_cache, PR_NOWAIT, &req->rxreq_pa);
- if (__predict_false(req->rxreq_va == 0)) {
- printf("%s: rx no buf\n", ifp->if_xname);
- ifp->if_ierrors++;
- req->rxreq_va = va;
- req->rxreq_pa = pa;
- xennet_rx_free_req(req);
- m_freem(m);
- continue;
+ if (rx->status <= MHLEN) {
+ /* small packet; copy to mbuf data area */
+ m_copyback(m, 0, rx->status, pktp);
+ KASSERT(m->m_pkthdr.len == rx->status);
+ KASSERT(m->m_len == rx->status);
+ } else {
+ /* large packet; attach buffer to mbuf */
+ req->rxreq_va = (vaddr_t)pool_cache_get_paddr(
+ if_xennetrxbuf_cache, PR_NOWAIT, &req->rxreq_pa);
+ if (__predict_false(req->rxreq_va == 0)) {
+printf("%s: rx no buf\n", ifp->if_xname);
+ifp->if_ierrors++;
+req->rxreq_va = va;
+req->rxreq_pa = pa;
+xennet_rx_free_req(req);
+m_freem(m);
+continue;
+ }
+ m->m_len = m->m_pkthdr.len = rx->status;
+ MEXTADD(m, pktp, rx->status,
+ M_DEVBUF, xennet_rx_mbuf_free, NULL);
+ m->m_ext.ext_paddr = pa;
+ m->m_flags |= M_EXT_RW; /* we own the buffer */
}
- m->m_len = m->m_pkthdr.len = rx->status;
- MEXTADD(m, pktp, rx->status,
- M_DEVBUF, xennet_rx_mbuf_free, NULL);
- m->m_flags |= M_EXT_RW; /* we own the buffer */
- m->m_ext.ext_paddr = pa;
if ((rx->flags & NETRXF_csum_blank) != 0) {
xennet_checksum_fill(&m);
if (m == NULL) {
ifp->if_ierrors++;
+xennet_rx_free_req(req);
continue;
}
}
CVS commit: src/lib
Module Name:src
Committed By: njoly
Date: Sat Mar 4 11:16:33 UTC 2017
Modified Files:
src/lib/libc/sys: clock_getcpuclockid.c clock_getcpuclockid2.2
src/lib/libpthread: pthread_getcpuclockid.3 pthread_getcpuclockid.c
Log Message:
Fix {clock,pthread}_getcpuclockid to return an error number on
failure, to match OpenGroup specifications.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/sys/clock_getcpuclockid.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/sys/clock_getcpuclockid2.2
cvs rdiff -u -r1.3 -r1.4 src/lib/libpthread/pthread_getcpuclockid.3
cvs rdiff -u -r1.1 -r1.2 src/lib/libpthread/pthread_getcpuclockid.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/sys/clock_getcpuclockid.c
diff -u src/lib/libc/sys/clock_getcpuclockid.c:1.1 src/lib/libc/sys/clock_getcpuclockid.c:1.2
--- src/lib/libc/sys/clock_getcpuclockid.c:1.1 Sat Apr 23 23:11:31 2016
+++ src/lib/libc/sys/clock_getcpuclockid.c Sat Mar 4 11:16:33 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: clock_getcpuclockid.c,v 1.1 2016/04/23 23:11:31 christos Exp $ */
+/* $NetBSD: clock_getcpuclockid.c,v 1.2 2017/03/04 11:16:33 njoly Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -30,14 +30,22 @@
*/
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: clock_getcpuclockid.c,v 1.1 2016/04/23 23:11:31 christos Exp $");
+__RCSID("$NetBSD: clock_getcpuclockid.c,v 1.2 2017/03/04 11:16:33 njoly Exp $");
#endif /* LIBC_SCCS and not lint */
#include
+#include
#include
int
clock_getcpuclockid(pid_t pid, clockid_t *clock_id)
{
- return clock_getcpuclockid2(P_PID, (id_t)pid, clock_id);
+ int error = 0, saved_errno;
+
+ saved_errno = errno;
+ if (clock_getcpuclockid2(P_PID, (id_t)pid, clock_id) == -1)
+ error = errno;
+ errno = saved_errno;
+
+ return error;
}
Index: src/lib/libc/sys/clock_getcpuclockid2.2
diff -u src/lib/libc/sys/clock_getcpuclockid2.2:1.2 src/lib/libc/sys/clock_getcpuclockid2.2:1.3
--- src/lib/libc/sys/clock_getcpuclockid2.2:1.2 Sun Apr 24 08:59:30 2016
+++ src/lib/libc/sys/clock_getcpuclockid2.2 Sat Mar 4 11:16:33 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: clock_getcpuclockid2.2,v 1.2 2016/04/24 08:59:30 wiz Exp $
+.\" $NetBSD: clock_getcpuclockid2.2,v 1.3 2017/03/04 11:16:33 njoly Exp $
.\"
.\" Copyright (c) 2016 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd April 23, 2016
+.Dd March 3, 2017
.Dt CLOCK_GETCPUCLOCKID2 2
.Os
.Sh NAME
@@ -81,17 +81,12 @@ function can be used with the returned
.Fa clock_id
to retrieve process and LWP times.
.Sh RETURN VALUES
-The
+.Rv -std clock_getcpuclockid2
+.Pp
+If successful, the
.Fn clock_getcpuclockid
-and
-.Fn clock_getcpuclockid2
-functions succeed and return 0, placing the requested
-.Fa clock_id
-in the argument.
-On error, the value \-1 is returned
-and the value of
-.Va errno
-is set to reflect what went wrong.
+function will return 0.
+Otherwise an error number will be returned.
.Sh ERRORS
These functions fail if:
.Bl -tag -width Er
Index: src/lib/libpthread/pthread_getcpuclockid.3
diff -u src/lib/libpthread/pthread_getcpuclockid.3:1.3 src/lib/libpthread/pthread_getcpuclockid.3:1.4
--- src/lib/libpthread/pthread_getcpuclockid.3:1.3 Sun Apr 24 09:01:45 2016
+++ src/lib/libpthread/pthread_getcpuclockid.3 Sat Mar 4 11:16:33 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: pthread_getcpuclockid.3,v 1.3 2016/04/24 09:01:45 wiz Exp $
+.\" $NetBSD: pthread_getcpuclockid.3,v 1.4 2017/03/04 11:16:33 njoly Exp $
.\"
.\" Copyright (c) 2016 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd April 23, 2016
+.Dd March 3, 2017
.Dt PTHREAD_GETCPUCLOCKID 3
.Os
.Sh NAME
@@ -58,10 +58,7 @@ On success the
function returns 0, placing the requested
.Fa clock_id
in the argument.
-On error, the value \-1 is returned
-and the value of
-.Va errno
-is set to reflect what went wrong.
+Otherwise an error number will be returned.
.Sh ERRORS
These functions fail if:
.Bl -tag -width Er
Index: src/lib/libpthread/pthread_getcpuclockid.c
diff -u src/lib/libpthread/pthread_getcpuclockid.c:1.1 src/lib/libpthread/pthread_getcpuclockid.c:1.2
--- src/lib/libpthread/pthread_getcpuclockid.c:1.1 Sat Apr 23 23:12:19 2016
+++ src/lib/libpthread/pthread_getcpuclockid.c Sat Mar 4 11:16:33 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_getcpuclockid.c,v 1.1 2016/04/23 23:12:19 christos Exp $ */
+/* $NetBSD: pthread_getcpuclockid.c,v 1.2 2017/03/04 11:16:33 njoly Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -30,10 +30,11 @@
*/
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pthread_getcpuclockid.c,v 1.1 2016/04/23
