From b9986d7fcb0731267c8dfac635b1081c4fd0addc457e1e2ca293a550f5642ccc Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 30 Nov 2013 02:58:15 +0000 Subject: [PATCH 1/6] Accepting request 208931 from home:tobijk:X11:XOrg Update to version 1.15RC3 #2 OBS-URL: https://build.opensuse.org/request/show/208931 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=474 --- N_dpms_screensaver.diff | 2 +- N_edid_data_sanity_check.diff | 21 --- N_p_xnest-ignore-getimage-errors.diff | 31 ---- ...tly_set_changed_bits_in_randr_screen.patch | 99 ---------- ...anges_when_we_disconnect_a_GPU_slave.patch | 54 ------ ...i2_drawable_if-pixmap_serial_changes.patch | 117 ------------ ..._grabdevice_by_default_for_non_seat0.patch | 38 ---- n_xorg-x11-server-rpmmacros.patch | 3 +- u_aarch64-support.patch | 55 ------ u_disable-acpi-code.patch | 23 --- ...t_and_crtc_events_of_attached_output.patch | 61 ------- ...dr_send_rrproviderchangenotify_event.patch | 161 ----------------- ...dr_send_rrresourcechangenotify_event.patch | 170 ------------------ xorg-server-1.14.3.901.tar.bz2 | 3 - xorg-server-1.14.99.903.1.tar.bz2 | 3 + xorg-server-provides | 6 +- xorg-x11-server.changes | 19 ++ xorg-x11-server.spec | 44 ++--- 18 files changed, 41 insertions(+), 869 deletions(-) delete mode 100644 N_edid_data_sanity_check.diff delete mode 100644 N_p_xnest-ignore-getimage-errors.diff delete mode 100644 U_randr_dont_directly_set_changed_bits_in_randr_screen.patch delete mode 100644 U_randr_report_changes_when_we_disconnect_a_GPU_slave.patch delete mode 100644 U_revert_dri2_realloc_dri2_drawable_if-pixmap_serial_changes.patch delete mode 100644 U_xserver_enable_grabdevice_by_default_for_non_seat0.patch delete mode 100644 u_aarch64-support.patch delete mode 100644 u_disable-acpi-code.patch delete mode 100644 u_randr_deliver_output_and_crtc_events_of_attached_output.patch delete mode 100644 u_randr_send_rrproviderchangenotify_event.patch delete mode 100644 u_randr_send_rrresourcechangenotify_event.patch delete mode 100644 xorg-server-1.14.3.901.tar.bz2 create mode 100644 xorg-server-1.14.99.903.1.tar.bz2 diff --git a/N_dpms_screensaver.diff b/N_dpms_screensaver.diff index 61b0985..ddf2fc6 100644 --- a/N_dpms_screensaver.diff +++ b/N_dpms_screensaver.diff @@ -3,7 +3,7 @@ Index: xorg-server-1.12.1/hw/xfree86/common/xf86DPMS.c --- xorg-server-1.12.1.orig/hw/xfree86/common/xf86DPMS.c +++ xorg-server-1.12.1/hw/xfree86/common/xf86DPMS.c @@ -151,7 +151,8 @@ DPMSSet(ClientPtr client, int level) - rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverActive); + rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverReset); if (rc != Success) return rc; - } diff --git a/N_edid_data_sanity_check.diff b/N_edid_data_sanity_check.diff deleted file mode 100644 index 1116844..0000000 --- a/N_edid_data_sanity_check.diff +++ /dev/null @@ -1,21 +0,0 @@ -Index: xorg-server-1.6.3.901/hw/xfree86/modes/xf86Crtc.c -================================================================================ ---- xorg-server-1.7.99/hw/xfree86/modes/xf86Crtc.c -+++ xorg-server-1.7.99/hw/xfree86/modes/xf86Crtc.c -@@ -2916,8 +2916,14 @@ - p->output->MonInfo->features.vsize); - if (det_mon->type == DT && - det_mon->section.d_timings.h_size != 0 && -- det_mon->section.d_timings.v_size != 0) { -- -+ det_mon->section.d_timings.v_size != 0 && -+ det_mon->section.d_timings.v_size != 0 && -+ /* some sanity checking for aspect ration */ -+ ((det_mon->section.d_timings.h_size / -+ det_mon->section.d_timings.v_size) < 2) && -+ ((det_mon->section.d_timings.v_size / -+ det_mon->section.d_timings.h_size) < 2) -+ ) { - p->output->mm_width = det_mon->section.d_timings.h_size; - p->output->mm_height = det_mon->section.d_timings.v_size; - p->ret = TRUE; diff --git a/N_p_xnest-ignore-getimage-errors.diff b/N_p_xnest-ignore-getimage-errors.diff deleted file mode 100644 index 3be1156..0000000 --- a/N_p_xnest-ignore-getimage-errors.diff +++ /dev/null @@ -1,31 +0,0 @@ -Index: xorg-server-1.12.1/hw/xnest/GCOps.c -=================================================================== ---- xorg-server-1.12.1.orig/hw/xnest/GCOps.c -+++ xorg-server-1.12.1/hw/xnest/GCOps.c -@@ -94,15 +94,26 @@ xnestPutImage(DrawablePtr pDrawable, GCP - } - } - -+static int -+xnestIgnoreErrorHandler (Display *display, -+ XErrorEvent *event) -+{ -+ return False; /* return value is ignored */ -+} -+ - void - xnestGetImage(DrawablePtr pDrawable, int x, int y, int w, int h, - unsigned int format, unsigned long planeMask, char *pImage) - { - XImage *ximage; - int length; -+ int (*old_handler)(Display*, XErrorEvent*); - -+ /* we may get BadMatch error when xnest window is minimized */ -+ old_handler = XSetErrorHandler (xnestIgnoreErrorHandler); - ximage = XGetImage(xnestDisplay, xnestDrawable(pDrawable), - x, y, w, h, planeMask, format); -+ XSetErrorHandler (old_handler); - - if (ximage) { - length = ximage->bytes_per_line * ximage->height; diff --git a/U_randr_dont_directly_set_changed_bits_in_randr_screen.patch b/U_randr_dont_directly_set_changed_bits_in_randr_screen.patch deleted file mode 100644 index a354e10..0000000 --- a/U_randr_dont_directly_set_changed_bits_in_randr_screen.patch +++ /dev/null @@ -1,99 +0,0 @@ -From f9c8248b8326ad01f33f31531c6b2479baf80f02 Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Wed, 9 Jan 2013 14:23:57 +1000 -Subject: [PATCH] randr: don't directly set changed bits in randr screen - -Introduce a wrapper interface so we can fix things up for multi-gpu -situations later. - -This just introduces the API for now. - -Reviewed-by: Peter Hutterer -Signed-off-by: Dave Airlie - -diff --git a/randr/randr.c b/randr/randr.c -index f0decfc..11f88b2 100644 ---- a/randr/randr.c -+++ b/randr/randr.c -@@ -464,6 +464,14 @@ TellChanged(WindowPtr pWin, pointer value) - return WT_WALKCHILDREN; - } - -+void -+RRSetChanged(ScreenPtr pScreen) -+{ -+ rrScrPriv(pScreen); -+ -+ pScrPriv->changed = TRUE; -+} -+ - /* - * Something changed; send events and adjust pointer position - */ -diff --git a/randr/randrstr.h b/randr/randrstr.h -index 2517479..2babfed 100644 ---- a/randr/randrstr.h -+++ b/randr/randrstr.h -@@ -486,6 +486,10 @@ extern _X_EXPORT void - RRDeliverScreenEvent(ClientPtr client, WindowPtr pWin, ScreenPtr pScreen); - - /* randr.c */ -+/* set a screen change on the primary screen */ -+extern _X_EXPORT void -+RRSetChanged(ScreenPtr pScreen); -+ - /* - * Send all pending events - */ -diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c -index 721b05a..2f76b62 100644 ---- a/randr/rrcrtc.c -+++ b/randr/rrcrtc.c -@@ -39,7 +39,7 @@ RRCrtcChanged(RRCrtcPtr crtc, Bool layoutChanged) - if (pScreen) { - rrScrPriv(pScreen); - -- pScrPriv->changed = TRUE; -+ RRSetChanged(pScreen); - /* - * Send ConfigureNotify on any layout change - */ -diff --git a/randr/rrinfo.c b/randr/rrinfo.c -index 1408d6f..fc57bd4 100644 ---- a/randr/rrinfo.c -+++ b/randr/rrinfo.c -@@ -225,7 +225,7 @@ RRScreenSetSizeRange(ScreenPtr pScreen, - pScrPriv->minHeight = minHeight; - pScrPriv->maxWidth = maxWidth; - pScrPriv->maxHeight = maxHeight; -- pScrPriv->changed = TRUE; -+ RRSetChanged(pScreen); - pScrPriv->configChanged = TRUE; - } - -diff --git a/randr/rroutput.c b/randr/rroutput.c -index 88781ba..922d61f 100644 ---- a/randr/rroutput.c -+++ b/randr/rroutput.c -@@ -36,7 +36,7 @@ RROutputChanged(RROutputPtr output, Bool configChanged) - output->changed = TRUE; - if (pScreen) { - rrScrPriv(pScreen); -- pScrPriv->changed = TRUE; -+ RRSetChanged(pScreen); - if (configChanged) - pScrPriv->configChanged = TRUE; - } -diff --git a/randr/rrscreen.c b/randr/rrscreen.c -index 39340cc..36179ae 100644 ---- a/randr/rrscreen.c -+++ b/randr/rrscreen.c -@@ -143,7 +143,7 @@ RRScreenSizeNotify(ScreenPtr pScreen) - pScrPriv->height = pScreen->height; - pScrPriv->mmWidth = pScreen->mmWidth; - pScrPriv->mmHeight = pScreen->mmHeight; -- pScrPriv->changed = TRUE; -+ RRSetChanged(pScreen); - /* pScrPriv->sizeChanged = TRUE; */ - - RRTellChanged(pScreen); diff --git a/U_randr_report_changes_when_we_disconnect_a_GPU_slave.patch b/U_randr_report_changes_when_we_disconnect_a_GPU_slave.patch deleted file mode 100644 index 93b4759..0000000 --- a/U_randr_report_changes_when_we_disconnect_a_GPU_slave.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 9d26e8eaf5a2d7c3e65670ac20254c60f665c463 Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Wed, 9 Jan 2013 14:26:35 +1000 -Subject: [PATCH] randr: report changes when we disconnect a GPU slave - -When we disconnect an output/offload slave set the changed bits, -so a later TellChanged can do something. - -Then when we remove a GPU slave device, sent change notification -to the protocol screen. - -This allows hot unplugged USB devices to disappear in clients. - -Reviewed-by: Peter Hutterer -Signed-off-by: Dave Airlie - -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index 9034dad..bcb65ff 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -47,6 +47,7 @@ - #include "Pci.h" - #include "xf86platformBus.h" - -+#include "randrstr.h" - int platformSlotClaimed; - - int xf86_num_platform_devices; -@@ -499,7 +500,7 @@ xf86platformRemoveDevice(int index) - xf86UnclaimPlatformSlot(&xf86_platform_devices[index], NULL); - - xf86_remove_platform_device(index); -- -+ RRTellChanged(xf86Screens[0]->pScreen); - out: - return; - } -diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c -index 25beee6..2817aaa 100644 ---- a/hw/xfree86/modes/xf86RandR12.c -+++ b/hw/xfree86/modes/xf86RandR12.c -@@ -1896,10 +1896,12 @@ xf86RandR14ProviderDestroy(ScreenPtr screen, RRProviderPtr provider) - if (config->randr_provider->offload_sink) { - DetachOffloadGPU(screen); - config->randr_provider->offload_sink = NULL; -+ RRSetChanged(screen); - } - else if (config->randr_provider->output_source) { - DetachOutputGPU(screen); - config->randr_provider->output_source = NULL; -+ RRSetChanged(screen); - } - else if (screen->current_master) - DetachUnboundGPU(screen); diff --git a/U_revert_dri2_realloc_dri2_drawable_if-pixmap_serial_changes.patch b/U_revert_dri2_realloc_dri2_drawable_if-pixmap_serial_changes.patch deleted file mode 100644 index 9867386..0000000 --- a/U_revert_dri2_realloc_dri2_drawable_if-pixmap_serial_changes.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 77e51d5bbb97eb5c9d9dbff9a7c44d7e53620e68 Mon Sep 17 00:00:00 2001 -From: Eric Anholt -Date: Mon, 17 Jun 2013 22:51:19 +0000 -Subject: Revert "DRI2: re-allocate DRI2 drawable if pixmap serial changes" - -This reverts commit 3209b094a3b1466b579e8020e12a4f3fa78a5f3f. After a -long debug session by Paul Berry, it appears that this was the commit -that has been producing sporadic failures in piglit front buffer -rendering tests for the last several years. - -GetBuffers may return fresh buffers with invalid contents at a couple -reasonable times: - -- When first asked for a non-fake-front buffer. -- When the drawable size is changed, an Invalidate has been sent, and - obviously the app needs to redraw the whole buffer. -- After a glXSwapBuffers(), GL allows the backbuffer to be undefined, - and an Invalidate was sent to tell the GL that it should grab these - appropriate new buffers to avoid stalling. - -But with the patch being reverted, GetBuffers would also return fresh -invalid buffers when the drawable serial number changed, which is -approximately "whenever, for any reason". The app is not expecting -invalid buffer contents "whenever", nor is it valid. Because the GL -usually only GetBuffers after an Invalidate is sent, and the new -buffer allocation only happened during a GetBuffers, most apps saw no -problems. But apps that do (fake-)frontbuffer rendering do frequently -ask the server for the front buffer (since we drop the fake front -allocation when we're not doing front buffer rendering), and if the -drawable serial got bumped midway through a draw, the server would -pointlessly ditch the front *and* backbuffer full of important -drawing, resulting in bad rendering. - -The patch was originally to fix bugzilla: -https://bugs.freedesktop.org/show_bug.cgi?id=28365 -Specifically: - - To reproduce, start with a large-ish display (i.e. 1680x1050 on my - laptop), use the patched glxgears from bug 28252 to add the - -override option. Then run glxgears -override -geometry 640x480 - to create a 640x480 window in the top left corner, which will work - fine. Next, run xrandr -s 640x480 and watch the fireworks. - -I've tested with an override-redirect glxgears, both with vblank sync -enabled and disabled, both with gnome-shell and no window manager at -all, before and after this patch. The only problem observed was that -before and after the revert, sometimes when alt-tabbing to kill my -gears after completing the test gnome-shell would get confused about -override-redirectness of the glxgears window (according to a log -message) and apparently not bother doing any further compositing. - -Signed-off-by: Eric Anholt -Reviewed-by: Keith Packard -Reviewed-by: Chris Wilson -Tested-by: Chris Wilson -Signed-off-by: Keith Packard ---- -diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c -index 40963c3..0b047f0 100644 ---- a/hw/xfree86/dri2/dri2.c -+++ b/hw/xfree86/dri2/dri2.c -@@ -99,7 +99,6 @@ typedef struct _DRI2Drawable { - CARD64 last_swap_msc; /* msc at completion of most recent swap */ - CARD64 last_swap_ust; /* ust at completion of most recent swap */ - int swap_limit; /* for N-buffering */ -- unsigned long serialNumber; - Bool needInvalidate; - int prime_id; - PixmapPtr prime_slave_pixmap; -@@ -189,19 +188,6 @@ DRI2GetDrawable(DrawablePtr pDraw) - } - } - --static unsigned long --DRI2DrawableSerial(DrawablePtr pDraw) --{ -- ScreenPtr pScreen = pDraw->pScreen; -- PixmapPtr pPix; -- -- if (pDraw->type != DRAWABLE_WINDOW) -- return pDraw->serialNumber; -- -- pPix = pScreen->GetWindowPixmap((WindowPtr) pDraw); -- return pPix->drawable.serialNumber; --} -- - static DRI2DrawablePtr - DRI2AllocateDrawable(DrawablePtr pDraw) - { -@@ -235,7 +221,6 @@ DRI2AllocateDrawable(DrawablePtr pDraw) - pPriv->last_swap_msc = 0; - pPriv->last_swap_ust = 0; - xorg_list_init(&pPriv->reference_list); -- pPriv->serialNumber = DRI2DrawableSerial(pDraw); - pPriv->needInvalidate = FALSE; - pPriv->redirectpixmap = NULL; - pPriv->prime_slave_pixmap = NULL; -@@ -493,7 +478,6 @@ allocate_or_reuse_buffer(DrawablePtr pDraw, DRI2ScreenPtr ds, - || attachment == DRI2BufferFrontLeft - || !dimensions_match || (pPriv->buffers[old_buf]->format != format)) { - *buffer = create_buffer (pDraw, attachment, format); -- pPriv->serialNumber = DRI2DrawableSerial(pDraw); - return TRUE; - - } -@@ -559,8 +543,7 @@ do_get_buffers(DrawablePtr pDraw, int *width, int *height, - ds = DRI2GetScreen(pDraw->pScreen); - - dimensions_match = (pDraw->width == pPriv->width) -- && (pDraw->height == pPriv->height) -- && (pPriv->serialNumber == DRI2DrawableSerial(pDraw)); -+ && (pDraw->height == pPriv->height); - - buffers = calloc((count + 1), sizeof(buffers[0])); - if (!buffers) --- -cgit v0.9.0.2-2-gbebe diff --git a/U_xserver_enable_grabdevice_by_default_for_non_seat0.patch b/U_xserver_enable_grabdevice_by_default_for_non_seat0.patch deleted file mode 100644 index 588f86b..0000000 --- a/U_xserver_enable_grabdevice_by_default_for_non_seat0.patch +++ /dev/null @@ -1,38 +0,0 @@ -From c73c36b537f996574628e69681833ea37dec2b6e Mon Sep 17 00:00:00 2001 -From: Laércio de Sousa -Date: Wed, 18 Sep 2013 16:42:17 +0000 -Subject: xserver: enable InputClass option "GrabDevice" by default for non-seat0 seats (#69478) - -This patch contributes to fill the remaining gaps which make -systemd-multi-seat-x wrapper still necessary in some multiseat setups. - -This also replaces previous evdev patch that does the same thing -for that particular driver. - -When option "-seat" is passed with an argument different from "seat0", -option "GrabDevice" for input devices is enabled by default -(no need of enabling it in xorg.conf's "InputClass" section). - -Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=69478 - -Signed-off-by: Laércio de Sousa -Reviewed-by: Peter Hutterer -Signed-off-by: Peter Hutterer ---- -diff --git a/config/udev.c b/config/udev.c -index de89241..b55b78e 100644 ---- a/config/udev.c -+++ b/config/udev.c -@@ -226,6 +226,10 @@ device_added(struct udev_device *udev_device) - - input_options = input_option_new(input_options, "config_info", config_info); - -+ /* Default setting needed for non-seat0 seats */ -+ if (ServerIsNotSeat0()) -+ input_options = input_option_new(input_options, "GrabDevice", "on"); -+ - LogMessage(X_INFO, "config/udev: Adding input device %s (%s)\n", - name, path); - rc = NewInputDeviceRequest(input_options, &attrs, &dev); --- -cgit v0.9.0.2-2-gbebe diff --git a/n_xorg-x11-server-rpmmacros.patch b/n_xorg-x11-server-rpmmacros.patch index c6d637c..91e7e88 100644 --- a/n_xorg-x11-server-rpmmacros.patch +++ b/n_xorg-x11-server-rpmmacros.patch @@ -2,9 +2,10 @@ Index: xorg-server-1.12.1/configure.ac =================================================================== --- xorg-server-1.12.1.orig/configure.ac +++ xorg-server-1.12.1/configure.ac -@@ -2232,4 +2232,5 @@ test/Makefile +@@ -2232,5 +2232,6 @@ test/Makefile test/xi2/Makefile xserver.ent xorg-server.pc +xorg-x11-server.macros ]) + AC_OUTPUT diff --git a/u_aarch64-support.patch b/u_aarch64-support.patch deleted file mode 100644 index 487605e..0000000 --- a/u_aarch64-support.patch +++ /dev/null @@ -1,55 +0,0 @@ -Subject: Basic support for aarch64 -Author: Andreas Schwab - -Index: xorg-server-1.13.2/hw/xfree86/common/compiler.h -=================================================================== ---- xorg-server-1.13.2.orig/hw/xfree86/common/compiler.h -+++ xorg-server-1.13.2/hw/xfree86/common/compiler.h -@@ -1351,7 +1351,7 @@ stl_u(unsigned long val, unsigned int *p - #else /* ix86 */ - - #if !defined(__SUNPRO_C) --#if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__) -+#if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__) && !defined(__aarch64__) - #ifdef GCCUSESGAS - - /* -Index: xorg-server-1.13.2/hw/xfree86/os-support/linux/lnx_video.c -=================================================================== ---- xorg-server-1.13.2.orig/hw/xfree86/os-support/linux/lnx_video.c -+++ xorg-server-1.13.2/hw/xfree86/os-support/linux/lnx_video.c -@@ -58,7 +58,8 @@ static Bool ExtendedEnabled = FALSE; - !defined(__sparc__) && \ - !defined(__mips__) && \ - !defined(__nds32__) && \ -- !defined(__arm__) -+ !defined(__arm__) && \ -+ !defined(__aarch64__) - - /* - * Due to conflicts with "compiler.h", don't rely on to declare -Index: xorg-server-1.13.2/include/servermd.h -=================================================================== ---- xorg-server-1.13.2.orig/include/servermd.h -+++ xorg-server-1.13.2/include/servermd.h -@@ -286,6 +286,20 @@ SOFTWARE. - #define GLYPHPADBYTES 4 - #endif /* linux/s390 */ - -+#ifdef __aarch64__ -+ -+#ifdef __AARCH64EL__ -+#define IMAGE_BYTE_ORDER LSBFirst -+#define BITMAP_BIT_ORDER LSBFirst -+#endif -+#ifdef __AARCH64EB__ -+#define IMAGE_BYTE_ORDER MSBFirst -+#define BITMAP_BIT_ORDER MSBFirst -+#endif -+#define GLYPHPADBYTES 4 -+ -+#endif /* __aarch64__ */ -+ - /* size of buffer to use with GetImage, measured in bytes. There's obviously - * a trade-off between the amount of heap used and the number of times the - * ddx routine has to be called. diff --git a/u_disable-acpi-code.patch b/u_disable-acpi-code.patch deleted file mode 100644 index b80136a..0000000 --- a/u_disable-acpi-code.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Adam Jackson <ajax@redhat.com> -Date: Wed, 9 Nov 2011 11:52:06 +1000 -Subject: [PATCH 2/7] Don't build the ACPI code. - -No good can come of this. ---- - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index a12783c..54f4464 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1620,7 +1620,6 @@ if test "x$XORG" = xyes; then - linux_alpha=yes - ;; - i*86|amd64*|x86_64*|ia64*) -- linux_acpi="yes" - ;; - *) - ;; --- -1.7.10.1 diff --git a/u_randr_deliver_output_and_crtc_events_of_attached_output.patch b/u_randr_deliver_output_and_crtc_events_of_attached_output.patch deleted file mode 100644 index c1e42a4..0000000 --- a/u_randr_deliver_output_and_crtc_events_of_attached_output.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0ad777cecd414d4c4b3326cc25580833535b0c0b Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Fri, 4 Oct 2013 17:46:50 +0300 -Subject: [PATCH] randr: deliver Output and Crtc events of attached output - providers. - -Consider all attached output providers when looking for changed outputs and -crtcs. - -Reviewed-by: Dave Airlie -Signed-off-by: Michal Srb - -diff --git a/randr/randr.c b/randr/randr.c -index 9cec6f6..3c51427 100755 ---- a/randr/randr.c -+++ b/randr/randr.c -@@ -478,6 +478,16 @@ TellChanged(WindowPtr pWin, pointer value) - if (crtc->changed) - RRDeliverCrtcEvent(client, pWin, crtc); - } -+ -+ xorg_list_for_each_entry(iter, &pScreen->output_slave_list, output_head) { -+ pSlaveScrPriv = rrGetScrPriv(iter); -+ for (i = 0; i < pSlaveScrPriv->numCrtcs; i++) { -+ RRCrtcPtr crtc = pSlaveScrPriv->crtcs[i]; -+ -+ if (crtc->changed) -+ RRDeliverCrtcEvent(client, pWin, crtc); -+ } -+ } - } - - if (pRREvent->mask & RROutputChangeNotifyMask) { -@@ -487,6 +497,16 @@ TellChanged(WindowPtr pWin, pointer value) - if (output->changed) - RRDeliverOutputEvent(client, pWin, output); - } -+ -+ xorg_list_for_each_entry(iter, &pScreen->output_slave_list, output_head) { -+ pSlaveScrPriv = rrGetScrPriv(iter); -+ for (i = 0; i < pSlaveScrPriv->numOutputs; i++) { -+ RROutputPtr output = pSlaveScrPriv->outputs[i]; -+ -+ if (output->changed) -+ RRDeliverOutputEvent(client, pWin, output); -+ } -+ } - } - - if (pRREvent->mask & RRProviderChangeNotifyMask) { -@@ -581,6 +601,10 @@ RRTellChanged(ScreenPtr pScreen) - xorg_list_for_each_entry(iter, &master->output_slave_list, output_head) { - pSlaveScrPriv = rrGetScrPriv(iter); - pSlaveScrPriv->provider->changed = FALSE; -+ for (i = 0; i < pSlaveScrPriv->numOutputs; i++) -+ pSlaveScrPriv->outputs[i]->changed = FALSE; -+ for (i = 0; i < pSlaveScrPriv->numCrtcs; i++) -+ pSlaveScrPriv->crtcs[i]->changed = FALSE; - } - xorg_list_for_each_entry(iter, &master->offload_slave_list, offload_head) { - pSlaveScrPriv = rrGetScrPriv(iter); diff --git a/u_randr_send_rrproviderchangenotify_event.patch b/u_randr_send_rrproviderchangenotify_event.patch deleted file mode 100644 index 1d3b4b6..0000000 --- a/u_randr_send_rrproviderchangenotify_event.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 6ec75c2f85c14c805f4433a17a56774594d8641c Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Fri, 4 Oct 2013 15:59:34 +0300 -Subject: [PATCH] randr: send RRProviderChangeNotify event - -Send RRProviderChangeNotify event when a provider becomes output source or -offload sink. - -Reviewed-by: Dave Airlie -Signed-off-by: Michal Srb - -diff --git a/randr/randr.c b/randr/randr.c -old mode 100644 -new mode 100755 -index cb6fce7..fa0a4da ---- a/randr/randr.c -+++ b/randr/randr.c -@@ -426,6 +426,8 @@ TellChanged(WindowPtr pWin, pointer value) - RREventPtr *pHead, pRREvent; - ClientPtr client; - ScreenPtr pScreen = pWin->drawable.pScreen; -+ ScreenPtr iter; -+ rrScrPrivPtr pSlaveScrPriv; - - rrScrPriv(pScreen); - int i; -@@ -460,6 +462,24 @@ TellChanged(WindowPtr pWin, pointer value) - RRDeliverOutputEvent(client, pWin, output); - } - } -+ -+ if (pRREvent->mask & RRProviderChangeNotifyMask) { -+ xorg_list_for_each_entry(iter, &pScreen->output_slave_list, output_head) { -+ pSlaveScrPriv = rrGetScrPriv(iter); -+ if (pSlaveScrPriv->provider->changed) -+ RRDeliverProviderEvent(client, pWin, pSlaveScrPriv->provider); -+ } -+ xorg_list_for_each_entry(iter, &pScreen->offload_slave_list, offload_head) { -+ pSlaveScrPriv = rrGetScrPriv(iter); -+ if (pSlaveScrPriv->provider->changed) -+ RRDeliverProviderEvent(client, pWin, pSlaveScrPriv->provider); -+ } -+ xorg_list_for_each_entry(iter, &pScreen->unattached_list, unattached_head) { -+ pSlaveScrPriv = rrGetScrPriv(iter); -+ if (pSlaveScrPriv->provider->changed) -+ RRDeliverProviderEvent(client, pWin, pSlaveScrPriv->provider); -+ } -+ } - } - return WT_WALKCHILDREN; - } -@@ -496,6 +516,8 @@ RRTellChanged(ScreenPtr pScreen) - rrScrPriv(pScreen); - rrScrPrivPtr mastersp; - int i; -+ ScreenPtr iter; -+ rrScrPrivPtr pSlaveScrPriv; - - if (pScreen->isGPU) { - master = pScreen->current_master; -@@ -519,6 +541,20 @@ RRTellChanged(ScreenPtr pScreen) - pScrPriv->outputs[i]->changed = FALSE; - for (i = 0; i < pScrPriv->numCrtcs; i++) - pScrPriv->crtcs[i]->changed = FALSE; -+ -+ xorg_list_for_each_entry(iter, &master->output_slave_list, output_head) { -+ pSlaveScrPriv = rrGetScrPriv(iter); -+ pSlaveScrPriv->provider->changed = FALSE; -+ } -+ xorg_list_for_each_entry(iter, &master->offload_slave_list, offload_head) { -+ pSlaveScrPriv = rrGetScrPriv(iter); -+ pSlaveScrPriv->provider->changed = FALSE; -+ } -+ xorg_list_for_each_entry(iter, &master->unattached_list, unattached_head) { -+ pSlaveScrPriv = rrGetScrPriv(iter); -+ pSlaveScrPriv->provider->changed = FALSE; -+ } -+ - if (mastersp->layoutChanged) { - pScrPriv->layoutChanged = FALSE; - RRPointerScreenConfigured(master); -diff --git a/randr/randrstr.h b/randr/randrstr.h -old mode 100644 -new mode 100755 -index 2babfed..c933349 ---- a/randr/randrstr.h -+++ b/randr/randrstr.h -@@ -164,6 +164,7 @@ struct _rrProvider { - int nameLength; - RRPropertyPtr properties; - Bool pendingProperties; -+ Bool changed; - struct _rrProvider *offload_sink; - struct _rrProvider *output_source; - }; -@@ -923,6 +924,9 @@ RRProviderSetCapabilities(RRProviderPtr provider, uint32_t capabilities); - extern _X_EXPORT Bool - RRProviderLookup(XID id, RRProviderPtr *provider_p); - -+extern _X_EXPORT void -+RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider); -+ - /* rrproviderproperty.c */ - - extern _X_EXPORT void -diff --git a/randr/rrprovider.c b/randr/rrprovider.c -old mode 100644 -new mode 100755 -index b321e62..2334ad2 ---- a/randr/rrprovider.c -+++ b/randr/rrprovider.c -@@ -304,6 +304,9 @@ ProcRRSetProviderOutputSource(ClientPtr client) - - pScrPriv->rrProviderSetOutputSource(pScreen, provider, source_provider); - -+ provider->changed = TRUE; -+ RRSetChanged(pScreen); -+ - RRTellChanged (pScreen); - - return Success; -@@ -333,6 +336,9 @@ ProcRRSetProviderOffloadSink(ClientPtr client) - - pScrPriv->rrProviderSetOffloadSink(pScreen, provider, sink_provider); - -+ provider->changed = TRUE; -+ RRSetChanged(pScreen); -+ - RRTellChanged (pScreen); - - return Success; -@@ -357,6 +363,7 @@ RRProviderCreate(ScreenPtr pScreen, const char *name, - provider->nameLength = nameLength; - memcpy(provider->name, name, nameLength); - provider->name[nameLength] = '\0'; -+ provider->changed = FALSE; - - if (!AddResource (provider->id, RRProviderType, (pointer) provider)) - return NULL; -@@ -416,3 +423,21 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p) - return TRUE; - return FALSE; - } -+ -+void -+RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider) -+{ -+ ScreenPtr pScreen = pWin->drawable.pScreen; -+ -+ rrScrPriv(pScreen); -+ -+ xRRProviderChangeNotifyEvent pe = { -+ .type = RRNotify + RREventBase, -+ .subCode = RRNotify_ProviderChange, -+ .timestamp = pScrPriv->lastSetTime.milliseconds, -+ .window = pWin->drawable.id, -+ .provider = provider->id -+ }; -+ -+ WriteEventsToClient(client, 1, (xEvent *) &pe); -+} diff --git a/u_randr_send_rrresourcechangenotify_event.patch b/u_randr_send_rrresourcechangenotify_event.patch deleted file mode 100644 index 63fc682..0000000 --- a/u_randr_send_rrresourcechangenotify_event.patch +++ /dev/null @@ -1,170 +0,0 @@ -From 7fa3e6ac35602ba7025e9283e9b2a7ab21ab77fb Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Fri, 4 Oct 2013 16:11:18 +0300 -Subject: [PATCH] randr: send RRResourceChangeNotify event - -Send RRResourceChangeNotify event when provider, output or crtc was created or -destroyed. I.e. when the list of resources returned by RRGetScreenResources and -RRGetProviders changes. - -Reviewed-by: Dave Airlie -Signed-off-by: Michal Srb - -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -old mode 100644 -new mode 100755 -index e368dee..33b2b7d ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -466,6 +466,9 @@ xf86platformAddDevice(int index) - /* attach unbound to 0 protocol screen */ - AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); - -+ RRResourcesChanged(xf86Screens[0]->pScreen); -+ RRTellChanged(xf86Screens[0]->pScreen); -+ - return 0; - } - -@@ -508,6 +511,8 @@ xf86platformRemoveDevice(int index) - xf86UnclaimPlatformSlot(&xf86_platform_devices[index], NULL); - - xf86_remove_platform_device(index); -+ -+ RRResourcesChanged(xf86Screens[0]->pScreen); - RRTellChanged(xf86Screens[0]->pScreen); - out: - return; -diff --git a/randr/randr.c b/randr/randr.c -index fa0a4da..9cec6f6 100755 ---- a/randr/randr.c -+++ b/randr/randr.c -@@ -420,6 +420,32 @@ RRExtensionInit(void) - #endif - } - -+void -+RRResourcesChanged(ScreenPtr pScreen) -+{ -+ rrScrPriv(pScreen); -+ pScrPriv->resourcesChanged = TRUE; -+ -+ RRSetChanged(pScreen); -+} -+ -+static void -+RRDeliverResourceEvent(ClientPtr client, WindowPtr pWin) -+{ -+ ScreenPtr pScreen = pWin->drawable.pScreen; -+ -+ rrScrPriv(pScreen); -+ -+ xRRResourceChangeNotifyEvent re = { -+ .type = RRNotify + RREventBase, -+ .subCode = RRNotify_ResourceChange, -+ .timestamp = pScrPriv->lastSetTime.milliseconds, -+ .window = pWin->drawable.id -+ }; -+ -+ WriteEventsToClient(client, 1, (xEvent *) &re); -+} -+ - static int - TellChanged(WindowPtr pWin, pointer value) - { -@@ -480,6 +506,12 @@ TellChanged(WindowPtr pWin, pointer value) - RRDeliverProviderEvent(client, pWin, pSlaveScrPriv->provider); - } - } -+ -+ if (pRREvent->mask & RRResourceChangeNotifyMask) { -+ if (pScrPriv->resourcesChanged) { -+ RRDeliverResourceEvent(client, pWin); -+ } -+ } - } - return WT_WALKCHILDREN; - } -@@ -536,7 +568,11 @@ RRTellChanged(ScreenPtr pScreen) - } - pScrPriv->changed = FALSE; - mastersp->changed = FALSE; -+ - WalkTree(master, TellChanged, (pointer) master); -+ -+ mastersp->resourcesChanged = FALSE; -+ - for (i = 0; i < pScrPriv->numOutputs; i++) - pScrPriv->outputs[i]->changed = FALSE; - for (i = 0; i < pScrPriv->numCrtcs; i++) -diff --git a/randr/randrstr.h b/randr/randrstr.h -index c933349..15299fd 100755 ---- a/randr/randrstr.h -+++ b/randr/randrstr.h -@@ -301,6 +301,7 @@ typedef struct _rrScrPriv { - Bool changed; /* some config changed */ - Bool configChanged; /* configuration changed */ - Bool layoutChanged; /* screen layout changed */ -+ Bool resourcesChanged; /* screen resources change */ - - CARD16 minWidth, minHeight; - CARD16 maxWidth, maxHeight; -@@ -486,6 +487,9 @@ extern _X_EXPORT int - extern _X_EXPORT void - RRDeliverScreenEvent(ClientPtr client, WindowPtr pWin, ScreenPtr pScreen); - -+extern _X_EXPORT void -+ RRResourcesChanged(ScreenPtr pScreen); -+ - /* randr.c */ - /* set a screen change on the primary screen */ - extern _X_EXPORT void -diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c -old mode 100644 -new mode 100755 -index 2f76b62..99b3dca ---- a/randr/rrcrtc.c -+++ b/randr/rrcrtc.c -@@ -102,6 +102,8 @@ RRCrtcCreate(ScreenPtr pScreen, void *devPrivate) - crtc->pScreen = pScreen; - pScrPriv->crtcs[pScrPriv->numCrtcs++] = crtc; - -+ RRResourcesChanged(pScreen); -+ - return crtc; - } - -@@ -669,6 +671,8 @@ RRCrtcDestroyResource(pointer value, XID pid) - break; - } - } -+ -+ RRResourcesChanged(pScreen); - } - - if (crtc->scanout_pixmap) -diff --git a/randr/rroutput.c b/randr/rroutput.c -old mode 100644 -new mode 100755 -index 922d61f..2b0b82f ---- a/randr/rroutput.c -+++ b/randr/rroutput.c -@@ -101,6 +101,9 @@ RROutputCreate(ScreenPtr pScreen, - return NULL; - - pScrPriv->outputs[pScrPriv->numOutputs++] = output; -+ -+ RRResourcesChanged(pScreen); -+ - return output; - } - -@@ -355,6 +358,8 @@ RROutputDestroyResource(pointer value, XID pid) - break; - } - } -+ -+ RRResourcesChanged(pScreen); - } - if (output->modes) { - for (m = 0; m < output->numModes; m++) diff --git a/xorg-server-1.14.3.901.tar.bz2 b/xorg-server-1.14.3.901.tar.bz2 deleted file mode 100644 index 76efd9f..0000000 --- a/xorg-server-1.14.3.901.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d8481f60d6ef67bb9b72c1ee375f5a64e69ba32c613c01367b3c2b5c154ab0a -size 5510351 diff --git a/xorg-server-1.14.99.903.1.tar.bz2 b/xorg-server-1.14.99.903.1.tar.bz2 new file mode 100644 index 0000000..8223912 --- /dev/null +++ b/xorg-server-1.14.99.903.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64c780e8d2e61c0ba1877c3334c468c4e35f9d63bf9b307a62ff1288e2a46f21 +size 3631174 diff --git a/xorg-server-provides b/xorg-server-provides index 59fe1f2..3631234 100644 --- a/xorg-server-provides +++ b/xorg-server-provides @@ -1,4 +1,4 @@ -Provides: X11_ABI_XINPUT = 19.1 -Provides: X11_ABI_VIDEODRV = 14.1 +Provides: X11_ABI_XINPUT = 20.0 +Provides: X11_ABI_VIDEODRV = 15.0 Provides: X11_ABI_ANSIC = 0.4 -Provides: X11_ABI_EXTENSION = 7.0 +Provides: X11_ABI_EXTENSION = 8.0 diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index ed1897a..3fde27c 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Thu Nov 28 14:08:58 UTC 2013 - tobias.johannes.klausmann@mni.thm.de + +- Update to 1.14.99.903 (1.15 RC3): +- Remove upstreamed patches: + + Patch228: u_aarch64-support.patch + + Patch229: u_disable-acpi-code.patch + A new configure option controls this now + + Patch240: U_revert_dri2_realloc_dri2_drawable_if-pixmap_serial_changes.patch + + Patch242: U_randr_dont_directly_set_changed_bits_in_randr_screen.patch + + Patch243: U_randr_report_changes_when_we_disconnect_a_GPU_slave.patch + + Patch244: u_randr_send_rrproviderchangenotify_event.patch + + Patch245: u_randr_send_rrresourcechangenotify_event.patch + + Patch246: u_randr_deliver_output_and_crtc_events_of_attached_output.patch + + Patch249: U_xserver_enable_grabdevice_by_default_for_non_seat0.patch +- Drop superseded patches: + + Patch16: N_p_xnest-ignore-getimage-errors.diff + + Patch79: N_edid_data_sanity_check.diff + ------------------------------------------------------------------- Thu Nov 28 11:56:07 UTC 2013 - lbsousajr@gmail.com diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index f76c560..df869a9 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -18,7 +18,7 @@ Name: xorg-x11-server -%define dirsuffix 1.14.3.901 +%define dirsuffix 1.14.99.903.1 Summary: X License: GPL-2.0+ and MIT @@ -37,8 +37,7 @@ Source99: pre_checkin.sh Patch0: n_xorg-x11-server-rpmmacros.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch2: N_p_default-module-path.diff -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch16: N_p_xnest-ignore-getimage-errors.diff + BuildRequires: Mesa-devel BuildRequires: bison BuildRequires: flex @@ -65,8 +64,11 @@ BuildRequires: pkgconfig(renderproto) >= 0.11 BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xau) -BuildRequires: pkgconfig(xau) BuildRequires: pkgconfig(xaw7) +BuildRequires: pkgconfig(xcb-aux) +BuildRequires: pkgconfig(xcb-icccm) +BuildRequires: pkgconfig(xcb-image) +BuildRequires: pkgconfig(xcb-keysyms) BuildRequires: pkgconfig(xcmiscproto) >= 1.2.0 BuildRequires: pkgconfig(xdmcp) BuildRequires: pkgconfig(xext) >= 1.0.99.4 @@ -82,8 +84,9 @@ BuildRequires: pkgconfig(xprintutil) BuildRequires: pkgconfig(xproto) >= 7.0.17 BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xres) +BuildRequires: pkgconfig(xshmfence) BuildRequires: pkgconfig(xt) -BuildRequires: pkgconfig(xtrans) >= 1.2.2 +BuildRequires: pkgconfig(xtrans) >= 1.3.1 BuildRequires: pkgconfig(xtst) >= 1.0.99.2 BuildRequires: pkgconfig(xv) ### udev support (broken on openSUSE 11.2, see also bnc #589997) @@ -118,8 +121,6 @@ Patch45: N_bug-197858_dpms.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch77: N_fbdevhw.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch79: N_edid_data_sanity_check.diff -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch101: N_zap_warning_xserver.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch103: N_confine_to_shape.diff @@ -153,20 +154,10 @@ Patch222: N_sync-fix.patch Patch223: N_x86emu-include-order.patch Patch226: u_vgaHW-no-legacy.patch -Patch228: u_aarch64-support.patch -Patch229: u_disable-acpi-code.patch Patch230: u_xserver_xvfb-randr.patch -Patch240: U_revert_dri2_realloc_dri2_drawable_if-pixmap_serial_changes.patch - -Patch242: U_randr_dont_directly_set_changed_bits_in_randr_screen.patch -Patch243: U_randr_report_changes_when_we_disconnect_a_GPU_slave.patch -Patch244: u_randr_send_rrproviderchangenotify_event.patch -Patch245: u_randr_send_rrresourcechangenotify_event.patch -Patch246: u_randr_deliver_output_and_crtc_events_of_attached_output.patch Patch247: u_randr_allow_rrselectinput_for_providerchange_and_resourcechange_events.patch Patch248: N_randr_fix_abi.patch -Patch249: U_xserver_enable_grabdevice_by_default_for_non_seat0.patch %description This package contains the X.Org Server. @@ -222,17 +213,17 @@ sh %{SOURCE99} --verify . %{SOURCE98} cp %{SOURCE96} . %patch0 -p1 %patch2 -%patch16 -p1 ### Needs to be rebased #%patch45 -p0 %patch77 -%patch79 -p1 %patch101 -p1 %patch103 %patch106 -p1 %patch112 -p0 + %patch127 -p1 + %patch143 -p1 %patch145 -p0 ### disabled for now @@ -248,20 +239,9 @@ cp %{SOURCE96} . #%patch222 -p1 %patch223 -p1 %patch226 -p0 -%patch228 -p1 -%patch229 -p1 %patch230 -p1 - -%patch240 -p1 - -%patch242 -p1 -%patch243 -p1 -%patch244 -p1 -%patch245 -p1 -%patch246 -p1 %patch247 -p1 %patch248 -p1 -%patch249 -p1 %build autoreconf -fi @@ -272,6 +252,7 @@ autoreconf -fi --enable-xdm-auth-1 \ --enable-dri \ --enable-dri2 \ + --enable-dri3 \ --enable-dmx \ --enable-xnest \ --enable-kdrive \ @@ -282,6 +263,7 @@ autoreconf -fi --enable-record \ --enable-xcsecurity \ --with-sha1=libcrypto \ + --disable-linux-acpi \ %ifarch s390 s390x --disable-xorg \ --disable-aiglx \ @@ -391,7 +373,7 @@ exit 0 %dir %{_sysconfdir}/X11/xorg.conf.d %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/10-evdev.conf %dir %{_datadir}/X11/xorg.conf.d -%{_datadir}/X11/xorg.conf.d/10-evdev.conf +%{_datadir}/X11/xorg.conf.d/10-*.conf %endif %dir %{_localstatedir}/lib/X11 %endif From 80184ab41e21a65993d31ea2bfd626fd60719a99a67c2b4018c3ca616c306205 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 30 Nov 2013 03:07:54 +0000 Subject: [PATCH 2/6] - No longer specify download URL in Source0, always fails with 'osc service localrun download_files' anyway OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=475 --- xorg-x11-server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index df869a9..ffd3266 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -23,7 +23,7 @@ Name: xorg-x11-server Summary: X License: GPL-2.0+ and MIT Group: System/X11/Servers/XF86_4 -Source0: http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-%{dirsuffix}.tar.bz2 +Source0: xorg-server-%{dirsuffix}.tar.bz2 Source1: sysconfig.displaymanager.template Source3: README.updates Source4: xorgcfg.tar.bz2 From ccd92665264cfce4e38d3be4c6a44ccf9ae40947310ce83085d0687fd6f449d0 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 5 Dec 2013 12:19:01 +0000 Subject: [PATCH 3/6] - removed no longer applied n_Xvnc-pthread.diff from package OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=476 --- n_Xvnc-pthread.diff | 20 -------------------- xorg-x11-server.changes | 5 +++++ 2 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 n_Xvnc-pthread.diff diff --git a/n_Xvnc-pthread.diff b/n_Xvnc-pthread.diff deleted file mode 100644 index b76a6ef..0000000 --- a/n_Xvnc-pthread.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- xorg-server-1.10.4/hw/vnc/Makefile.am.orig 2011-09-06 15:25:27.000000000 +0000 -+++ xorg-server-1.10.4/hw/vnc/Makefile.am 2011-09-06 15:26:40.000000000 +0000 -@@ -37,6 +37,7 @@ - JPEG_LIBS = -ljpeg - CRYPT_LIBS = -lcrypt - Z_LIBS = -lz -+PTHREAD_LIBS = -lpthread - - AM_CFLAGS = $(DIX_CFLAGS) $(XVNC_CFLAGS) -I$(top_srcdir)/hw/dmx/vnc -DCHROMIUM=1 - -@@ -48,7 +49,8 @@ - $(CRYPT_LIBS) \ - $(XSERVER_SYS_LIBS) \ - $(VNCMODULES_LIBS) \ -- $(Z_LIBS) -+ $(Z_LIBS) \ -+ $(PTHREAD_LIBS) - - - relink: diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 3fde27c..299619b 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 5 12:18:30 UTC 2013 - sndirsch@suse.com + +- removed no longer applied n_Xvnc-pthread.diff from package + ------------------------------------------------------------------- Thu Nov 28 14:08:58 UTC 2013 - tobias.johannes.klausmann@mni.thm.de From 9df95a71897cbfc193588bf63b2b1cb634bd5b9e6cb42d823f746a9db5bc20b7 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 11 Dec 2013 14:33:07 +0000 Subject: [PATCH 4/6] Accepting request 210557 from home:tobijk:X11:XOrg update to 1.14.99.904 OBS-URL: https://build.opensuse.org/request/show/210557 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=477 --- ...driver-a-higher-precedence-than-vesa.patch | 59 ------------------- xorg-server-1.14.99.903.1.tar.bz2 | 3 - xorg-server-1.14.99.904.tar.bz2 | 3 + xorg-x11-server.changes | 7 +++ xorg-x11-server.spec | 5 +- 5 files changed, 11 insertions(+), 66 deletions(-) delete mode 100644 n_autoconf-On-Linux-give-fbdev-driver-a-higher-precedence-than-vesa.patch delete mode 100644 xorg-server-1.14.99.903.1.tar.bz2 create mode 100644 xorg-server-1.14.99.904.tar.bz2 diff --git a/n_autoconf-On-Linux-give-fbdev-driver-a-higher-precedence-than-vesa.patch b/n_autoconf-On-Linux-give-fbdev-driver-a-higher-precedence-than-vesa.patch deleted file mode 100644 index e0405c7..0000000 --- a/n_autoconf-On-Linux-give-fbdev-driver-a-higher-precedence-than-vesa.patch +++ /dev/null @@ -1,59 +0,0 @@ -From: Egbert Eich -Date: Thu Aug 8 21:43:44 2013 +0200 -Subject: [PATCH]autoconf: On Linux give fbdev driver a higher precedence than vesa -Patch-Mainline: never -Git-commit: ccda2310eedf55215de792cdd5a793e3bf58fed1 -Git-repo: -References: -Signed-off-by: Egbert Eich - -At SUSE we want to perfer the fbdev driver over the VESA driver -at autoconfiguration as it is expected that fbdev will work in -allmost all situations where no native driver can be found - -even under UEFI and with secure boot. - -Signed-off-by: Egbert Eich ---- - hw/xfree86/common/xf86AutoConfig.c | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c -index 2da792e..252fe37 100644 ---- a/hw/xfree86/common/xf86AutoConfig.c -+++ b/hw/xfree86/common/xf86AutoConfig.c -@@ -277,26 +277,26 @@ listPossibleVideoDrivers(char *matches[], int nmatches) - if (i < (nmatches - 1)) - i = xf86PciMatchDriver(matches, nmatches); - #endif -+ -+#if defined(__linux__) -+ matches[i++] = xnfstrdup("modesetting"); -+#endif - /* Fallback to platform default hardware */ - if (i < (nmatches - 1)) { --#if defined(__i386__) || defined(__amd64__) || defined(__hurd__) -- matches[i++] = xnfstrdup("vesa"); --#elif defined(__sparc__) && !defined(sun) -+#if defined(__sparc__) && !defined(sun) - matches[i++] = xnfstrdup("sunffb"); -+#else -+ matches[i++] = xnfstrdup("fbdev"); - #endif - } - --#if defined(__linux__) -- matches[i++] = xnfstrdup("modesetting"); --#endif -- - #if !defined(sun) - /* Fallback to platform default frame buffer driver */ - if (i < (nmatches - 1)) { - #if !defined(__linux__) && defined(__sparc__) - matches[i++] = xnfstrdup("wsfb"); --#else -- matches[i++] = xnfstrdup("fbdev"); -+#elif defined(__i386__) || defined(__amd64__) || defined(__hurd__) -+ matches[i++] = xnfstrdup("vesa"); - #endif - } - #endif /* !sun */ diff --git a/xorg-server-1.14.99.903.1.tar.bz2 b/xorg-server-1.14.99.903.1.tar.bz2 deleted file mode 100644 index 8223912..0000000 --- a/xorg-server-1.14.99.903.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64c780e8d2e61c0ba1877c3334c468c4e35f9d63bf9b307a62ff1288e2a46f21 -size 3631174 diff --git a/xorg-server-1.14.99.904.tar.bz2 b/xorg-server-1.14.99.904.tar.bz2 new file mode 100644 index 0000000..47f947a --- /dev/null +++ b/xorg-server-1.14.99.904.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0da88a48a7880891c007c1f941cc99fa1f97ced7605a7ccbe3ada3b24b2cf9c +size 3635056 diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 299619b..96fe1ae 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 11 00:35:57 UTC 2013 - tobias.johannes.klausmann@mni.thm.de + +- Update to version 1.14.99.904 (1.15 RC4) +- Drop superseded patches: + + Patch143: n_autoconf-On-Linux-give-fbdev-driver-a-higher-precedence-than-vesa.patch + ------------------------------------------------------------------- Thu Dec 5 12:18:30 UTC 2013 - sndirsch@suse.com diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index ffd3266..5f638d3 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -18,7 +18,7 @@ Name: xorg-x11-server -%define dirsuffix 1.14.99.903.1 +%define dirsuffix 1.14.99.904 Summary: X License: GPL-2.0+ and MIT @@ -131,8 +131,6 @@ Patch112: N_fix-dpi-values.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch127: N_dpms_screensaver.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch143: n_autoconf-On-Linux-give-fbdev-driver-a-higher-precedence-than-vesa.patch -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch145: N_driver-autoconfig.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch162: N_cache-xkbcomp-output-for-fast-start-up.patch @@ -224,7 +222,6 @@ cp %{SOURCE96} . %patch127 -p1 -%patch143 -p1 %patch145 -p0 ### disabled for now #%patch162 -p1 From 7286d857382b31ad1ab6f0913c81fcb2b719929684ef603f6b54a0c97cefcc3e Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Wed, 11 Dec 2013 15:46:05 +0000 Subject: [PATCH 5/6] - Dropped: * N_0001-Check-harder-for-primary-PCI-device.patch Whith libpciaccess code path irrelevant for Linux. * N_0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch Solved differently upstream * N_bug-197858_dpms.diff This one is upstream already - apparently nobody check this when it no longer applied... * N_bug534768-prefer_local_symbols.patch Upstream has a better suggestion how to solve this. However this patch is no longer needed * N_dpms_screensaver.diff This topic was solved slightly differently upstream - still patch got ported without checking it's context. * N_randr1_1-sig11.diff No longer needed. Problem was fixed differently upstream. * u_vgaHW-no-legacy.patch Problem solved in the nv driver. - Renamed: Those patches will go upstream, thus they are prefixed by a u_: * n__confine_to_shape.diff -> u_confine_to_shape.diff * N_fbdevhw.diff -> u_fbdevhw.diff * n_x86emu-include-order.patch -> u_x86emu-include-order.patch * N_xorg-server-xdmcp.patchA -> u_xorg-server-xdmcp.patch Those patches no longer apply but are kept for reference thus prefixed by b_: * N_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch -> b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch * N_cache-xkbcomp-output-for-fast-start-up.patch -> b_cache-xkbcomp-output-for-fast-start-up.patch * N_sync-fix.patch -> b_sync-fix.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=478 --- ...-Check-harder-for-primary-PCI-device.patch | 70 ------------------- ...en-killing-X-with-ctrl-alt-backspace.patch | 12 ---- N_bug-197858_dpms.diff | 70 ------------------- N_bug534768-prefer_local_symbols.patch | 13 ---- N_dpms_screensaver.diff | 14 ---- N_randr1_1-sig11.diff | 14 ---- ...arms-from-senslessly-calling-CheckTr.patch | 0 ...che-xkbcomp-output-for-fast-start-up.patch | 0 N_sync-fix.patch => b_sync-fix.patch | 0 ...e_to_shape.diff => u_confine_to_shape.diff | 0 N_fbdevhw.diff => u_fbdevhw.diff | 0 u_vgaHW-no-legacy.patch | 23 ------ ...rder.patch => u_x86emu-include-order.patch | 0 ...r-xdmcp.patch => u_xorg-server-xdmcp.patch | 0 ...randr.patch => ux_xserver_xvfb-randr.patch | 0 xorg-x11-server.changes | 39 +++++++++++ xorg-x11-server.spec | 38 +++------- 17 files changed, 47 insertions(+), 246 deletions(-) delete mode 100644 N_0001-Check-harder-for-primary-PCI-device.patch delete mode 100644 N_0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch delete mode 100644 N_bug-197858_dpms.diff delete mode 100644 N_bug534768-prefer_local_symbols.patch delete mode 100644 N_dpms_screensaver.diff delete mode 100644 N_randr1_1-sig11.diff rename N_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch => b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch (100%) rename N_cache-xkbcomp-output-for-fast-start-up.patch => b_cache-xkbcomp-output-for-fast-start-up.patch (100%) rename N_sync-fix.patch => b_sync-fix.patch (100%) rename N_confine_to_shape.diff => u_confine_to_shape.diff (100%) rename N_fbdevhw.diff => u_fbdevhw.diff (100%) delete mode 100644 u_vgaHW-no-legacy.patch rename N_x86emu-include-order.patch => u_x86emu-include-order.patch (100%) rename N_xorg-server-xdmcp.patch => u_xorg-server-xdmcp.patch (100%) rename u_xserver_xvfb-randr.patch => ux_xserver_xvfb-randr.patch (100%) diff --git a/N_0001-Check-harder-for-primary-PCI-device.patch b/N_0001-Check-harder-for-primary-PCI-device.patch deleted file mode 100644 index 4a19ee9..0000000 --- a/N_0001-Check-harder-for-primary-PCI-device.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 35540106538b24ca1765e752fe9d6efc968a88fa Mon Sep 17 00:00:00 2001 -From: Egbert Eich -Date: Wed, 7 Oct 2009 16:31:44 +0200 -Subject: [PATCH] Check harder for primary PCI device. - -Primary PCI devices are identified by checking for an 'PCIINFOCLASSES' -device which is VGA and has access to the memory bars enabled. -If there should be more than one device for which this is true -redo the check and also check if IO resoures are also enabled, -if this still doesn't turn up a unique result also check for -the presence of a BIOS rom. -================================================================================ -Index: xorg-server-1.12.1/hw/xfree86/common/xf86pciBus.c -=================================================================== ---- xorg-server-1.12.1.orig/hw/xfree86/common/xf86pciBus.c -+++ xorg-server-1.12.1/hw/xfree86/common/xf86pciBus.c -@@ -134,9 +134,50 @@ xf86PciProbe(void) - primaryBus.id.pci = info; - } - else { -- xf86Msg(X_NOTICE, -- "More than one possible primary device found\n"); -- primaryBus.type ^= (BusType) (-1); -+ /* -+ * Ok, we found more than one possible primary device with this heuristic -+ * Now also check if IO is enabled. -+ */ -+ int j; -+ -+ primaryBus.type = BUS_NONE; -+ for (j = 0; j < num; j++) { -+ info = xf86PciVideoInfo[j]; -+ pci_device_cfg_read_u16(info, & command, 4); -+ -+ if ((command & PCI_CMD_MEM_ENABLE) -+ && (command & PCI_CMD_IO_ENABLE) -+ && (IS_VGA(info->device_class))) { -+ if (primaryBus.type == BUS_NONE) { -+ primaryBus.type = BUS_PCI; -+ primaryBus.id.pci = info; -+ } else { -+ primaryBus.type = BUS_NONE; -+ for (j = 0; j < num; j++) { -+ info = xf86PciVideoInfo[j]; -+ pci_device_cfg_read_u16(info, & command, 4); -+ -+ if ((command & PCI_CMD_MEM_ENABLE) -+ && (command & PCI_CMD_IO_ENABLE) -+ && (IS_VGA(info->device_class)) -+ && info->rom_size) { -+ if (primaryBus.type == BUS_NONE) { -+ primaryBus.type = BUS_PCI; -+ primaryBus.id.pci = info; -+ } else { -+ xf86Msg(X_NOTICE, -+ "More than one possible primary device found\n"); -+ primaryBus.type ^= (BusType)(-1); -+ break; -+ } -+ } -+ } -+ break; -+ } -+ } -+ } -+ break; -+ - } - } - } diff --git a/N_0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch b/N_0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch deleted file mode 100644 index 8866d04..0000000 --- a/N_0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: xorg-server-1.12.1/mi/misprite.c -=================================================================== ---- xorg-server-1.12.1.orig/mi/misprite.c -+++ xorg-server-1.12.1/mi/misprite.c -@@ -378,6 +378,7 @@ miSpriteCloseScreen(int i, ScreenPtr pSc - pScreen->InstallColormap = pScreenPriv->InstallColormap; - pScreen->StoreColors = pScreenPriv->StoreColors; - -+ miSpriteDisableDamage(pScreen, pScreenPriv); - DamageDestroy(pScreenPriv->pDamage); - - free(pScreenPriv); diff --git a/N_bug-197858_dpms.diff b/N_bug-197858_dpms.diff deleted file mode 100644 index 8fd555a..0000000 --- a/N_bug-197858_dpms.diff +++ /dev/null @@ -1,70 +0,0 @@ -Index: hw/xfree86/common/xf86Events.c -=================================================================== ---- hw/xfree86/common/xf86Events.c.orig -+++ hw/xfree86/common/xf86Events.c -@@ -115,6 +115,7 @@ typedef struct x_IHRec { - InputHandlerProc ihproc; - pointer data; - Bool enabled; -+ Bool is_input; - struct x_IHRec *next; - } IHRec, *IHPtr; - -@@ -445,9 +446,13 @@ xf86VTSwitch(void) - * Keep the order: Disable Device > LeaveVT - * EnterVT > EnableDevice - */ -- for (ih = InputHandlers; ih; ih = ih->next) -+ for (ih = InputHandlers; ih; ih = ih->next) { -+ if (ih->is_input) - xf86DisableInputHandler(ih); -- for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next) { -+ else -+ xf86DisableGeneralHandler(ih); -+ } -+ for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next) { - if (pInfo->dev) { - xf86ReleaseKeys(pInfo->dev); - ProcessInputEvents(); -@@ -486,8 +491,12 @@ xf86VTSwitch(void) - EnableDevice(pInfo->dev, TRUE); - pInfo = pInfo->next; - } -- for (ih = InputHandlers; ih; ih = ih->next) -- xf86EnableInputHandler(ih); -+ for (ih = InputHandlers; ih; ih = ih->next) { -+ if (ih->is_input) -+ xf86EnableInputHandler(ih); -+ else -+ xf86EnableGeneralHandler(ih); -+ } - - xf86UnblockSIGIO(prevSIGIO); - -@@ -542,8 +551,12 @@ xf86VTSwitch(void) - pInfo = pInfo->next; - } - -- for (ih = InputHandlers; ih; ih = ih->next) -- xf86EnableInputHandler(ih); -+ for (ih = InputHandlers; ih; ih = ih->next) { -+ if (ih->is_input) -+ xf86EnableInputHandler(ih); -+ else -+ xf86EnableGeneralHandler(ih); -+ } - - xf86UnblockSIGIO(prevSIGIO); - } -@@ -579,8 +592,10 @@ xf86AddInputHandler(int fd, InputHandler - { - IHPtr ih = addInputHandler(fd, proc, data); - -- if (ih) -+ if (ih) { - AddEnabledDevice(fd); -+ ih->is_input = TRUE; -+ } - return ih; - } - diff --git a/N_bug534768-prefer_local_symbols.patch b/N_bug534768-prefer_local_symbols.patch deleted file mode 100644 index e9739e5..0000000 --- a/N_bug534768-prefer_local_symbols.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: xorg-server-1.12.1/hw/xfree86/loader/loader.c -=================================================================== ---- xorg-server-1.12.1.orig/hw/xfree86/loader/loader.c -+++ xorg-server-1.12.1/hw/xfree86/loader/loader.c -@@ -152,7 +152,7 @@ LoaderSymbol(const char *name) - return p; - - if (!global_scope) -- global_scope = dlopen(NULL, DLOPEN_LAZY | DLOPEN_GLOBAL); -+ global_scope = dlopen(NULL, DLOPEN_LAZY | DLOPEN_GLOBAL | RTLD_DEEPBIND); - - if (global_scope) - return dlsym(global_scope, name); diff --git a/N_dpms_screensaver.diff b/N_dpms_screensaver.diff deleted file mode 100644 index ddf2fc6..0000000 --- a/N_dpms_screensaver.diff +++ /dev/null @@ -1,14 +0,0 @@ -Index: xorg-server-1.12.1/hw/xfree86/common/xf86DPMS.c -=================================================================== ---- xorg-server-1.12.1.orig/hw/xfree86/common/xf86DPMS.c -+++ xorg-server-1.12.1/hw/xfree86/common/xf86DPMS.c -@@ -151,7 +151,8 @@ DPMSSet(ClientPtr client, int level) - rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverReset); - if (rc != Success) - return rc; -- } -+ } else -+ dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverReset); - - /* For each screen, set the DPMS level */ - for (i = 0; i < xf86NumScreens; i++) { diff --git a/N_randr1_1-sig11.diff b/N_randr1_1-sig11.diff deleted file mode 100644 index 58853be..0000000 --- a/N_randr1_1-sig11.diff +++ /dev/null @@ -1,14 +0,0 @@ -Index: xorg-server-1.12.1/hw/xfree86/common/xf86RandR.c -=================================================================== ---- xorg-server-1.12.1.orig/hw/xfree86/common/xf86RandR.c -+++ xorg-server-1.12.1/hw/xfree86/common/xf86RandR.c -@@ -237,6 +237,9 @@ xf86RandRSetConfig(ScreenPtr pScreen, - DeviceIntPtr dev; - Bool view_adjusted = FALSE; - -+ if (!scrp->vtSema) -+ return FALSE; -+ - for (dev = inputInfo.devices; dev; dev = dev->next) { - if (!IsMaster(dev) && !IsFloating(dev)) - continue; diff --git a/N_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch b/b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch similarity index 100% rename from N_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch rename to b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch diff --git a/N_cache-xkbcomp-output-for-fast-start-up.patch b/b_cache-xkbcomp-output-for-fast-start-up.patch similarity index 100% rename from N_cache-xkbcomp-output-for-fast-start-up.patch rename to b_cache-xkbcomp-output-for-fast-start-up.patch diff --git a/N_sync-fix.patch b/b_sync-fix.patch similarity index 100% rename from N_sync-fix.patch rename to b_sync-fix.patch diff --git a/N_confine_to_shape.diff b/u_confine_to_shape.diff similarity index 100% rename from N_confine_to_shape.diff rename to u_confine_to_shape.diff diff --git a/N_fbdevhw.diff b/u_fbdevhw.diff similarity index 100% rename from N_fbdevhw.diff rename to u_fbdevhw.diff diff --git a/u_vgaHW-no-legacy.patch b/u_vgaHW-no-legacy.patch deleted file mode 100644 index 7ac21f6..0000000 --- a/u_vgaHW-no-legacy.patch +++ /dev/null @@ -1,23 +0,0 @@ -Author: Andreas Schwab -Subject: disable DACDelay on non-vga-hardware users -Patch-Mainline: To be upstreamed -Signed-Off-By: Marcus Meissner - ---- hw/xfree86/vgahw/vgaHW.h -+++ hw/xfree86/vgahw/vgaHW.h -@@ -168,11 +168,15 @@ typedef struct _vgaHWRec { - #define BITS_PER_GUN 6 - #define COLORMAP_SIZE 256 - -+#if defined(__powerpc__) || defined(__arm__) || defined(__s390__) || defined(__nds32__) -+#define DACDelay(hw) /* No legacy VGA support */ -+#else - #define DACDelay(hw) \ - do { \ - (hw)->readST01((hw)); \ - (hw)->readST01((hw)); \ - } while (0) -+#endif - - /* Function Prototypes */ - diff --git a/N_x86emu-include-order.patch b/u_x86emu-include-order.patch similarity index 100% rename from N_x86emu-include-order.patch rename to u_x86emu-include-order.patch diff --git a/N_xorg-server-xdmcp.patch b/u_xorg-server-xdmcp.patch similarity index 100% rename from N_xorg-server-xdmcp.patch rename to u_xorg-server-xdmcp.patch diff --git a/u_xserver_xvfb-randr.patch b/ux_xserver_xvfb-randr.patch similarity index 100% rename from u_xserver_xvfb-randr.patch rename to ux_xserver_xvfb-randr.patch diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 96fe1ae..8b4fc1b 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Wed Dec 11 15:26:59 UTC 2013 - eich@suse.com + +- Dropped: + * N_0001-Check-harder-for-primary-PCI-device.patch + Whith libpciaccess code path irrelevant for Linux. + * N_0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch + Solved differently upstream + * N_bug-197858_dpms.diff + This one is upstream already - apparently nobody check this when + it no longer applied... + * N_bug534768-prefer_local_symbols.patch + Upstream has a better suggestion how to solve this. However this + patch is no longer needed + * N_dpms_screensaver.diff + This topic was solved slightly differently upstream - still patch + got ported without checking it's context. + * N_randr1_1-sig11.diff + No longer needed. Problem was fixed differently upstream. + * u_vgaHW-no-legacy.patch + Problem solved in the nv driver. +- Renamed: + Those patches will go upstream, thus they are prefixed by a u_: + * n__confine_to_shape.diff -> u_confine_to_shape.diff + * N_fbdevhw.diff -> u_fbdevhw.diff + * n_x86emu-include-order.patch -> u_x86emu-include-order.patch + * N_xorg-server-xdmcp.patchA -> u_xorg-server-xdmcp.patch + Those patches no longer apply but are kept for reference thus prefixed by b_: + * N_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch -> + b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch + * N_cache-xkbcomp-output-for-fast-start-up.patch -> + b_cache-xkbcomp-output-for-fast-start-up.patch + * N_sync-fix.patch -> b_sync-fix.patch + Those patches came from a foreign source but are not upstream, yet, thus + prefix ux_: + * u_xserver_xvfb-randr.patch -> ux_xserver_xvfb-randr.patch + + + ------------------------------------------------------------------- Wed Dec 11 00:35:57 UTC 2013 - tobias.johannes.klausmann@mni.thm.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 5f638d3..71378f1 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -117,42 +117,29 @@ Obsoletes: xorg-x11-server-glx Requires: xkeyboard-config # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch45: N_bug-197858_dpms.diff -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch77: N_fbdevhw.diff +Patch77: u_fbdevhw.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch101: N_zap_warning_xserver.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch103: N_confine_to_shape.diff -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch106: N_randr1_1-sig11.diff +Patch103: u_confine_to_shape.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch112: N_fix-dpi-values.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch127: N_dpms_screensaver.diff -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch145: N_driver-autoconfig.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch162: N_cache-xkbcomp-output-for-fast-start-up.patch -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch200: N_bug534768-prefer_local_symbols.patch -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch202: N_0001-Check-harder-for-primary-PCI-device.patch -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch203: N_0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch +Patch162: b_cache-xkbcomp-output-for-fast-start-up.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch206: N_fix_fglrx_screendepth_issue.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch211: N_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch +Patch211: b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch213: N_xorg-server-xdmcp.patch +Patch213: u_xorg-server-xdmcp.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch222: N_sync-fix.patch +Patch222: b_sync-fix.patch # PATCH-FIX-UPSTREAM N_x86emu-include-order.patch schwab@suse.de -- Change include order to avoid conflict with system header, remove duplicate definitions -Patch223: N_x86emu-include-order.patch +Patch223: u_x86emu-include-order.patch -Patch226: u_vgaHW-no-legacy.patch -Patch230: u_xserver_xvfb-randr.patch +Patch230: ux_xserver_xvfb-randr.patch Patch247: u_randr_allow_rrselectinput_for_providerchange_and_resourcechange_events.patch Patch248: N_randr_fix_abi.patch @@ -212,22 +199,14 @@ cp %{SOURCE96} . %patch0 -p1 %patch2 -### Needs to be rebased -#%patch45 -p0 %patch77 %patch101 -p1 %patch103 -%patch106 -p1 %patch112 -p0 -%patch127 -p1 - %patch145 -p0 ### disabled for now #%patch162 -p1 -%patch200 -p1 -%patch202 -p1 -%patch203 -p1 %patch206 -p0 ### disabled for now #%patch211 -p1 @@ -235,7 +214,6 @@ cp %{SOURCE96} . ### patch222 might not be applicable anymore #%patch222 -p1 %patch223 -p1 -%patch226 -p0 %patch230 -p1 %patch247 -p1 %patch248 -p1 From 34680956c91d2c25711b74e5ef73b5c87b6c04bb402dbaf272633eceeb53030a Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 12 Dec 2013 10:17:31 +0000 Subject: [PATCH 6/6] Accepting request 210585 from home:tobijk:X11:XOrg use the now released "official" snapshot and add more information to the changes entry OBS-URL: https://build.opensuse.org/request/show/210585 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=479 --- xorg-server-1.14.99.904.tar.bz2 | 4 ++-- xorg-x11-server.changes | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/xorg-server-1.14.99.904.tar.bz2 b/xorg-server-1.14.99.904.tar.bz2 index 47f947a..e115172 100644 --- a/xorg-server-1.14.99.904.tar.bz2 +++ b/xorg-server-1.14.99.904.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0da88a48a7880891c007c1f941cc99fa1f97ced7605a7ccbe3ada3b24b2cf9c -size 3635056 +oid sha256:cf95321abd0da52be45c7a01eeba4288d886121c1b19de10bf11f00702bbbbf9 +size 5550929 diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 8b4fc1b..dc4e53d 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -40,7 +40,9 @@ Wed Dec 11 15:26:59 UTC 2013 - eich@suse.com ------------------------------------------------------------------- Wed Dec 11 00:35:57 UTC 2013 - tobias.johannes.klausmann@mni.thm.de -- Update to version 1.14.99.904 (1.15 RC4) +- Update to version 1.14.99.904 (1.15 RC4): + Here's another RC this week. This includes fixes for the GLX regression + on OS X and Windows, and fixes for Xinerama and various extensions. - Drop superseded patches: + Patch143: n_autoconf-On-Linux-give-fbdev-driver-a-higher-precedence-than-vesa.patch