diff options
| -rw-r--r-- | lib/libXxf86dga/ChangeLog | 77 | ||||
| -rw-r--r-- | lib/libXxf86dga/Makefile.in | 11 | ||||
| -rw-r--r-- | lib/libXxf86dga/README.md | 2 | ||||
| -rw-r--r-- | lib/libXxf86dga/aclocal.m4 | 84 | ||||
| -rw-r--r-- | lib/libXxf86dga/configure | 178 | ||||
| -rw-r--r-- | lib/libXxf86dga/configure.ac | 9 | ||||
| -rw-r--r-- | lib/libXxf86dga/man/Makefile.in | 1 | ||||
| -rw-r--r-- | lib/libXxf86dga/src/Makefile.in | 1 | ||||
| -rw-r--r-- | lib/libXxf86dga/src/XF86DGA.c | 124 | ||||
| -rw-r--r-- | lib/libXxf86dga/src/XF86DGA2.c | 96 |
10 files changed, 302 insertions, 281 deletions
diff --git a/lib/libXxf86dga/ChangeLog b/lib/libXxf86dga/ChangeLog index 1ff0a3160..4454272cd 100644 --- a/lib/libXxf86dga/ChangeLog +++ b/lib/libXxf86dga/ChangeLog @@ -1,3 +1,78 @@ +commit 39ca6ea5c66044b40ace47e79f416d980a799eea +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Dec 4 15:50:24 2022 -0800 + + libXxf86dga 1.1.6 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit def6d25fc3918caf890a5a63bff6f2b9e0d3dcb9 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Jul 17 18:58:33 2022 -0700 + + unifdef DGUX + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 43b8136a07fbbdf6e5bdd786d06be89904fc0854 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Jul 17 18:57:28 2022 -0700 + + unifdef Lynx + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit d58ba314d1fe6fdb1aab7a9f471caabb6f13968c +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Jul 17 18:54:25 2022 -0700 + + unifdef ISC + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit c8ae9b549e781dece49ca1576948b3d6d644b2f8 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Jul 17 18:47:07 2022 -0700 + + Remove SunOS 4 support (defined(sun) && (SVR4)) + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit b512d07b3125ed3ec5ae962ebb1a01d007d0efe9 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Jul 17 18:42:33 2022 -0700 + + unifdef __UNIXOS2__ + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit fd5436d2ef3484a0eaec619cf69870c18d7cb3ca +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Jul 17 18:36:13 2022 -0700 + + gitlab CI: add a basic build test + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit e6ea676e23770cf0d5c272f2a57375f5ed03e965 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Jul 17 18:35:06 2022 -0700 + + Fix spelling/wording issues + + Found by using: + codespell --builtin clear,rare,usage,informal,code,names + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit dd301c9f1bebc008193f281826b38dfa0064b5f3 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Jul 17 18:34:10 2022 -0700 + + Build xz tarballs instead of bzip2 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + commit e605c540995554af99d8b728c7d1d4e82e514199 Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Sat Mar 16 15:20:28 2019 -0700 @@ -727,7 +802,7 @@ Date: Fri Jul 1 16:16:15 2005 +0000 spell freedesktop.org correctly commit 139215564ee6e63101858b9481f3413361a6d4a7 -Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> Date: Fri Jun 10 22:38:47 2005 +0000 Apply patch from Jeff Smith (whydoubt@yahoo.com): diff --git a/lib/libXxf86dga/Makefile.in b/lib/libXxf86dga/Makefile.in index c1ec954e0..60b364021 100644 --- a/lib/libXxf86dga/Makefile.in +++ b/lib/libXxf86dga/Makefile.in @@ -53,8 +53,8 @@ host_triplet = @host@ subdir = . DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/xxf86dga.pc.in \ - $(top_srcdir)/configure COPYING ChangeLog INSTALL compile \ - config.guess config.sub depcomp install-sh ltmain.sh missing + $(top_srcdir)/configure COPYING ChangeLog INSTALL config.guess \ + config.sub depcomp install-sh ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -164,9 +164,9 @@ am__relativize = \ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz GZIP_ENV = --best -DIST_TARGETS = dist-bzip2 dist-gzip +DIST_TARGETS = dist-xz dist-gzip distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -305,6 +305,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -594,6 +595,7 @@ distdir: $(DISTFILES) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__post_remove_distdir) + dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 $(am__post_remove_distdir) @@ -601,7 +603,6 @@ dist-bzip2: distdir dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__post_remove_distdir) - dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) diff --git a/lib/libXxf86dga/README.md b/lib/libXxf86dga/README.md index a0898aee8..7428031bb 100644 --- a/lib/libXxf86dga/README.md +++ b/lib/libXxf86dga/README.md @@ -6,7 +6,7 @@ Xorg mailing list: https://lists.x.org/mailman/listinfo/xorg -The master development code repository can be found at: +The primary development code repository can be found at: https://gitlab.freedesktop.org/xorg/lib/libXxf86dga diff --git a/lib/libXxf86dga/aclocal.m4 b/lib/libXxf86dga/aclocal.m4 index e7052124f..0b2bd60c4 100644 --- a/lib/libXxf86dga/aclocal.m4 +++ b/lib/libXxf86dga/aclocal.m4 @@ -8606,9 +8606,9 @@ m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29.1) -dnl +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) + dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> dnl @@ -8649,7 +8649,7 @@ dnl dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -8750,7 +8750,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -8760,11 +8760,11 @@ and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _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 @@ -8781,7 +8781,7 @@ installed software in a non-standard prefix. _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -9905,7 +9905,7 @@ AC_SUBST([am__untar]) dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. dnl -dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. +dnl Copyright (c) 2005, 2023, Oracle and/or its affiliates. dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the "Software"), @@ -9942,7 +9942,7 @@ dnl DEALINGS IN THE SOFTWARE. # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_MACROS_VERSION],[ -m4_define([vers_have], [1.19.2]) +m4_define([vers_have], [1.20.0]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -9963,7 +9963,7 @@ AM_MAINTAINER_MODE # such as man pages and config files AC_DEFUN([XORG_PROG_RAWCPP],[ AC_REQUIRE([AC_PROG_CPP]) -AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], +AC_PATH_TOOL(RAWCPP, [cpp], [${CPP}], [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib]) # Check for flag to avoid builtin definitions - assumes unix is predefined, @@ -10273,7 +10273,7 @@ AC_SUBST(MAKE_HTML) # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-xmlto option, it allows maximum flexibilty in making decisions +# the --with-xmlto option, it allows maximum flexibility in making decisions # as whether or not to use the xmlto package. When DEFAULT is not specified, # --with-xmlto assumes 'auto'. # @@ -10487,7 +10487,7 @@ AM_CONDITIONAL([HAVE_PERL], [test "$have_perl" = yes]) # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-asciidoc option, it allows maximum flexibilty in making decisions +# the --with-asciidoc option, it allows maximum flexibility in making decisions # as whether or not to use the asciidoc package. When DEFAULT is not specified, # --with-asciidoc assumes 'auto'. # @@ -10557,7 +10557,7 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes]) # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-doxygen option, it allows maximum flexibilty in making decisions +# the --with-doxygen option, it allows maximum flexibility in making decisions # as whether or not to use the doxygen package. When DEFAULT is not specified, # --with-doxygen assumes 'auto'. # @@ -10641,7 +10641,7 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes]) # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-groff option, it allows maximum flexibilty in making decisions +# the --with-groff option, it allows maximum flexibility in making decisions # as whether or not to use the groff package. When DEFAULT is not specified, # --with-groff assumes 'auto'. # @@ -10749,7 +10749,7 @@ AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes]) # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-fop option, it allows maximum flexibilty in making decisions +# the --with-fop option, it allows maximum flexibility in making decisions # as whether or not to use the fop package. When DEFAULT is not specified, # --with-fop assumes 'auto'. # @@ -10843,7 +10843,7 @@ AC_SUBST([M4], [$ac_cv_path_M4]) # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-ps2pdf option, it allows maximum flexibilty in making decisions +# the --with-ps2pdf option, it allows maximum flexibility in making decisions # as whether or not to use the ps2pdf package. When DEFAULT is not specified, # --with-ps2pdf assumes 'auto'. # @@ -10898,7 +10898,7 @@ AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes]) # not at the appropriate level. This macro enables a builder to skip all # documentation targets except traditional man pages. # Combined with the specific tool checking macros XORG_WITH_*, it provides -# maximum flexibilty in controlling documentation building. +# maximum flexibility in controlling documentation building. # Refer to: # XORG_WITH_XMLTO --with-xmlto # XORG_WITH_ASCIIDOC --with-asciidoc @@ -10931,7 +10931,7 @@ AC_MSG_RESULT([$build_docs]) # # This macro enables a builder to skip all developer documentation. # Combined with the specific tool checking macros XORG_WITH_*, it provides -# maximum flexibilty in controlling documentation building. +# maximum flexibility in controlling documentation building. # Refer to: # XORG_WITH_XMLTO --with-xmlto # XORG_WITH_ASCIIDOC --with-asciidoc @@ -10964,7 +10964,7 @@ AC_MSG_RESULT([$build_devel_docs]) # # This macro enables a builder to skip all functional specification targets. # Combined with the specific tool checking macros XORG_WITH_*, it provides -# maximum flexibilty in controlling documentation building. +# maximum flexibility in controlling documentation building. # Refer to: # XORG_WITH_XMLTO --with-xmlto # XORG_WITH_ASCIIDOC --with-asciidoc @@ -11439,7 +11439,11 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) AC_DEFUN([XORG_COMPILER_BRAND], [ AC_LANG_CASE( [C], [ - AC_REQUIRE([AC_PROG_CC_C99]) + dnl autoconf-2.70 folded AC_PROG_CC_C99 into AC_PROG_CC + dnl and complains that AC_PROG_CC_C99 is obsolete + m4_version_prereq([2.70], + [AC_REQUIRE([AC_PROG_CC])], + [AC_REQUIRE([AC_PROG_CC_C99])]) ], [C++], [ AC_REQUIRE([AC_PROG_CXX]) @@ -11455,7 +11459,7 @@ AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) # Minimum version: 1.16.0 # # Test if the compiler works when passed the given flag as a command line argument. -# If it succeeds, the flag is appeneded to the given variable. If not, it tries the +# If it succeeds, the flag is appended to the given variable. If not, it tries the # next flag in the list until there are no more options. # # Note that this does not guarantee that the compiler supports the flag as some @@ -11471,7 +11475,11 @@ AC_LANG_COMPILER_REQUIRE AC_LANG_CASE( [C], [ - AC_REQUIRE([AC_PROG_CC_C99]) + dnl autoconf-2.70 folded AC_PROG_CC_C99 into AC_PROG_CC + dnl and complains that AC_PROG_CC_C99 is obsolete + m4_version_prereq([2.70], + [AC_REQUIRE([AC_PROG_CC])], + [AC_REQUIRE([AC_PROG_CC_C99])]) define([PREFIX], [C]) define([CACHE_PREFIX], [cc]) define([COMPILER], [$CC]) @@ -11602,7 +11610,7 @@ XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wuninitialized]) XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wshadow]) XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-noreturn]) XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-format-attribute]) -# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls]) +XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls]) XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op]) # These are currently disabled because they are noisy. They will be enabled @@ -11612,7 +11620,7 @@ XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op]) # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual]) -# Turn some warnings into errors, so we don't accidently get successful builds +# Turn some warnings into errors, so we don't accidentally get successful builds # when there are problems that should be fixed. if test "x$SELECTIVE_WERROR" = "xyes" ; then @@ -11721,23 +11729,35 @@ AC_SUBST([BASE_]PREFIX[FLAGS]) AC_LANG_CASE([C], AC_SUBST([CWARNFLAGS])) ]) # XORG_STRICT_OPTION +# XORG_DEFAULT_NOCODE_OPTIONS +# --------------------------- +# Minimum version: 1.20.0 +# +# Defines default options for X.Org modules which don't compile code, +# such as fonts, bitmaps, cursors, and docs. +# +AC_DEFUN([XORG_DEFAULT_NOCODE_OPTIONS], [ +AC_REQUIRE([AC_PROG_INSTALL]) +XORG_RELEASE_VERSION +XORG_CHANGELOG +XORG_INSTALL +XORG_MANPAGE_SECTIONS +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], + [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) +]) # XORG_DEFAULT_NOCODE_OPTIONS + # XORG_DEFAULT_OPTIONS # -------------------- # Minimum version: 1.3.0 # -# Defines default options for X.Org modules. +# Defines default options for X.Org modules which compile code. # AC_DEFUN([XORG_DEFAULT_OPTIONS], [ AC_REQUIRE([AC_PROG_INSTALL]) XORG_COMPILER_FLAGS XORG_CWARNFLAGS XORG_STRICT_OPTION -XORG_RELEASE_VERSION -XORG_CHANGELOG -XORG_INSTALL -XORG_MANPAGE_SECTIONS -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], - [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) +XORG_DEFAULT_NOCODE_OPTIONS ]) # XORG_DEFAULT_OPTIONS # XORG_INSTALL() diff --git a/lib/libXxf86dga/configure b/lib/libXxf86dga/configure index fbc8395f7..20c25b003 100644 --- a/lib/libXxf86dga/configure +++ b/lib/libXxf86dga/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libXxf86dga 1.1.5. +# Generated by GNU Autoconf 2.69 for libXxf86dga 1.1.6. # -# Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libXxf86dga/issues>. +# Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxxf86dga/-/issues>. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -275,7 +275,7 @@ fi $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: https://gitlab.freedesktop.org/xorg/lib/libXxf86dga/issues +$0: https://gitlab.freedesktop.org/xorg/lib/libxxf86dga/-/issues $0: about your system, including any error possibly output $0: before this message. Then install a modern shell, or $0: manually run the script under such a shell if you do @@ -591,9 +591,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libXxf86dga' PACKAGE_TARNAME='libXxf86dga' -PACKAGE_VERSION='1.1.5' -PACKAGE_STRING='libXxf86dga 1.1.5' -PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libXxf86dga/issues' +PACKAGE_VERSION='1.1.6' +PACKAGE_STRING='libXxf86dga 1.1.6' +PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libxxf86dga/-/issues' PACKAGE_URL='' ac_unique_file="Makefile.am" @@ -760,6 +760,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -848,6 +849,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1100,6 +1102,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1237,7 +1248,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1350,7 +1361,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libXxf86dga 1.1.5 to adapt to many kinds of systems. +\`configure' configures libXxf86dga 1.1.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1390,6 +1401,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1420,7 +1432,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libXxf86dga 1.1.5:";; + short | recursive ) echo "Configuration of libXxf86dga 1.1.6:";; esac cat <<\_ACEOF @@ -1482,7 +1494,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libXxf86dga/issues>. +Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxxf86dga/-/issues>. _ACEOF ac_status=$? fi @@ -1545,7 +1557,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libXxf86dga configure 1.1.5 +libXxf86dga configure 1.1.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1869,7 +1881,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libXxf86dga $as_me 1.1.5, which was +It was created by libXxf86dga $as_me 1.1.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2698,7 +2710,7 @@ fi # Define the identity of the package. PACKAGE='libXxf86dga' - VERSION='1.1.5' + VERSION='1.1.6' cat >>confdefs.h <<_ACEOF @@ -13561,7 +13573,124 @@ $as_echo "$supported" >&6; } fi -# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls]) + + + + + + + + + + + + + +xorg_testset_save_CFLAGS="$CFLAGS" + +if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unknown_warning_option=yes +else + xorg_cv_cc_flag_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } + xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + xorg_cv_cc_flag_unused_command_line_argument=yes +else + xorg_cv_cc_flag_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } + xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument + CFLAGS="$xorg_testset_save_CFLAGS" +fi + +found="no" + + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -Wredundant-decls" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wredundant-decls" >&5 +$as_echo_n "checking if $CC supports -Wredundant-decls... " >&6; } + cacheid=xorg_cv_cc_flag__Wredundant_decls + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -Wredundant-decls" + found="yes" + fi + fi + + @@ -13688,7 +13817,7 @@ $as_echo "$supported" >&6; } # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual]) -# Turn some warnings into errors, so we don't accidently get successful builds +# Turn some warnings into errors, so we don't accidentally get successful builds # when there are problems that should be fixed. if test "x$SELECTIVE_WERROR" = "xyes" ; then @@ -17360,6 +17489,8 @@ fi + + cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` _ACEOF @@ -17562,6 +17693,7 @@ AM_BACKSLASH='\' + # Check whether --enable-malloc0returnsnull was given. if test "${enable_malloc0returnsnull+set}" = set; then : enableval=$enable_malloc0returnsnull; MALLOC_ZERO_RETURNS_NULL=$enableval @@ -17633,11 +17765,11 @@ fi -# Obtain compiler/linker options for depedencies +# Obtain compiler/linker options for dependencies pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XXF86DGA" >&5 -$as_echo_n "checking for XXF86DGA... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xproto x11 >= 1.6 xextproto xext xf86dgaproto >= 2.0.99.2" >&5 +$as_echo_n "checking for xproto x11 >= 1.6 xextproto xext xf86dgaproto >= 2.0.99.2... " >&6; } if test -n "$XXF86DGA_CFLAGS"; then pkg_cv_XXF86DGA_CFLAGS="$XXF86DGA_CFLAGS" @@ -17677,7 +17809,7 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -17704,7 +17836,7 @@ Alternatively, you may set the environment variables XXF86DGA_CFLAGS and XXF86DGA_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -18262,7 +18394,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libXxf86dga $as_me 1.1.5, which was +This file was extended by libXxf86dga $as_me 1.1.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18322,13 +18454,13 @@ $config_headers Configuration commands: $config_commands -Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libXxf86dga/issues>." +Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxxf86dga/-/issues>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libXxf86dga config.status 1.1.5 +libXxf86dga config.status 1.1.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/lib/libXxf86dga/configure.ac b/lib/libXxf86dga/configure.ac index d6efd3bbe..f7bba6bce 100644 --- a/lib/libXxf86dga/configure.ac +++ b/lib/libXxf86dga/configure.ac @@ -1,13 +1,14 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXxf86dga], [1.1.5], - [https://gitlab.freedesktop.org/xorg/lib/libXxf86dga/issues], [libXxf86dga]) +AC_INIT([libXxf86dga], [1.1.6], + [https://gitlab.freedesktop.org/xorg/lib/libxxf86dga/-/issues], + [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-xz]) # Initialize libtool AC_PROG_LIBTOOL @@ -19,7 +20,7 @@ XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS XORG_CHECK_MALLOC_ZERO -# Obtain compiler/linker options for depedencies +# Obtain compiler/linker options for dependencies PKG_CHECK_MODULES(XXF86DGA, xproto [x11 >= 1.6] xextproto xext [xf86dgaproto >= 2.0.99.2]) AC_CONFIG_FILES([Makefile diff --git a/lib/libXxf86dga/man/Makefile.in b/lib/libXxf86dga/man/Makefile.in index 513907927..a5491b5e3 100644 --- a/lib/libXxf86dga/man/Makefile.in +++ b/lib/libXxf86dga/man/Makefile.in @@ -266,6 +266,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/lib/libXxf86dga/src/Makefile.in b/lib/libXxf86dga/src/Makefile.in index f01be7285..9cb52702b 100644 --- a/lib/libXxf86dga/src/Makefile.in +++ b/lib/libXxf86dga/src/Makefile.in @@ -284,6 +284,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/lib/libXxf86dga/src/XF86DGA.c b/lib/libXxf86dga/src/XF86DGA.c index 4544507f2..ffadf0b0d 100644 --- a/lib/libXxf86dga/src/XF86DGA.c +++ b/lib/libXxf86dga/src/XF86DGA.c @@ -8,12 +8,6 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc /* THIS IS NOT AN X CONSORTIUM STANDARD */ -#ifdef __UNIXOS2__ /* needed here to override certain constants in X headers */ -#define INCL_DOS -#define INCL_DOSIOCTL -#define I_NEED_OS2_H -#include <os2.h> -#endif #if defined(linux) #define HAS_MMAP_ANON @@ -32,27 +26,12 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc #include <sys/mman.h> #endif /* CSRG_BASED */ -#if defined(DGUX) -#define HAS_GETPAGESIZE -#define MMAP_DEV_ZERO -#include <sys/types.h> -#include <sys/mman.h> -#include <unistd.h> -#endif /* DGUX */ - -#if defined(SVR4) && !defined(DGUX) +#if defined(SVR4) #define MMAP_DEV_ZERO #include <sys/types.h> #include <sys/mman.h> #include <unistd.h> -#endif /* SVR4 && !DGUX */ - -#if defined(sun) && !defined(SVR4) /* SunOS */ -#define MMAP_DEV_ZERO /* doesn't SunOS have MAP_ANON ?? */ -#define HAS_GETPAGESIZE -#include <sys/types.h> -#include <sys/mman.h> -#endif /* sun && !SVR4 */ +#endif /* SVR4 */ #ifdef XNO_SYSCONF #undef _SC_PAGESIZE @@ -342,30 +321,7 @@ Bool XF86DGAViewPortChanged( #include <stdlib.h> #include <stdio.h> #include <fcntl.h> -#if defined(ISC) -# define HAS_SVR3_MMAP -# include <sys/types.h> -# include <errno.h> - -# include <sys/at_ansi.h> -# include <sys/kd.h> - -# include <sys/sysmacros.h> -# include <sys/immu.h> -# include <sys/region.h> - -# include <sys/mmap.h> -#else -# if defined(Lynx) && defined(NO_MMAP) -# include <sys/types.h> -# include <errno.h> -# include <smem.h> -# else -# if !defined(__UNIXOS2__) -# include <sys/mman.h> -# endif -# endif -#endif +#include <sys/mman.h> #include <sys/wait.h> #include <signal.h> #include <unistd.h> @@ -467,13 +423,6 @@ MapPhysAddress(unsigned long address, unsigned long size) int pagesize = -1; void *vaddr; MapPtr mp; -#if defined(ISC) && defined(HAS_SVR3_MMAP) - struct kd_memloc mloc; -#elif defined(__UNIXOS2__) - APIRET rc; - ULONG action; - HFILE hfd; -#endif if ((mp = FindMap(address, size))) { mp->refcount++; @@ -500,57 +449,6 @@ MapPhysAddress(unsigned long address, unsigned long size) delta = address % pagesize; offset = address - delta; - -#if defined(ISC) && defined(HAS_SVR3_MMAP) - if (mapFd < 0) { - if ((mapFd = open("/dev/mmap", O_RDWR)) < 0) - return NULL; - } - mloc.vaddr = (char *)0; - mloc.physaddr = (char *)offset; - mloc.length = size + delta; - mloc.ioflg=1; - - if ((vaddr = (void *)ioctl(mapFd, MAP, &mloc)) == (void *)-1) - return NULL; -#elif defined (__UNIXOS2__) - /* - * Dragon warning here! /dev/pmap$ is never closed, except on progam exit. - * Consecutive calling of this routine will make PMAP$ driver run out - * of memory handles. Some umap/close mechanism should be provided - */ - - rc = DosOpen("/dev/pmap$", &hfd, &action, 0, FILE_NORMAL, FILE_OPEN, - OPEN_ACCESS_READWRITE | OPEN_SHARE_DENYNONE, (PEAOP2)NULL); - if (rc != 0) - return NULL; - { - struct map_ioctl { - union { - ULONG phys; - void* user; - } a; - ULONG size; - } pmap,dmap; - ULONG plen,dlen; -#define XFREE86_PMAP 0x76 -#define PMAP_MAP 0x44 - - pmap.a.phys = offset; - pmap.size = size + delta; - rc = DosDevIOCtl(hfd, XFREE86_PMAP, PMAP_MAP, - (PULONG)&pmap, sizeof(pmap), &plen, - (PULONG)&dmap, sizeof(dmap), &dlen); - if (rc == 0) { - vaddr = dmap.a.user; - } - } - if (rc != 0) - return NULL; -#elif defined(Lynx) && defined(NO_MMAP) - vaddr = (void *)smem_create("XF86DGA", (char *)offset, - size + delta, SM_READ|SM_WRITE); -#else #ifndef MAP_FILE #define MAP_FILE 0 #endif @@ -559,10 +457,9 @@ MapPhysAddress(unsigned long address, unsigned long size) return NULL; } vaddr = (void *)mmap(NULL, size + delta, PROT_READ | PROT_WRITE, - MAP_FILE | MAP_SHARED, mapFd, (off_t)offset); + MAP_FILE | MAP_SHARED, mapFd, (off_t)offset); if (vaddr == (void *)-1) return NULL; -#endif if (!vaddr) { if (!(mp = AddMap())) @@ -622,23 +519,11 @@ XF86DGADirectVideo( mp = sp->map; if (enable & XF86DGADirectGraphics) { -#if !defined(ISC) && !defined(HAS_SVR3_MMAP) \ - && !(defined(Lynx) && defined(NO_MMAP)) \ - && !defined(__UNIXOS2__) if (mp && mp->vaddr) mprotect(mp->vaddr, mp->size + mp->delta, PROT_READ | PROT_WRITE); -#endif } else { -#if !defined(ISC) && !defined(HAS_SVR3_MMAP) \ - && !(defined(Lynx) && defined(NO_MMAP)) \ - && !defined(__UNIXOS2__) if (mp && mp->vaddr) mprotect(mp->vaddr, mp->size + mp->delta, PROT_READ); -#elif defined(Lynx) && defined(NO_MMAP) - /* XXX this doesn't allow enable after disable */ - smem_create(NULL, mp->vaddr, mp->size + mp->delta, SM_DETACH); - smem_remove("XF86DGA"); -#endif } XF86DGADirectVideoLL(dis, screen, enable); @@ -715,4 +600,3 @@ XF86DGAGetVideo( return 1; } - diff --git a/lib/libXxf86dga/src/XF86DGA2.c b/lib/libXxf86dga/src/XF86DGA2.c index ebc97ce1a..deb42671f 100644 --- a/lib/libXxf86dga/src/XF86DGA2.c +++ b/lib/libXxf86dga/src/XF86DGA2.c @@ -10,12 +10,6 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc #include <config.h> #endif -#ifdef __UNIXOS2__ /* needed here to override certain constants in X headers */ -#define INCL_DOS -#define INCL_DOSIOCTL -#define I_NEED_OS2_H -#include <os2.h> -#endif #include <X11/Xlibint.h> #include <X11/extensions/Xxf86dga.h> @@ -743,30 +737,7 @@ void XDGAKeyEventToXKeyEvent( #include <stdlib.h> #include <stdio.h> #include <fcntl.h> -#if defined(ISC) -# define HAS_SVR3_MMAP -# include <sys/types.h> -# include <errno.h> - -# include <sys/at_ansi.h> -# include <sys/kd.h> - -# include <sys/sysmacros.h> -# include <sys/immu.h> -# include <sys/region.h> - -# include <sys/mmap.h> -#else -# if defined(Lynx) && defined(NO_MMAP) -# include <sys/types.h> -# include <errno.h> -# include <smem.h> -# else -# if !defined(__UNIXOS2__) -# include <sys/mman.h> -# endif -# endif -#endif +#include <sys/mman.h> #include <sys/wait.h> #include <signal.h> #include <unistd.h> @@ -892,13 +863,6 @@ DGAMapPhysical( CARD32 extra, /* optional extra data */ DGAMapPtr pMap ) { -#if defined(ISC) && defined(HAS_SVR3_MMAP) - struct kd_memloc mloc; -#elif defined(__UNIXOS2__) - APIRET rc; - ULONG action; - HFILE hfd; -#endif base += offset; @@ -906,53 +870,6 @@ DGAMapPhysical( pMap->physical = base; pMap->size = size; -#if defined(ISC) && defined(HAS_SVR3_MMAP) - if ((pMap->fd = open("/dev/mmap", O_RDWR)) < 0) - return False; - mloc.vaddr = (char *)0; - mloc.physaddr = (char *)base; - mloc.length = size; - mloc.ioflg=1; - - if ((pMap->virtual = (void *)ioctl(pMap->fd, MAP, &mloc)) == (void *)-1) - return False; -#elif defined (__UNIXOS2__) - /* - * Dragon warning here! /dev/pmap$ is never closed, except on progam exit. - * Consecutive calling of this routine will make PMAP$ driver run out - * of memory handles. Some umap/close mechanism should be provided - */ - - rc = DosOpen("/dev/pmap$", &hfd, &action, 0, FILE_NORMAL, FILE_OPEN, - OPEN_ACCESS_READWRITE | OPEN_SHARE_DENYNONE, (PEAOP2)NULL); - if (rc != 0) - return False; - { - struct map_ioctl { - union { - ULONG phys; - void* user; - } a; - ULONG size; - } pmap,dmap; - ULONG plen,dlen; -#define XFREE86_PMAP 0x76 -#define PMAP_MAP 0x44 - - pmap.a.phys = base; - pmap.size = size; - rc = DosDevIOCtl(hfd, XFREE86_PMAP, PMAP_MAP, - (PULONG)&pmap, sizeof(pmap), &plen, - (PULONG)&dmap, sizeof(dmap), &dlen); - if (rc == 0) { - pMap->virtual = dmap.a.user; - } - } - if (rc != 0) - return False; -#elif defined (Lynx) && defined(NO_MMAP) - pMap->virtual = smem_create("XF86DGA", (char*)base, size, SM_READ|SM_WRITE); -#else #ifndef MAP_FILE #define MAP_FILE 0 #endif @@ -965,7 +882,6 @@ DGAMapPhysical( if (pMap->virtual == (void *)-1) return False; mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE); -#endif return True; } @@ -975,15 +891,6 @@ DGAMapPhysical( static void DGAUnmapPhysical(DGAMapPtr pMap) { -#if defined(ISC) && defined(HAS_SVR3_MMAP) - /* XXX Add unmapping code here. */ -#elif defined (__UNIXOS2__) - /* XXX Add unmapping code here. */ -#elif defined(Lynx) && defined(NO_MMAP) - /* XXX this doesn't allow enable after disable */ - smem_create(NULL, pMap->virtual, pMap->size, SM_DETACH); - smem_remove("XF86DGA"); -#else if (pMap->virtual && pMap->virtual != (void *)-1) { mprotect(pMap->virtual,pMap->size, PROT_READ); munmap(pMap->virtual, pMap->size); @@ -993,5 +900,4 @@ DGAUnmapPhysical(DGAMapPtr pMap) close(pMap->fd); pMap->fd = -1; } -#endif } |