From 9ca26e958d5dc6790409fb9c4e9e114c4831c383 Mon Sep 17 00:00:00 2001
From: Chongyun Lee <45286352+licy183@users.noreply.github.com>
Date: Wed, 17 Apr 2024 13:06:27 +0800
Subject: [PATCH] virglrenderer-android: update patches

---
 .../0001-do-not-use-gbm.patch.beforehostbuild | 22 +---------------
 ...Enable-debug-for-EGL.patch.beforehostbuild | 25 ++++++++++++-------
 x11-packages/virglrenderer-android/build.sh   |  1 +
 3 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/x11-packages/virglrenderer-android/0001-do-not-use-gbm.patch.beforehostbuild b/x11-packages/virglrenderer-android/0001-do-not-use-gbm.patch.beforehostbuild
index aa7db7a127..1560c228c1 100644
--- a/x11-packages/virglrenderer-android/0001-do-not-use-gbm.patch.beforehostbuild
+++ b/x11-packages/virglrenderer-android/0001-do-not-use-gbm.patch.beforehostbuild
@@ -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;
 +   }
diff --git a/x11-packages/virglrenderer-android/0005-Enable-debug-for-EGL.patch.beforehostbuild b/x11-packages/virglrenderer-android/0005-Enable-debug-for-EGL.patch.beforehostbuild
index 58a653c779..7b8c3a83c3 100644
--- a/x11-packages/virglrenderer-android/0005-Enable-debug-for-EGL.patch.beforehostbuild
+++ b/x11-packages/virglrenderer-android/0005-Enable-debug-for-EGL.patch.beforehostbuild
@@ -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;
  
diff --git a/x11-packages/virglrenderer-android/build.sh b/x11-packages/virglrenderer-android/build.sh
index 63dc9a38d9..a2c43cdd52 100644
--- a/x11-packages/virglrenderer-android/build.sh
+++ b/x11-packages/virglrenderer-android/build.sh
@@ -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)