xorg-server: Changes to 'ubuntu'
ChangeLog | 2626 ++++++++++
Xext/xace.c | 15
Xext/xace.h | 3
Xext/xselinux_hooks.c | 8
Xi/exevents.c | 12
configure.ac | 13
debian/changelog | 74
debian/control | 37
debian/patches/02_kbsd-input-devd.diff | 14
debian/patches/03_static-nettle.diff | 2
debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch | 20
debian/patches/191-Xorg-add-an-extra-module-path.patch | 32
debian/patches/228_autobind_gpu.patch | 10
debian/patches/disable-rotation-transform-gpuscreens.patch | 4
debian/patches/drm_device_keep_trying.patch | 12
debian/patches/fix-detach-gpu.patch | 28
debian/patches/glamor-make-current-in-prepare-paths.diff | 32
debian/patches/linux-Do-not-call-FatalError-from-xf86CloseConsole.patch | 80
debian/patches/no-nv.patch | 4
debian/patches/series | 3
debian/patches/xext-fix-udeb-build.diff | 37
debian/patches/xf86-ignore-conflicting-rr-caps.patch | 8
debian/patches/xmir.patch | 80
debian/po/POTFILES.in | 1
debian/po/ar.po | 62
debian/po/ast.po | 64
debian/po/be.po | 58
debian/po/bg.po | 80
debian/po/bn.po | 60
debian/po/bs.po | 70
debian/po/ca.po | 79
debian/po/cs.po | 79
debian/po/da.po | 98
debian/po/de.po | 78
debian/po/dz.po | 73
debian/po/el.po | 84
debian/po/eo.po | 61
debian/po/es.po | 88
debian/po/eu.po | 82
debian/po/fi.po | 62
debian/po/fr.po | 87
debian/po/gl.po | 68
debian/po/gu.po | 59
debian/po/he.po | 61
debian/po/hr.po | 56
debian/po/hu.po | 56
debian/po/id.po | 74
debian/po/it.po | 85
debian/po/ja.po | 81
debian/po/kk.po | 55
debian/po/km.po | 70
debian/po/ko.po | 58
debian/po/ku.po | 56
debian/po/lt.po | 71
debian/po/ml.po | 70
debian/po/mr.po | 60
debian/po/nb.po | 63
debian/po/ne.po | 63
debian/po/nl.po | 82
debian/po/nn.po | 70
debian/po/pl.po | 66
debian/po/pothead.in | 30
debian/po/pt.po | 67
debian/po/pt_BR.po | 85
debian/po/ro.po | 84
debian/po/ru.po | 87
debian/po/sk.po | 65
debian/po/sq.po | 66
debian/po/sr.po | 60
debian/po/sr@latin.po | 61
debian/po/sv.po | 88
debian/po/ta.po | 70
debian/po/templates.pot | 53
debian/po/th.po | 59
debian/po/tr.po | 83
debian/po/vi.po | 62
debian/po/wo.po | 61
debian/po/zh_CN.po | 81
debian/po/zh_TW.po | 74
debian/rules | 21
debian/xserver-xorg-core.NEWS | 17
debian/xserver-xorg-core.install | 2
debian/xserver-xorg-legacy.config | 87
debian/xserver-xorg-legacy.install | 3
debian/xserver-xorg-legacy.postinst | 77
debian/xserver-xorg-legacy.postrm | 36
debian/xserver-xorg-legacy.templates | 22
dev/null |binary
dix/Xserver.d | 5
dix/dispatch.c | 5
dix/dixfonts.c | 21
dix/events.c | 8
dix/getevents.c | 7
dix/main.c | 1
dix/privates.c | 9
dix/protocol.txt | 299 -
dix/resource.c | 5
exa/exa_render.c | 2
fb/fb.h | 5
fb/fbpict.c | 13
glamor/glamor.c | 27
glamor/glamor_font.c | 37
glamor/glamor_image.c | 4
glamor/glamor_prepare.c | 2
glx/createcontext.c | 15
glx/extension_string.c | 1
glx/extension_string.h | 3
glx/glxcmds.c | 22
glx/glxcontext.h | 5
glx/glxdri2.c | 7
glx/glxdriswrast.c | 44
hw/dmx/config/dmxparse.h | 3
hw/dmx/config/dmxprint.c | 20
hw/dmx/dmx.c | 1
hw/dmx/dmxcb.c | 3
hw/dmx/dmxfont.h | 2
hw/dmx/dmxgc.c | 4
hw/dmx/dmxgc.h | 4
hw/dmx/dmxinit.c | 42
hw/dmx/dmxpict.c | 1
hw/dmx/dmxprop.c | 6
hw/dmx/dmxscrinit.c | 1
hw/dmx/dmxwindow.c | 4
hw/dmx/glxProxy/compsize.h | 7
hw/dmx/glxProxy/g_disptab.h | 21
hw/dmx/glxProxy/glxcmds.c | 7
hw/dmx/glxProxy/glxcmds.h | 6
hw/dmx/glxProxy/glxcmdsswap.c | 4
hw/dmx/glxProxy/glxext.h | 1
hw/dmx/glxProxy/glxscreens.c | 6
hw/dmx/glxProxy/glxscreens.h | 2
hw/dmx/glxProxy/glxserver.h | 8
hw/dmx/glxProxy/glxsingle.c | 6
hw/dmx/glxProxy/glxsingle.h | 4
hw/dmx/glxProxy/glxswap.c | 4
hw/dmx/glxProxy/glxvendor.c | 6
hw/dmx/input/dmxinputinit.c | 10
hw/kdrive/ephyr/hostx.c | 10
hw/xfree86/dri2/dri2ext.c | 14
hw/xfree86/man/Xorg.man | 2
hw/xfree86/modes/xf86EdidModes.c | 2
hw/xfree86/modes/xf86RandR12.c | 13
hw/xfree86/os-support/linux/lnx_init.c | 22
hw/xfree86/os-support/shared/sigio.c | 2
hw/xfree86/os-support/xf86_OSlib.h | 4
hw/xfree86/x86emu/debug.c | 6
hw/xfree86/xorg-wrapper.c | 14
hw/xquartz/GL/indirect.c | 37
hw/xquartz/X11Application.m | 27
hw/xquartz/X11Controller.m | 13
hw/xquartz/bundle/Info.plist.cpp | 13
hw/xquartz/bundle/Makefile.am | 30
hw/xquartz/bundle/mk_bundke.sh | 2
hw/xquartz/darwinEvents.c | 11
hw/xquartz/quartzKeyboard.c | 2
hw/xwayland/xwayland-input.c | 2
hw/xwayland/xwayland-output.c | 2
include/Makefile.am | 1
include/probes.h | 41
man/Xserver.man | 11
mi/miarc.c | 2
mi/mieq.c | 2
mi/miexpose.c | 13
mi/miwideline.c | 2
miext/rootless/rootlessCommon.h | 22
miext/rootless/rootlessGC.c | 2
miext/rootless/rootlessValTree.c | 2
os/connection.c | 12
os/utils.c | 50
os/xdmauth.c | 4
os/xdmcp.c | 33
present/present.c | 16
randr/rrcrtc.c | 67
randr/rrdispatch.c | 4
randr/rrtransform.c | 2
render/picture.c | 13
render/render.c | 15
177 files changed, 7597 insertions(+), 920 deletions(-)
New commits:
commit 6e1fff18ebea9f0a775579a77e994d7fbeaef36a
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Oct 28 15:22:25 2015 +0200
refresh patches
diff --git a/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch b/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
index cd6b956..7544e3d 100644
--- a/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
+++ b/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
@@ -4,10 +4,8 @@ Description: Causes the X Keyboard Compiler (xkbcomp) to create a cache file of
Author: Bryce Harrington <bryce@ubuntu.com>
Last-Update: 2013-09-19
-Index: xorg-server-1.17.2/configure.ac
-===================================================================
---- xorg-server-1.17.2.orig/configure.ac
-+++ xorg-server-1.17.2/configure.ac
+--- a/configure.ac
++++ b/configure.ac
@@ -501,9 +501,9 @@ AC_MSG_RESULT([$FONTPATH])
AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]),
[ XKBPATH="$withval" ],
@@ -20,7 +18,7 @@ Index: xorg-server-1.17.2/configure.ac
AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES],
[Keyboard ruleset (default: base/evdev)]),
[ XKB_DFLT_RULES="$withval" ],
-@@ -1449,7 +1449,7 @@ AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKB_BIN
+@@ -1452,7 +1452,7 @@ AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKB_BIN
dnl Make sure XKM_OUTPUT_DIR is an absolute path
XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then
@@ -29,10 +27,8 @@ Index: xorg-server-1.17.2/configure.ac
fi
dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
-Index: xorg-server-1.17.2/xkb/README.compiled
-===================================================================
---- xorg-server-1.17.2.orig/xkb/README.compiled
-+++ xorg-server-1.17.2/xkb/README.compiled
+--- a/xkb/README.compiled
++++ b/xkb/README.compiled
@@ -4,10 +4,10 @@ current keymap and/or any scratch keymap
or some other tool might destroy or replace the files in this directory,
so it is not a safe place to store compiled keymaps for long periods of
@@ -48,10 +44,8 @@ Index: xorg-server-1.17.2/xkb/README.compiled
Unless the X server is modified, sharing this directory between servers on
different hosts could cause problems.
-Index: xorg-server-1.17.2/xkb/ddxLoad.c
-===================================================================
---- xorg-server-1.17.2.orig/xkb/ddxLoad.c
-+++ xorg-server-1.17.2/xkb/ddxLoad.c
+--- a/xkb/ddxLoad.c
++++ b/xkb/ddxLoad.c
@@ -30,6 +30,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <xkb-config.h>
diff --git a/debian/patches/191-Xorg-add-an-extra-module-path.patch b/debian/patches/191-Xorg-add-an-extra-module-path.patch
index 22b3afb..f42972b 100644
--- a/debian/patches/191-Xorg-add-an-extra-module-path.patch
+++ b/debian/patches/191-Xorg-add-an-extra-module-path.patch
@@ -1,9 +1,7 @@
Description: Patch from Mandriva to allow the use of an extra-modules-dir so that the modules installed in this dir will override the ones in the default directory.
-Index: xorg-server-1.17.2/configure.ac
-===================================================================
---- xorg-server-1.17.2.orig/configure.ac
-+++ xorg-server-1.17.2/configure.ac
+--- a/configure.ac
++++ b/configure.ac
@@ -446,6 +446,10 @@ AC_ARG_WITH(module-dir, AS_HELP_STR
[Directory where modules are installed (default: $libdir/xorg/modules)]),
[ moduledir="$withval" ],
@@ -15,7 +13,7 @@ Index: xorg-server-1.17.2/configure.ac
AC_ARG_WITH(log-dir, AS_HELP_STRING([--with-log-dir=DIR],
[Directory where log files are kept (default: $localstatedir/log)]),
[ logdir="$withval" ],
-@@ -2083,6 +2087,7 @@ if test "x$XORG" = xyes; then
+@@ -2086,6 +2090,7 @@ if test "x$XORG" = xyes; then
AC_DEFINE_DIR(XF86CONFIGFILE, XF86CONFIGFILE, [Name of configuration file])
AC_DEFINE_DIR(__XCONFIGDIR__, XF86CONFIGDIR, [Name of configuration directory])
AC_DEFINE_DIR(DEFAULT_MODULE_PATH, moduledir, [Default module search path])
@@ -23,10 +21,8 @@ Index: xorg-server-1.17.2/configure.ac
AC_DEFINE_DIR(DEFAULT_LIBRARY_PATH, libdir, [Default library install path])
AC_DEFINE_DIR(DEFAULT_LOGDIR, logdir, [Default log location])
AC_DEFINE_DIR(DEFAULT_LOGPREFIX, LOGPREFIX, [Default logfile prefix])
-Index: xorg-server-1.17.2/hw/xfree86/common/xf86Config.c
-===================================================================
---- xorg-server-1.17.2.orig/hw/xfree86/common/xf86Config.c
-+++ xorg-server-1.17.2/hw/xfree86/common/xf86Config.c
+--- a/hw/xfree86/common/xf86Config.c
++++ b/hw/xfree86/common/xf86Config.c
@@ -635,11 +635,22 @@ configFiles(XF86ConfFilesPtr fileconf)
/* ModulePath */
@@ -52,10 +48,8 @@ Index: xorg-server-1.17.2/hw/xfree86/common/xf86Config.c
}
xf86Msg(xf86ModPathFrom, "ModulePath set to \"%s\"\n", xf86ModulePath);
-Index: xorg-server-1.17.2/hw/xfree86/common/xf86Globals.c
-===================================================================
---- xorg-server-1.17.2.orig/hw/xfree86/common/xf86Globals.c
-+++ xorg-server-1.17.2/hw/xfree86/common/xf86Globals.c
+--- a/hw/xfree86/common/xf86Globals.c
++++ b/hw/xfree86/common/xf86Globals.c
@@ -142,6 +142,7 @@ xf86InfoRec xf86Info = {
const char *xf86ConfigFile = NULL;
const char *xf86ConfigDir = NULL;
@@ -64,10 +58,8 @@ Index: xorg-server-1.17.2/hw/xfree86/common/xf86Globals.c
MessageType xf86ModPathFrom = X_DEFAULT;
const char *xf86LogFile = DEFAULT_LOGDIR "/" DEFAULT_LOGPREFIX;
MessageType xf86LogFileFrom = X_DEFAULT;
-Index: xorg-server-1.17.2/hw/xfree86/common/xf86Priv.h
-===================================================================
---- xorg-server-1.17.2.orig/hw/xfree86/common/xf86Priv.h
-+++ xorg-server-1.17.2/hw/xfree86/common/xf86Priv.h
+--- a/hw/xfree86/common/xf86Priv.h
++++ b/hw/xfree86/common/xf86Priv.h
@@ -77,6 +77,7 @@ extern _X_EXPORT const char *xf86ServerN
extern _X_EXPORT xf86InfoRec xf86Info;
@@ -76,10 +68,8 @@ Index: xorg-server-1.17.2/hw/xfree86/common/xf86Priv.h
extern _X_EXPORT MessageType xf86ModPathFrom;
extern _X_EXPORT const char *xf86LogFile;
extern _X_EXPORT MessageType xf86LogFileFrom;
-Index: xorg-server-1.17.2/include/xorg-config.h.in
-===================================================================
---- xorg-server-1.17.2.orig/include/xorg-config.h.in
-+++ xorg-server-1.17.2/include/xorg-config.h.in
+--- a/include/xorg-config.h.in
++++ b/include/xorg-config.h.in
@@ -42,6 +42,9 @@
/* Path to loadable modules. */
#undef DEFAULT_MODULE_PATH
diff --git a/debian/patches/228_autobind_gpu.patch b/debian/patches/228_autobind_gpu.patch
index 6e92d36..f714ea4 100644
--- a/debian/patches/228_autobind_gpu.patch
+++ b/debian/patches/228_autobind_gpu.patch
@@ -17,7 +17,7 @@ DO NOT UPSTREAM.
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
-@@ -363,6 +363,16 @@
+@@ -340,6 +340,16 @@ xf86CreateRootWindow(WindowPtr pWin)
return ret;
}
@@ -34,7 +34,7 @@ DO NOT UPSTREAM.
static void
InstallSignalHandlers(void)
{
-@@ -973,6 +983,8 @@
+@@ -950,6 +960,8 @@ InitOutput(ScreenInfo * pScreenInfo, int
for (i = 0; i < xf86NumGPUScreens; i++)
AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
@@ -45,7 +45,7 @@ DO NOT UPSTREAM.
OsReleaseSIGIO();
--- a/hw/xfree86/common/xf86platformBus.c
+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -497,9 +497,12 @@
+@@ -466,9 +466,12 @@ xf86platformProbeDev(DriverPtr drvp)
}
}
@@ -58,7 +58,7 @@ DO NOT UPSTREAM.
int
xf86platformAddDevice(int index)
{
-@@ -568,6 +571,7 @@
+@@ -537,6 +540,7 @@ xf86platformAddDevice(int index)
}
/* attach unbound to 0 protocol screen */
AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
@@ -68,7 +68,7 @@ DO NOT UPSTREAM.
RRTellChanged(xf86Screens[0]->pScreen);
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -3387,3 +3387,35 @@
+@@ -3387,3 +3387,35 @@ xf86DetachAllCrtc(ScrnInfoPtr scrn)
crtc->x = crtc->y = 0;
}
}
diff --git a/debian/patches/disable-rotation-transform-gpuscreens.patch b/debian/patches/disable-rotation-transform-gpuscreens.patch
index 6fd829c..e62a133 100644
--- a/debian/patches/disable-rotation-transform-gpuscreens.patch
+++ b/debian/patches/disable-rotation-transform-gpuscreens.patch
@@ -6,7 +6,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/1489696
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
-@@ -927,6 +927,9 @@ xf86RandR12SetRotations(ScreenPtr pScree
+@@ -922,6 +922,9 @@ xf86RandR12SetRotations(ScreenPtr pScree
if (xf86RandR12Key == NULL)
return;
@@ -16,7 +16,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/1489696
randrp = XF86RANDRINFO(pScreen);
#if RANDR_12_INTERFACE
for (c = 0; c < config->num_crtc; c++) {
-@@ -947,6 +950,9 @@ xf86RandR12SetTransformSupport(ScreenPtr
+@@ -942,6 +945,9 @@ xf86RandR12SetTransformSupport(ScreenPtr
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
#endif
diff --git a/debian/patches/drm_device_keep_trying.patch b/debian/patches/drm_device_keep_trying.patch
index c093525..59bb1cf 100644
--- a/debian/patches/drm_device_keep_trying.patch
+++ b/debian/patches/drm_device_keep_trying.patch
@@ -21,7 +21,7 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
--- a/config/udev.c
+++ b/config/udev.c
-@@ -116,7 +116,7 @@
+@@ -126,7 +126,7 @@ device_added(struct udev_device *udev_de
if (xf86_find_platform_device_by_devnum(major(devnum), minor(devnum)))
return;
@@ -30,7 +30,7 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
config_udev_odev_setup_attribs(path, syspath, major(devnum),
minor(devnum), NewGPUDeviceRequest);
-@@ -456,18 +456,54 @@
+@@ -465,18 +465,54 @@ config_udev_fini(void)
#ifdef CONFIG_UDEV_KMS
@@ -99,7 +99,7 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
Bool paused, server_fd = FALSE;
major = attribs->major;
-@@ -51,18 +48,6 @@
+@@ -51,18 +48,6 @@ get_drm_info(struct OdevAttributes *attr
if (fd == -1)
return FALSE;
@@ -118,7 +118,7 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
/* for a delayed probe we've already added the device */
if (delayed_index == -1) {
xf86_add_platform_device(attribs, FALSE);
-@@ -72,10 +57,6 @@
+@@ -72,10 +57,6 @@ get_drm_info(struct OdevAttributes *attr
if (server_fd)
xf86_platform_devices[delayed_index].flags |= XF86_PDEV_SERVER_FD;
@@ -129,7 +129,7 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
v = drmGetVersion(fd);
if (!v) {
xf86Msg(X_ERROR, "%s: failed to query DRM version\n", path);
-@@ -88,7 +69,7 @@
+@@ -88,7 +69,7 @@ get_drm_info(struct OdevAttributes *attr
out:
if (!server_fd)
close(fd);
@@ -138,7 +138,7 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
}
Bool
-@@ -158,8 +139,11 @@
+@@ -158,8 +139,11 @@ xf86PlatformDeviceProbe(struct OdevAttri
break;
}
diff --git a/debian/patches/fix-detach-gpu.patch b/debian/patches/fix-detach-gpu.patch
index 17ec89b..7e1149b 100644
--- a/debian/patches/fix-detach-gpu.patch
+++ b/debian/patches/fix-detach-gpu.patch
@@ -2,11 +2,9 @@ Description: Fix crash in RRCrtcDetachScanoutPixmap.
Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Bug-Ubuntu: https://launchpad.net/bugs/1280743
-Index: xorg-server-1.17.2/hw/xfree86/modes/xf86RandR12.c
-===================================================================
---- xorg-server-1.17.2.orig/hw/xfree86/modes/xf86RandR12.c
-+++ xorg-server-1.17.2/hw/xfree86/modes/xf86RandR12.c
-@@ -1786,7 +1786,8 @@ xf86RandR14ProviderSetOutputSource(Scree
+--- a/hw/xfree86/modes/xf86RandR12.c
++++ b/hw/xfree86/modes/xf86RandR12.c
+@@ -1781,7 +1781,8 @@ xf86RandR14ProviderSetOutputSource(Scree
ScreenPtr cmScreen = pScreen->current_master;
xf86DetachOutputGPU(pScreen);
@@ -16,7 +14,7 @@ Index: xorg-server-1.17.2/hw/xfree86/modes/xf86RandR12.c
}
provider->output_source = NULL;
return TRUE;
-@@ -1797,7 +1798,8 @@ xf86RandR14ProviderSetOutputSource(Scree
+@@ -1792,7 +1793,8 @@ xf86RandR14ProviderSetOutputSource(Scree
SetRootClip(source_provider->pScreen, FALSE);
@@ -26,7 +24,7 @@ Index: xorg-server-1.17.2/hw/xfree86/modes/xf86RandR12.c
AttachOutputGPU(source_provider->pScreen, pScreen);
provider->output_source = source_provider;
-@@ -1814,7 +1816,8 @@ xf86RandR14ProviderSetOffloadSink(Screen
+@@ -1809,7 +1811,8 @@ xf86RandR14ProviderSetOffloadSink(Screen
if (provider->offload_sink) {
ScreenPtr cmScreen = pScreen->current_master;
xf86DetachOutputGPU(pScreen);
@@ -36,7 +34,7 @@ Index: xorg-server-1.17.2/hw/xfree86/modes/xf86RandR12.c
}
provider->offload_sink = NULL;
-@@ -1824,7 +1827,8 @@ xf86RandR14ProviderSetOffloadSink(Screen
+@@ -1819,7 +1822,8 @@ xf86RandR14ProviderSetOffloadSink(Screen
if (provider->offload_sink == sink_provider)
return TRUE;
@@ -46,7 +44,7 @@ Index: xorg-server-1.17.2/hw/xfree86/modes/xf86RandR12.c
AttachOffloadGPU(sink_provider->pScreen, pScreen);
provider->offload_sink = sink_provider;
-@@ -1903,12 +1907,14 @@ xf86RandR14ProviderDestroy(ScreenPtr scr
+@@ -1898,12 +1902,14 @@ xf86RandR14ProviderDestroy(ScreenPtr scr
config->randr_provider->offload_sink = NULL;
RRSetChanged(screen);
}
@@ -63,11 +61,9 @@ Index: xorg-server-1.17.2/hw/xfree86/modes/xf86RandR12.c
DetachUnboundGPU(screen);
}
config->randr_provider = NULL;
-Index: xorg-server-1.17.2/dix/dispatch.c
-===================================================================
---- xorg-server-1.17.2.orig/dix/dispatch.c
-+++ xorg-server-1.17.2/dix/dispatch.c
-@@ -3954,6 +3954,8 @@ AttachUnboundGPU(ScreenPtr pScreen, Scre
+--- a/dix/dispatch.c
++++ b/dix/dispatch.c
+@@ -3951,6 +3951,8 @@ AttachUnboundGPU(ScreenPtr pScreen, Scre
assert(new->isGPU);
assert(!new->current_master);
xorg_list_add(&new->unattached_head, &pScreen->unattached_list);
@@ -76,7 +72,7 @@ Index: xorg-server-1.17.2/dix/dispatch.c
new->current_master = pScreen;
}
-@@ -3978,7 +3980,8 @@ DetachOutputGPU(ScreenPtr slave)
+@@ -3975,7 +3977,8 @@ DetachOutputGPU(ScreenPtr slave)
{
assert(slave->isGPU);
xorg_list_del(&slave->output_head);
@@ -86,7 +82,7 @@ Index: xorg-server-1.17.2/dix/dispatch.c
}
void
-@@ -3994,6 +3997,7 @@ DetachOffloadGPU(ScreenPtr slave)
+@@ -3991,6 +3994,7 @@ DetachOffloadGPU(ScreenPtr slave)
{
assert(slave->isGPU);
xorg_list_del(&slave->offload_head);
diff --git a/debian/patches/no-nv.patch b/debian/patches/no-nv.patch
index 4fb23e7..351f745 100644
--- a/debian/patches/no-nv.patch
+++ b/debian/patches/no-nv.patch
@@ -7,11 +7,9 @@ Date: Wed Apr 3 13:36:20 2013 -0700
For linux this driver is long obsolete now. It may have some relevance
on non-linux systems.
-diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
-index b2545be..73a662d 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
-@@ -1220,8 +1220,9 @@ xf86VideoPtrToDriverList(struct pci_device *dev,
+@@ -1193,8 +1193,9 @@ xf86VideoPtrToDriverList(struct pci_devi
driverList[idx++] = "nvidia";
#ifdef __linux__
driverList[idx++] = "nouveau";
diff --git a/debian/patches/xf86-ignore-conflicting-rr-caps.patch b/debian/patches/xf86-ignore-conflicting-rr-caps.patch
index 094aa1f..d9bd163 100644
--- a/debian/patches/xf86-ignore-conflicting-rr-caps.patch
+++ b/debian/patches/xf86-ignore-conflicting-rr-caps.patch
@@ -2,11 +2,9 @@ Description: Only set RR caps that are appropriate to main/gpu screen.
Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Bug-Ubuntu: https://launchpad.net/bugs/1277014
-Index: xorg-server-1.17.2/hw/xfree86/modes/xf86RandR12.c
-===================================================================
---- xorg-server-1.17.2.orig/hw/xfree86/modes/xf86RandR12.c
-+++ xorg-server-1.17.2/hw/xfree86/modes/xf86RandR12.c
-@@ -1555,10 +1555,16 @@ xf86RandR12CreateObjects12(ScreenPtr pSc
+--- a/hw/xfree86/modes/xf86RandR12.c
++++ b/hw/xfree86/modes/xf86RandR12.c
+@@ -1550,10 +1550,16 @@ xf86RandR12CreateObjects12(ScreenPtr pSc
}
if (config->name) {
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index a14956b..3a471c2 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -45,10 +45,8 @@ Contributions from:
create mode 100644 hw/xmir/xmir.c
create mode 100644 hw/xmir/xmir.h
-Index: xorg-server-1.17.2/configure.ac
-===================================================================
---- xorg-server-1.17.2.orig/configure.ac
-+++ xorg-server-1.17.2/configure.ac
+--- a/configure.ac
++++ b/configure.ac
@@ -629,6 +629,7 @@ AC_ARG_ENABLE(xvfb, AS_HELP_ST
AC_ARG_ENABLE(xnest, AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto])
AC_ARG_ENABLE(xquartz, AS_HELP_STRING([--enable-xquartz], [Build Xquartz server for OS-X (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto])
@@ -65,7 +63,7 @@ Index: xorg-server-1.17.2/configure.ac
COMPOSITE=no
DGA=no
-@@ -2495,6 +2497,27 @@ if test "x$XWAYLAND" = xyes; then
+@@ -2498,6 +2500,27 @@ if test "x$XWAYLAND" = xyes; then
[${WAYLAND_PREFIX}/bin$PATH_SEPARATOR$PATH])
fi
@@ -93,7 +91,7 @@ Index: xorg-server-1.17.2/configure.ac
dnl and the rest of these are generic, so they're in config.h
dnl
-@@ -2643,6 +2666,8 @@ hw/kdrive/fbdev/Makefile
+@@ -2646,6 +2669,8 @@ hw/kdrive/fbdev/Makefile
hw/kdrive/linux/Makefile
hw/kdrive/src/Makefile
hw/xwayland/Makefile
@@ -102,10 +100,8 @@ Index: xorg-server-1.17.2/configure.ac
test/Makefile
test/xi1/Makefile
test/xi2/Makefile
-Index: xorg-server-1.17.2/hw/Makefile.am
-===================================================================
---- xorg-server-1.17.2.orig/hw/Makefile.am
-+++ xorg-server-1.17.2/hw/Makefile.am
+--- a/hw/Makefile.am
++++ b/hw/Makefile.am
@@ -30,6 +30,10 @@ if XWAYLAND
XWAYLAND_SUBDIRS = xwayland
endif
@@ -130,16 +126,12 @@ Index: xorg-server-1.17.2/hw/Makefile.am
relink:
$(AM_V_at)for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink || exit 1 ; done
-Index: xorg-server-1.17.2/hw/xmir/.gitignore
-===================================================================
--- /dev/null
-+++ xorg-server-1.17.2/hw/xmir/.gitignore
++++ b/hw/xmir/.gitignore
@@ -0,0 +1 @@
+Xmir
-Index: xorg-server-1.17.2/hw/xmir/Makefile.am
-===================================================================
--- /dev/null
-+++ xorg-server-1.17.2/hw/xmir/Makefile.am
++++ b/hw/xmir/Makefile.am
@@ -0,0 +1,61 @@
+bin_PROGRAMS = Xmir
+
@@ -202,10 +194,8 @@ Index: xorg-server-1.17.2/hw/xmir/Makefile.am
+
+relink:
+ $(AM_V_at)rm -f Xmir$(EXEEXT) && $(MAKE) Xmir$(EXEEXT)
-Index: xorg-server-1.17.2/hw/xmir/dri2/Makefile.am
-===================================================================
--- /dev/null
-+++ xorg-server-1.17.2/hw/xmir/dri2/Makefile.am
++++ b/hw/xmir/dri2/Makefile.am
@@ -0,0 +1,14 @@
+noinst_LTLIBRARIES = libdri2.la
+
@@ -221,10 +211,8 @@ Index: xorg-server-1.17.2/hw/xmir/dri2/Makefile.am
+ dri2ext.c \
+ dri2int.h
+
-Index: xorg-server-1.17.2/hw/xmir/dri2/dri2.c
-===================================================================
--- /dev/null
-+++ xorg-server-1.17.2/hw/xmir/dri2/dri2.c
++++ b/hw/xmir/dri2/dri2.c
@@ -0,0 +1,1398 @@
+/*
+ * Copyright © 2007, 2008 Red Hat, Inc.
@@ -1624,10 +1612,8 @@ Index: xorg-server-1.17.2/hw/xmir/dri2/dri2.c
+ *is_param_recognized = FALSE;
+ return Success;
+}
-Index: xorg-server-1.17.2/hw/xmir/dri2/dri2.h
-===================================================================
--- /dev/null
-+++ xorg-server-1.17.2/hw/xmir/dri2/dri2.h
++++ b/hw/xmir/dri2/dri2.h
@@ -0,0 +1,364 @@
+/*
+ * Copyright © 2007 Red Hat, Inc.
@@ -1993,10 +1979,8 @@ Index: xorg-server-1.17.2/hw/xmir/dri2/dri2.h
+extern Bool noDRI2Extension;
+
+#endif
-Index: xorg-server-1.17.2/hw/xmir/dri2/dri2ext.c
-===================================================================
--- /dev/null
-+++ xorg-server-1.17.2/hw/xmir/dri2/dri2ext.c
++++ b/hw/xmir/dri2/dri2ext.c
@@ -0,0 +1,683 @@
+/*
+ * Copyright © 2008 Red Hat, Inc.
@@ -2681,10 +2665,8 @@ Index: xorg-server-1.17.2/hw/xmir/dri2/dri2ext.c
+
+ DRI2ModuleSetup();
+}
-Index: xorg-server-1.17.2/hw/xmir/dri2/dri2int.h
-===================================================================
--- /dev/null
-+++ xorg-server-1.17.2/hw/xmir/dri2/dri2int.h
++++ b/hw/xmir/dri2/dri2int.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2011 Daniel Stone
@@ -2712,10 +2694,8 @@ Index: xorg-server-1.17.2/hw/xmir/dri2/dri2int.h
+ */
+
+extern Bool DRI2ModuleSetup(void);
-Index: xorg-server-1.17.2/hw/xmir/xmir-cursor.c
-===================================================================
--- /dev/null
-+++ xorg-server-1.17.2/hw/xmir/xmir-cursor.c
++++ b/hw/xmir/xmir-cursor.c
@@ -0,0 +1,214 @@
+/*
+ * Copyright © 2015 Canonical Ltd
@@ -2931,10 +2911,8 @@ Index: xorg-server-1.17.2/hw/xmir/xmir-cursor.c
+ &xmir_pointer_sprite_funcs,
+ &xmir_pointer_screen_funcs, TRUE);
+}
-Index: xorg-server-1.17.2/hw/xmir/xmir-cvt.c
-===================================================================
--- /dev/null
-+++ xorg-server-1.17.2/hw/xmir/xmir-cvt.c
++++ b/hw/xmir/xmir-cvt.c
@@ -0,0 +1,304 @@
+/* Copied from hw/xfree86/modes/xf86cvt.c into xmir DDX and
+ * changed to generate an RRMode */
@@ -3240,10 +3218,8 @@ Index: xorg-server-1.17.2/hw/xmir/xmir-cvt.c
+
+ return RRModeGet(&modeinfo, name);
+}
-Index: xorg-server-1.17.2/hw/xmir/xmir-dri2.c
-===================================================================
--- /dev/null
-+++ xorg-server-1.17.2/hw/xmir/xmir-dri2.c
++++ b/hw/xmir/xmir-dri2.c
@@ -0,0 +1,529 @@
+/*
+ * Copyright © 2015 Canonical Ltd
@@ -3774,10 +3750,8 @@ Index: xorg-server-1.17.2/hw/xmir/xmir-dri2.c
+ ret = DRI2ScreenInit(xmir_screen->screen, &xmir_screen->dri2);
+ return ret;
+}
-Index: xorg-server-1.17.2/hw/xmir/xmir-glamor.c
-===================================================================
--- /dev/null
-+++ xorg-server-1.17.2/hw/xmir/xmir-glamor.c
++++ b/hw/xmir/xmir-glamor.c
@@ -0,0 +1,1184 @@
+/*
+ * Copyright © 2015 Canonical Ltd
@@ -4963,10 +4937,8 @@ Index: xorg-server-1.17.2/hw/xmir/xmir-glamor.c
+
+ return TRUE;
+}
-Index: xorg-server-1.17.2/hw/xmir/xmir-input.c
-===================================================================
--- /dev/null
-+++ xorg-server-1.17.2/hw/xmir/xmir-input.c
++++ b/hw/xmir/xmir-input.c
@@ -0,0 +1,505 @@
+/*
+ * Copyright © 2015 Canonical Ltd
@@ -5473,10 +5445,8 @@ Index: xorg-server-1.17.2/hw/xmir/xmir-input.c
+
+ mieqFini();
+}
-Index: xorg-server-1.17.2/hw/xmir/xmir-output.c
-===================================================================
--- /dev/null
-+++ xorg-server-1.17.2/hw/xmir/xmir-output.c
++++ b/hw/xmir/xmir-output.c
@@ -0,0 +1,444 @@
+/*
+ * Copyright © 2015 Canonical Ltd
@@ -5922,10 +5892,8 @@ Index: xorg-server-1.17.2/hw/xmir/xmir-output.c
+
+ return TRUE;
+}
-Index: xorg-server-1.17.2/hw/xmir/xmir-thread-proxy.c
-===================================================================
--- /dev/null
-+++ xorg-server-1.17.2/hw/xmir/xmir-thread-proxy.c
++++ b/hw/xmir/xmir-thread-proxy.c
@@ -0,0 +1,132 @@
+/*
+ * Copyright © 2012-2015 Canonical Ltd
@@ -6059,10 +6027,8 @@ Index: xorg-server-1.17.2/hw/xmir/xmir-thread-proxy.c
+ free(msg);
+ }
+}
-Index: xorg-server-1.17.2/hw/xmir/xmir.c
-===================================================================
--- /dev/null
-+++ xorg-server-1.17.2/hw/xmir/xmir.c
++++ b/hw/xmir/xmir.c
@@ -0,0 +1,999 @@
+/*
+ * Copyright © 2015 Canonical Ltd
@@ -7063,10 +7029,8 @@ Index: xorg-server-1.17.2/hw/xmir/xmir.c
+ FatalError("Couldn't add screen\n");
+ }
+}
-Index: xorg-server-1.17.2/hw/xmir/xmir.h
-===================================================================
--- /dev/null
-+++ xorg-server-1.17.2/hw/xmir/xmir.h
++++ b/hw/xmir/xmir.h
@@ -0,0 +1,211 @@
+/*
+ * Copyright © 2015 Canonical Ltd
commit 25dec8bbe4563fb20848ede92fb53ace9427af60
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Oct 28 15:18:28 2015 +0200
purge patches included upstream
diff --git a/debian/patches/glamor-make-current-in-prepare-paths.diff b/debian/patches/glamor-make-current-in-prepare-paths.diff
deleted file mode 100644
index 78594cb..0000000
--- a/debian/patches/glamor-make-current-in-prepare-paths.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-commit db5337afb248edf81087cf8d74006fc496d70589
-Author: Dave Airlie <airlied@redhat.com>
-Date: Wed Jul 15 17:56:11 2015 +1000
-
- glamor: make current in prepare paths
-
- Lots of the accel paths only make current once they start
- doing someting, so a lot of them call the bail paths without
- make current, which means on PRIME systems for example
- we end up in the wrong context.
-
- Add a prepare pixmap in the prepare fallback path.
-
- Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90667
- Signed-off-by: Dave Airlie <airlied@redhat.com>
- Signed-off-by: Eric Anholt <eric@anholt.net>
- Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
- Reviewed-by: Eric Anholt <eric@anholt.net>
-
-diff --git a/glamor/glamor_prepare.c b/glamor/glamor_prepare.c
-index 833291c..5a73e6c 100644
---- a/glamor/glamor_prepare.c
-+++ b/glamor/glamor_prepare.c
-@@ -45,6 +45,8 @@ glamor_prep_pixmap_box(PixmapPtr pixmap, glamor_access_t access, BoxPtr box)
- if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(priv))
- return TRUE;
-
-+ glamor_make_current(glamor_priv);
-+
- RegionInit(®ion, box, 1);
-
- /* See if it's already mapped */
diff --git a/debian/patches/linux-Do-not-call-FatalError-from-xf86CloseConsole.patch b/debian/patches/linux-Do-not-call-FatalError-from-xf86CloseConsole.patch
deleted file mode 100644
index 9419f9d..0000000
--- a/debian/patches/linux-Do-not-call-FatalError-from-xf86CloseConsole.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 2092f12a243b9f7682f542b593b77c96d455ec89 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Wed, 21 Oct 2015 11:36:06 +0200
-Subject: linux: Do not call FatalError from xf86CloseConsole
-
-FatalError ends up calling xf86CloseConsole itself, so calling FatalError
-from within xf86CloseConsole is not a good idea.
-
-Make switch_to log errors using xf86Msg(X_WARNING, ...) and return success
-(or failure).
-
-This makes switch_to match the other error checking done in xf86CloseConsole
-which all logs warnings and continues.
-
-Add checking of the return value in xf86OpenConsole and call
-FatalError there when switch_to fails, to preserve the error-handling
-behavior of xf86OpenConsole.
-
-BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1269210
-Reviewed-by: Adam Jackson <ajax@redhat.com>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-
-diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
-index ec06a05..1ed213c 100644
---- a/hw/xfree86/os-support/linux/lnx_init.c
-+++ b/hw/xfree86/os-support/linux/lnx_init.c
-@@ -63,18 +63,24 @@ drain_console(int fd, void *closure)
- }
- }
-
--static void
-+static int
- switch_to(int vt, const char *from)
- {
- int ret;
-
- SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt));
-- if (ret < 0)
-- FatalError("%s: VT_ACTIVATE failed: %s\n", from, strerror(errno));
-+ if (ret < 0) {
-+ xf86Msg(X_WARNING, "%s: VT_ACTIVATE failed: %s\n", from, strerror(errno));
-+ return 0;
-+ }
-
- SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt));
-- if (ret < 0)
-- FatalError("%s: VT_WAITACTIVE failed: %s\n", from, strerror(errno));
-+ if (ret < 0) {
-+ xf86Msg(X_WARNING, "%s: VT_WAITACTIVE failed: %s\n", from, strerror(errno));
-+ return 0;
-+ }
-+
-+ return 1;
- }
-
- #pragma GCC diagnostic push
-@@ -233,7 +239,8 @@ xf86OpenConsole(void)
- /*
- * now get the VT. This _must_ succeed, or else fail completely.
- */
-- switch_to(xf86Info.vtno, "xf86OpenConsole");
-+ if (!switch_to(xf86Info.vtno, "xf86OpenConsole"))
-+ FatalError("xf86OpenConsole: Switching VT failed\n");
-
- SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETMODE, &VT));
- if (ret < 0)
-@@ -294,7 +301,8 @@ xf86OpenConsole(void)
- else { /* serverGeneration != 1 */
- if (!xf86Info.ShareVTs && xf86Info.autoVTSwitch) {
- /* now get the VT */
-- switch_to(xf86Info.vtno, "xf86OpenConsole");
-+ if (!switch_to(xf86Info.vtno, "xf86OpenConsole"))
-+ FatalError("xf86OpenConsole: Switching VT failed\n");
- }
- }
- }
---
-cgit v0.10.2
-
-
diff --git a/debian/patches/series b/debian/patches/series
index 7f87d43..6945191 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -53,5 +53,3 @@ xmir-desktop-file-hint-flag.patch
drm_device_keep_trying.patch
xi2-resize-touch.patch
os-make-sure-the-clientswritable-fd-set-is-initialized.diff
-glamor-make-current-in-prepare-paths.diff
-linux-Do-not-call-FatalError-from-xf86CloseConsole.patch
commit 3150ae9bc005f85ee08e9a5063564e067d162401
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Oct 28 11:32:01 2015 +0200
rules: Drop extra diff; don't disable xfbdev twice, already in confflags.
diff --git a/debian/rules b/debian/rules
index 753f5b2..5d1f9a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -184,7 +184,6 @@ confflags_main = \
--enable-xnest \
--enable-kdrive \
--enable-xephyr \
- $(build_xfbdev) \
$(build_xmir) \
--with-sha1=libgcrypt \
--enable-xcsecurity \
@@ -220,7 +219,6 @@ confflags_udeb = \
--disable-xnest \
--disable-kdrive \
--disable-xephyr \
- --disable-xfbdev \
--disable-xmir \
--with-sha1=libnettle \
$(config_backend_udeb) \
commit 9f194301c61c7d0f2da1905180612e1eb91c833d
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Oct 28 11:30:54 2015 +0200
rules: Drop extra diff; check target.
diff --git a/debian/rules b/debian/rules
index 19ae773..753f5b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -432,7 +432,7 @@ endif
# Build architecture-independent files here
-binary-indep: build-indep install check
+binary-indep: build-indep install
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-initial
dh_install -i
dh_installdocs -i
@@ -440,8 +440,5 @@ binary-indep: build-indep install check
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-deb
-check:
- dh_testdir
-
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
Reply to: