blob: c2ce2895ca46f4fe6eeb31b45a335e9a1c835581 (
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
|
# Maintainer: Det <nimetonmaili g-mail>
# Based on [testing]'s xorg-server
_pkgbase=xorg-server
pkgname=('xorg-server-dev' 'xorg-server-xephyr-dev' 'xorg-server-xdmx-dev' 'xorg-server-xvfb-dev' 'xorg-server-xnest-dev' 'xorg-server-xwayland-dev' 'xorg-server-common-dev' 'xorg-server-devel-dev')
pkgver=1.19.3 # https://lists.x.org/archives/xorg/2017-March/058662.html
pkgrel=3 # https://git.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/xorg-server&id=c24304917e61de5de15695065f8a9be89d77818c
arch=('i686' 'x86_64')
license=('custom')
groups=('xorg')
url="https://xorg.freedesktop.org"
makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto'
'inputproto' 'fontsproto' 'videoproto' 'presentproto' 'compositeproto' 'recordproto' 'scrnsaverproto'
'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont2' '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' 'systemd' 'wayland-protocols')
source=(${url}/releases/individual/xserver/${_pkgbase}-${pkgver}.tar.bz2{,.sig}
nvidia-add-modulepath-support.patch
xserver-autobind-hotplug.patch
modesetting-Set-correct-DRM-event-context-version.patch
CVE-2017-10971.patch
CVE-2017-10972.patch
bug99708.patch
xvfb-run
xvfb-run.1)
validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
'C383B778255613DFDB409D91DB221A6900000011'
'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3')
sha256sums=('677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98'
'SKIP'
'914a8d775b708f836ae3f0eeca553da3872727a2e4262190f4d5c01241cb14e8'
'fcaf536e4fc307958923b58f2baf3d3102ad694efc28506f6f95a9e64483fa57'
'831a70809e6bec766138d7a1c96643732df9a2c0c5f77ee44b47ce4be882e0af'
'3950d5d64822b4a34ca0358389216eed25e159751006d674e7cb491aa3b54d0b'
'700af48c541f613b376eb7a7e567d13c0eba7a835d0aaa9d4b0431ebdd9f397c'
'67013743ba8ff1663b233f50fae88989d36504de83fca5f93af5623f2bef6920'
'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
prepare() {
cd "${_pkgbase}-${pkgver}"
msg2 "merged upstream in trunk"
patch -Np1 -i ../nvidia-add-modulepath-support.patch
msg2 "patch from Fedora, not yet merged"
patch -Np1 -i ../xserver-autobind-hotplug.patch
msg2 "merged in trunk"
patch -Np1 -i ../modesetting-Set-correct-DRM-event-context-version.patch
msg2 "Security: CVE-2017-10971"
patch -Np1 -i ../CVE-2017-10971.patch
msg2 "Security: CVE-2017-10972"
patch -Np1 -i ../CVE-2017-10972.patch
msg2 "Fix Glamor lines: https://bugs.archlinux.org/task/53404"
patch -Np1 -i ../bug99708.patch
msg2 "Starting autoreconf..."
autoreconf -vfi
}
build() {
# Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
# With them, modules fail to load with undefined symbol.
# See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
export CFLAGS=${CFLAGS/-fno-plt}
export CXXFLAGS=${CXXFLAGS/-fno-plt}
export LDFLAGS=${LDFLAGS/,-z,now}
cd "${_pkgbase}-${pkgver}"
msg2 "Starting ./configure..."
./configure --prefix=/usr \
--enable-ipv6 \
--enable-dri \
--enable-dmx \
--enable-xvfb \
--enable-xnest \
--enable-composite \
--enable-xcsecurity \
--enable-libunwind \
--enable-xorg \
--enable-xephyr \
--enable-glamor \
--enable-xwayland \
--enable-kdrive \
--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
# --without-dtrace \
# --disable-linux-acpi --disable-linux-apm \
msg2 "Starting make..."
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
}
package_xorg-server-common-dev() {
pkgdesc="Xorg server common files - Bleeding edge version"
depends=(xkeyboard-config xorg-xkbcomp xorg-setxkbmap xorg-fonts-misc)
provides=(xorg-server-common=$pkgver-$pkgrel)
conflicts=(xorg-server-common)
cd "${_pkgbase}-${pkgver}"
install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common"
install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common"
msg2 "Starting make install-data..."
make -C xkb DESTDIR="${pkgdir}" install-data
install -m755 -d "${pkgdir}/usr/share/man/man1"
install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/"
install -m755 -d "${pkgdir}/usr/lib/xorg"
install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/"
}
package_xorg-server-dev() {
pkgdesc="Xorg X server - Bleeding edge version"
depends=(libepoxy libxfont2 pixman xorg-server-common-dev libunwind dbus libgl xf86-input-libinput
libpciaccess libdrm libxshmfence) # FS#52949
# see src/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-dev pkg
provides=("xorg-server=$pkgver" 'X-ABI-VIDEODRV_VERSION=23' 'X-ABI-XINPUT_VERSION=24.1' 'X-ABI-EXTENSION_VERSION=10.0' 'x-server')
conflicts=('xorg-server' 'nvidia-utils<375.26-3' 'glamor-egl' 'xf86-video-modesetting')
replaces=('glamor-egl' 'xf86-video-modesetting')
install=xorg-server-dev.install
cd "${_pkgbase}-${pkgver}"
msg2 "Starting make install..."
make DESTDIR="${pkgdir}" install
# distro specific files must be installed in /usr/share/X11/xorg.conf.d
install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
rm -rf "${pkgdir}/var"
rm -f "${pkgdir}/usr/share/man/man1/Xserver.1"
rm -f "${pkgdir}/usr/lib/xorg/protocol.txt"
install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server"
ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING"
rm -rf "${pkgdir}/usr/lib/pkgconfig"
rm -rf "${pkgdir}/usr/include"
rm -rf "${pkgdir}/usr/share/aclocal"
}
package_xorg-server-xephyr-dev() {
pkgdesc="A nested X server that runs as an X application - Bleeding edge version"
depends=(libxfont2 libgl libepoxy libunwind libsystemd libxv pixman xorg-server-common-dev xcb-util-image
xcb-util-renderutil xcb-util-wm xcb-util-keysyms)
provides=(xorg-server-xephyr=$pkgver)
conflicts=(xorg-server-xephyr)
cd "${_pkgbase}-${pkgver}/hw/kdrive"
msg2 "Starting make install..."
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr"
ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING"
}
package_xorg-server-xvfb-dev() {
pkgdesc="Virtual framebuffer X server - Bleeding edge version"
depends=(libxfont2 libunwind libsystemd pixman xorg-server-common-dev xorg-xauth libgl)
provides=(xorg-server-xvfb=$pkgver)
conflicts=(xorg-server-xvfb)
cd "${_pkgbase}-${pkgver}/hw/vfb"
msg2 "Starting make install..."
make DESTDIR="${pkgdir}" install
install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/"
install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb"
ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING"
}
package_xorg-server-xnest-dev() {
pkgdesc="A nested X server that runs as an X application - Bleeding edge version"
depends=(libxfont2 libxext libunwind pixman xorg-server-common-dev libsystemd)
provides=(xorg-server-xnest=$pkgver)
conflicts=(xorg-server-xnest)
cd "${_pkgbase}-${pkgver}/hw/xnest"
msg2 "Starting make install..."
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest"
ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING"
}
package_xorg-server-xdmx-dev() {
pkgdesc="Distributed Multihead X Server and utilities - Bleeding edge version"
depends=(libxfont2 libxi libxaw libxrender libdmx libxfixes libunwind pixman xorg-server-common-dev)
provides=(xorg-server-xdmx=$pkgver)
conflicts=(xorg-server-xdmx)
cd "${_pkgbase}-${pkgver}/hw/dmx"
msg2 "Starting make install..."
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx"
ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING"
}
package_xorg-server-xwayland-dev() {
pkgdesc="Run X clients under Wayland - Bleeding edge version"
depends=(libxfont libepoxy libgl pixman xorg-server-common-dev)
provides=(xorg-server-xwayland=$pkgver)
conflicts=(xorg-server-xwayland)
cd "${_pkgbase}-${pkgver}/hw/xwayland"
msg2 "Starting make install..."
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xwayland"
ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xwayland/COPYING"
}
package_xorg-server-devel-dev() {
pkgdesc="Development files for the X.Org X server - Bleeding edge version"
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)
provides=(xorg-server-devel=$pkgver)
conflicts=(xorg-server-devel)
cd "${_pkgbase}-${pkgver}"
msg2 "Starting make install..."
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"
install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel"
ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING"
}
|