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

tigervnc: download xorg-server src through TERMUX_PKG_SRCURL as well

Browse Source 
And put those sources to the correct place in
termux_step_post_get_source.
This commit is contained in:
Henrik Grimler 2022-02-21 21:40:51 +01:00 committed by Yaksh Bariya
parent 34da5307a6
commit f7e8539ea4
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
x11-packages/tigervnc/build.sh
View File

@ -3,10 +3,13 @@ TERMUX_PKG_DESCRIPTION="Suite of VNC servers. Based on the VNC 4 branch of Tight
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
# No update anymore. v1.11.x requires support of PAM.
TERMUX_PKG_VERSION=1.10.1
TERMUX_PKG_REVISION=17
TERMUX_PKG_SRCURL=https://github.com/TigerVNC/tigervnc/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=19fcc80d7d35dd58115262e53cac87d8903180261d94c2a6b0c19224f50b58c4
TERMUX_PKG_VERSION=(1.10.1
1.20.0)
TERMUX_PKG_REVISION=18
TERMUX_PKG_SRCURL=(https://github.com/TigerVNC/tigervnc/archive/v${TERMUX_PKG_VERSION}.tar.gz
https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${TERMUX_PKG_VERSION[1]}.tar.bz2)
TERMUX_PKG_SHA256=(19fcc80d7d35dd58115262e53cac87d8903180261d94c2a6b0c19224f50b58c4
9d967d185f05709274ee0c4f861a4672463986e550ca05725ce27974f550d3e6)
TERMUX_PKG_DEPENDS="freetype, libandroid-shmem, libbz2, libc++, libdrm, libexpat, libgnutls, libjpeg-turbo, libpixman, libpng, libuuid, libx11, libxau, libxcb, libxdamage, libxdmcp, libxext, libxxf86vm, libxfixes, libxfont2, libxshmfence, mesa, openssl, perl, xkeyboard-config, xorg-xauth, xorg-xkbcomp"
TERMUX_PKG_BUILD_DEPENDS="xorgproto, xorg-font-util, xorg-util-macros, xtrans"
@ -16,31 +19,26 @@ TERMUX_PKG_FOLDERNAME=tigervnc-${TERMUX_PKG_VERSION}
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBUILD_VIEWER=ON -DENABLE_NLS=OFF -DENABLE_PAM=OFF -DENABLE_GNUTLS=ON -DFLTK_MATH_LIBRARY=libm.a"
TERMUX_PKG_BUILD_IN_SRC=true
termux_step_pre_configure() {
mkdir -p ${TERMUX_PKG_BUILDDIR}/unix/xserver
termux_step_post_get_source() {
## TigerVNC requires sources of X server (either Xorg or Xvfb).
cd ${TERMUX_PKG_BUILDDIR}/unix/xserver/ && {
termux_download \
https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.20.0.tar.bz2 \
xorg-server-src.tar.bz2 \
9d967d185f05709274ee0c4f861a4672463986e550ca05725ce27974f550d3e6
tar xf xorg-server-src.tar.bz2 --strip-components=1
rm -f xorg-server-src.tar.bz2
cp -r xorg-server-${TERMUX_PKG_VERSION[1]}/* unix/xserver/
for p in "$TERMUX_SCRIPTDIR/packages/xorg-server-xvfb"/*.patch; do
sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" "$p" | \
sed "s%\@TERMUX_HOME\@%${TERMUX_ANDROID_HOME}%g" | \
patch --silent -p1
done
}
cd ${TERMUX_PKG_BUILDDIR}/unix/xserver
for p in "$TERMUX_SCRIPTDIR/packages/xorg-server-xvfb"/*.patch; do
echo "$p"
sed -e "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" \
-e "s%\@TERMUX_HOME\@%${TERMUX_ANDROID_HOME}%g" "$p" \
| patch -p1
done
patch -p1 -i ${TERMUX_PKG_SRCDIR}/unix/xserver120.patch
}
termux_step_pre_configure() {
cd ${TERMUX_PKG_BUILDDIR}/unix/xserver
export ACLOCAL="aclocal -I ${TERMUX_PREFIX}/share/aclocal"
autoreconf -fi
CFLAGS="${CFLAGS/-Os/-Oz} -DFNDELAY=O_NDELAY -DINITARGS=void"
CPPFLAGS="${CPPFLAGS} -I${TERMUX_PREFIX}/include/libdrm"
LDFLAGS="${LDFLAGS} -llog"