Timo Aaltonen pushed to branch ubuntu at X Strike Force / xserver / xorg-server
Commits:
-
fe5bb3a1
by Timo Aaltonen at 2018-09-19T21:22:03Z
-
f31c940d
by Timo Aaltonen at 2018-09-19T21:41:29Z
-
166ad97f
by Timo Aaltonen at 2018-09-20T08:12:53Z
-
02086fd1
by Timo Aaltonen at 2018-09-20T08:26:23Z
-
f0ad970e
by Timo Aaltonen at 2018-09-21T08:21:57Z
-
17449663
by Timo Aaltonen at 2018-09-21T08:22:34Z
5 changed files:
Changes:
1 |
+xorg-server (2:1.20.1-3ubuntu1) cosmic; urgency=medium
|
|
2 |
+ |
|
3 |
+ * Merge from Debian.
|
|
4 |
+ |
|
5 |
+ -- Timo Aaltonen <tjaalton@debian.org> Fri, 21 Sep 2018 11:22:03 +0300
|
|
6 |
+ |
|
7 |
+xorg-server (2:1.20.1-3) unstable; urgency=medium
|
|
8 |
+ |
|
9 |
+ * xvfb-run*: Update default resolution and bitdepth to match upstream
|
|
10 |
+ defaults.
|
|
11 |
+ * Limit libunwind to archs that actually have it. (Closes: #909240)
|
|
12 |
+ |
|
13 |
+ -- Timo Aaltonen <tjaalton@debian.org> Thu, 20 Sep 2018 11:26:11 +0300
|
|
14 |
+ |
|
1 | 15 |
xorg-server (2:1.20.1-2ubuntu1) cosmic; urgency=medium
|
2 | 16 |
|
3 | 17 |
* Merge from Debian.
|
... | ... | @@ -31,7 +31,7 @@ Build-Depends: |
31 | 31 |
libaudit-dev [linux-any],
|
32 | 32 |
libdrm-dev (>= 2.4.89) [!hurd-i386],
|
33 | 33 |
libgl1-mesa-dev (>= 9.2),
|
34 |
- libunwind-dev,
|
|
34 |
+ libunwind-dev [amd64 arm64 armel armhf hppa i386 ia64 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sh4],
|
|
35 | 35 |
libxmuu-dev (>= 1:0.99.1),
|
36 | 36 |
libxext-dev (>= 1:0.99.1),
|
37 | 37 |
libx11-dev (>= 2:1.6),
|
... | ... | @@ -2,8 +2,7 @@ |
2 | 2 |
|
3 | 3 |
# This script starts an instance of Xvfb, the "fake" X server, runs a command
|
4 | 4 |
# with that server available, and kills the X server when done. The return
|
5 |
-# value of the command becomes the return value of this script, except in cases
|
|
6 |
-# where this script encounters an error.
|
|
5 |
+# value of the command becomes the return value of this script.
|
|
7 | 6 |
#
|
8 | 7 |
# If anyone is using this to build a Debian package, make sure the package
|
9 | 8 |
# Build-Depends on xvfb and xauth.
|
... | ... | @@ -14,7 +13,7 @@ PROGNAME=xvfb-run |
14 | 13 |
SERVERNUM=99
|
15 | 14 |
AUTHFILE=
|
16 | 15 |
ERRORFILE=/dev/null
|
17 |
-XVFBARGS="-screen 0 640x480x16"
|
|
16 |
+XVFBARGS="-screen 0 1280x1024x24"
|
|
18 | 17 |
LISTENTCP="-nolisten tcp"
|
19 | 18 |
XAUTHPROTO=.
|
20 | 19 |
|
... | ... | @@ -156,7 +156,7 @@ Use the |
156 | 156 |
option
|
157 | 157 |
.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber
|
158 | 158 |
to achieve the latter function.
|
159 |
-The default is \(oq\-screen 0 640x480x8\(cq.
|
|
159 |
+The default is \(oq\-screen 0 1280x1024x24\(cq.
|
|
160 | 160 |
.TP
|
161 | 161 |
.BI \-w\ delay \fR,\fB\ \-\-wait= delay
|
162 | 162 |
Ignored for compatibility with earlier versions.
|
... | ... | @@ -41,7 +41,6 @@ confflags += \ |
41 | 41 |
confflags_main = \
|
42 | 42 |
--with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,built-ins" \
|
43 | 43 |
--enable-composite \
|
44 |
- --enable-libunwind \
|
|
45 | 44 |
--enable-record \
|
46 | 45 |
--enable-xv \
|
47 | 46 |
--enable-xvmc \
|
... | ... | @@ -133,6 +132,11 @@ else # hurd |
133 | 132 |
confflags += --disable-config-udev
|
134 | 133 |
endif
|
135 | 134 |
|
135 |
+# some archs don't have libunwind
|
|
136 |
+ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf hppa i386 ia64 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sh4))
|
|
137 |
+ confflags_main += --enable-libunwind
|
|
138 |
+endif
|
|
139 |
+ |
|
136 | 140 |
# linux: libdrm needed for kms (hw/xfree86/os-support/linux/lnx_platform.c)
|
137 | 141 |
# even in udeb
|
138 | 142 |
# kfreebsd: libdrm for dri in main build
|