xserver: Branch 'master' - 6 commits
Eric Anholt
anholt at kemper.freedesktop.org
Tue Apr 25 22:04:37 UTC 2017
configure.ac | 4 -
doc/Xserver-spec.xml | 2
glx/glxbyteorder.h | 21 -----
hw/xfree86/common/xf86Init.c | 6 -
hw/xfree86/drivers/modesetting/drmmode_display.c | 1
hw/xfree86/parser/Makefile.am | 1
hw/xfree86/parser/scan.c | 19 ----
include/misc.h | 88 ++++++-----------------
include/xorg-config.h.in | 4 -
include/xorg-server.h.in | 2
manpages.am | 2
os/io.c | 4 -
test/misc.c | 30 +++++++
xkb/ddxLoad.c | 12 ---
14 files changed, 68 insertions(+), 128 deletions(-)
New commits:
commit 23f2f1932a1d3f36468eaf735ae34934d246567b
Author: Eric Anholt <eric at anholt.net>
Date: Tue Apr 25 11:33:50 2017 -0700
modesetting: Add the "DPI" connector type.
The number for it was merged to drm_mode.h in kernel 4.7, and the
output_names[] array just requires that we slot in new strings in
order.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index 516eb7691..bbca8ca70 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -1621,6 +1621,7 @@ static const char *const output_names[] = {
"eDP",
"Virtual",
"DSI",
+ "DPI",
};
static xf86OutputPtr find_output(ScrnInfoPtr pScrn, int id)
commit fec9607c8e0a84dc86466c638d00b502f21ec622
Author: Eric Anholt <eric at anholt.net>
Date: Fri Apr 21 12:03:45 2017 -0700
Remove support for unaligned swaps.
The previous misc.h code went out of its way to allow swapping of
unaligned pointers to values. However, the members of an X
request/response are always naturally aligned within the struct, and
the buffers containing a request/response will also be aligned to at
least 8 bytes, so we can just drop it.
text data bss dec hex filename
before: 2215167 51552 132016 2398735 249a0f hw/xfree86/Xorg
after: 2214919 51552 132016 2398487 249917 hw/xfree86/Xorg
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Keith Packard <keithp at keithp.com>
diff --git a/include/misc.h b/include/misc.h
index a75eb617c..38af70ff9 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -310,12 +310,9 @@ bswap_64(uint64_t x)
}
#define swapll(x) do { \
- uint64_t temp; \
if (sizeof(*(x)) != 8) \
wrong_size(); \
- memcpy(&temp, x, 8); \
- temp = bswap_64(temp); \
- memcpy(x, &temp, 8); \
+ *(x) = bswap_64(*(x)); \
} while (0)
static inline uint32_t
@@ -328,12 +325,9 @@ bswap_32(uint32_t x)
}
#define swapl(x) do { \
- uint32_t temp; \
if (sizeof(*(x)) != 4) \
wrong_size(); \
- memcpy(&temp, x, 4); \
- temp = bswap_32(temp); \
- memcpy(x, &temp, 4); \
+ *(x) = bswap_32(*(x)); \
} while (0)
static inline uint16_t
@@ -344,12 +338,9 @@ bswap_16(uint16_t x)
}
#define swaps(x) do { \
- uint16_t temp; \
if (sizeof(*(x)) != 2) \
wrong_size(); \
- memcpy(&temp, x, 2); \
- temp = bswap_16(temp); \
- memcpy(x, &temp, 2); \
+ *(x) = bswap_16(*(x)); \
} while (0)
/* copy 32-bit value from src to dst byteswapping on the way */
diff --git a/test/misc.c b/test/misc.c
index c10a2b935..3c669b677 100644
--- a/test/misc.c
+++ b/test/misc.c
@@ -204,34 +204,21 @@ bswap_test(void)
uint16_t result_16;
uint32_t result_32;
uint64_t result_64;
- unsigned buffer[sizeof(test_64) + 4];
- void *unaligned = &buffer[1];
assert(bswap_16(test_16) == expect_16);
assert(bswap_32(test_32) == expect_32);
assert(bswap_64(test_64) == expect_64);
- /* Test the swapping-in-a-pointer functions, with unaligned
- * addresses (the functions shouldn't cause traps in that case).
- */
- for (int i = 0; i < 2; i++) {
- unaligned = buffer + i;
- if (((uintptr_t)unaligned & 1) == 1)
- break;
- }
- memcpy(unaligned, &test_16, sizeof(test_16));
- swaps((uint16_t *)unaligned);
- memcpy(&result_16, unaligned, sizeof(result_16));
+ result_16 = test_16;
+ swaps(&result_16);
assert(result_16 == expect_16);
- memcpy(unaligned, &test_32, sizeof(test_32));
- swapl((uint32_t *)unaligned);
- memcpy(&result_32, unaligned, sizeof(result_32));
+ result_32 = test_32;
+ swapl(&result_32);
assert(result_32 == expect_32);
- memcpy(unaligned, &test_64, sizeof(test_64));
- swapll((uint64_t *)unaligned);
- memcpy(&result_64, unaligned, sizeof(result_64));
+ result_64 = test_64;
+ swapll(&result_64);
assert(result_64 == expect_64);
}
commit 4552238960fc05ff885bcabbc24d1489370fbd89
Author: Eric Anholt <eric at anholt.net>
Date: Tue Mar 28 13:09:30 2017 -0700
Add unit tests for the byte swapping macros.
Peter noted a weirdness in my new bswap code, which could use some
tests to justify it.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/test/misc.c b/test/misc.c
index ae46ccccb..c10a2b935 100644
--- a/test/misc.c
+++ b/test/misc.c
@@ -192,6 +192,48 @@ dix_request_size_checks(void)
assert(rc == Success);
}
+static void
+bswap_test(void)
+{
+ const uint16_t test_16 = 0xaabb;
+ const uint16_t expect_16 = 0xbbaa;
+ const uint32_t test_32 = 0xaabbccdd;
+ const uint32_t expect_32 = 0xddccbbaa;
+ const uint64_t test_64 = 0x11223344aabbccddull;
+ const uint64_t expect_64 = 0xddccbbaa44332211ull;
+ uint16_t result_16;
+ uint32_t result_32;
+ uint64_t result_64;
+ unsigned buffer[sizeof(test_64) + 4];
+ void *unaligned = &buffer[1];
+
+ assert(bswap_16(test_16) == expect_16);
+ assert(bswap_32(test_32) == expect_32);
+ assert(bswap_64(test_64) == expect_64);
+
+ /* Test the swapping-in-a-pointer functions, with unaligned
+ * addresses (the functions shouldn't cause traps in that case).
+ */
+ for (int i = 0; i < 2; i++) {
+ unaligned = buffer + i;
+ if (((uintptr_t)unaligned & 1) == 1)
+ break;
+ }
+ memcpy(unaligned, &test_16, sizeof(test_16));
+ swaps((uint16_t *)unaligned);
+ memcpy(&result_16, unaligned, sizeof(result_16));
+ assert(result_16 == expect_16);
+
+ memcpy(unaligned, &test_32, sizeof(test_32));
+ swapl((uint32_t *)unaligned);
+ memcpy(&result_32, unaligned, sizeof(result_32));
+ assert(result_32 == expect_32);
+
+ memcpy(unaligned, &test_64, sizeof(test_64));
+ swapll((uint64_t *)unaligned);
+ memcpy(&result_64, unaligned, sizeof(result_64));
+ assert(result_64 == expect_64);
+}
int
misc_test(void)
@@ -199,6 +241,7 @@ misc_test(void)
dix_version_compare();
dix_update_desktop_dimensions();
dix_request_size_checks();
+ bswap_test();
return 0;
}
commit 563b6ee873b898c0f3e3671cf6adaf91def5d92a
Author: Eric Anholt <eric at anholt.net>
Date: Mon Mar 27 14:59:06 2017 -0700
Rewrite the byte swapping macros.
The clever pointer tricks were actually not working, and we were doing
the byte-by-byte moves in general. By just doing the memcpy and
obvious byte swap code, we end up generating actual byte swap
instructions, thanks to optimizing compilers.
text data bss dec hex filename
before: 2240807 51552 132016 2424375 24fe37 hw/xfree86/Xorg
after: 2215167 51552 132016 2398735 249a0f hw/xfree86/Xorg
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Keith Packard <keithp at keithp.com>
diff --git a/doc/Xserver-spec.xml b/doc/Xserver-spec.xml
index 7867544e4..3dde65178 100644
--- a/doc/Xserver-spec.xml
+++ b/doc/Xserver-spec.xml
@@ -600,7 +600,7 @@ are: REQUEST, REQUEST_SIZE_MATCH, REQUEST_AT_LEAST_SIZE,
REQUEST_FIXED_SIZE, LEGAL_NEW_RESOURCE, and
VALIDATE_DRAWABLE_AND_GC. Useful byte swapping macros can be found
in Xserver/include/dix.h: WriteReplyToClient and WriteSwappedDataToClient; and
-in Xserver/include/misc.h: lswapl, lswaps, LengthRestB, LengthRestS,
+in Xserver/include/misc.h: bswap_64, bswap_32, bswap_16, LengthRestB, LengthRestS,
LengthRestL, SwapRestS, SwapRestL, swapl, swaps, cpswapl, and cpswaps.</para>
</section>
</section>
diff --git a/glx/glxbyteorder.h b/glx/glxbyteorder.h
index 5e94e8626..8f0cd8a4b 100644
--- a/glx/glxbyteorder.h
+++ b/glx/glxbyteorder.h
@@ -37,25 +37,4 @@
#include "misc.h"
-static inline uint16_t
-bswap_16(uint16_t val)
-{
- swap_uint16(&val);
- return val;
-}
-
-static inline uint32_t
-bswap_32(uint32_t val)
-{
- swap_uint32(&val);
- return val;
-}
-
-static inline uint64_t
-bswap_64(uint64_t val)
-{
- swap_uint64(&val);
- return val;
-}
-
#endif /* !defined(__GLXBYTEORDER_H__) */
diff --git a/include/misc.h b/include/misc.h
index 01747fd38..a75eb617c 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -128,21 +128,6 @@ typedef struct _xReq *xReqPtr;
#define USE_BACKGROUND_PIXEL 3
#define USE_BORDER_PIXEL 3
-/* byte swap a 32-bit literal */
-static inline uint32_t
-lswapl(uint32_t x)
-{
- return ((x & 0xff) << 24) |
- ((x & 0xff00) << 8) | ((x & 0xff0000) >> 8) | ((x >> 24) & 0xff);
-}
-
-/* byte swap a 16-bit literal */
-static inline uint16_t
-lswaps(uint16_t x)
-{
- return (uint16_t)((x & 0xff) << 8) | ((x >> 8) & 0xff);
-}
-
#undef min
#undef max
@@ -311,88 +296,74 @@ __builtin_constant_p(int x)
}
#endif
-/* byte swap a 64-bit value */
-static inline void
-swap_uint64(uint64_t *x)
+static inline uint64_t
+bswap_64(uint64_t x)
{
- char n;
-
- n = ((char *) x)[0];
- ((char *) x)[0] = ((char *) x)[7];
- ((char *) x)[7] = n;
-
- n = ((char *) x)[1];
- ((char *) x)[1] = ((char *) x)[6];
- ((char *) x)[6] = n;
-
- n = ((char *) x)[2];
- ((char *) x)[2] = ((char *) x)[5];
- ((char *) x)[5] = n;
-
- n = ((char *) x)[3];
- ((char *) x)[3] = ((char *) x)[4];
- ((char *) x)[4] = n;
+ return (((x & 0xFF00000000000000ull) >> 56) |
+ ((x & 0x00FF000000000000ull) >> 40) |
+ ((x & 0x0000FF0000000000ull) >> 24) |
+ ((x & 0x000000FF00000000ull) >> 8) |
+ ((x & 0x00000000FF000000ull) << 8) |
+ ((x & 0x0000000000FF0000ull) << 24) |
+ ((x & 0x000000000000FF00ull) << 40) |
+ ((x & 0x00000000000000FFull) << 56));
}
#define swapll(x) do { \
+ uint64_t temp; \
if (sizeof(*(x)) != 8) \
wrong_size(); \
- swap_uint64((uint64_t *)(x)); \
+ memcpy(&temp, x, 8); \
+ temp = bswap_64(temp); \
+ memcpy(x, &temp, 8); \
} while (0)
-/* byte swap a 32-bit value */
-static inline void
-swap_uint32(uint32_t * x)
+static inline uint32_t
+bswap_32(uint32_t x)
{
- char n = ((char *) x)[0];
-
- ((char *) x)[0] = ((char *) x)[3];
- ((char *) x)[3] = n;
- n = ((char *) x)[1];
- ((char *) x)[1] = ((char *) x)[2];
- ((char *) x)[2] = n;
+ return (((x & 0xFF000000) >> 24) |
+ ((x & 0x00FF0000) >> 8) |
+ ((x & 0x0000FF00) << 8) |
+ ((x & 0x000000FF) << 24));
}
#define swapl(x) do { \
+ uint32_t temp; \
if (sizeof(*(x)) != 4) \
wrong_size(); \
- if (__builtin_constant_p((uintptr_t)(x) & 3) && ((uintptr_t)(x) & 3) == 0) \
- *(x) = lswapl(*(x)); \
- else \
- swap_uint32((uint32_t *)(x)); \
+ memcpy(&temp, x, 4); \
+ temp = bswap_32(temp); \
+ memcpy(x, &temp, 4); \
} while (0)
-/* byte swap a 16-bit value */
-static inline void
-swap_uint16(uint16_t * x)
+static inline uint16_t
+bswap_16(uint16_t x)
{
- char n = ((char *) x)[0];
-
- ((char *) x)[0] = ((char *) x)[1];
- ((char *) x)[1] = n;
+ return (((x & 0xFF00) >> 8) |
+ ((x & 0x00FF) << 8));
}
#define swaps(x) do { \
+ uint16_t temp; \
if (sizeof(*(x)) != 2) \
wrong_size(); \
- if (__builtin_constant_p((uintptr_t)(x) & 1) && ((uintptr_t)(x) & 1) == 0) \
- *(x) = lswaps(*(x)); \
- else \
- swap_uint16((uint16_t *)(x)); \
+ memcpy(&temp, x, 2); \
+ temp = bswap_16(temp); \
+ memcpy(x, &temp, 2); \
} while (0)
/* copy 32-bit value from src to dst byteswapping on the way */
#define cpswapl(src, dst) do { \
if (sizeof((src)) != 4 || sizeof((dst)) != 4) \
wrong_size(); \
- (dst) = lswapl((src)); \
+ (dst) = bswap_32((src)); \
} while (0)
/* copy short from src to dst byteswapping on the way */
#define cpswaps(src, dst) do { \
if (sizeof((src)) != 2 || sizeof((dst)) != 2) \
wrong_size(); \
- (dst) = lswaps((src)); \
+ (dst) = bswap_16((src)); \
} while (0)
extern _X_EXPORT void SwapLongs(CARD32 *list, unsigned long count);
diff --git a/os/io.c b/os/io.c
index 8aa51a107..46c7e2371 100644
--- a/os/io.c
+++ b/os/io.c
@@ -108,12 +108,12 @@ static ConnectionOutputPtr FreeOutputs = (ConnectionOutputPtr) NULL;
static OsCommPtr AvailableInput = (OsCommPtr) NULL;
#define get_req_len(req,cli) ((cli)->swapped ? \
- lswaps((req)->length) : (req)->length)
+ bswap_16((req)->length) : (req)->length)
#include <X11/extensions/bigreqsproto.h>
#define get_big_req_len(req,cli) ((cli)->swapped ? \
- lswapl(((xBigReq *)(req))->length) : \
+ bswap_32(((xBigReq *)(req))->length) : \
((xBigReq *)(req))->length)
#define BUFSIZE 16384
commit 5ef4e785131bb30e774a8175099c0432537533fa
Author: Eric Anholt <eric at anholt.net>
Date: Fri Mar 31 17:38:27 2017 -0700
Remove default defines of some directories.
The build defines these, so having the defaults is just a way for the
build system's configuration to get out of sync with the code.
v2: Drop #ifndefs around the other two defines.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Keith Packard <keithp at keithp.com>
diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
index 9aa8cfefb..2e4c6afdb 100644
--- a/hw/xfree86/parser/Makefile.am
+++ b/hw/xfree86/parser/Makefile.am
@@ -24,7 +24,6 @@ libxf86config_la_SOURCES = \
$(INTERNAL_SOURCES)
AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \
- -DSYSCONFDIR=\"$(sysconfdir)\" \
-DDATADIR=\"$(datadir)\"
EXTRA_DIST = \
diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c
index 3356224ce..bac213a73 100644
--- a/hw/xfree86/parser/scan.c
+++ b/hw/xfree86/parser/scan.c
@@ -542,27 +542,8 @@ xf86pathIsSafe(const char *path)
* %% %
*/
-#ifndef XCONFIGFILE
-#define XCONFIGFILE "xorg.conf"
-#endif
-#ifndef XCONFIGDIR
-#define XCONFIGDIR "xorg.conf.d"
-#endif
-#ifndef XCONFIGSUFFIX
#define XCONFIGSUFFIX ".conf"
-#endif
-#ifndef PROJECTROOT
-#define PROJECTROOT "/usr/X11R6"
-#endif
-#ifndef SYSCONFDIR
-#define SYSCONFDIR PROJECTROOT "/etc"
-#endif
-#ifndef DATADIR
-#define DATADIR PROJECTROOT "/share"
-#endif
-#ifndef XCONFENV
#define XCONFENV "XORGCONFIG"
-#endif
#define BAIL_OUT do { \
free(result); \
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index f71815aa8..a1a0fd3a2 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -45,18 +45,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/extensions/XI.h>
#include "xkb.h"
- /*
- * If XKM_OUTPUT_DIR specifies a path without a leading slash, it is
- * relative to the top-level XKB configuration directory.
- * Making the server write to a subdirectory of that directory
- * requires some work in the general case (install procedure
- * has to create links to /var or somesuch on many machines),
- * so we just compile into /usr/tmp for now.
- */
-#ifndef XKM_OUTPUT_DIR
-#define XKM_OUTPUT_DIR "compiled/"
-#endif
-
#define PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\""
#define ERROR_PREFIX "\"> \""
#define POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\""
commit da27ca84b4324b68037d6ec19a73b9e0a5ef10bc
Author: Eric Anholt <eric at anholt.net>
Date: Fri Mar 31 17:33:52 2017 -0700
xorg: Change __XCONFIGFILE__ to XCONFIGFILE (and DIR) to fix scan.c.
parser/scan.c was checking for #ifdef XCONFIGFILE and XCONFIGDIR and
defaulting to "xorg.conf", and "xorg.conf.d", so if you had changed
__XCONFIGFILE__ to anything else, it would have got out of sync.
Settle on the name without gratuitous underscores.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Keith Packard <keithp at keithp.com>
diff --git a/configure.ac b/configure.ac
index 07c552094..4ee43d2d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2024,9 +2024,9 @@ if test "x$XORG" = xyes; then
AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
- AC_DEFINE_DIR(__XCONFIGFILE__, XF86CONFIGFILE, [Name of configuration file])
+ AC_DEFINE_DIR(XCONFIGFILE, XF86CONFIGFILE, [Name of configuration file])
AC_DEFINE_DIR(XF86CONFIGFILE, XF86CONFIGFILE, [Name of configuration file])
- AC_DEFINE_DIR(__XCONFIGDIR__, XF86CONFIGDIR, [Name of configuration directory])
+ AC_DEFINE_DIR(XCONFIGDIR, XF86CONFIGDIR, [Name of configuration directory])
AC_DEFINE_DIR(DEFAULT_MODULE_PATH, moduledir, [Default module search path])
AC_DEFINE_DIR(DEFAULT_LIBRARY_PATH, libdir, [Default library install path])
AC_DEFINE_DIR(DEFAULT_LOGDIR, logdir, [Default log location])
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 88f99ac5e..d3c7c47b0 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1359,17 +1359,17 @@ ddxUseMsg(void)
ErrorF("-modulepath paths specify the module search path\n");
ErrorF("-logfile file specify a log file name\n");
ErrorF("-configure probe for devices and write an "
- __XCONFIGFILE__ "\n");
+ XCONFIGFILE "\n");
ErrorF
("-showopts print available options for all installed drivers\n");
}
ErrorF
("-config file specify a configuration file, relative to the\n");
- ErrorF(" " __XCONFIGFILE__
+ ErrorF(" " XCONFIGFILE
" search path, only root can use absolute\n");
ErrorF
("-configdir dir specify a configuration directory, relative to the\n");
- ErrorF(" " __XCONFIGDIR__
+ ErrorF(" " XCONFIGDIR
" search path, only root can use absolute\n");
ErrorF("-verbose [n] verbose startup messages\n");
ErrorF("-logverbose [n] verbose log messages\n");
diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
index a7d80b5af..b8d6a87a3 100644
--- a/include/xorg-config.h.in
+++ b/include/xorg-config.h.in
@@ -34,10 +34,10 @@
#undef XF86CONFIGFILE
/* Path to configuration file. */
-#undef __XCONFIGFILE__
+#undef XCONFIGFILE
/* Name of configuration directory. */
-#undef __XCONFIGDIR__
+#undef XCONFIGDIR
/* Path to loadable modules. */
#undef DEFAULT_MODULE_PATH
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index dafc27f4a..570893e34 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -180,7 +180,7 @@
#undef __VENDORDWEBSUPPORT__
/* Location of configuration file */
-#undef __XCONFIGFILE__
+#undef XCONFIGFILE
/* Name of X server */
#undef __XSERVERNAME__
diff --git a/manpages.am b/manpages.am
index 648210b4e..124bb5575 100644
--- a/manpages.am
+++ b/manpages.am
@@ -22,7 +22,7 @@ MAN_SUBSTS += -e 's|__logdir__|$(logdir)|g' \
-e 's|__datadir__|$(datadir)|g' \
-e 's|__mandir__|$(mandir)|g' \
-e 's|__sysconfdir__|$(sysconfdir)|g' \
- -e 's|__xconfigdir__|$(__XCONFIGDIR__)|g' \
+ -e 's|__xconfigdir__|$(XCONFIGDIR)|g' \
-e 's|__xkbdir__|$(XKB_BASE_DIRECTORY)|g' \
-e 's|__XKB_DFLT_RULES__|$(XKB_DFLT_RULES)|g' \
-e 's|__XKB_DFLT_MODEL__|$(XKB_DFLT_MODEL)|g' \
More information about the xorg-commit
mailing list