Skip to content
Snippets Groups Projects
Commit 47d1faaf authored by Jean-Michel T.Dydak's avatar Jean-Michel T.Dydak
Browse files

update xorg-server-1.20.12-2

parent 2616beb7
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 69 additions and 80 deletions
trunk/PKGBUILD
+ 69
− 80
View file @ 47d1faaf
......@@ -3,14 +3,13 @@
# Maintainer : YianIris <yianiris At disroot Dot org>
# Obarun PkgSrc : https://framagit.org/obarun-pkgbuild-extra/xorg-server
#----------------
# Maintainer : AndyRTR <andyrtr@archlinux.org>
# Maintainer : Jan de Groot <jgc@archlinux.org>
# Arch PkgSrc : https://www.archlinux.org/packages/extra/x86_64/xorg-server
#----------------
# Website : http://xorg.freedesktop.org
#--------------------------------------------------------------------------------------
# DESCRIPTION ]
pkgbase=xorg-server
pkgver=1.20.12
pkgrel=2
pkgname=(
'xorg-server'
......@@ -20,15 +19,11 @@ pkgname=(
'xorg-server-common'
'xorg-server-devel')
pkgver=1.20.11
pkgrel=2
url="https://xorg.freedesktop.org/releases/individual/xserver"
track=commit
target=8059bbba8438d44041883de2e3ee35503f3f17f0 # refs/tags/xorg-server-1.20.11
source=("git+https://gitlab.freedesktop.org/xorg/xserver#${track}=${target}"
track=
target="$pkgbase-$pkgver.tar.xz"
source=("$url/$target"{,.sig}
'xserver-autobind-hotplug.patch'
'0001-v2-FS-58644.patch'
'0002-fix-libshadow-2.patch'
......@@ -36,8 +31,19 @@ source=("git+https://gitlab.freedesktop.org/xorg/xserver#${track}=${target}"
'xvfb-run.1'
'Xwrapper.config')
#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
#------------------------
# INSTALL CONFIGURATION ]
arch=(x86_64)
groups=(
'xorg')
backup=(
'etc/X11/Xwrapper.config')
#----------------------
# BUILD CONFIGURATION ]
makedepends=(
'xorgproto'
......@@ -72,16 +78,12 @@ makedepends=(
'wayland-protocols'
'egl-wayland')
#--------------------------------------| BUILD PREPARATION |------------------------------------
pkgver() {
cd xserver
git describe --tags | sed 's/^xorg.server.//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
#--------------------
# BUILD PREPARATION ]
prepare() {
#cd "${pkgbase}-${pkgver}"
cd xserver
cd "$pkgbase-$pkgver"
#cd xserver
## patch from Fedora, not yet merged
patch -Np1 -i ../xserver-autobind-hotplug.patch
......@@ -93,7 +95,32 @@ prepare() {
}
#--------------------------------------------| BUILD |------------------------------------------
#----------------
# BUILD CONTROL ]
_path=(
-Dxkb_dir=/usr/share/X11/xkb
-Dxkb_output_dir=/var/lib/xkb
)
_flags=(
-Dos_vendor="Obarun"
-Dxvfb=true
-Dxnest=true
-Dxcsecurity=true
-Dxorg=true
-Dxephyr=true
-Dxwayland=true
-Dxwayland_eglstream=true
-Dglamor=true
-Dudev=true
-Dsuid_wrapper=true
-Dipv6=true
-Dsystemd_logind=false
)
#--------
# BUILD ]
build() {
......@@ -105,23 +132,8 @@ build() {
export CXXFLAGS=${CXXFLAGS/-fno-plt}
export LDFLAGS=${LDFLAGS/,-z,now}
# arch-meson ${pkgbase}-$pkgver build
arch-meson xserver build \
-D os_vendor="Obarun" \
-D ipv6=true \
-D xvfb=true \
-D xnest=true \
-D xcsecurity=true \
-D xorg=true \
-D xephyr=true \
-D xwayland=true \
-D xwayland_eglstream=true \
-D glamor=true \
-D udev=true \
-D suid_wrapper=true \
-D xkb_dir=/usr/share/X11/xkb \
-D xkb_output_dir=/var/lib/xkb \
-D systemd_logind=false
# arch-meson build
arch-meson $pkgbase-$pkgver build "${_path[@]}" "${_flags[@]}"
## Print config
meson configure build
......@@ -131,11 +143,8 @@ build() {
DESTDIR="${srcdir}/fakeinstall" ninja -C build install
}
#--------------------------------------------| CHECK |------------------------------------------
#-------------------------------------------| PACKAGE |-----------------------------------------
#----------
# PACKAGE ]
_install() {
local src f dir
......@@ -157,12 +166,9 @@ package_xorg-server-common() {
_install fakeinstall/usr/lib/xorg/protocol.txt
_install fakeinstall/usr/share/man/man1/Xserver.1
#install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase}-${pkgver}"/xkb/README.compiled
install -m644 -Dt "${pkgdir}/var/lib/xkb/" xserver/xkb/README.compiled
install -m644 -Dt "${pkgdir}/var/lib/xkb/" "$pkgbase-$pkgver"/xkb/README.compiled
## license
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
}
package_xorg-server() {
......@@ -215,8 +221,7 @@ package_xorg-server() {
install -Dm0644 Xwrapper.config "${pkgdir}"/etc/X11/Xwrapper.config
## license
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
}
package_xorg-server-xephyr() {
......@@ -240,8 +245,7 @@ package_xorg-server-xephyr() {
_install fakeinstall/usr/share/man/man1/Xephyr.1
## license
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
}
package_xorg-server-xvfb() {
......@@ -263,8 +267,7 @@ package_xorg-server-xvfb() {
install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda
## license
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
}
package_xorg-server-xnest() {
......@@ -281,8 +284,7 @@ package_xorg-server-xnest() {
_install fakeinstall/usr/share/man/man1/Xnest.1
## license
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
}
package_xorg-server-devel() {
......@@ -298,26 +300,15 @@ package_xorg-server-devel() {
_install fakeinstall/usr/share/aclocal/xorg-server.m4
## license
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
## make sure there are no files left to install
rm fakeinstall/usr/bin/Xwayland
find fakeinstall -depth -print0 | xargs -0 rmdir
}
#------------------------------------| INSTALL CONFIGURATION |----------------------------------
arch=('x86_64')
groups=(
'xorg')
backup=(
'etc/X11/Xwrapper.config')
#-------------------------------------| SECURITY AND LICENCE |----------------------------------
#---------------------------
# LICENSE AND VERIFICATION ]
license=('CUSTOM')
......@@ -327,13 +318,11 @@ validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
'995ED5C8A6138EB0961F18474C09DD83CAAA50B2'
'3BB639E56F861FA2E86505690FDD682D974CA72A')
sha512sums=('SKIP'
'876e17d65f35714c75eced72ac67609f7fd83c7c6d3a842c011d3b3adbcda75447721024f49ce164cefbbe698d00b291af6f21d6f081879986cca7e447784f86'
'f05c18354a3cf5b5b0fa97c4a887cfd688297e39d7ddc93b5900357119a689a060321019aeec9ca9c1366ea4b65b7875b2a9cadb84e46d2c193c15e6df22fcd8'
'f9b22b91acdebedc0e485ba99bfeab107bced5706693d16ba66aa4a6ea1f6b39d835b5dba6eda38da02bc2dca16150ccceae42e18e6563eff3fac4e4195aa328'
'c1da07f0040f52ffcfec4c9b96d80c07738db6451c149c36a5636f28307dfcffa46c2f2490a52691c6fbffa7cc45565b552da87d6ef487b5198f00f4482257be'
'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
'97315b682bef7892d3cf641ea9add6e0d22901150763930020302cc73de5fe5bda0f47384b7d405c7169cb5f072d27da306066063d5a8ea116e97ea474caffe8'
)
sha512sums=('98350c42fb1f10c965663c1c8d4b225689a6a63163d788d454aa71b28b9cc8fcf9709a932f882358a13ca0c277c0c15812d05919092b4c32828d4ed61cca0406'
'SKIP'
'876e17d65f35714c75eced72ac67609f7fd83c7c6d3a842c011d3b3adbcda75447721024f49ce164cefbbe698d00b291af6f21d6f081879986cca7e447784f86'
'f05c18354a3cf5b5b0fa97c4a887cfd688297e39d7ddc93b5900357119a689a060321019aeec9ca9c1366ea4b65b7875b2a9cadb84e46d2c193c15e6df22fcd8'
'f9b22b91acdebedc0e485ba99bfeab107bced5706693d16ba66aa4a6ea1f6b39d835b5dba6eda38da02bc2dca16150ccceae42e18e6563eff3fac4e4195aa328'
'c1da07f0040f52ffcfec4c9b96d80c07738db6451c149c36a5636f28307dfcffa46c2f2490a52691c6fbffa7cc45565b552da87d6ef487b5198f00f4482257be'
'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
'97315b682bef7892d3cf641ea9add6e0d22901150763930020302cc73de5fe5bda0f47384b7d405c7169cb5f072d27da306066063d5a8ea116e97ea474caffe8')
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment