blob: 2bed698910a0dc86e1c1b761070e4ccf0a5f33f9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
|
# Maintainer: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
# Original Maintainer: AndyRTR <andyrtr@archlinux.org>
# Original Maintainer: Jan de Groot <jgc@archlinux.org>
# Based on Arch Linux commit 1dff94b27b2b8d9e312dd194a50b60852c33bb13
pkgbase=xorg-server-mir
pkgname=(xorg-server-mir xorg-server-xephyr-mir xorg-server-xdmx-mir
xorg-server-xvfb-mir xorg-server-xnest-mir xorg-server-xwayland-mir
xorg-server-common-mir xorg-server-devel-mir)
_ubuntu_rel=0ubuntu4
pkgver=1.17.1
pkgrel=1
arch=(i686 x86_64)
license=(custom)
url="http://xorg.freedesktop.org"
makedepends=(pixman libx11 mesa mesa-libgl xf86driproto xcmiscproto xtrans
bigreqsproto randrproto inputproto fontsproto videoproto
presentproto compositeproto recordproto scrnsaverproto
resourceproto xineramaproto libxkbfile libxfont renderproto
libpciaccess libxv xf86dgaproto libxmu libxrender libxi dmxproto
libxaw libdmx libxtst libxres xorg-xkbcomp xorg-util-macros
xorg-font-util glproto dri2proto libgcrypt libepoxy xcb-util
xcb-util-image xcb-util-renderutil xcb-util-wm xcb-util-keysyms
dri3proto libxshmfence libunwind)
makedepends+=(mir)
validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
'C383B778255613DFDB409D91DB221A6900000011')
source=(${url}/releases/individual/xserver/xorg-server-${pkgver}.tar.bz2{,.sig}
https://launchpad.net/ubuntu/+archive/primary/+files/xorg-server_${_ubuntu_ver:-${pkgver}}-${_ubuntu_rel}.diff.gz
nvidia-drm-outputclass.conf
xvfb-run
xvfb-run.1
os-access-fix-regression-in-server-interpreted-auth.patch
v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch
0001-int10-Fix-error-check-for-pci_device_map_legacy.patch
0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch
0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch
0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch
0002-dix-hook-up-the-unaccelerated-valuator-masks.patch
fix-CVE-2015-3164.patch)
sha512sums=('195a0e0a6bd9c7655e62dd40dfbd7dea77d10f1143d4fd6154e8bdbb463d3729f81ecd1e379d66f68e828d4f4583782c15ce260de24444802076844aec552c4f'
'SKIP'
'280ef30b05c8d2bb876d4af04b47359fd7cf937a2d49f513f033797327e8350ef010c040bac3f67bc1b7c9fbe4b1b4322ccf70a5403d3401b0c6324e51ab1e3c'
'06c649df3b02c6ccf5491fecd06f4c979656aaba2bb366e6197e96bb0eecd8d0a46245e69628d507ddc8c5fc6d5f1cac694f036bc45ba51f82a092ebd6097bf5'
'ca1cda27016f7c269cbdecc45da36255afeef5c1973cc484544f9dfbf56ed1868365c93a4c7f93e3a23e5322f084ec0cdd137e15b43872aae7f0c03040028ce6'
'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
'976c0b93b7eb0a1ff05dacd8ebb9644db4211ec38bcd172fa2c3a8c4611ad2b8e47d8445f90b2f3d498c55fa76a53522cf6e210dcc5b9b56a19409d933874fd4'
'2e1fa43d2ecfd0387ca43cbfa99838f92d2cf5a4dcac2de98ba2d72eef28a15ab5cceee39919462ab9c175a9faa5dbd8b37492ff534110e434d434df6260ae9d'
'46cbc1abb3b12b49345d73f21bf8c5302b6d1b74eb615c291a12177701f6c20c8c777f4f3b427188d1fc7f5cc7116104f1285c6e28fa038810b09c940e4f1b76'
'ecabb18ac448e2c528f9dd7648679514c4240570e3b3471d603d9249e577c824a4ecd89d88a4f67bb23ea3e567503aa1f31fd70dc2dcb1e0ea7a28d00514a689'
'890727bd21074f4990495cea74dcae1929b3fd56504b8ab599974eb2371ba26bc84c36b32ac9fee22c3b6092bb3a728927d70b9c2f731415b99d7ea0fa63caa1'
'c442f566c861c746e92bde992cc736399c74df71a4a3b0e3abe43e7998ba97f2e6550b1fd1da21d9ba960314974dd95e8f3d6aab0b3fbe4c5a6af1a2a8c92495'
'51bf1ac1135512e8f2621f4dd211d4b80d3072e9ee6896a0d9c7ae569ca693a664cc1e5adf4f7c95da8d6626816ea17ef3bf0f488c121cb3c3b317884d3f3bfc'
'b8b5a9a9bbf3c6b511196c919694c54b5c67090e7f535f65b61be0d33569b6f32180250637fd5cf0aef8e4fd33689a600553f61abcc43fa7e564bff04f0f3e3c')
prepare() {
cd "xorg-server-${pkgver}"
# Apply Ubuntu's patches
patch -p1 -i "../xorg-server_${_ubuntu_ver:-${pkgver}}-${_ubuntu_rel}.diff"
# Disable patches
sed -i '/03_static-nettle.diff/d' debian/patches/series
sed -i '/ppc64el-endian-fix.patch/d' debian/patches/series
for i in $(grep -v '#' debian/patches/series); do
msg "Applying ${i} ..."
patch -p1 -i "debian/patches/${i}"
done
# fix FS#43884, merged upstream
patch -p1 -i ../os-access-fix-regression-in-server-interpreted-auth.patch
# partially fix FS#43867, merged upstream
patch -p1 -i ../v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch
# fix FS#43924, merged upstream
#patch -p1 -i ../0001-int10-Fix-error-check-for-pci_device_map_legacy.patch
# fix FS#43937, merged upstream
patch -p1 -i ../0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch
# fix FS#45245, merged upstream
patch -p1 -i ../0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch
# fix FS#45229, merged upstream
patch -p1 -i ../0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch
patch -p1 -i ../0002-dix-hook-up-the-unaccelerated-valuator-masks.patch
# fix CVE-2015-3164, merged upstream
patch -p1 -i ../fix-CVE-2015-3164.patch
}
build() {
cd "xorg-server-${pkgver}"
autoreconf -vfi
./configure \
--prefix=/usr \
--enable-ipv6 \
--enable-dri \
--enable-dmx \
--enable-xvfb \
--enable-xmir \
--enable-xnest \
--enable-composite \
--enable-xcsecurity \
--enable-libunwind \
--enable-xorg \
--enable-xephyr \
--enable-glamor \
--enable-xwayland \
--enable-glx-tls \
--enable-kdrive \
--enable-kdrive-evdev \
--enable-kdrive-kbd \
--enable-kdrive-mouse \
--enable-config-udev \
--enable-systemd-logind \
--enable-suid-wrapper \
--disable-install-setuid \
--enable-record \
--disable-xfbdev \
--disable-xfake \
--disable-static \
--libexecdir=/usr/lib/xorg-server \
--sysconfdir=/etc \
--localstatedir=/var \
--with-xkb-path=/usr/share/X11/xkb \
--with-xkb-output=/var/lib/xkb \
--with-fontrootdir=/usr/share/fonts \
--with-sha1=libgcrypt
make
# Disable subdirs for make install rule to make splitting easier
sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \
-e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \
-e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \
-e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \
-e 's/^XWAYLAND_SUBDIRS =.*/XWAYLAND_SUBDIRS =/' \
-i hw/Makefile
}
replace_orig() {
local pkg="${1}"
provides+=("${pkg}=${pkgver}")
conflicts+=(${pkg})
}
install_license() {
local pkg="${1}"
install -dm755 "${pkgdir}"/usr/share/licenses/${pkg}/
if grep -q xorg-server-common-mir <<< "${pkg}"; then
install -m644 "${srcdir}/xorg-server-${pkgver}/COPYING" \
"${pkgdir}"/usr/share/licenses/${pkg}/
else
ln -s ../xorg-server-common-mir/COPYING \
"${pkgdir}"/usr/share/licenses/${pkg}/
fi
}
package_xorg-server-common-mir() {
pkgdesc="Xorg server common files"
depends=(xkeyboard-config xorg-xkbcomp xorg-setxkbmap xorg-fonts-misc
libunwind)
replace_orig xorg-server-common
install_license xorg-server-common-mir
cd "xorg-server-${pkgver}"
make -C xkb DESTDIR="${pkgdir}" install-data
install -dm755 "${pkgdir}"/usr/share/man/man1/
install -m644 man/Xserver.1 "${pkgdir}"/usr/share/man/man1/
install -dm755 "${pkgdir}"/usr/lib/xorg/
install -m644 dix/protocol.txt "${pkgdir}"/usr/lib/xorg/
}
package_xorg-server-mir() {
pkgdesc="Xorg X server"
depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt
libxau xorg-server-common-mir xf86-input-evdev libxshmfence libgl)
# see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we
# provide major numbers that drivers can depend on
# and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
provides=('X-ABI-VIDEODRV_VERSION=19' 'X-ABI-XINPUT_VERSION=21.1'
'X-ABI-EXTENSION_VERSION=9.0' x-server)
groups=(xorg)
conflicts=('nvidia-utils<=331.20' glamor-egl xf86-video-modesetting)
replaces=(glamor-egl xf86-video-modesetting)
install=xorg-server.install
replace_orig xorg-server
install_license xorg-server-mir
cd "xorg-server-${pkgver}"
make DESTDIR="${pkgdir}" install
# distro specific files must be installed in /usr/share/X11/xorg.conf.d
install -dm755 "${pkgdir}"/etc/X11/xorg.conf.d/
install -m644 ../nvidia-drm-outputclass.conf \
"${pkgdir}"/usr/share/X11/xorg.conf.d/
# Needed for non-mesa drivers, libgl will restore it
mv "${pkgdir}"/usr/lib/xorg/modules/extensions/libglx.so \
"${pkgdir}"/usr/lib/xorg/modules/extensions/libglx.xorg
rm -rf "${pkgdir}"/var/
rm -f "${pkgdir}"/usr/share/man/man1/Xserver.1
rm -f "${pkgdir}"/usr/lib/xorg/protocol.txt
rm -rf "${pkgdir}"/usr/lib/pkgconfig/
rm -rf "${pkgdir}"/usr/include/
rm -rf "${pkgdir}"/usr/share/aclocal/
}
package_xorg-server-xephyr-mir() {
pkgdesc="A nested X server that runs as an X application"
depends=(libxfont libgl libepoxy libgcrypt libxv pixman
xorg-server-common-mir xcb-util-image xcb-util-renderutil
xcb-util-wm xcb-util-keysyms)
replace_orig xorg-server-xephyr
install_license xorg-server-xephyr-mir
cd "xorg-server-${pkgver}/hw/kdrive"
make DESTDIR="${pkgdir}" install
}
package_xorg-server-xvfb-mir() {
pkgdesc="Virtual framebuffer X server"
depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common-mir
xorg-xauth libgl)
replace_orig xorg-server-xvfb
install_license xorg-server-xvfb-mir
cd "xorg-server-${pkgver}/hw/vfb"
make DESTDIR="${pkgdir}" install
install -m755 "${srcdir}"/xvfb-run "${pkgdir}"/usr/bin/
install -m644 "${srcdir}"/xvfb-run.1 "${pkgdir}"/usr/share/man/man1/
}
package_xorg-server-xnest-mir() {
pkgdesc="A nested X server that runs as an X application"
depends=(libxfont libxext libgcrypt pixman xorg-server-common-mir
libsystemd)
replace_orig xorg-server-xnest
install_license xorg-server-xnest-mir
cd "xorg-server-${pkgver}/hw/xnest"
make DESTDIR="${pkgdir}" install
}
package_xorg-server-xdmx-mir() {
pkgdesc="Distributed Multihead X Server and utilities"
depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman
xorg-server-common-mir)
replace_orig xorg-server-xdmx
install_license xorg-server-xdmx-mir
cd "xorg-server-${pkgver}/hw/dmx"
make DESTDIR="${pkgdir}" install
}
package_xorg-server-xwayland-mir() {
pkgdesc="run X clients under wayland"
depends=(libxfont libepoxy libgl pixman xorg-server-common)
replace_orig xorg-server-xwayland
install_license xorg-server-xwayland-mir
cd "xorg-server-${pkgver}/hw/xwayland"
make DESTDIR="${pkgdir}" install
}
package_xorg-server-devel-mir() {
pkgdesc="Development files for the X.Org X server"
depends=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc
xproto randrproto renderproto xextproto inputproto kbproto
fontsproto pixman videoproto xf86driproto glproto
mesa dri2proto dri3proto xineramaproto libpciaccess
resourceproto scrnsaverproto presentproto
# not technically required but almost every Xorg pkg needs it to
# build
xorg-util-macros)
replace_orig xorg-server-devel
install_license xorg-server-devel-mir
cd "xorg-server-${pkgver}"
make DESTDIR="${pkgdir}" install
rm -rf "${pkgdir}"/usr/bin/
rm -rf "${pkgdir}"/usr/share/man/
rm -rf "${pkgdir}"/usr/share/doc/
rm -rf "${pkgdir}"/usr/share/X11/
rm -rf "${pkgdir}"/usr/lib/xorg/
rm -rf "${pkgdir}"/usr/lib/xorg-server/
rm -rf "${pkgdir}"/var/
}
|