Android build, packet stream fixes

Signed-off-by: Andrew Opalach <andrew@akon.city>

3 files changed, 17 insertions, 24 deletions

diff --git a/subprojects/libev.wrap b/subprojects/libev.wrap
index 02b8df5..56b5299 100644
--- a/subprojects/libev.wrap
+++ b/subprojects/libev.wrap
@@ -6,7 +6,7 @@ source_filename = libev-4.33.tar.gz
 source_hash = 507eb7b8d1015fbec5b935f34ebed15bf346bed04a11ab82b8eee848c4205aea
 
 patch_directory = libev
-diff_files = libev/libev_aki_sleep_no_monotonic.diff, libev/no_extern_on_init.diff
+diff_files = libev/libev_aki_thread_sleep.diff, libev/no_extern_on_init.diff, libev/no_monotonic.diff
 
 [provide]
 dependency_names = libev
diff --git a/subprojects/packagefiles/libev/libev_aki_sleep_no_monotonic.diff b/subprojects/packagefiles/libev/libev_aki_thread_sleep.diff
index 2080116..59d197c 100644
--- a/subprojects/packagefiles/libev/libev_aki_sleep_no_monotonic.diff
+++ b/subprojects/packagefiles/libev/libev_aki_thread_sleep.diff
@@ -9,15 +9,6 @@
  #ifdef EV_H
  # include EV_H
  #else
-@@ -437,7 +439,7 @@
- /* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
- /* which makes programs even slower. might work on other unices, too. */
- #if EV_USE_CLOCK_SYSCALL
--# include <sys/syscall.h>
-+# include <unistd.h>
- # ifdef SYS_clock_gettime
- #  define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
- #  undef EV_USE_MONOTONIC
 @@ -2216,24 +2218,7 @@
  {
    if (delay > EV_TS_CONST (0.))
@@ -44,17 +35,3 @@
      }
  }
  
-@@ -4100,11 +4085,13 @@
-               waittime = EV_TS_CONST (MAX_BLOCKTIME2);
- #endif
- #if !EV_PERIODIC_ENABLE
-+#if EV_USE_MONOTONIC
-             /* without periodics but with monotonic clock there is no need */
-             /* for any time jump detection, so sleep longer */
-             if (ecb_expect_true (have_monotonic))
-               waittime = EV_TS_CONST (MAX_BLOCKTIME2);
- #endif
-+#endif
- 
-             if (timercnt)
-               {
diff --git a/subprojects/packagefiles/libev/no_monotonic.diff b/subprojects/packagefiles/libev/no_monotonic.diff
new file mode 100644
index 0000000..382c241
--- /dev/null
+++ b/subprojects/packagefiles/libev/no_monotonic.diff
@@ -0,0 +1,16 @@
+--- a/ev.c 2020-03-18 08:27:32.000000000 -0400
++++ b/ev.c 2024-01-16 15:42:39.360703755 -0400
+@@ -4100,11 +4085,13 @@
+               waittime = EV_TS_CONST (MAX_BLOCKTIME2);
+ #endif
+ #if !EV_PERIODIC_ENABLE
++#if EV_USE_MONOTONIC
+             /* without periodics but with monotonic clock there is no need */
+             /* for any time jump detection, so sleep longer */
+             if (ecb_expect_true (have_monotonic))
+               waittime = EV_TS_CONST (MAX_BLOCKTIME2);
+ #endif
++#endif
+ 
+             if (timercnt)
+               {