wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-07-26 23:42:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

xorg-server: split -common and -xwayland

Browse source
This commit is contained in:
Paper 2021-03-21 23:49:20 +01:00 • committed by Érico Nogueira Rolim
parent 0187444530
commit c44269a631
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
srcpkgs/xorg-server-common Symbolic link
View file

@ -0,0 +1 @@
xorg-server

28
srcpkgs/xorg-server/template
View file

@ -1,7 +1,7 @@
# Template file for 'xorg-server' # Template file for 'xorg-server'
pkgname=xorg-server pkgname=xorg-server
version=1.20.11 version=1.20.11
revision=1 revision=2
build_style=meson build_style=meson
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
-Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@ -9,16 +9,16 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
-Ddmx=true -Dlinux_acpi=true -Dlinux_apm=false -Dsuid_wrapper=true -Ddmx=true -Dlinux_acpi=true -Dlinux_apm=false -Dsuid_wrapper=true
-Dxcsecurity=true -Dsystemd_logind=$(vopt_if elogind true false) -Dxcsecurity=true -Dsystemd_logind=$(vopt_if elogind true false)
-Dos_vendor=Void -Dglamor=true -Ddri2=true -Ddri3=true -Dglx=true -Dos_vendor=Void -Dglamor=true -Ddri2=true -Ddri3=true -Dglx=true
-Dxwayland=true" -Dxwayland=false"
hostmakedepends="pkg-config wayland-devel xkbcomp flex" hostmakedepends="pkg-config xkbcomp flex"
makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
libxkbui-devel pixman-devel wayland-devel wayland-protocols libxkbui-devel pixman-devel xcb-util-image-devel xcb-util-keysyms-devel
xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-renderutil-devel xcb-util-wm-devel xkbcomp nettle-devel
xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')" $(vopt_if elogind 'dbus-devel')"
# See hw/xfree86/common/xf86Module.h. Only care for the major version. # See hw/xfree86/common/xf86Module.h. Only care for the major version.
depends="xkeyboard-config $(vopt_if elogind 'elogind')" depends="xkeyboard-config $(vopt_if elogind 'elogind') xorg-server-common"
checkdepends="xkeyboard-config" checkdepends="xkeyboard-config"
short_desc="X11 server from X.org" short_desc="X11 server from X.org"
maintainer="Leah Neukirchen <leah@vuxu.org>" maintainer="Leah Neukirchen <leah@vuxu.org>"
@ -77,13 +77,6 @@ xorg-server-xdmx_package() {
} }
} }
xorg-server-xwayland_package() {
short_desc="Nested X server that runs as a wayland client"
pkg_install() {
vmove usr/bin/Xwayland
}
}
xorg-server-xnest_package() { xorg-server-xnest_package() {
short_desc="Nested X server that runs as an X application" short_desc="Nested X server that runs as an X application"
pkg_install() { pkg_install() {
@ -109,6 +102,13 @@ xorg-server-xvfb_package() {
} }
} }
xorg-server-common_package() {
short_desc+="- common files"
pkg_install() {
vmove usr/lib/xorg/protocol.txt
}
}
xorg-server-devel_package() { xorg-server-devel_package() {
depends="${makedepends}" depends="${makedepends}"
short_desc+=" - development files" short_desc+=" - development files"