aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorprspkt <prspkt@protonmail.com>2019-05-30 23:08:58 +0300
committerNatanael Copa <ncopa@alpinelinux.org>2019-05-31 06:20:44 +0000
commite33bb5ae1e54f086fade8a476f744ac745c433e2 (patch)
tree3983038170bbe92b71dd263683327daeb293e0f7
parentec7e23e4b31581a9fbb9859f8cfb60a48dfa5577 (diff)
downloadaports-e33bb5ae1e54f086fade8a476f744ac745c433e2.tar.bz2
aports-e33bb5ae1e54f086fade8a476f744ac745c433e2.tar.xz
main/xorg-server: modernize
- Switch url to https. - Remove CLIBC check, we use musl across the board. - Remove 20-modules.conf. musl emulates lazy relocation which makes hard-coding X.org modules in 20-modules.conf redundant.
-rw-r--r--main/xorg-server/20-modules.conf18
-rw-r--r--main/xorg-server/APKBUILD19
2 files changed, 3 insertions, 34 deletions
diff --git a/main/xorg-server/20-modules.conf b/main/xorg-server/20-modules.conf
deleted file mode 100644
index 4ddcdd461b..0000000000
--- a/main/xorg-server/20-modules.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-Section "Module"
- Load "exa"
-# Load "wfb"
-
- Load "dri"
- Load "dri2"
- Load "glx"
-
- Load "int10"
- Load "vbe"
- Load "fb"
- Load "shadowfb"
- Load "shadow"
- Load "vgahw"
- Load "evdev"
- Load "fbdevhw"
- Load "glamoregl"
-EndSection
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD
index af0138e525..9d69174d44 100644
--- a/main/xorg-server/APKBUILD
+++ b/main/xorg-server/APKBUILD
@@ -4,7 +4,7 @@ pkgname=xorg-server
pkgver=1.20.4
pkgrel=0
pkgdesc="X.Org X servers"
-url="http://xorg.freedesktop.org"
+url="https://www.x.org/wiki"
arch="all"
license="MIT"
options="suid"
@@ -59,7 +59,6 @@ source="https://www.x.org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2
autoconfig-nvidia.patch
autoconfig-sis.patch
fix-musl-arm.patch
- 20-modules.conf
"
# secfixes:
@@ -82,21 +81,17 @@ source="https://www.x.org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2
# - CVE-2017-13723
prepare() {
- cd "$builddir"
default_prepare
-
# Fix dbus config path
sed -i -e 's/\$(sysconfdir)/\/etc/' config/Makefile.*
sed -i -e 's/termio.h/termios.h/' hw/xfree86/os-support/xf86_OSlib.h
}
build() {
- cd "$builddir"
# xorg modules does not work with the -z now and it seems like we
# cannot pass over the linker flag to .so files. so we tweak the
# gcc specs.
- export CFLAGS="$CFLAGS -D_GNU_SOURCE"
- [ "$CLIBC" == musl ] && export CFLAGS="$CFLAGS -D__gid_t=gid_t -D__uid_t=uid_t"
+ export CFLAGS="$CFLAGS -D_GNU_SOURCE -D__gid_t=gid_t -D__uid_t=uid_t"
export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
_fontroot="/usr/share/fonts"
@@ -135,22 +130,17 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
chmod u+s "$pkgdir"/usr/bin/Xorg
# Don't conflict with xf86-input-evdev
rm -f "$pkgdir"/usr/share/X11/xorg.conf.d/10-evdev.conf
- install -m755 -d "$pkgdir"/etc/X11/xorg.conf.d
- install -m644 "$srcdir"/20-modules.conf "$pkgdir"/etc/X11/xorg.conf.d/
install -m755 -d "$pkgdir"/var/lib/xkb
- install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
xvfb() {
@@ -161,14 +151,12 @@ xvfb() {
xephyr() {
pkgdesc="kdrive based X Server which targets a window on a host X Server as its framebuffer"
- depends=
mkdir -p "$subpkgdir"/usr/bin
mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/
}
xnest() {
pkgdesc="A nested Xorg server"
- depends=
mkdir -p "$subpkgdir"/usr/bin
mv "$pkgdir"/usr/bin/Xnest "$subpkgdir"/usr/bin/
}
@@ -182,5 +170,4 @@ xwayland() {
sha512sums="f1c92ef6d7613e0636973d3395b48dfdad42230847ab1c8b1cea84647a968f649f9aba97bdb01c10ee8351cbe954d4e6ca4a0fc84bb8fa662d49c8ba2aee00a8 xorg-server-1.20.4.tar.bz2
016d10e59681d36be19aacc1505103bd340a5e81855e551997b42f8b54796be46fb2d91be8d1aa3bebb10d34e51258be9de1299c2e351b840450de38ff103df0 autoconfig-nvidia.patch
30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200 autoconfig-sis.patch
-b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch
-95036f2452732cc31f6b646da9f46b7be30f4c9392724386b02f67fece1f506b00e15d14cbd8cf0ce75ca1fd144b4bea7e59288d4aaf4d6c1e06e5168931eb67 20-modules.conf"
+b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch"