xorg-server: update to 1.17.2.
This commit is contained in:
parent
3e86481300
commit
22fe1ef770
|
@ -1,39 +0,0 @@
|
||||||
From 1f679da30a33f3ddad14bc6b2be0795160ae12b8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Adam Jackson <ajax@redhat.com>
|
|
||||||
Date: Thu, 9 Apr 2015 10:19:13 -0400
|
|
||||||
Subject: [PATCH] include: Fix endianness setup
|
|
||||||
|
|
||||||
Need to make sure X_{BIG,LITTLE}_ENDIAN actually get defined
|
|
||||||
|
|
||||||
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
|
||||||
---
|
|
||||||
include/dix-config.h.in | 1 +
|
|
||||||
include/xorg-server.h.in | 1 +
|
|
||||||
2 files changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
|
|
||||||
index 1aa77a5..5e53c00 100644
|
|
||||||
--- include/dix-config.h.in
|
|
||||||
+++ include/dix-config.h.in
|
|
||||||
@@ -499,6 +499,7 @@
|
|
||||||
|
|
||||||
/* byte order */
|
|
||||||
#undef X_BYTE_ORDER
|
|
||||||
+#include <X11/Xarch.h>
|
|
||||||
|
|
||||||
/* Listen on TCP socket */
|
|
||||||
#undef LISTEN_TCP
|
|
||||||
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
|
|
||||||
index 4cb9487..de6462a 100644
|
|
||||||
--- include/xorg-server.h.in
|
|
||||||
+++ include/xorg-server.h.in
|
|
||||||
@@ -233,5 +233,6 @@
|
|
||||||
|
|
||||||
/* byte order */
|
|
||||||
#undef X_BYTE_ORDER
|
|
||||||
+#include <X11/Xarch.h>
|
|
||||||
|
|
||||||
#endif /* _XORG_SERVER_H_ */
|
|
||||||
--
|
|
||||||
2.1.0
|
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
From 2f3267bc017a420854dc98aac1526fb8f11b1874 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Adam Jackson <ajax@redhat.com>
|
|
||||||
Date: Wed, 4 Mar 2015 12:44:39 -0500
|
|
||||||
Subject: [PATCH] int10: Fix mapping the interrupt vector
|
|
||||||
|
|
||||||
pci_device_map_legacy returns 0 on success, and an errno value on
|
|
||||||
failure. It works a lot better if we don't treat 0 as failure.
|
|
||||||
|
|
||||||
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
|
||||||
---
|
|
||||||
hw/xfree86/int10/generic.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
|
|
||||||
index 012d194..8d5c4da 100644
|
|
||||||
--- w/xfree86/int10/generic.c
|
|
||||||
+++ hw/xfree86/int10/generic.c
|
|
||||||
@@ -104,7 +104,7 @@ readIntVec(struct pci_device *dev, unsigned char *buf, int len)
|
|
||||||
{
|
|
||||||
void *map;
|
|
||||||
|
|
||||||
- if (!pci_device_map_legacy(dev, 0, len, 0, &map))
|
|
||||||
+ if (pci_device_map_legacy(dev, 0, len, 0, &map))
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
memcpy(buf, map, len);
|
|
||||||
--
|
|
||||||
1.9.3
|
|
||||||
|
|
|
@ -1,42 +0,0 @@
|
||||||
From 63e4f22d5fe3d4247cb48c969b5f7f2690665d78 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Adel Gadllah <adel.gadllah@gmail.com>
|
|
||||||
Date: Fri, 1 May 2015 17:21:12 +0200
|
|
||||||
Subject: [PATCH] modesetting: Fix software cursor fallback
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
The code in drmmode_set_cursor does not properly handle the case where
|
|
||||||
drmModeSetCursor2 returns any other error than EINVAL and silently fails to set
|
|
||||||
a cursor.
|
|
||||||
|
|
||||||
So only return when the drmModeSetCursor2 succeeds (i.e returns 0) and disable
|
|
||||||
the cursor2 usage on EINVAL.
|
|
||||||
|
|
||||||
References: https://bugzilla.redhat.com/show_bug.cgi?id=1205725
|
|
||||||
Signed-off-by: Adel Gadllah <adel.gadllah@gmail.com>
|
|
||||||
Reviewed-by: Michel Dänzer <michel@daenzer.net>
|
|
||||||
---
|
|
||||||
hw/xfree86/drivers/modesetting/drmmode_display.c | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
|
|
||||||
index 824500b..912abda 100644
|
|
||||||
--- hw/xfree86/drivers/modesetting/drmmode_display.c
|
|
||||||
+++ hw/xfree86/drivers/modesetting/drmmode_display.c
|
|
||||||
@@ -396,10 +396,10 @@ drmmode_set_cursor(xf86CrtcPtr crtc)
|
|
||||||
drmModeSetCursor2(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
|
|
||||||
handle, ms->cursor_width, ms->cursor_height,
|
|
||||||
cursor->bits->xhot, cursor->bits->yhot);
|
|
||||||
+ if (!ret)
|
|
||||||
+ return;
|
|
||||||
if (ret == -EINVAL)
|
|
||||||
use_set_cursor2 = FALSE;
|
|
||||||
- else
|
|
||||||
- return;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = drmModeSetCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, handle,
|
|
||||||
--
|
|
||||||
2.1.0
|
|
||||||
|
|
|
@ -1,34 +0,0 @@
|
||||||
From 6b617438442aee010ae69e1134b5a6f34cbdc9fd Mon Sep 17 00:00:00 2001
|
|
||||||
From: Dave Airlie <airlied@redhat.com>
|
|
||||||
Date: Tue, 17 Feb 2015 14:38:21 +1000
|
|
||||||
Subject: [PATCH] os/access: fix regression in server interpreted auth
|
|
||||||
|
|
||||||
This was reported on irc on Fedora when rawhide went to 1.17.1.
|
|
||||||
|
|
||||||
regression occured in: 2566835b4374edb3e5a8353d4f7c9e7ec4851c57
|
|
||||||
os: Eliminate uninitialized value warnings from access.c
|
|
||||||
|
|
||||||
siAddrMatch doesn't need addr to be a useful value, it checks
|
|
||||||
some things like localuser without having an address at all.
|
|
||||||
|
|
||||||
Signed-off-by: Dave Airlie <airlied@redhat.com>
|
|
||||||
---
|
|
||||||
os/access.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/os/access.c b/os/access.c
|
|
||||||
index 28f2d32..8fa028e 100644
|
|
||||||
--- os/access.c
|
|
||||||
+++ os/access.c
|
|
||||||
@@ -1392,7 +1392,7 @@ InvalidHost(register struct sockaddr *saddr, int len, ClientPtr client)
|
|
||||||
}
|
|
||||||
for (host = validhosts; host; host = host->next) {
|
|
||||||
if (host->family == FamilyServerInterpreted) {
|
|
||||||
- if (addr && siAddrMatch(family, addr, len, host, client)) {
|
|
||||||
+ if (siAddrMatch(family, addr, len, host, client)) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
--
|
|
||||||
1.9.3
|
|
||||||
|
|
|
@ -1,48 +0,0 @@
|
||||||
From df3b03e05b5c826584fc75466f404b53844edcf4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Chris Wilson <chris@chris-wilson.co.uk>
|
|
||||||
Date: Thu, 5 Feb 2015 14:11:40 -0500
|
|
||||||
Subject: [PATCH] present: Copy unflip contents back to the Screen Pixmap
|
|
||||||
|
|
||||||
As we unflip after the flip Window no longer passes the pixel ownership
|
|
||||||
test for the full Screen Pixmap, we can no longer utilize that Window to
|
|
||||||
copy the contents back to the backing pixmap. To first flip means that
|
|
||||||
the Window was originally backed by the Screen Pixmap and wholly covered
|
|
||||||
the Pixmap, thus we need to copy the last frame contents to the Screen
|
|
||||||
Pixmap when the flip chain is complete.
|
|
||||||
|
|
||||||
---
|
|
||||||
present/present.c | 8 ++++----
|
|
||||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/present/present.c b/present/present.c
|
|
||||||
index 8e4829e..a516575 100644
|
|
||||||
--- present/present.c
|
|
||||||
+++ present/present.c
|
|
||||||
@@ -377,20 +377,20 @@ present_set_tree_pixmap(WindowPtr window, PixmapPtr pixmap)
|
|
||||||
present_unflip(ScreenPtr screen)
|
|
||||||
{
|
|
||||||
present_screen_priv_ptr screen_priv = present_screen_priv(screen);
|
|
||||||
+ PixmapPtr pixmap = (*screen->GetScreenPixmap)(screen);
|
|
||||||
|
|
||||||
assert (!screen_priv->unflip_event_id);
|
|
||||||
assert (!screen_priv->flip_pending);
|
|
||||||
|
|
||||||
if (screen_priv->flip_window)
|
|
||||||
- present_set_tree_pixmap(screen_priv->flip_window,
|
|
||||||
- (*screen->GetScreenPixmap)(screen));
|
|
||||||
+ present_set_tree_pixmap(screen_priv->flip_window, pixmap);
|
|
||||||
|
|
||||||
- present_set_tree_pixmap(screen->root, (*screen->GetScreenPixmap)(screen));
|
|
||||||
+ present_set_tree_pixmap(screen->root, pixmap);
|
|
||||||
|
|
||||||
/* Update the screen pixmap with the current flip pixmap contents
|
|
||||||
*/
|
|
||||||
if (screen_priv->flip_pixmap && screen_priv->flip_window) {
|
|
||||||
- present_copy_region(&screen_priv->flip_window->drawable,
|
|
||||||
+ present_copy_region(&pixmap->drawable,
|
|
||||||
screen_priv->flip_pixmap,
|
|
||||||
NULL, 0, 0);
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.1.0
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template build file for 'xorg-server'.
|
# Template build file for 'xorg-server'.
|
||||||
pkgname=xorg-server
|
pkgname=xorg-server
|
||||||
version=1.17.1
|
version=1.17.2
|
||||||
revision=14
|
revision=1
|
||||||
build_pie=yes
|
build_pie=yes
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--enable-ipv6 --enable-record --enable-xorg
|
configure_args="--enable-ipv6 --enable-record --enable-xorg
|
||||||
|
@ -14,13 +14,13 @@ configure_args="--enable-ipv6 --enable-record --enable-xorg
|
||||||
--enable-kdrive --enable-kdrive-evdev --enable-kdrive-kbd
|
--enable-kdrive --enable-kdrive-evdev --enable-kdrive-kbd
|
||||||
--disable-linux-acpi --disable-linux-apm --enable-xwayland
|
--disable-linux-acpi --disable-linux-apm --enable-xwayland
|
||||||
--enable-suid-wrapper --with-shared-memory-dir=/dev/shm
|
--enable-suid-wrapper --with-shared-memory-dir=/dev/shm
|
||||||
$(vopt_enable systemd systemd-logind) $(vopt_with systemd systemd-daemon)"
|
--disable-systemd --without-systemd-daemon"
|
||||||
short_desc="The X11 server from X.org"
|
short_desc="The X11 server from X.org"
|
||||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||||
homepage="http://xorg.freedesktop.org"
|
homepage="http://xorg.freedesktop.org"
|
||||||
license="MIT/X11, BSD"
|
license="MIT/X11, BSD"
|
||||||
distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2"
|
distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2"
|
||||||
checksum=2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab
|
checksum=f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993
|
||||||
|
|
||||||
lib32disabled=yes
|
lib32disabled=yes
|
||||||
|
|
||||||
|
@ -40,9 +40,6 @@ depends="xkeyboard-config"
|
||||||
provides="xserver-abi-extension-9_1 xserver-abi-input-21_1 xserver-abi-video-19_1 xf86-video-modesetting-1_1"
|
provides="xserver-abi-extension-9_1 xserver-abi-input-21_1 xserver-abi-video-19_1 xf86-video-modesetting-1_1"
|
||||||
replaces="xf86-video-modesetting>=0"
|
replaces="xf86-video-modesetting>=0"
|
||||||
|
|
||||||
# Package build options
|
|
||||||
build_options="systemd"
|
|
||||||
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
i686*|x86_64*)
|
i686*|x86_64*)
|
||||||
# Enable glamor/dri/opengl by default on x86.
|
# Enable glamor/dri/opengl by default on x86.
|
||||||
|
|
Loading…
Reference in New Issue