glfw: Bump to 3.3.8-p20230303

x11-packages/glfw/build.sh

@@ -2,10 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://www.glfw.org/
 TERMUX_PKG_DESCRIPTION="An Open Source, multi-platform library for OpenGL, OpenGL ES and Vulkan application development"
 TERMUX_PKG_LICENSE="ZLIB"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=3.3.8
-TERMUX_PKG_SRCURL=https://github.com/glfw/glfw/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=f30f42e05f11e5fc62483e513b0488d5bceeab7d9c5da0ffe2252ad81816c713
-TERMUX_PKG_DEPENDS="libx11"
+_COMMIT=9a87635686c7fcb63ca63149c5b179b85a53a725
+_COMMIT_DATE=20230303
+TERMUX_PKG_VERSION=3.3.8-p${_COMMIT_DATE}
+TERMUX_PKG_SRCURL=git+https://github.com/glfw/glfw
+TERMUX_PKG_SHA256=54ff7b5753857681ad832110e3b0729eadb128289dd58ba0a9f5cf487dbaf901
+TERMUX_PKG_GIT_BRANCH=master
+TERMUX_PKG_DEPENDS="opengl"
 TERMUX_PKG_BUILD_DEPENDS="libxcursor, libxi, libxinerama, libxrandr, xorgproto"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DBUILD_SHARED_LIBS=ON
@@ -14,6 +17,24 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DGLFW_BUILD_DOCS=OFF
 "
 
+termux_step_post_get_source() {
+	git fetch --unshallow
+	git checkout $_COMMIT
+
+	local pdate="p$(git log -1 --format=%cs | sed 's/-//g')"
+	if [[ "$TERMUX_PKG_VERSION" != *"${pdate}" ]]; then
+		echo -n "ERROR: The version string \"$TERMUX_PKG_VERSION\" is"
+		echo -n " different from what is expected to be; should end"
+		echo " with \"${pdate}\"."
+		return 1
+	fi
+
+	local s=$(find . -type f ! -path '*/.git/*' -print0 | xargs -0 sha256sum | LC_ALL=C sort | sha256sum)
+	if [[ "${s}" != "${TERMUX_PKG_SHA256}  "* ]]; then
+		termux_error_exit "Checksum mismatch for source files."
+	fi
+}
+
 termux_step_pre_configure() {
 	LDFLAGS+=" -lm"
 }

x11-packages/glfw/src-CMakeLists.txt.patch

@@ -0,0 +1,20 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -57,7 +57,7 @@
+ endif()
+ 
+ if (GLFW_BUILD_X11 OR GLFW_BUILD_WAYLAND)
+-    if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
++    if (CMAKE_SYSTEM_NAME MATCHES "Linux|Android")
+         target_sources(glfw PRIVATE linux_joystick.h linux_joystick.c)
+     endif()
+     target_sources(glfw PRIVATE posix_poll.h posix_poll.c)
+@@ -174,7 +174,7 @@
+ 
+     target_include_directories(glfw PRIVATE ${Wayland_INCLUDE_DIRS})
+ 
+-    if (NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
++    if (NOT CMAKE_SYSTEM_NAME MATCHES "Linux|Android")
+         find_package(EpollShim)
+         if (EPOLLSHIM_FOUND)
+             target_include_directories(glfw PRIVATE ${EPOLLSHIM_INCLUDE_DIRS})

x11-packages/glfw/src-wl_init.c.patch

@@ -1,20 +0,0 @@
---- a/src/wl_init.c
-+++ b/src/wl_init.c
-@@ -1150,7 +1150,7 @@
-     // Sync so we got all initial output events
-     wl_display_roundtrip(_glfw.wl.display);
- 
--#ifdef __linux__
-+#if defined __linux__ && !defined __ANDROID__
-     if (!_glfwInitJoysticksLinux())
-         return GLFW_FALSE;
- #endif
-@@ -1211,7 +1211,7 @@
- 
- void _glfwPlatformTerminate(void)
- {
--#ifdef __linux__
-+#if defined __linux__ && !defined __ANDROID__
-     _glfwTerminateJoysticksLinux();
- #endif
-     _glfwTerminateEGL();

x11-packages/glfw/src-wl_platform.h.patch

@@ -1,11 +0,0 @@
---- a/src/wl_platform.h
-+++ b/src/wl_platform.h
-@@ -45,7 +45,7 @@
- 
- #include "posix_thread.h"
- #include "posix_time.h"
--#ifdef __linux__
-+#if defined __linux__ && !defined __ANDROID__
- #include "linux_joystick.h"
- #else
- #include "null_joystick.h"

x11-packages/glfw/src-x11_init.c.patch

@@ -1,83 +1,74 @@
 --- a/src/x11_init.c
 +++ b/src/x11_init.c
-@@ -571,7 +571,7 @@
+@@ -606,7 +606,7 @@
  //
  static GLFWbool initExtensions(void)
  {
 -#if defined(__OpenBSD__) || defined(__NetBSD__)
 +#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__ANDROID__)
-     _glfw.x11.vidmode.handle = _glfw_dlopen("libXxf86vm.so");
+     _glfw.x11.vidmode.handle = _glfwPlatformLoadModule("libXxf86vm.so");
  #else
-     _glfw.x11.vidmode.handle = _glfw_dlopen("libXxf86vm.so.1");
-@@ -595,7 +595,7 @@
+     _glfw.x11.vidmode.handle = _glfwPlatformLoadModule("libXxf86vm.so.1");
+@@ -630,7 +630,7 @@
  
  #if defined(__CYGWIN__)
-     _glfw.x11.xi.handle = _glfw_dlopen("libXi-6.so");
+     _glfw.x11.xi.handle = _glfwPlatformLoadModule("libXi-6.so");
 -#elif defined(__OpenBSD__) || defined(__NetBSD__)
 +#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__ANDROID__)
-     _glfw.x11.xi.handle = _glfw_dlopen("libXi.so");
+     _glfw.x11.xi.handle = _glfwPlatformLoadModule("libXi.so");
  #else
-     _glfw.x11.xi.handle = _glfw_dlopen("libXi.so.6");
-@@ -627,7 +627,7 @@
+     _glfw.x11.xi.handle = _glfwPlatformLoadModule("libXi.so.6");
+@@ -662,7 +662,7 @@
  
  #if defined(__CYGWIN__)
-     _glfw.x11.randr.handle = _glfw_dlopen("libXrandr-2.so");
+     _glfw.x11.randr.handle = _glfwPlatformLoadModule("libXrandr-2.so");
 -#elif defined(__OpenBSD__) || defined(__NetBSD__)
 +#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__ANDROID__)
-     _glfw.x11.randr.handle = _glfw_dlopen("libXrandr.so");
+     _glfw.x11.randr.handle = _glfwPlatformLoadModule("libXrandr.so");
  #else
-     _glfw.x11.randr.handle = _glfw_dlopen("libXrandr.so.2");
-@@ -721,7 +721,7 @@
+     _glfw.x11.randr.handle = _glfwPlatformLoadModule("libXrandr.so.2");
+@@ -756,7 +756,7 @@
  
  #if defined(__CYGWIN__)
-     _glfw.x11.xcursor.handle = _glfw_dlopen("libXcursor-1.so");
+     _glfw.x11.xcursor.handle = _glfwPlatformLoadModule("libXcursor-1.so");
 -#elif defined(__OpenBSD__) || defined(__NetBSD__)
 +#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__ANDROID__)
-     _glfw.x11.xcursor.handle = _glfw_dlopen("libXcursor.so");
+     _glfw.x11.xcursor.handle = _glfwPlatformLoadModule("libXcursor.so");
  #else
-     _glfw.x11.xcursor.handle = _glfw_dlopen("libXcursor.so.1");
-@@ -738,7 +738,7 @@
+     _glfw.x11.xcursor.handle = _glfwPlatformLoadModule("libXcursor.so.1");
+@@ -779,7 +779,7 @@
  
  #if defined(__CYGWIN__)
-     _glfw.x11.xinerama.handle = _glfw_dlopen("libXinerama-1.so");
+     _glfw.x11.xinerama.handle = _glfwPlatformLoadModule("libXinerama-1.so");
 -#elif defined(__OpenBSD__) || defined(__NetBSD__)
 +#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__ANDROID__)
-     _glfw.x11.xinerama.handle = _glfw_dlopen("libXinerama.so");
+     _glfw.x11.xinerama.handle = _glfwPlatformLoadModule("libXinerama.so");
  #else
-     _glfw.x11.xinerama.handle = _glfw_dlopen("libXinerama.so.1");
-@@ -791,7 +791,7 @@
+     _glfw.x11.xinerama.handle = _glfwPlatformLoadModule("libXinerama.so.1");
+@@ -834,7 +834,7 @@
+     {
+ #if defined(__CYGWIN__)
+         _glfw.x11.x11xcb.handle = _glfwPlatformLoadModule("libX11-xcb-1.so");
+-#elif defined(__OpenBSD__) || defined(__NetBSD__)
++#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__ANDROID__)
+         _glfw.x11.x11xcb.handle = _glfwPlatformLoadModule("libX11-xcb.so");
+ #else
+         _glfw.x11.x11xcb.handle = _glfwPlatformLoadModule("libX11-xcb.so.1");
+@@ -849,7 +849,7 @@
  
  #if defined(__CYGWIN__)
-     _glfw.x11.x11xcb.handle = _glfw_dlopen("libX11-xcb-1.so");
+     _glfw.x11.xrender.handle = _glfwPlatformLoadModule("libXrender-1.so");
 -#elif defined(__OpenBSD__) || defined(__NetBSD__)
 +#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__ANDROID__)
-     _glfw.x11.x11xcb.handle = _glfw_dlopen("libX11-xcb.so");
+     _glfw.x11.xrender.handle = _glfwPlatformLoadModule("libXrender.so");
  #else
-     _glfw.x11.x11xcb.handle = _glfw_dlopen("libX11-xcb.so.1");
-@@ -804,7 +804,7 @@
+     _glfw.x11.xrender.handle = _glfwPlatformLoadModule("libXrender.so.1");
+@@ -878,7 +878,7 @@
  
  #if defined(__CYGWIN__)
-     _glfw.x11.xrender.handle = _glfw_dlopen("libXrender-1.so");
+     _glfw.x11.xshape.handle = _glfwPlatformLoadModule("libXext-6.so");
 -#elif defined(__OpenBSD__) || defined(__NetBSD__)
 +#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__ANDROID__)
-     _glfw.x11.xrender.handle = _glfw_dlopen("libXrender.so");
+     _glfw.x11.xshape.handle = _glfwPlatformLoadModule("libXext.so");
  #else
-     _glfw.x11.xrender.handle = _glfw_dlopen("libXrender.so.1");
-@@ -1147,7 +1147,7 @@
-         }
-     }
- 
--#if defined(__linux__)
-+#if defined(__linux__) && !defined(__ANDROID__)
-     if (!_glfwInitJoysticksLinux())
-         return GLFW_FALSE;
- #endif
-@@ -1240,7 +1240,7 @@
-     _glfwTerminateEGL();
-     _glfwTerminateGLX();
- 
--#if defined(__linux__)
-+#if defined(__linux__) && !defined(__ANDROID__)
-     _glfwTerminateJoysticksLinux();
- #endif
- 
+     _glfw.x11.xshape.handle = _glfwPlatformLoadModule("libXext.so.6");

x11-packages/glfw/src-x11_window.c.patch

@@ -1,11 +0,0 @@
---- a/src/x11_window.c
-+++ b/src/x11_window.c
-@@ -2830,7 +2830,7 @@
- {
-     drainEmptyEvents();
- 
--#if defined(__linux__)
-+#if defined(__linux__) && !defined(__ANDROID__)
-     _glfwDetectJoystickConnectionLinux();
- #endif
-     XPending(_glfw.x11.display);