Termux
/
termux-packages
mirror of https://github.com/termux/termux-packages
1
0
Fork 0
Code Issues Releases Wiki Activity

virglrenderer-android: update patches

This commit is contained in:
Chongyun Lee 2024-04-17 13:06:27 +08:00
parent d69bce73bb
commit 9ca26e958d
3 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
x11-packages/virglrenderer-android/0001-do-not-use-gbm.patch.beforehostbuild
View File

@ -1,14 +1,5 @@
--- a/meson.build
+++ b/meson.build
@@ -71,7 +71,7 @@
prog_python = import('python').find_installation('python3')
not_found = dependency('', required: false)
-libdrm_dep = dependency('libdrm', version : '>=2.4.50', required: get_option('drm').enabled() or get_option('venus'))
+libdrm_dep = dependency('libdrm', version : '>=2.4.50', required: get_option('drm').enabled())
gbm_dep = not_found
thread_dep = dependency('threads')
epoxy_dep = dependency('epoxy', version: '>= 1.5.4')
@@ -129,6 +129,7 @@
endif
@ -26,17 +17,6 @@
have_egl = true
else
if libdrm_dep.found()
--- a/src/virglrenderer.c
+++ b/src/virglrenderer.c
@@ -837,6 +837,8 @@
state.winsys_initialized = true;
}
+ printf("CBS version: %d\n", state.cbs->version);
+
if (!state.winsys_initialized && !state.external_winsys_initialized &&
state.cbs && state.cbs->version >= 4 && state.cbs->get_egl_display) {
void *egl_display = NULL;
--- a/src/vrend_winsys.c
+++ b/src/vrend_winsys.c
@@ -76,6 +76,12 @@
@ -58,7 +38,7 @@
{
+#ifdef __ANDROID__
+ if (use_context == CONTEXT_EGL) {
+ free(egl);
+ virgl_egl_destroy(egl);
+ egl = NULL;
+ use_context = CONTEXT_NONE;
+ }

25
x11-packages/virglrenderer-android/0005-Enable-debug-for-EGL.patch.beforehostbuild
View File

@ -1,32 +1,39 @@
diff --git a/src/vrend_winsys_egl.c b/src/vrend_winsys_egl.c
--- a/src/vrend_winsys_egl.c
+++ b/src/vrend_winsys_egl.c
@@ -393,14 +393,12 @@
@@ -391,14 +391,12 @@
goto fail;
extensions = eglQueryString(egl->egl_display, EGL_EXTENSIONS);
-#ifdef VIRGL_EGL_DEBUG
virgl_debug("EGL major/minor: %d.%d\n", major, minor);
virgl_debug("EGL version: %s\n",
- virgl_debug("EGL major/minor: %d.%d\n", major, minor);
- virgl_debug("EGL version: %s\n",
+ virgl_info("EGL major/minor: %d.%d\n", major, minor);
+ virgl_info("EGL version: %s\n",
eglQueryString(egl->egl_display, EGL_VERSION));
virgl_debug("EGL vendor: %s\n",
- virgl_debug("EGL vendor: %s\n",
+ virgl_info("EGL vendor: %s\n",
eglQueryString(egl->egl_display, EGL_VENDOR));
virgl_debug("EGL extensions: %s\n", extensions);
- virgl_debug("EGL extensions: %s\n", extensions);
-#endif
+ virgl_info("EGL extensions: %s\n", extensions);
if (!virgl_egl_add_extensions(egl, extensions))
goto fail;
@@ -593,13 +591,11 @@
@@ -591,13 +589,11 @@
goto fail;
extensions = eglQueryString(egl->egl_display, EGL_EXTENSIONS);
-#ifdef VIRGL_EGL_DEBUG
virgl_debug("EGL version: %s\n",
- virgl_debug("EGL version: %s\n",
+ virgl_info("EGL version: %s\n",
eglQueryString(egl->egl_display, EGL_VERSION));
virgl_debug("EGL vendor: %s\n",
- virgl_debug("EGL vendor: %s\n",
+ virgl_info("EGL vendor: %s\n",
eglQueryString(egl->egl_display, EGL_VENDOR));
virgl_debug("EGL extensions: %s\n", extensions);
- virgl_debug("EGL extensions: %s\n", extensions);
-#endif
+ virgl_info("EGL extensions: %s\n", extensions);
if (!virgl_egl_add_extensions(egl, extensions))
goto fail;

1
x11-packages/virglrenderer-android/build.sh
View File

@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@licy183"
TERMUX_PKG_VERSION=(1.0.1)
TERMUX_PKG_VERSION+=(1.5.10) # libepoxy version
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=(https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-${TERMUX_PKG_VERSION[0]}/virglrenderer-virglrenderer-${TERMUX_PKG_VERSION[0]}.tar.gz)
TERMUX_PKG_SRCURL+=(https://github.com/anholt/libepoxy/archive/refs/tags/${TERMUX_PKG_VERSION[1]}.tar.gz)
TERMUX_PKG_SHA256=(446ab3e265f574ec598e77bdfbf0616ee3c77361f0574bec733ba4bac4df730a)