Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit merge xorg-server 1.20.12 and xkeyboard-confi...
details: https://anonhg.NetBSD.org/xsrc/rev/d594523338e2
branches: trunk
changeset: 10755:d594523338e2
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Jul 11 00:13:26 2021 +0000
description:
merge xorg-server 1.20.12 and xkeyboard-config 2.33.
diffstat:
external/mit/xkeyboard-config/dist/configure | 36 +-
external/mit/xkeyboard-config/dist/symbols/Makefile.in | 1 +
external/mit/xkeyboard-config/dist/symbols/in | 155 +++++++-
external/mit/xkeyboard-config/dist/symbols/pl | 2 +-
external/mit/xorg-server/dist/configure | 39 +-
external/mit/xorg-server/dist/configure.ac | 10 +-
external/mit/xorg-server/dist/dix/devices.c | 3 +
external/mit/xorg-server/dist/glx/glxcmds.c | 16 +-
external/mit/xorg-server/dist/hw/xfree86/common/xf86Bus.c | 4 +-
external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c | 31 +-
external/mit/xorg-server/dist/hw/xfree86/common/xf86Helper.c | 37 +-
external/mit/xorg-server/dist/hw/xfree86/common/xf86str.h | 2 +-
external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c | 25 +-
external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.h | 2 +-
external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c | 12 +-
external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c | 2 +-
external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/vblank.c | 193 ++-------
external/mit/xorg-server/dist/randr/randrstr.h | 5 +
external/mit/xorg-server/include/dix-config.h | 2 +-
external/mit/xorg-server/include/version-config.h | 4 +-
external/mit/xorg-server/include/xf86Build.h | 4 +-
external/mit/xorg-server/include/xorg-config.h | 2 +-
external/mit/xorg-server/include/xorg-server.h | 2 +-
23 files changed, 330 insertions(+), 259 deletions(-)
diffs (truncated from 1242 to 300 lines):
diff -r c4d8a6f26131 -r d594523338e2 external/mit/xkeyboard-config/dist/configure
--- a/external/mit/xkeyboard-config/dist/configure Sun Jul 11 00:08:36 2021 +0000
+++ b/external/mit/xkeyboard-config/dist/configure Sun Jul 11 00:13:26 2021 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.32.
+# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.33.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
# Identity of this package.
PACKAGE_NAME='xkeyboard-config'
PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='2.32'
-PACKAGE_STRING='xkeyboard-config 2.32'
+PACKAGE_VERSION='2.33'
+PACKAGE_STRING='xkeyboard-config 2.33'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -717,6 +717,7 @@
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -807,6 +808,7 @@
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1059,6 +1061,15 @@
| -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=* \
@@ -1196,7 +1207,7 @@
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.
@@ -1309,7 +1320,7 @@
# 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 xkeyboard-config 2.32 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 2.33 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1349,6 +1360,7 @@
--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]
@@ -1380,7 +1392,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xkeyboard-config 2.32:";;
+ short | recursive ) echo "Configuration of xkeyboard-config 2.33:";;
esac
cat <<\_ACEOF
@@ -1497,7 +1509,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xkeyboard-config configure 2.32
+xkeyboard-config configure 2.33
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1677,7 +1689,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xkeyboard-config $as_me 2.32, which was
+It was created by xkeyboard-config $as_me 2.33, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2542,7 +2554,7 @@
# Define the identity of the package.
PACKAGE='xkeyboard-config'
- VERSION='2.32'
+ VERSION='2.33'
cat >>confdefs.h <<_ACEOF
@@ -3226,7 +3238,7 @@
if ${am_cv_python_version+:} false; then :
$as_echo_n "(cached) " >&6
else
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+ am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[:2])"`
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
$as_echo "$am_cv_python_version" >&6; }
@@ -7634,7 +7646,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xkeyboard-config $as_me 2.32, which was
+This file was extended by xkeyboard-config $as_me 2.33, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7691,7 +7703,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xkeyboard-config config.status 2.32
+xkeyboard-config config.status 2.33
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -r c4d8a6f26131 -r d594523338e2 external/mit/xkeyboard-config/dist/symbols/Makefile.in
--- a/external/mit/xkeyboard-config/dist/symbols/Makefile.in Sun Jul 11 00:08:36 2021 +0000
+++ b/external/mit/xkeyboard-config/dist/symbols/Makefile.in Sun Jul 11 00:13:26 2021 +0000
@@ -348,6 +348,7 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -r c4d8a6f26131 -r d594523338e2 external/mit/xkeyboard-config/dist/symbols/in
--- a/external/mit/xkeyboard-config/dist/symbols/in Sun Jul 11 00:08:36 2021 +0000
+++ b/external/mit/xkeyboard-config/dist/symbols/in Sun Jul 11 00:13:26 2021 +0000
@@ -16,7 +16,7 @@
// - Indic INSCRIPT keyboard layout diagrams:
// http://java.sun.com/products/jfc/tsc/articles/InputMethod/indiclayout.html
// - Bangla Baishakhi (Bangla layouts):
-// - Bangla Baishakhi Inscript (Bangla layouts):
+// - Bangla Baishakhi InScript (Bangla layouts):
// - Bangla Bornona (Bangla layouts):
// - Uni Gitanjali (Bangla layouts):
// http://nltr.org
@@ -319,7 +319,7 @@
include "rupeesign(4)"
};
-// Bangla Baishakhi, Bangla Baishakhi Inscript, Bangla Bornona, Uni Gitanjali Layouts are added by Promathesh Mandal <promathesh812004%gmail.com@localhost>
+// Bangla Baishakhi, Bangla Baishakhi InScript, Bangla Bornona, Uni Gitanjali Layouts are added by Promathesh Mandal <promathesh812004%gmail.com@localhost>
xkb_symbols "ben_baishakhi" {
name[Group1]= "Bangla (India, Baishakhi)";
@@ -397,7 +397,7 @@
};
xkb_symbols "ben_inscript" {
- name[Group1]= "Bangla (India, Baishakhi Inscript)";
+ name[Group1]= "Bangla (India, Baishakhi InScript)";
// Mainly numbers.
key <TLDE> { [ 0x100200D, 0x100200C ] };
@@ -682,7 +682,7 @@
partial alphanumeric_keys
xkb_symbols "kan" {
- // Inscript layout for Kannada
+ // InScript layout for Kannada
// Author : G Karunakar <karunakar%freedomink.org@localhost>
// Date : Wed Nov 13 17:22:58 IST 2002
// Kannada digits mapped in basic only
@@ -984,7 +984,7 @@
partial alphanumeric_keys
xkb_symbols "ori" {
- // Inscript layout for Oriya
+ // InScript layout for Oriya
// Author: G Karunakar <karunakar%freedomink.org@localhost>
// Date: Wed Nov 13 18:16:19 IST 2002
@@ -1046,10 +1046,133 @@
include "level3(ralt_switch)"
};
+// Phonetic layout for Oriya like Hindi Bolnagiri
+// Author: Lalit Mishra
+// Date: 3rd March, 2021.
+partial alphanumeric_keys
+xkb_symbols "ori-bolnagri" {
+ name[Group1] = "Oriya (Bolnagri)";
+ key.type="FOUR_LEVEL";
+ // Roman digits
+ key <TLDE> { [ U0B02, U0B01, grave, asciitilde ] }; // grave: anusvara, candrabindu
+ key <AE01> { [ U0B67, exclam, 1 ] };
+ key <AE02> { [ U0B68, at, 2, U20AC ] };
+ key <AE03> { [ U0B69, numbersign, 3, U00A3 ] };
+ key <AE04> { [ U0B6A, dollar, 4, U20B9 ] }; // Rupee symbol on Shift+AltGr+4
+ key <AE05> { [ U0B6B, percent, 5 ] };
+ key <AE06> { [ U0B6C, asciicircum, 6 ] };
+ key <AE07> { [ U0B6D, ampersand, 7 ] };
+ key <AE08> { [ U0B6E, asterisk, 8 ] };
+ key <AE09> { [ U0B6F, parenleft, 9 ] };
+ key <AE10> { [ U0B66, parenright, 0 ] };
+ key <AE11> { [ minus, underscore ] };
+ key <AE12> { [ equal, plus ] };
+ key <BKSL> { [ U0964, U0965, U007C, U005C ] }; //pipe : danda, double danda
+ //Q Row
+ key <AD01> { [ U200C, U200D ] }; // Q: ZWNJ, ZWJ
+ key <AD02> { [ U0B71, U0B35 ] }; // W: wa
+ key <AD03> { [ U0B47, U0B48, U0B0F, U0B10 ] }; // E: e, ai matras
+ key <AD04> { [ U0B30, U0B43, U0B0B, U0B60 ] }; // R: ra, vocalic Ri
+ key <AD05> { [ U0B24, U0B25 ] }; // T: ta, tha
+ key <AD06> { [ U0B2f, U0B5F, U0B1E ] }; // Y: ya, nya
+ key <AD07> { [ U0B41, U0B42, U0B09, U0B0A ] }; // U: u, uu matras
+ key <AD08> { [ U0B3F, U0B40, U0B07, U0B08 ] }; // I: i, ii matras
+ key <AD09> { [ U0B4B, U0B4C, U0B13, U0B14 ] }; // O: o, au matras
+ key <AD10> { [ U0B2A, U0B2B ] }; // P: pa, pha
+ key <AD11> { [ bracketleft, braceleft ] };
+ key <AD12> { [ bracketright, braceright] };
+ //A Row
+ key <AC01> { [ U0B3E, U0B06, U0B05, U0B06 ] }; // A: aa, full A, AA
+ key <AC02> { [ U0B38, U0B37 ] }; // S: sa, ssa
+ key <AC03> { [ U0B26, U0B27 ] }; // D: da, dha
+ key <AC04> { [ U0B1F, U0B20 ] }; // F: TA, THA
+ key <AC05> { [ U0B17, U0B18 ] }; // G: ga, gha
+ key <AC06> { [ U0B39, U0B03 ] }; // H: ha, visarg
+ key <AC07> { [ U0B1C, U0B1D ] }; // J: ja, jha
+ key <AC08> { [ U0B15, U0B16 ] }; // K: ka, kha
+ key <AC09> { [ U0B32, U0B33, U0B62, U0B0C ] }; // L: la, vocalic L or lru matra
+ key <AC10> { [ semicolon, colon ] };
+ key <AC11> { [ apostrophe, quotedbl ] };
+ //Z Row
+ key <AB01> { [ U0B36 ] }; // Z: sha, akaar candra
+ key <AB02> { [ U0B4D ] }; // X: halant, aakaar candra, chandra A
+ key <AB03> { [ U0B1A, U0B1B ] }; // C: ca, cha
+ key <AB04> { [ U0B21, U0B22 ] }; // V: da, dha
+ key <AB05> { [ U0B2C, U0B2D ] }; // B: ba, bha
+ key <AB06> { [ U0B28, U0B23 ] }; // N: na, nna
+ key <AB07> { [ U0B2E, U0B19, U0B3D ] }; // M: ma, nga, avagraha
+ key <AB08> { [ comma, U0B70, U0B44, U0B61 ] }; // comma: comma, dev abbreviation sign
+ key <AB09> { [ period, U0B3C, U0B55 ] }; // period: period, nukta
+ key <AB10> { [ slash, question ] };
+
+// modifier_map Shift { Shift_L };
+// modifier_map Lock { Caps_Lock };
+// modifier_map Control{ Control_L };
+// modifier_map Mod3 { Mode_switch };
+
+ include "level3(ralt_switch)"
+};
+
+// Phonetic layout for Oriya like Hindi Wx
+// Author: Lalit Mishra
+// Date: 3rd March, 2021.
+partial alphanumeric_keys
+xkb_symbols "ori-wx" {
+ name[Group1]= "Oriya (Wx)";
+ key <TLDE> { [ grave, asciitilde, 0x100200C, 0x100200D ] };
+ key <AE01> { [ 0x1000B67, exclam, 1 ] };
+ key <AE02> { [ 0x1000B68, at, 2, 0x10020AC ] };
+ key <AE03> { [ 0x1000B69, numbersign, 3, 0x10000A3 ] };
+ key <AE04> { [ 0x1000B6A, dollar, 4, 0x10020B9 ] };
+ key <AE05> { [ 0x1000B6B, percent, 5 ] };
+ key <AE06> { [ 0x1000B6C, asciicircum, 6 ] };
+ key <AE07> { [ 0x1000B6D, ampersand, 7 ] };
+ key <AE08> { [ 0x1000B6e, asterisk, 8 ] };
+ key <AE09> { [ 0x1000B6F, parenleft, 9 ] };
+ key <AE10> { [ 0x1000B66, parenright, 0 ] };
+ key <AE11> { [ minus, underscore ] };
+ key <AE12> { [ equal, plus ] };
+ key <AD01> { [ 0x1000B43, 0x1000B44, 0x1000B0B, 0x1000B60 ] };
+ key <AD02> { [ 0x1000B24, 0x1000B25 ] };
+ key <AD03> { [ 0x1000B47, 0x1000B48, 0x1000B0F, 0x1000B10 ] };
+ key <AD04> { [ 0x1000B30, 0x1000B37 ] };
+ key <AD05> { [ 0x1000B1F, 0x1000B20 ] };
+ key <AD06> { [ 0x1000B2F, 0x1000B5F ] };
+ key <AD07> { [ 0x1000B41, 0x1000B42, 0x1000B09, 0x1000B0A ] };
+ key <AD08> { [ 0x1000B3F, 0x1000B40, 0x1000B07, 0x1000B08 ] };
Home |
Main Index |
Thread Index |
Old Index