From 2b8415ff1db9c2f332a88c0a5a5571a996090f80449649505ce145b8308098e5 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Sat, 12 Mar 2016 08:59:06 +0000 Subject: [PATCH 1/3] 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 --- ...ive-evdev-update-keyboard-LEDs-22302.patch | 56 ------------------- xorg-server-1.18.1.tar.bz2 | 3 - xorg-server-1.18.2.tar.bz2 | 3 + xorg-x11-server.changes | 19 +++++++ xorg-x11-server.spec | 5 +- 5 files changed, 24 insertions(+), 62 deletions(-) delete mode 100644 U_kdrive-evdev-update-keyboard-LEDs-22302.patch delete mode 100644 xorg-server-1.18.1.tar.bz2 create mode 100644 xorg-server-1.18.2.tar.bz2 diff --git a/U_kdrive-evdev-update-keyboard-LEDs-22302.patch b/U_kdrive-evdev-update-keyboard-LEDs-22302.patch deleted file mode 100644 index aa6aff6..0000000 --- a/U_kdrive-evdev-update-keyboard-LEDs-22302.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 0461bca0cb2f7918c77ed45d2cbc756cf65021be Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?La=C3=A9rcio=20de=20Sousa?= - -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 -Signed-off-by: Laércio de Sousa ---- - 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 - diff --git a/xorg-server-1.18.1.tar.bz2 b/xorg-server-1.18.1.tar.bz2 deleted file mode 100644 index 102a017..0000000 --- a/xorg-server-1.18.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:85ec56dbeb89a951295cdf4f39bf38e515f900d35e06d4a8081b114d1520789d -size 5846953 diff --git a/xorg-server-1.18.2.tar.bz2 b/xorg-server-1.18.2.tar.bz2 new file mode 100644 index 0000000..3e4b714 --- /dev/null +++ b/xorg-server-1.18.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:022142b07f6477d140dcc915902df326408a53ca3a352426a499f142b25d632d +size 5864615 diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 87a65e8..9588805 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -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 diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index dfecb62..662f47c 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -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 From bce7c75bf321e7c687b92520fee6647f246c65757bb768e2a105927236b334f5 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Tue, 22 Mar 2016 12:26:09 +0000 Subject: [PATCH 2/3] - Add support for a driver specific psi IDs files supplementing what's in xf86VideoPtrToDriverList() (boo#972126). OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=619 --- xorg-x11-server.changes | 6 ++++++ xorg-x11-server.spec | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 9588805..2e05c1f 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 22 12:22:28 UTC 2016 - eich@suse.com + +- Add support for a driver specific psi IDs files supplementing + what's in xf86VideoPtrToDriverList() (boo#972126). + ------------------------------------------------------------------- Sat Mar 12 00:31:53 UTC 2016 - tobias.johannes.klausmann@mni.thm.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 662f47c..c777c90 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -21,6 +21,7 @@ %else %if 0%{?suse_version} >= 1330 || 0%{?build_xwayland} %define have_wayland 1 +%define pci_ids_dir %{_sysconfdir}/X11/xorg.ids %endif %endif @@ -327,6 +328,9 @@ test -e source-file-list || \ source-file-list autoreconf -fi +%if 0%{?pci_ids_dir:1} +export PCI_TXT_IDS_DIR=%{pci_ids_dir} +%endif %configure CFLAGS="%{optflags} -fno-strict-aliasing" \ --sysconfdir=/etc \ --enable-xdmcp \ @@ -393,18 +397,19 @@ install -m 644 hw/xfree86/parser/{xf86Parser.h,xf86Optrec.h} \ # bnc #632737 chmod u-s %{buildroot}%{_bindir}/Xorg mkdir -p %{buildroot}%{_localstatedir}/lib/X11 +%if 0%{?pci_ids_dir:1} +%__mkdir_p %{buildroot}%{pci_ids_dir} +%endif ln -snf ../../../usr/bin/Xorg %{buildroot}%{_localstatedir}/lib/X11/X ln -snf ../../var/lib/X11/X %{buildroot}%{_bindir}/X %if 0%{?suse_version} > 1120 # get rid of evdev config file, since it's meanwhile shipped with # evdev driver itself (since 2.10.0) rm -f %{buildroot}/%{_datadir}/X11/xorg.conf.d/10-evdev.conf -%ifnarch s390 s390x mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d cp %{buildroot}/%{_datadir}/X11/xorg.conf.d/10-quirks.conf %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/ %{__install} -m 644 %{S:5} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/ %endif -%endif %if 0%{?suse_version} < 1315 mkdir -p %{buildroot}%{_libdir}/xorg/modules/updates/{fonts,input,linux,drivers,multimedia,extensions} install -m 644 $RPM_SOURCE_DIR/README.updates %{buildroot}%{_libdir}/xorg/modules/updates @@ -485,6 +490,9 @@ fi %ifnarch s390 s390x %if 0%{?suse_version} > 1120 %dir %{_sysconfdir}/X11/xorg.conf.d +%if 0%{?pci_ids_dir:1} +%dir %{pci_ids_dir} +%endif %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/10-quirks.conf %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/50-extensions.conf %dir %{_datadir}/X11/xorg.conf.d From 812c2fd72216c44120c9f87760db0446bd9bc5bdb8b9f6cf945526263034fafc Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Tue, 22 Mar 2016 17:08:06 +0000 Subject: [PATCH 3/3] - Add support for a driver specific PCI IDs files supplementing what's in xf86VideoPtrToDriverList(). PCI ID lists may be held in /etc/X11/xorg_pci_ids (boo#972126). OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=620 --- xorg-x11-server.changes | 5 +++-- xorg-x11-server.spec | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 2e05c1f..6425dcc 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,8 +1,9 @@ ------------------------------------------------------------------- Tue Mar 22 12:22:28 UTC 2016 - eich@suse.com -- Add support for a driver specific psi IDs files supplementing - what's in xf86VideoPtrToDriverList() (boo#972126). +- Add support for a driver specific PCI IDs files supplementing + what's in xf86VideoPtrToDriverList(). PCI ID lists may be held + in /etc/X11/xorg_pci_ids (boo#972126). ------------------------------------------------------------------- Sat Mar 12 00:31:53 UTC 2016 - tobias.johannes.klausmann@mni.thm.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index c777c90..0edc5b8 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -19,9 +19,9 @@ %ifarch s390 s390x %define have_wayland 0 %else +%define pci_ids_dir %{_sysconfdir}/X11/xorg_pci_ids %if 0%{?suse_version} >= 1330 || 0%{?build_xwayland} %define have_wayland 1 -%define pci_ids_dir %{_sysconfdir}/X11/xorg.ids %endif %endif