Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2016-01-13 22:43:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-server" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes 2016-01-12 16:12:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new/xorg-x11-server.changes 2016-01-13 22:43:03.000000000 +0100 @@ -1,0 +2,14 @@ +Tue Jan 12 13:19:06 UTC 2016 - [email protected] + +- U_modesetting-should-not-reference-gbm-when-it-s-not-d.patch: fix + build when gbm is not defined. + +------------------------------------------------------------------- +Mon Jan 11 21:48:00 UTC 2016 - [email protected] + +- u_busfault_sigaction-Only-initialize-pointer-when-matched.patch + Only initialize pointer when matched (boo#961439). +- u_kdrive-UnregisterFd-Fix-off-by-one.patch -> + U_kdrive-UnregisterFd-Fix-off-by-one.patch + +------------------------------------------------------------------- Old: ---- u_kdrive-UnregisterFd-Fix-off-by-one.patch New: ---- U_kdrive-UnregisterFd-Fix-off-by-one.patch U_modesetting-should-not-reference-gbm-when-it-s-not-d.patch u_busfault_sigaction-Only-initialize-pointer-when-matched.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.6LYzDo/_old 2016-01-13 22:43:04.000000000 +0100 +++ /var/tmp/diff_new_pack.6LYzDo/_new 2016-01-13 22:43:04.000000000 +0100 @@ -181,7 +181,9 @@ Patch160: u_vesa-Add-VBEDPMSGetCapabilities-VBEDPMSGet.patch Patch204: U_systemd-logind-do-not-rely-on-directed-signals.patch -Patch205: u_kdrive-UnregisterFd-Fix-off-by-one.patch +Patch205: U_kdrive-UnregisterFd-Fix-off-by-one.patch +Patch206: u_busfault_sigaction-Only-initialize-pointer-when-matched.patch +Patch207: U_modesetting-should-not-reference-gbm-when-it-s-not-d.patch Patch1000: n_xserver-optimus-autoconfig-hack.patch @@ -288,6 +290,8 @@ %patch204 -p1 %patch205 -p1 +%patch206 -p1 +%patch207 -p1 %patch1000 -p1 ++++++ U_kdrive-UnregisterFd-Fix-off-by-one.patch ++++++ From: Egbert Eich <[email protected]> Date: Tue Nov 24 16:10:08 2015 +0100 Subject: [PATCH]kdrive/UnregisterFd: Fix off by one Patch-mainline: to be upstreamed References: boo#867483 Signed-off-by: Egbert Eich <[email protected]> The number of FDs has been decremented already, therefore this number contains the index of the top one that is to me moved down. Signed-off-by: Egbert Eich <[email protected]> --- hw/kdrive/src/kinput.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index a539ca5..d28bbe0 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -221,7 +221,7 @@ KdUnregisterFd(void *closure, int fd, Bool do_close) if (do_close) close(kdInputFds[i].fd); kdNumInputFds--; - for (j = i; j < (kdNumInputFds - 1); j++) + for (j = i; j < kdNumInputFds; j++) kdInputFds[j] = kdInputFds[j + 1]; break; } ++++++ U_modesetting-should-not-reference-gbm-when-it-s-not-d.patch ++++++ >From fe8562f5316d8c74ca074ad145295c65ddff5fc2 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith <[email protected]> Date: Fri, 1 Jan 2016 18:10:08 -0800 Subject: [PATCH] modesetting should not reference gbm when it's not defined Fixes build errors of: present.c: In function 'ms_do_pageflip': present.c:410:17: error: 'drmmode_bo' has no member named 'gbm' new_front_bo.gbm = glamor_gbm_bo_from_pixmap(screen, new_front); ^ present.c:412:22: error: 'drmmode_bo' has no member named 'gbm' if (!new_front_bo.gbm) { ^ present.c: In function 'ms_present_check_flip': present.c:536:36: error: 'drmmode_bo' has no member named 'gbm' if (drmmode_crtc->rotate_bo.gbm) ^ Introduced by commit 13c7d53d Reviewed-by: Adam Jackson <[email protected]> Signed-off-by: Alan Coopersmith <[email protected]> --- hw/xfree86/drivers/modesetting/present.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/xfree86/drivers/modesetting/present.c b/hw/xfree86/drivers/modesetting/present.c index bb2976b..d65c8c8 100644 --- a/hw/xfree86/drivers/modesetting/present.c +++ b/hw/xfree86/drivers/modesetting/present.c @@ -398,6 +398,9 @@ ms_do_pageflip(ScreenPtr screen, int ref_crtc_vblank_pipe, Bool async) { +#ifndef GLAMOR_HAS_GBM + return FALSE; +#else ScrnInfoPtr scrn = xf86ScreenToScrn(screen); modesettingPtr ms = modesettingPTR(scrn); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); @@ -505,6 +508,7 @@ error_out: flipdata->flip_count--; return FALSE; +#endif /* GLAMOR_HAS_GBM */ } /* @@ -533,8 +537,10 @@ ms_present_check_flip(RRCrtcPtr crtc, drmmode_crtc_private_ptr drmmode_crtc = config->crtc[i]->driver_private; /* Don't do pageflipping if CRTCs are rotated. */ +#ifdef GLAMOR_HAS_GBM if (drmmode_crtc->rotate_bo.gbm) return FALSE; +#endif if (ms_crtc_on(config->crtc[i])) num_crtcs_on++; -- 2.6.2 ++++++ u_busfault_sigaction-Only-initialize-pointer-when-matched.patch ++++++ From: Egbert Eich <[email protected]> Date: Mon Jan 11 21:48:15 2016 +0100 Subject: [PATCH]busfault_sigaction: Only initialize pointer when matched Patch-mainline: to be upstreamed References: boo#961439 Signed-off-by: Egbert Eich <[email protected]> When looping over the registered map ranges, don't use the variable holding the final result as loop variable - It would always be initialized, on an empty list or when we run past the end of the list when no entry was found. Signed-off-by: Egbert Eich <[email protected]> --- os/busfault.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/os/busfault.c b/os/busfault.c index d4afa6d..53f02e6 100644 --- a/os/busfault.c +++ b/os/busfault.c @@ -98,13 +98,15 @@ static void busfault_sigaction(int sig, siginfo_t *info, void *param) { void *fault = info->si_addr; - struct busfault *busfault = NULL; + struct busfault *tmp, *busfault = NULL; void *new_addr; /* Locate the faulting address in our list of shared segments */ - xorg_list_for_each_entry(busfault, &busfaults, list) { - if ((char *) busfault->addr <= (char *) fault && (char *) fault < (char *) busfault->addr + busfault->size) { + xorg_list_for_each_entry(tmp, &busfaults, list) { + if ((char *) tmp->addr <= (char *) fault && + (char *) fault < (char *) tmp->addr + tmp->size) { + busfault = tmp; break; } }
