Accepting request 370374 from home:tobijk:X11:XOrg

- Update version to 1.18.2:
  A big pile of updates in this one. Highlights include:
  * glamor is updated to use OpenGL core profiles if available, which
    should improve memory usage and performance on modern hardware, and got
    some other performance improvements for rpi and other GLES platforms
  * DRI2, DRI3, and Present all received correctness fixes for hangs,
    crashes, and other weirdness
  * Xwayland server has been updated to support the Xv and the
    xf86vidmode extensions for better compatibility, and fixed some bugs
    with output hotplug and pointer updates
  * Xwin saw improvements to window and clipboard management, and a few
    new keyboard layouts
- Remove upstreamed patches:
  + U_kdrive-evdev-update-keyboard-LEDs-22302.patch

OBS-URL: https://build.opensuse.org/request/show/370374
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=618
This commit is contained in:
Egbert Eich 2016-03-12 08:59:06 +00:00 committed by Git OBS Bridge
parent 7aff496244
commit 2b8415ff1d
5 changed files with 24 additions and 62 deletions

View File

@ -1,56 +0,0 @@
From 0461bca0cb2f7918c77ed45d2cbc756cf65021be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?La=C3=A9rcio=20de=20Sousa?=
<laerciosousa@sme-mogidascruzes.sp.gov.br>
Date: Mon, 22 Feb 2016 16:04:12 -0300
Subject: [PATCH 17/56] kdrive/evdev: update keyboard LEDs (#22302)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Implement missing parts in kdrive evdev driver for
correct update of evdev keyboard LEDs.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=22302
[ajax: Fixed deref-before-null-check bug]
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
---
hw/kdrive/linux/evdev.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/hw/kdrive/linux/evdev.c b/hw/kdrive/linux/evdev.c
index cdd45e7..8415772 100644
--- a/hw/kdrive/linux/evdev.c
+++ b/hw/kdrive/linux/evdev.c
@@ -442,10 +442,16 @@ EvdevKbdEnable(KdKeyboardInfo * ki)
static void
EvdevKbdLeds(KdKeyboardInfo * ki, int leds)
{
-/* struct input_event event;
+ struct input_event event;
Kevdev *ke;
- ki->driverPrivate = ke;
+ if (!ki)
+ return;
+
+ ke = ki->driverPrivate;
+
+ if (!ke)
+ return;
memset(&event, 0, sizeof(event));
@@ -468,7 +474,6 @@ EvdevKbdLeds(KdKeyboardInfo * ki, int leds)
event.code = LED_COMPOSE;
event.value = leds & (1 << 3) ? 1 : 0;
write(ke->fd, (char *) &event, sizeof(event));
-*/
}
static void
--
2.6.2

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:85ec56dbeb89a951295cdf4f39bf38e515f900d35e06d4a8081b114d1520789d
size 5846953

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:022142b07f6477d140dcc915902df326408a53ca3a352426a499f142b25d632d
size 5864615

View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Sat Mar 12 00:31:53 UTC 2016 - tobias.johannes.klausmann@mni.thm.de
- Update version to 1.18.2:
A big pile of updates in this one. Highlights include:
* glamor is updated to use OpenGL core profiles if available, which
should improve memory usage and performance on modern hardware, and got
some other performance improvements for rpi and other GLES platforms
* DRI2, DRI3, and Present all received correctness fixes for hangs,
crashes, and other weirdness
* Xwayland server has been updated to support the Xv and the
xf86vidmode extensions for better compatibility, and fixed some bugs
with output hotplug and pointer updates
* Xwin saw improvements to window and clipboard management, and a few
new keyboard layouts
- Remove upstreamed patches:
+ U_kdrive-evdev-update-keyboard-LEDs-22302.patch
-------------------------------------------------------------------
Mon Mar 7 11:06:53 UTC 2016 - lbsousajr@gmail.com

View File

@ -26,7 +26,7 @@
Name: xorg-x11-server
%define dirsuffix 1.18.1
%define dirsuffix 1.18.2
Summary: X
License: MIT
@ -199,7 +199,6 @@ Patch1227: U_ephyr-ignore-Xorg-multiseat-command-line-options.patch
Patch1228: U_ephyr-enable-option-sw-cursor-by-default-in-multi-se.patch
Patch1229: U_kdrive-introduce-input-hot-plugging-support-for-udev.patch
Patch1230: U_kdrive-add-options-to-set-default-XKB-properties.patch
Patch1231: U_kdrive-evdev-update-keyboard-LEDs-22302.patch
Patch1232: U_config-udev-distinguish-between-real-keyboards-and-o.patch
%description
@ -319,7 +318,7 @@ sh %{SOURCE92} --verify . %{SOURCE91}
%patch1228 -p1
%patch1229 -p1
%patch1230 -p1
%patch1231 -p1
%patch1232 -p1
%build