sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xwayland: Remove files conflicting with xorg-server

Browse Source
This commit is contained in:
Tee KOBAYASHI 2022-04-24 21:59:22 +09:00 committed by xtkoba
parent 54527f58a8
commit 5b7520b5a0
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
x11-packages/xwayland/build.sh
View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Wayland X11 server"
TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.20.5 TERMUX_PKG_VERSION=1.20.5
TERMUX_PKG_REVISION=13 TERMUX_PKG_REVISION=14
TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_SHA256=a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d TERMUX_PKG_SHA256=a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d
TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libpciaccess, libpixman, libx11, libxau, libxfont2, libxinerama, libxkbfile, libxshmfence, mesa, openssl, xkeyboard-config, xorg-xkbcomp, libwayland, libwayland-protocols, libepoxy" TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libpciaccess, libpixman, libx11, libxau, libxfont2, libxinerama, libxkbfile, libxshmfence, mesa, openssl, xkeyboard-config, xorg-xkbcomp, libwayland, libwayland-protocols, libepoxy"
@ -52,8 +52,15 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--with-sha1=libcrypto --with-sha1=libcrypto
--with-fontrootdir=${TERMUX_PREFIX}/share/fonts --with-fontrootdir=${TERMUX_PREFIX}/share/fonts
--with-xkb-path=${TERMUX_PREFIX}/share/X11/xkb --with-xkb-path=${TERMUX_PREFIX}/share/X11/xkb
--with-serverconfig-path=${TERMUX_PREFIX}/etc/xwayland
LIBS=-landroid-shmem" LIBS=-landroid-shmem"
# Remove files conflicting with xorg-server:
TERMUX_PKG_RM_AFTER_INSTALL="
share/X11/xkb/compiled
share/man/man1/Xserver.1
"
termux_step_pre_configure() { termux_step_pre_configure() {
CFLAGS+=" -fcommon -fPIC -DFNDELAY=O_NDELAY -Wno-int-to-pointer-cast" CFLAGS+=" -fcommon -fPIC -DFNDELAY=O_NDELAY -Wno-int-to-pointer-cast"
CPPFLAGS+=" -fcommon -fPIC -I${TERMUX_PREFIX}/include/libdrm" CPPFLAGS+=" -fcommon -fPIC -I${TERMUX_PREFIX}/include/libdrm"
@ -72,7 +79,3 @@ termux_step_pre_configure () {
autoreconf -if autoreconf -if
cd - cd -
} }
termux_step_post_make_install () {
rm -f "${TERMUX_PREFIX}/usr/share/X11/xkb/compiled"
}