105 lines
3.6 KiB
Diff
105 lines
3.6 KiB
Diff
diff --no-dereference -Naur -- libtheora.normalized/config.sub libtheora.srctix/config.sub
|
|
--- libtheora.normalized/config.sub 2009-02-24 04:50:50.000000000 +0100
|
|
+++ libtheora.srctix/config.sub 2013-06-21 15:51:12.704600363 +0200
|
|
@@ -1093,7 +1093,7 @@
|
|
| -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
|
|
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
|
|
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
|
|
- | -aos* \
|
|
+ | -aos* | -sortix* \
|
|
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
|
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
|
| -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
|
|
diff --no-dereference -Naur -- libtheora.normalized/examples/dump_psnr.c libtheora.srctix/examples/dump_psnr.c
|
|
--- libtheora.normalized/examples/dump_psnr.c 2009-08-22 20:10:01.000000000 +0200
|
|
+++ libtheora.srctix/examples/dump_psnr.c 2013-06-21 16:11:31.920627914 +0200
|
|
@@ -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.*/
|
|
diff --no-dereference -Naur -- libtheora.normalized/examples/dump_video.c libtheora.srctix/examples/dump_video.c
|
|
--- libtheora.normalized/examples/dump_video.c 2009-08-22 20:10:01.000000000 +0200
|
|
+++ libtheora.srctix/examples/dump_video.c 2013-06-21 16:03:20.232616804 +0200
|
|
@@ -37,9 +37,9 @@
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
-#include <sys/timeb.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
+#include <time.h>
|
|
/*Yes, yes, we're going to hell.*/
|
|
#if defined(_WIN32)
|
|
#include <io.h>
|
|
@@ -205,9 +205,9 @@
|
|
int long_option_index;
|
|
int c;
|
|
|
|
- struct timeb start;
|
|
- struct timeb after;
|
|
- struct timeb last;
|
|
+ struct timespec start;
|
|
+ struct timespec after;
|
|
+ struct timespec last;
|
|
int fps_only=0;
|
|
int frames = 0;
|
|
|
|
@@ -418,8 +418,8 @@
|
|
}
|
|
|
|
if(fps_only){
|
|
- ftime(&start);
|
|
- ftime(&last);
|
|
+ clock_gettime(CLOCK_MONOTONIC, &start);
|
|
+ clock_gettime(CLOCK_MONOTONIC, &last);
|
|
}
|
|
|
|
while(!got_sigint){
|
|
@@ -433,7 +433,7 @@
|
|
videobuf_ready=1;
|
|
frames++;
|
|
if(fps_only)
|
|
- ftime(&after);
|
|
+ clock_gettime(CLOCK_MONOTONIC, &after);
|
|
}
|
|
|
|
}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_nsec/1000000-
|
|
+ (last.tv_sec*1000.+last.tv_nsec/1000000);
|
|
|
|
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_nsec/1000000-
|
|
+ (start.tv_sec*1000.+start.tv_nsec/1000000);
|
|
|
|
fprintf(stderr,"\rframe:%d rate:%.2fx ",
|
|
frames,
|
|
diff --no-dereference -Naur -- libtheora.normalized/tixbuildinfo libtheora.srctix/tixbuildinfo
|
|
--- libtheora.normalized/tixbuildinfo 1970-01-01 01:00:00.000000000 +0100
|
|
+++ libtheora.srctix/tixbuildinfo 2013-12-15 21:24:28.168103992 +0100
|
|
@@ -0,0 +1,9 @@
|
|
+tix.version=1
|
|
+tix.class=srctix
|
|
+pkg.name=libtheora
|
|
+pkg.build-libraries=libogg libvorbis libSDL? libcairo? libpng?
|
|
+pkg.build-system=configure
|
|
+# TODO: This package runs cross-compiled programs when generating documentation:
|
|
+pkg.configure.args=--disable-spec
|
|
+pkg.make.vars=V=1
|
|
+pkg.post-install.cmd=tix-eradicate-libtool-la
|