From 91f40de289ddc4f9a92ffd02a2810ddddcb5f984 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Mon, 9 Jul 2018 22:44:09 -0500
Subject: user/libtheora: pull in, fix up

---
 user/libtheora/fix-timeb.patch | 75 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 user/libtheora/fix-timeb.patch

(limited to 'user/libtheora/fix-timeb.patch')

diff --git a/user/libtheora/fix-timeb.patch b/user/libtheora/fix-timeb.patch
new file mode 100644
index 000000000..5344c0757
--- /dev/null
+++ b/user/libtheora/fix-timeb.patch
@@ -0,0 +1,75 @@
+--- libtheora-1.1.1.orig/examples/dump_psnr.c
++++ libtheora-1.1.1/examples/dump_psnr.c
+@@ -37,7 +37,6 @@
+ #endif
+ #include <stdlib.h>
+ #include <string.h>
+-#include <sys/timeb.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ /*Yes, yes, we're going to hell.*/
+--- libtheora-1.1.1.orig/examples/dump_video.c
++++ libtheora-1.1.1/examples/dump_video.c
+@@ -37,7 +37,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <sys/timeb.h>
++#include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ /*Yes, yes, we're going to hell.*/
+@@ -205,9 +205,9 @@
+   int long_option_index;
+   int c;
+ 
+-  struct timeb start;
+-  struct timeb after;
+-  struct timeb last;
++  struct timeval start;
++  struct timeval after;
++  struct timeval last;
+   int fps_only=0;
+   int frames = 0;
+ 
+@@ -418,8 +418,8 @@
+   }
+ 
+   if(fps_only){
+-    ftime(&start);
+-    ftime(&last);
++    gettimeofday(&start, NULL);
++    gettimeofday(&last, NULL);
+   }
+ 
+   while(!got_sigint){
+@@ -433,7 +433,7 @@
+           videobuf_ready=1;
+           frames++;
+           if(fps_only)
+-            ftime(&after);
++            gettimeofday(&after, NULL);
+         }
+ 
+       }else
+@@ -442,16 +442,16 @@
+ 
+     if(fps_only && (videobuf_ready || fps_only==2)){
+       long ms =
+-        after.time*1000.+after.millitm-
+-        (last.time*1000.+last.millitm);
++        after.tv_sec*1000.+after.tv_usec/1000-
++        (last.tv_sec*1000.+last.tv_usec/1000);
+ 
+       if(ms>500 || fps_only==1 ||
+          (feof(infile) && !videobuf_ready)){
+         float file_fps = (float)ti.fps_numerator/ti.fps_denominator;
+         fps_only=2;
+ 
+-        ms = after.time*1000.+after.millitm-
+-          (start.time*1000.+start.millitm);
++        ms = after.tv_sec*1000.+after.tv_usec/1000-
++          (start.tv_sec*1000.+start.tv_usec/1000);
+ 
+         fprintf(stderr,"\rframe:%d rate:%.2fx           ",
+                 frames,
-- 
cgit v1.2.3-70-g09d2