qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Upate to libXxf86dga 1.1.3

Browse Source
This commit is contained in:
matthieu 2012-03-10 17:07:14 +00:00
parent 5fa34673d3
commit 880e17f2a8
15 changed files with 29093 additions and 22292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
lib/libXxf86dga/ChangeLog
View File

@ -1,3 +1,74 @@
commit 3dad5d7c34c5787f0466b9ff50d7c26cd18e37bd
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Mar 7 21:34:06 2012 -0800
libXxf86dga 1.1.3
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 870a35db2ad6eab47d1026a56e52c3f53a9877eb
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Nov 10 21:50:52 2011 -0800
Fix gcc -Wwrite-strings warnings
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit e9936bbcfe7ae6430ec91fd5fca696c09f2b904c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Sep 16 22:57:14 2011 -0700
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit c85b3c711d96331b4aa564ee4c9168d1aa0c10bc
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue May 17 20:54:52 2011 -0700
XDGA.man: Fix capitalization of ViewportStep to match xf86dgaproto headers
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 8d4356002f886417c1edb7b41aa1139d984bb861
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Feb 2 11:43:45 2011 -0500
config: comment, minor upgrade, quote and layout configure.ac
Group statements per section as per Autoconf standard layout
Quote statements where appropriate.
Autoconf recommends not using dnl instead of # for comments
Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
Add AC_CONFIG_SRCDIR([Makefile.am])
This helps automated maintenance and release activities.
Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
commit 1d8387fbb917fb47d27b20b369d3fb7d0947ab6a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jan 28 19:41:38 2011 -0500
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 4aae82f7d0533ba696434b2c8d108e8d8206b8bc
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jan 27 18:50:15 2011 -0500
config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 3eb0d49a8d673c79ba9714d027f1ee056cf4b0b9 commit 3eb0d49a8d673c79ba9714d027f1ee056cf4b0b9
Author: Alan Coopersmith <alan.coopersmith@oracle.com> Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 18:00:17 2010 -0700 Date: Fri Oct 29 18:00:17 2010 -0700

31
lib/libXxf86dga/Makefile.in
View File

@ -23,9 +23,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = . top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@ INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644 install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA) INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name) transform = $(program_transform_name)
NORMAL_INSTALL = : NORMAL_INSTALL = :
@ -95,6 +95,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@ CC = @CC@
CCDEPMODE = @CCDEPMODE@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
@ -102,24 +103,20 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@ CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@ DEFS = @DEFS@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@ DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@ DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@ ECHO_T = @ECHO_T@
EGREP = @EGREP@ EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
F77 = @F77@ FGREP = @FGREP@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@ GREP = @GREP@
@ -128,12 +125,14 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LIPO = @LIPO@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@
@ -141,11 +140,16 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@ MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@ NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_NAME = @PACKAGE_NAME@
@ -158,6 +162,7 @@ RANLIB = @RANLIB@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@
VERSION = @VERSION@ VERSION = @VERSION@
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
@ -165,13 +170,11 @@ XORG_MAN_PAGE = @XORG_MAN_PAGE@
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@ XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
XXF86DGA_CFLAGS = @XXF86DGA_CFLAGS@ XXF86DGA_CFLAGS = @XXF86DGA_CFLAGS@
XXF86DGA_LIBS = @XXF86DGA_LIBS@ XXF86DGA_LIBS = @XXF86DGA_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@ am__include = @am__include@
am__leading_dot = @am__leading_dot@ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@ am__quote = @am__quote@

10626
lib/libXxf86dga/aclocal.m4 vendored
View File

File diff suppressed because it is too large Load Diff

30303
lib/libXxf86dga/configure vendored
View File

File diff suppressed because it is too large Load Diff

36
lib/libXxf86dga/configure.ac
View File

@ -1,28 +1,30 @@
AC_PREREQ([2.60])
AC_INIT([libXxf86dga], [1.1.2], # Initialize Autoconf
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], AC_PREREQ([2.60])
[libXxf86dga]) AC_INIT([libXxf86dga], [1.1.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXxf86dga])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS(src/config.h)
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
# Initialize libtool
AC_PROG_LIBTOOL
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION], m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8) XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(src/config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
# Checks for pkg-config packages
PKG_CHECK_MODULES(XXF86DGA, xproto x11 xextproto xext [xf86dgaproto >= 2.0.99.2])
XORG_CHECK_MALLOC_ZERO XORG_CHECK_MALLOC_ZERO
AC_OUTPUT([Makefile # Obtain compiler/linker options for depedencies
src/Makefile PKG_CHECK_MODULES(XXF86DGA, xproto x11 xextproto xext [xf86dgaproto >= 2.0.99.2])
man/Makefile
xxf86dga.pc]) AC_CONFIG_FILES([Makefile
src/Makefile
man/Makefile
xxf86dga.pc])
AC_OUTPUT

2
lib/libXxf86dga/include/X11/extensions/Xxf86dga.h
View File

@ -150,7 +150,7 @@ int XDGAGetViewportStatus(
Display *dpy, Display *dpy,
int screen int screen
); );
void XDGASync( void XDGASync(
Display *dpy, Display *dpy,
int screen int screen

2
lib/libXxf86dga/include/X11/extensions/xf86dga1.h
View File

@ -37,7 +37,7 @@ Status XF86DGAGetVideoLL(
unsigned int * /* base addr */, unsigned int * /* base addr */,
int * /* width */, int * /* width */,
int * /* bank_size */, int * /* bank_size */,
int * /* ram_size */ int * /* ram_size */
); );
Status XF86DGAGetVideo( Status XF86DGAGetVideo(

10136
lib/libXxf86dga/ltmain.sh
View File

File diff suppressed because it is too large Load Diff

31
lib/libXxf86dga/man/Makefile.in
View File

@ -46,9 +46,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .. top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@ INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644 install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA) INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name) transform = $(program_transform_name)
NORMAL_INSTALL = : NORMAL_INSTALL = :
@ -94,6 +94,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@ CC = @CC@
CCDEPMODE = @CCDEPMODE@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
@ -101,24 +102,20 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@ CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@ DEFS = @DEFS@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@ DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@ DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@ ECHO_T = @ECHO_T@
EGREP = @EGREP@ EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
F77 = @F77@ FGREP = @FGREP@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@ GREP = @GREP@
@ -127,12 +124,14 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LIPO = @LIPO@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@
@ -140,11 +139,16 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@ MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@ NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_NAME = @PACKAGE_NAME@
@ -157,6 +161,7 @@ RANLIB = @RANLIB@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@
VERSION = @VERSION@ VERSION = @VERSION@
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
@ -164,13 +169,11 @@ XORG_MAN_PAGE = @XORG_MAN_PAGE@
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@ XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
XXF86DGA_CFLAGS = @XXF86DGA_CFLAGS@ XXF86DGA_CFLAGS = @XXF86DGA_CFLAGS@
XXF86DGA_LIBS = @XXF86DGA_LIBS@ XXF86DGA_LIBS = @XXF86DGA_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@ am__include = @am__include@
am__leading_dot = @am__leading_dot@ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@ am__quote = @am__quote@

14
lib/libXxf86dga/man/XDGA.man
View File

@ -1,4 +1,4 @@
.\" .\"
.TH XDGA 3 __vendorversion__ .TH XDGA 3 __vendorversion__
.SH NAME .SH NAME
XDGA \- Client library for the XFree86-DGA extension. XDGA \- Client library for the XFree86-DGA extension.
@ -230,7 +230,7 @@ Each
corresponds to a different framebuffer layout. corresponds to a different framebuffer layout.
.PP .PP
.BR XDGAQueryModes () .BR XDGAQueryModes ()
returns a pointer to an array of returns a pointer to an array of
.IR XDGAMode s .IR XDGAMode s
which are valid for the given screen. which are valid for the given screen.
.I num .I num
@ -372,9 +372,9 @@ etc.
The dimensions of the portion of the framebuffer which will be displayed The dimensions of the portion of the framebuffer which will be displayed
on the screen. on the screen.
.TP 8 .TP 8
.I xViewPortStep .I xViewportStep
.TP 8 .TP 8
.I yViewPortStep .I yViewportStep
The granularity of the x,y viewport positioning possible with the The granularity of the x,y viewport positioning possible with the
.BR XDGASetViewport () .BR XDGASetViewport ()
function. function.
@ -382,7 +382,7 @@ function.
.I maxViewportX .I maxViewportX
.TP 8 .TP 8
.I maxViewportY .I maxViewportY
The maximum x and y positions possible with the The maximum x and y positions possible with the
.BR XDGASetViewport () .BR XDGASetViewport ()
function. function.
.TP 8 .TP 8
@ -522,9 +522,9 @@ rectangle.
sets the upper left-hand corner of the rectangle of framebuffer that is sets the upper left-hand corner of the rectangle of framebuffer that is
to be displayed on the screen. Not all locations may be supported by to be displayed on the screen. Not all locations may be supported by
the hardware and requested locations will be adjusted according to the the hardware and requested locations will be adjusted according to the
.I xViewPortStep .I xViewportStep
and and
.I yViewPortStep .I yViewportStep
fields in the fields in the
.IR XDGAMode . .IR XDGAMode .
.PP .PP

2
lib/libXxf86dga/src/Makefile.am
View File

@ -6,7 +6,7 @@ AM_CFLAGS = -I $(top_srcdir)/include \
$(XXF86DGA_CFLAGS) \ $(XXF86DGA_CFLAGS) \
$(MALLOC_ZERO_CFLAGS) \ $(MALLOC_ZERO_CFLAGS) \
$(CWARNFLAGS) $(CWARNFLAGS)
libXxf86dga_la_LIBADD = $(XXF86DGA_LIBS) libXxf86dga_la_LIBADD = $(XXF86DGA_LIBS)
libXxf86dga_la_LDFLAGS = -version-number 1:0:0 libXxf86dga_la_LDFLAGS = -version-number 1:0:0

31
lib/libXxf86dga/src/Makefile.in
View File

@ -24,9 +24,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .. top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@ INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644 install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA) INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name) transform = $(program_transform_name)
NORMAL_INSTALL = : NORMAL_INSTALL = :
@ -93,6 +93,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@ CC = @CC@
CCDEPMODE = @CCDEPMODE@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
@ -100,24 +101,20 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@ CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@ DEFS = @DEFS@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@ DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@ DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@ ECHO_T = @ECHO_T@
EGREP = @EGREP@ EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
F77 = @F77@ FGREP = @FGREP@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@ GREP = @GREP@
@ -126,12 +123,14 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LIPO = @LIPO@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@ MAINT = @MAINT@
@ -139,11 +138,16 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@ MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@ NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_NAME = @PACKAGE_NAME@
@ -156,6 +160,7 @@ RANLIB = @RANLIB@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@
VERSION = @VERSION@ VERSION = @VERSION@
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@ XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
@ -163,13 +168,11 @@ XORG_MAN_PAGE = @XORG_MAN_PAGE@
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@ XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
XXF86DGA_CFLAGS = @XXF86DGA_CFLAGS@ XXF86DGA_CFLAGS = @XXF86DGA_CFLAGS@
XXF86DGA_LIBS = @XXF86DGA_LIBS@ XXF86DGA_LIBS = @XXF86DGA_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@ am__include = @am__include@
am__leading_dot = @am__leading_dot@ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@ am__quote = @am__quote@

36
lib/libXxf86dga/src/XF86DGA.c
View File

@ -65,7 +65,7 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc
#include <X11/extensions/extutil.h> #include <X11/extensions/extutil.h>
extern XExtDisplayInfo* xdga_find_display(Display*); extern XExtDisplayInfo* xdga_find_display(Display*);
extern char *xdga_extension_name; extern const char *xdga_extension_name;
#define XF86DGACheckExtension(dpy,i,val) \ #define XF86DGACheckExtension(dpy,i,val) \
XextCheckExtension (dpy, i, xdga_extension_name, val) XextCheckExtension (dpy, i, xdga_extension_name, val)
@ -86,7 +86,7 @@ Bool XF86DGAQueryExtension (
Bool XF86DGAQueryVersion( Bool XF86DGAQueryVersion(
Display* dpy, Display* dpy,
int* majorVersion, int* majorVersion,
int* minorVersion int* minorVersion
){ ){
return XDGAQueryVersion(dpy, majorVersion, minorVersion); return XDGAQueryVersion(dpy, majorVersion, minorVersion);
@ -96,8 +96,8 @@ Bool XF86DGAGetVideoLL(
Display* dpy, Display* dpy,
int screen, int screen,
unsigned int *offset, unsigned int *offset,
int *width, int *width,
int *bank_size, int *bank_size,
int *ram_size int *ram_size
){ ){
XExtDisplayInfo *info = xdga_find_display (dpy); XExtDisplayInfo *info = xdga_find_display (dpy);
@ -121,13 +121,13 @@ Bool XF86DGAGetVideoLL(
*width = rep.width; *width = rep.width;
*bank_size = rep.bank_size; *bank_size = rep.bank_size;
*ram_size = rep.ram_size; *ram_size = rep.ram_size;
UnlockDisplay(dpy); UnlockDisplay(dpy);
SyncHandle(); SyncHandle();
return True; return True;
} }
Bool XF86DGADirectVideoLL( Bool XF86DGADirectVideoLL(
Display* dpy, Display* dpy,
int screen, int screen,
@ -153,7 +153,7 @@ Bool XF86DGADirectVideoLL(
Bool XF86DGAGetViewPortSize( Bool XF86DGAGetViewPortSize(
Display* dpy, Display* dpy,
int screen, int screen,
int *width, int *width,
int *height int *height
){ ){
XExtDisplayInfo *info = xdga_find_display (dpy); XExtDisplayInfo *info = xdga_find_display (dpy);
@ -175,17 +175,17 @@ Bool XF86DGAGetViewPortSize(
*width = rep.width; *width = rep.width;
*height = rep.height; *height = rep.height;
UnlockDisplay(dpy); UnlockDisplay(dpy);
SyncHandle(); SyncHandle();
return True; return True;
} }
Bool XF86DGASetViewPort( Bool XF86DGASetViewPort(
Display* dpy, Display* dpy,
int screen, int screen,
int x, int x,
int y int y
){ ){
XExtDisplayInfo *info = xdga_find_display (dpy); XExtDisplayInfo *info = xdga_find_display (dpy);
@ -206,7 +206,7 @@ Bool XF86DGASetViewPort(
return True; return True;
} }
Bool XF86DGAGetVidPage( Bool XF86DGAGetVidPage(
Display* dpy, Display* dpy,
int screen, int screen,
@ -235,7 +235,7 @@ Bool XF86DGAGetVidPage(
return True; return True;
} }
Bool XF86DGASetVidPage( Bool XF86DGASetVidPage(
Display* dpy, Display* dpy,
int screen, int screen,
@ -342,7 +342,7 @@ Bool XF86DGAViewPortChanged(
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <fcntl.h> #include <fcntl.h>
#if defined(ISC) #if defined(ISC)
# define HAS_SVR3_MMAP # define HAS_SVR3_MMAP
# include <sys/types.h> # include <sys/types.h>
# include <errno.h> # include <errno.h>
@ -548,7 +548,7 @@ MapPhysAddress(unsigned long address, unsigned long size)
if (rc != 0) if (rc != 0)
return NULL; return NULL;
#elif defined(Lynx) && defined(NO_MMAP) #elif defined(Lynx) && defined(NO_MMAP)
vaddr = (void *)smem_create("XF86DGA", (char *)offset, vaddr = (void *)smem_create("XF86DGA", (char *)offset,
size + delta, SM_READ|SM_WRITE); size + delta, SM_READ|SM_WRITE);
#else #else
#ifndef MAP_FILE #ifndef MAP_FILE
@ -670,8 +670,8 @@ XF86DGAGetVideo(
Display *dis, Display *dis,
int screen, int screen,
char **addr, char **addr,
int *width, int *width,
int *bank, int *bank,
int *ram int *ram
){ ){
unsigned int offset; unsigned int offset;
@ -710,7 +710,7 @@ XF86DGAGetVideo(
signal(SIGBUS, XF86cleanup); signal(SIGBUS, XF86cleanup);
#endif #endif
signal(SIGHUP, XF86cleanup); signal(SIGHUP, XF86cleanup);
signal(SIGFPE, XF86cleanup); signal(SIGFPE, XF86cleanup);
} }
return 1; return 1;

60
lib/libXxf86dga/src/XF86DGA2.c
View File

@ -25,12 +25,12 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc
/* If you change this, change the Bases[] array below as well */ /* If you change this, change the Bases[] array below as well */
#define MAX_HEADS 16 #define MAX_HEADS 16
char *xdga_extension_name = XF86DGANAME; const char *xdga_extension_name = XF86DGANAME;
static XExtensionInfo _xdga_info_data; static XExtensionInfo _xdga_info_data;
static XExtensionInfo *xdga_info = &_xdga_info_data; static XExtensionInfo *xdga_info = &_xdga_info_data;
Bool XDGAMapFramebuffer(int, char *, unsigned char*, CARD32, CARD32, CARD32); Bool XDGAMapFramebuffer(int, char *, unsigned char*, CARD32, CARD32, CARD32);
void XDGAUnmapFramebuffer(int); void XDGAUnmapFramebuffer(int);
unsigned char* XDGAGetMappedMemory(int); unsigned char* XDGAGetMappedMemory(int);
@ -66,9 +66,9 @@ static XEXT_GENERATE_CLOSE_DISPLAY (xdga_close_display, xdga_info)
XExtDisplayInfo* xdga_find_display(Display*); XExtDisplayInfo* xdga_find_display(Display*);
XEXT_GENERATE_FIND_DISPLAY (xdga_find_display, xdga_info, XEXT_GENERATE_FIND_DISPLAY (xdga_find_display, xdga_info,
"XFree86-DGA", "XFree86-DGA",
&xdga_extension_hooks, &xdga_extension_hooks,
0, NULL) 0, NULL)
@ -154,7 +154,7 @@ Bool XDGAQueryExtension (
Bool XDGAQueryVersion( Bool XDGAQueryVersion(
Display *dpy, Display *dpy,
int *majorVersion, int *majorVersion,
int *minorVersion int *minorVersion
){ ){
XExtDisplayInfo *info = xdga_find_display (dpy); XExtDisplayInfo *info = xdga_find_display (dpy);
@ -182,7 +182,7 @@ Bool XDGAQueryVersion(
for (i = 0, j = info->codes->first_event; for (i = 0, j = info->codes->first_event;
i < XF86DGANumberEvents; i < XF86DGANumberEvents;
i++, j++) i++, j++)
{ {
XESetWireToEvent (dpy, j, xdga_wire_to_event); XESetWireToEvent (dpy, j, xdga_wire_to_event);
XESetEventToWire (dpy, j, xdga_event_to_wire); XESetEventToWire (dpy, j, xdga_event_to_wire);
@ -240,11 +240,11 @@ Bool XDGAOpenFramebuffer(
} }
ret = XDGAMapFramebuffer(screen, deviceName, ret = XDGAMapFramebuffer(screen, deviceName,
(unsigned char*)(long)rep.mem1, (unsigned char*)(long)rep.mem1,
rep.size, rep.offset, rep.extra); rep.size, rep.offset, rep.extra);
if(deviceName) if(deviceName)
Xfree(deviceName); Xfree(deviceName);
UnlockDisplay(dpy); UnlockDisplay(dpy);
SyncHandle(); SyncHandle();
@ -305,12 +305,12 @@ XDGAMode* XDGAQueryModes(
offset = (char*)(&modes[rep.number]); /* start of text */ offset = (char*)(&modes[rep.number]); /* start of text */
if(modes) { if(modes) {
for(i = 0; i < rep.number; i++) { for(i = 0; i < rep.number; i++) {
_XRead(dpy, (char*)(&info), sz_xXDGAModeInfo); _XRead(dpy, (char*)(&info), sz_xXDGAModeInfo);
modes[i].num = info.num; modes[i].num = info.num;
modes[i].verticalRefresh = modes[i].verticalRefresh =
(float)info.vsync_num / (float)info.vsync_den; (float)info.vsync_num / (float)info.vsync_den;
modes[i].flags = info.flags; modes[i].flags = info.flags;
modes[i].imageWidth = info.image_width; modes[i].imageWidth = info.image_width;
@ -333,7 +333,7 @@ XDGAMode* XDGAQueryModes(
modes[i].maxViewportY = info.viewport_ymax; modes[i].maxViewportY = info.viewport_ymax;
modes[i].viewportFlags = info.viewport_flags; modes[i].viewportFlags = info.viewport_flags;
modes[i].reserved1 = info.reserved1; modes[i].reserved1 = info.reserved1;
modes[i].reserved2 = info.reserved2; modes[i].reserved2 = info.reserved2;
_XRead(dpy, offset, info.name_size); _XRead(dpy, offset, info.name_size);
modes[i].name = offset; modes[i].name = offset;
@ -352,7 +352,7 @@ XDGAMode* XDGAQueryModes(
} }
XDGADevice * XDGADevice *
XDGASetMode( XDGASetMode(
Display *dpy, Display *dpy,
int screen, int screen,
@ -373,7 +373,7 @@ XDGASetMode(
req->screen = screen; req->screen = screen;
req->mode = mode; req->mode = mode;
req->pid = pid = XAllocID(dpy); req->pid = pid = XAllocID(dpy);
if (_XReply(dpy, (xReply *)&rep, 0, xFalse)) { if (_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
if(rep.length) { if(rep.length) {
xXDGAModeInfo info; xXDGAModeInfo info;
@ -383,12 +383,12 @@ XDGASetMode(
size -= sz_xXDGAModeInfo; /* get text size */ size -= sz_xXDGAModeInfo; /* get text size */
dev = (XDGADevice*)Xmalloc(sizeof(XDGADevice) + size); dev = (XDGADevice*)Xmalloc(sizeof(XDGADevice) + size);
if(dev) { if(dev) {
_XRead(dpy, (char*)(&info), sz_xXDGAModeInfo); _XRead(dpy, (char*)(&info), sz_xXDGAModeInfo);
dev->mode.num = info.num; dev->mode.num = info.num;
dev->mode.verticalRefresh = dev->mode.verticalRefresh =
(float)info.vsync_num / (float)info.vsync_den; (float)info.vsync_num / (float)info.vsync_den;
dev->mode.flags = info.flags; dev->mode.flags = info.flags;
dev->mode.imageWidth = info.image_width; dev->mode.imageWidth = info.image_width;
@ -413,7 +413,7 @@ XDGASetMode(
dev->mode.reserved1 = info.reserved1; dev->mode.reserved1 = info.reserved1;
dev->mode.reserved2 = info.reserved2; dev->mode.reserved2 = info.reserved2;
dev->mode.name = (char*)(&dev[1]); dev->mode.name = (char*)(&dev[1]);
_XRead(dpy, dev->mode.name, info.name_size); _XRead(dpy, dev->mode.name, info.name_size);
dev->pixmap = (rep.flags & XDGAPixmap) ? pid : 0; dev->pixmap = (rep.flags & XDGAPixmap) ? pid : 0;
@ -421,7 +421,7 @@ XDGASetMode(
if(dev->data) if(dev->data)
dev->data += rep.offset; dev->data += rep.offset;
} }
/* not sure what to do if the allocation fails */ /* not sure what to do if the allocation fails */
} }
} }
@ -591,7 +591,7 @@ void XDGACopyTransparentArea(
int XDGAGetViewportStatus( int XDGAGetViewportStatus(
Display *dpy, Display *dpy,
int screen int screen
){ ){
XExtDisplayInfo *info = xdga_find_display (dpy); XExtDisplayInfo *info = xdga_find_display (dpy);
xXDGAGetViewportStatusReply rep; xXDGAGetViewportStatusReply rep;
@ -614,7 +614,7 @@ int XDGAGetViewportStatus(
void XDGASync( void XDGASync(
Display *dpy, Display *dpy,
int screen int screen
){ ){
XExtDisplayInfo *info = xdga_find_display (dpy); XExtDisplayInfo *info = xdga_find_display (dpy);
xXDGASyncReply rep; xXDGASyncReply rep;
@ -638,7 +638,7 @@ void XDGAChangePixmapMode(
int screen, int screen,
int *x, int *x,
int *y, int *y,
int mode int mode
){ ){
XExtDisplayInfo *info = xdga_find_display (dpy); XExtDisplayInfo *info = xdga_find_display (dpy);
xXDGAChangePixmapModeReq *req; xXDGAChangePixmapModeReq *req;
@ -689,7 +689,7 @@ Colormap XDGACreateColormap(
void XDGAKeyEventToXKeyEvent( void XDGAKeyEventToXKeyEvent(
XDGAKeyEvent* dk, XDGAKeyEvent* dk,
XKeyEvent* xk XKeyEvent* xk
){ ){
xk->type = dk->type; xk->type = dk->type;
@ -710,7 +710,7 @@ void XDGAKeyEventToXKeyEvent(
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <fcntl.h> #include <fcntl.h>
#if defined(ISC) #if defined(ISC)
# define HAS_SVR3_MMAP # define HAS_SVR3_MMAP
# include <sys/types.h> # include <sys/types.h>
# include <errno.h> # include <errno.h>
@ -760,7 +760,7 @@ typedef struct _DGAMapRec{
} DGAMapRec, *DGAMapPtr; } DGAMapRec, *DGAMapPtr;
static Bool static Bool
DGAMapPhysical(int, char*, unsigned char*, CARD32, CARD32, CARD32, DGAMapPtr); DGAMapPhysical(int, const char*, unsigned char*, CARD32, CARD32, CARD32, DGAMapPtr);
static void DGAUnmapPhysical(DGAMapPtr); static void DGAUnmapPhysical(DGAMapPtr);
static DGAMapPtr _Maps = NULL; static DGAMapPtr _Maps = NULL;
@ -794,7 +794,7 @@ XDGAMapFramebuffer(
){ ){
DGAMapPtr pMap = _Maps; DGAMapPtr pMap = _Maps;
Bool result; Bool result;
/* is it already mapped ? */ /* is it already mapped ? */
while(pMap != NULL) { while(pMap != NULL) {
if(pMap->screen == screen) if(pMap->screen == screen)
@ -815,9 +815,9 @@ XDGAMapFramebuffer(
if(result) { if(result) {
pMap->next = _Maps; pMap->next = _Maps;
_Maps = pMap; _Maps = pMap;
} else } else
Xfree(pMap); Xfree(pMap);
return result; return result;
} }
@ -852,7 +852,7 @@ XDGAUnmapFramebuffer(int screen)
static Bool static Bool
DGAMapPhysical( DGAMapPhysical(
int screen, int screen,
char *name, /* optional device name */ const char *name, /* optional device name */
unsigned char* base, /* physical memory */ unsigned char* base, /* physical memory */
CARD32 size, /* size */ CARD32 size, /* size */
CARD32 offset, /* optional offset */ CARD32 offset, /* optional offset */
@ -866,7 +866,7 @@ DGAMapPhysical(
ULONG action; ULONG action;
HFILE hfd; HFILE hfd;
#endif #endif
base += offset; base += offset;
pMap->screen = screen; pMap->screen = screen;
@ -927,7 +927,7 @@ DGAMapPhysical(
name = DEV_MEM; name = DEV_MEM;
if ((pMap->fd = open(name, O_RDWR)) < 0) if ((pMap->fd = open(name, O_RDWR)) < 0)
return False; return False;
pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE, pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE,
MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base); MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
if (pMap->virtual == (void *)-1) if (pMap->virtual == (void *)-1)
return False; return False;

4
lib/libXxf86dga/src/config.h.in
View File

@ -30,6 +30,10 @@
/* Define to 1 if you have the <unistd.h> header file. */ /* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H #undef HAVE_UNISTD_H
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
/* Name of package */ /* Name of package */
#undef PACKAGE #undef PACKAGE