sync with OpenBSD -current
This commit is contained in:
parent
5d45cd7ee8
commit
155eb8555e
5506 changed files with 1786257 additions and 1416034 deletions
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
#
|
||||
# Copyright 2005 Red Hat, Inc.
|
||||
#
|
||||
#
|
||||
# Permission to use, copy, modify, distribute, and sell this software and its
|
||||
# documentation for any purpose is hereby granted without fee, provided that
|
||||
# the above copyright notice appear in all copies and that both that
|
||||
|
@ -10,7 +10,7 @@
|
|||
# specific, written prior permission. Red Hat makes no
|
||||
# representations about the suitability of this software for any purpose. It
|
||||
# is provided "as is" without express or implied warranty.
|
||||
#
|
||||
#
|
||||
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
|
|
4
app/xf86dga/aclocal.m4
vendored
4
app/xf86dga/aclocal.m4
vendored
|
@ -21,7 +21,7 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
|
|||
|
||||
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
|
||||
# serial 1 (pkg-config-0.24)
|
||||
#
|
||||
#
|
||||
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
|
@ -144,7 +144,7 @@ if test $pkg_failed = yes; then
|
|||
_PKG_SHORT_ERRORS_SUPPORTED
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
|
||||
else
|
||||
else
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
|
|
6
app/xf86dga/config.guess
vendored
6
app/xf86dga/config.guess
vendored
|
@ -209,9 +209,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|||
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:SecBSD:*:*)
|
||||
UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'`
|
||||
echo ${UNAME_MACHINE_ARCH}-unknown-secbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'`
|
||||
echo ${UNAME_MACHINE_ARCH}-unknown-secbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:ekkoBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
dnl Copyright 2005 Red Hat, Inc.
|
||||
dnl
|
||||
dnl
|
||||
dnl Permission to use, copy, modify, distribute, and sell this software and its
|
||||
dnl documentation for any purpose is hereby granted without fee, provided that
|
||||
dnl the above copyright notice appear in all copies and that both that
|
||||
|
@ -10,7 +10,7 @@ dnl advertising or publicity pertaining to distribution of the software without
|
|||
dnl specific, written prior permission. Red Hat makes no
|
||||
dnl representations about the suitability of this software for any purpose. It
|
||||
dnl is provided "as is" without express or implied warranty.
|
||||
dnl
|
||||
dnl
|
||||
dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
|
|
|
@ -54,7 +54,7 @@ main(int argc, char *argv[])
|
|||
|
||||
|
||||
if (!XF86DGAQueryVersion(dis, &MajorVersion, &MinorVersion))
|
||||
{
|
||||
{
|
||||
fprintf(stderr, "Unable to query video extension version\n");
|
||||
exit(2);
|
||||
}
|
||||
|
@ -80,7 +80,7 @@ main(int argc, char *argv[])
|
|||
fprintf(stderr, "Xserver driver doesn't support DirectVideo on screen %d\n", DefaultScreen(dis) );
|
||||
exit(2);
|
||||
}
|
||||
|
||||
|
||||
XGrabKeyboard(dis, DefaultRootWindow(dis), True, GrabModeAsync,
|
||||
GrabModeAsync, CurrentTime);
|
||||
|
||||
|
@ -90,9 +90,9 @@ main(int argc, char *argv[])
|
|||
GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
|
||||
/* we want _our_ cmap */
|
||||
vis = DefaultVisual(dis, DefaultScreen(dis));
|
||||
|
||||
|
||||
bpp = DisplayPlanes (dis, DefaultScreen(dis));
|
||||
|
||||
|
||||
|
||||
if (bpp <= 8)
|
||||
{
|
||||
|
@ -151,7 +151,7 @@ main(int argc, char *argv[])
|
|||
int n_chars = 0;
|
||||
char buf[21];
|
||||
KeySym ks = 0;
|
||||
|
||||
|
||||
i = 0;
|
||||
XNextEvent(dis, &event);
|
||||
switch (event.type) {
|
||||
|
@ -195,7 +195,7 @@ main(int argc, char *argv[])
|
|||
{
|
||||
XF86DGASetVidPage(dis, DefaultScreen(dis), i);
|
||||
|
||||
start_clock = GetTimeInMillis(); finish_clock = start_clock;
|
||||
start_clock = GetTimeInMillis(); finish_clock = start_clock;
|
||||
|
||||
cycles=0;
|
||||
while ((finish_clock - start_clock) < 1000)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue