mirror of
https://git.freebsd.org/ports.git
synced 2025-05-15 08:41:51 -04:00
03f1c01e0f
- Remove ALSA from default options - Switch to options helpers - Move audio output options to their own option group - Make OSS support an explicit option, so that it can be turned off - Remove OGG option and make it mandatory: audio/libogg is already a dependency via audio/libvorbis - Make the port simpler by not building the examples and not installing the example games (if necessary installing them can be done later in a separate port) - Add LICENSE - Fix WWW - Allegro never directly links with libpng or libGLU; make them a build dependency only - Reset maintainer PR: 215838 Obtained from: OpenBSD [1] Approved by: mat (mentor), maintainer timeout (5 months) Differential Revision: https://reviews.freebsd.org/D11039
19 lines
660 B
C
19 lines
660 B
C
--- src/x/xkeyboard.c.orig 2010-12-08 08:13:50 UTC
|
|
+++ src/x/xkeyboard.c
|
|
@@ -23,6 +23,7 @@
|
|
#include <X11/Xos.h>
|
|
#include <X11/Xlib.h>
|
|
#include <X11/Xutil.h>
|
|
+#include <X11/XKBlib.h>
|
|
#include <X11/Xproto.h>
|
|
|
|
#include "allegro.h"
|
|
@@ -617,7 +618,7 @@ void _xwin_get_keyboard_mapping(void)
|
|
|
|
TRACE (PREFIX_I "Modifier %d:", i + 1);
|
|
for (j = 0; j < xmodmap->max_keypermod; j++) {
|
|
- KeySym sym = XKeycodeToKeysym(_xwin.display,
|
|
+ KeySym sym = XkbKeycodeToKeysym(_xwin.display, 0,
|
|
xmodmap->modifiermap[i * xmodmap->max_keypermod + j], 0);
|
|
char *sym_str = XKeysymToString(sym);
|
|
TRACE(" %s", sym_str ? sym_str : "NULL");
|