disable glx as it causes problems on some devices

Fixes https://github.com/termux/x11-packages/issues/16.

 This undo changes introduced in the following commits:

  * bf945ba417bfd2ba661287fa1d4d25cf1da052d0.
  * a954c554e02b2b8faae3a336101bf5539832c476.
  * effb70f99fb7d0e3f3010dc926cec4e0ca612922.
  * cd0f20c8bd6f01e7b55491a6009f2826db355a97.
This commit is contained in:
Leonid Pliushch 2018-10-31 20:54:40 +02:00 committed by Yaksh Bariya
parent 13d00f4720
commit 6380dacf03
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
4 changed files with 8 additions and 51 deletions

View File

@ -1,44 +0,0 @@
TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
## Required by GLX functionality of Xvnc/Xvfb servers and shouldn't be
## used by used by regular applications.
##
## Cannot built as part of package 'mesa' since --enable-glx=xlib
## require DRI to be disabled.
TERMUX_PKG_HOMEPAGE=https://www.mesa3d.org
TERMUX_PKG_DESCRIPTION="The legacy/original Mesa software rasterizer"
## Use 17.3.x branch because 18.x.x requires 'pthread_barrier_t'.
TERMUX_PKG_VERSION=17.3.9
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://mesa.freedesktop.org/archive/mesa-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=c5beb5fc05f0e0c294fefe1a393ee118cb67e27a4dca417d77c297f7d4b6e479
TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, libdrm, libexpat, mesa"
TERMUX_PKG_BUILD_DEPENDS="xorgproto"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--disable-asm
--disable-gbm
--disable-egl
--disable-gles1
--disable-gles2
--enable-glx=dri
--with-platforms=x11
--with-dri-drivers=swrast
--without-gallium-drivers
ac_cv_header_xlocale_h=no
"
termux_step_pre_configure () {
export LIBS="-landroid-shmem -latomic"
}
termux_step_make_install() {
install -Dm600 ./lib/swrast_dri.so "${TERMUX_PREFIX}/lib/dri/swrast_dri.so"
install \
-Dm600 \
"${TERMUX_PKG_SRCDIR}/include/GL/internal/dri_interface.h" \
"${TERMUX_PREFIX}/include/GL/internal/dri_interface.h"
}

View File

@ -4,7 +4,7 @@ TERMUX_PKG_HOMEPAGE=https://www.mesa3d.org
TERMUX_PKG_DESCRIPTION="An open-source implementation of the OpenGL specification" TERMUX_PKG_DESCRIPTION="An open-source implementation of the OpenGL specification"
## Use 17.3.x branch because 18.x.x requires 'pthread_barrier_t'. ## Use 17.3.x branch because 18.x.x requires 'pthread_barrier_t'.
TERMUX_PKG_VERSION=17.3.9 TERMUX_PKG_VERSION=17.3.9
TERMUX_PKG_REVISION=5 TERMUX_PKG_REVISION=6
TERMUX_PKG_SRCURL=https://mesa.freedesktop.org/archive/mesa-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SRCURL=https://mesa.freedesktop.org/archive/mesa-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=c5beb5fc05f0e0c294fefe1a393ee118cb67e27a4dca417d77c297f7d4b6e479 TERMUX_PKG_SHA256=c5beb5fc05f0e0c294fefe1a393ee118cb67e27a4dca417d77c297f7d4b6e479
@ -22,7 +22,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--disable-gles2 --disable-gles2
--disable-dri --disable-dri
--disable-dri3 --disable-dri3
--enable-glx=xlib --disable-glx
--with-platforms=x11 --with-platforms=x11
--without-dri-drivers --without-dri-drivers
--without-gallium-drivers --without-gallium-drivers

View File

@ -2,12 +2,12 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
TERMUX_PKG_HOMEPAGE=http://www.tigervnc.org/ TERMUX_PKG_HOMEPAGE=http://www.tigervnc.org/
TERMUX_PKG_VERSION=1.9.0 TERMUX_PKG_VERSION=1.9.0
TERMUX_PKG_REVISION=17 TERMUX_PKG_REVISION=18
TERMUX_PKG_DESCRIPTION="Suite of VNC servers. Based on the VNC 4 branch of TightVNC." TERMUX_PKG_DESCRIPTION="Suite of VNC servers. Based on the VNC 4 branch of TightVNC."
TERMUX_PKG_SRCURL=https://github.com/TigerVNC/tigervnc/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SRCURL=https://github.com/TigerVNC/tigervnc/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=f15ced8500ec56356c3bf271f52e58ed83729118361c7103eab64a618441f740 TERMUX_PKG_SHA256=f15ced8500ec56356c3bf271f52e58ed83729118361c7103eab64a618441f740
TERMUX_PKG_DEPENDS="freetype, libandroid-support, libandroid-shmem, libbz2, libc++, libdrm, libexpat, libgnutls, libjpeg-turbo, libpixman, libpng, libuuid, libx11, libxau, libxcb, libxdamage, libxdmcp, libxext, libxxf86vm, libxfixes, libxfont2, libxshmfence, mesa, mesa-swrast, openssl, perl, xkeyboard-config, xorg-xauth, xorg-xkbcomp" TERMUX_PKG_DEPENDS="freetype, libandroid-support, 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, xorg-server-xvfb, xtrans" TERMUX_PKG_BUILD_DEPENDS="xorgproto, xorg-font-util, xorg-util-macros, xorg-server-xvfb, xtrans"
TERMUX_PKG_SUGGESTS="aterm, xorg-twm" TERMUX_PKG_SUGGESTS="aterm, xorg-twm"

View File

@ -3,10 +3,11 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
TERMUX_PKG_HOMEPAGE=http://xorg.freedesktop.org/ TERMUX_PKG_HOMEPAGE=http://xorg.freedesktop.org/
TERMUX_PKG_DESCRIPTION="X virtual framebuffer" TERMUX_PKG_DESCRIPTION="X virtual framebuffer"
TERMUX_PKG_VERSION=1.20.3 TERMUX_PKG_VERSION=1.20.3
TERMUX_PKG_REVISION=1
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=1b3ce466c12cacbe2252b3ad5b0ed561972eef9d09e75900d65fb1e21f9201de TERMUX_PKG_SHA256=1b3ce466c12cacbe2252b3ad5b0ed561972eef9d09e75900d65fb1e21f9201de
TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libpixman, libx11, libxau, libxfont2, libxinerama, libxkbfile, libxshmfence, mesa, mesa-swrast, openssl, xkeyboard-config, xorg-xkbcomp" TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libpixman, libx11, libxau, libxfont2, libxinerama, libxkbfile, libxshmfence, mesa, openssl, xkeyboard-config, xorg-xkbcomp"
TERMUX_PKG_CONFLICTS="xorg-xvfb" TERMUX_PKG_CONFLICTS="xorg-xvfb"
TERMUX_PKG_REPLACES="xorg-xvfb" TERMUX_PKG_REPLACES="xorg-xvfb"
@ -20,7 +21,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--enable-dga --enable-dga
--enable-screensaver --enable-screensaver
--enable-xdmcp --enable-xdmcp
--enable-glx --disable-glx
--disable-dri --disable-dri
--disable-dri2 --disable-dri2
--disable-dri3 --disable-dri3