1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
|
diff -urN xine-lib-1.2.4/src/combined/wavpack_decoder.c xine-lib-1.2.4-patch/src/combined/wavpack_decoder.c
--- xine-lib-1.2.4/src/combined/wavpack_decoder.c 2013-09-18 13:04:54.000000000 +0300
+++ xine-lib-1.2.4-patch/src/combined/wavpack_decoder.c 2014-01-01 12:45:31.120873116 +0200
@@ -27,6 +27,7 @@
#define LOG_MODULE "decode_wavpack"
#define LOG_VERBOSE
+#include <malloc.h>
#include <xine/xine_internal.h>
#include <xine/attributes.h>
#include "bswap.h"
diff -urN xine-lib-1.2.4/src/input/input_cdda.c xine-lib-1.2.4-patch/src/input/input_cdda.c
--- xine-lib-1.2.4/src/input/input_cdda.c 2013-09-18 13:04:54.000000000 +0300
+++ xine-lib-1.2.4-patch/src/input/input_cdda.c 2014-01-01 12:42:52.954879392 +0200
@@ -56,6 +56,7 @@
#include <signal.h>
#include <netinet/in.h>
#include <sys/socket.h>
+#include <malloc.h>
#include <basedir.h>
diff -urN xine-lib-1.2.4/src/vdr/input_vdr.c xine-lib-1.2.4-patch/src/vdr/input_vdr.c
--- xine-lib-1.2.4/src/vdr/input_vdr.c 2014-01-01 12:52:41.000000000 +0200
+++ xine-lib-1.2.4-patch/src/vdr/input_vdr.c 2014-01-01 12:49:36.935863362 +0200
@@ -1760,7 +1760,7 @@
if (this->event_queue)
xine_event_dispose_queue(this->event_queue);
- if (this->rpc_thread)
+ /* if (this->rpc_thread)
{
struct timespec abstime;
int ms_to_time_out = 10000;
@@ -1799,12 +1799,12 @@
xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("%s: joining rpc thread ...\n"), LOG_MODULE);
pthread_join(this->rpc_thread, 0);
xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("%s: rpc thread joined.\n"), LOG_MODULE);
- }
+ }*/
pthread_cond_destroy(&this->rpc_thread_shutdown_cond);
pthread_mutex_destroy(&this->rpc_thread_shutdown_lock);
- if (this->metronom_thread)
+ /*if (this->metronom_thread)
{
xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("%s: joining metronom thread ...\n"), LOG_MODULE);
@@ -1814,12 +1814,6 @@
this->metronom_thread_request = -1;
this->metronom_thread_reply = 0;
pthread_cond_broadcast(&this->metronom_thread_request_cond);
-/*
- pthread_mutex_unlock(&this->metronom_thread_lock);
-
- pthread_mutex_lock(&this->metronom_thread_lock);
- if (!this->metronom_thread_reply)
-*/
pthread_cond_wait(&this->metronom_thread_reply_cond, &this->metronom_thread_lock);
pthread_mutex_unlock(&this->metronom_thread_lock);
@@ -1827,7 +1821,7 @@
pthread_join(this->metronom_thread, 0);
xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("%s: metronom thread joined.\n"), LOG_MODULE);
- }
+ }*/
pthread_mutex_destroy(&this->metronom_thread_lock);
pthread_cond_destroy(&this->metronom_thread_request_cond);
diff -urN xine-lib-1.2.4/src/xine-engine/scratch.c xine-lib-1.2.4-patch/src/xine-engine/scratch.c
--- xine-lib-1.2.4/src/xine-engine/scratch.c 2013-09-18 13:04:54.000000000 +0300
+++ xine-lib-1.2.4-patch/src/xine-engine/scratch.c 2014-01-01 12:36:59.724893408 +0200
@@ -40,20 +40,20 @@
scratch_printf (scratch_buffer_t *this, const char *format, va_list argp)
{
time_t t;
- struct tm tm;
+ struct tm *tm;
size_t l;
pthread_mutex_lock (&this->lock);
time (&t);
- localtime_r (&t, &tm);
+ tm = localtime (&t);
if ( ! this->lines[this->cur] )
this->lines[this->cur] = malloc(SCRATCH_LINE_LEN_MAX+1);
if ( ! this->lines[this->cur] )
return;
- l = strftime (this->lines[this->cur], SCRATCH_LINE_LEN_MAX, "%X: ", &tm);
+ l = strftime (this->lines[this->cur], SCRATCH_LINE_LEN_MAX, "%X: ", tm);
vsnprintf (this->lines[this->cur] + l, SCRATCH_LINE_LEN_MAX - l, format, argp);
lprintf ("printing format %s to line %d\n", format, this->cur);
diff -urN xine-lib-1.2.4/src/xine-utils/Makefile.am xine-lib-1.2.4-patch/src/xine-utils/Makefile.am
--- xine-lib-1.2.4/src/xine-utils/Makefile.am 2012-02-05 21:17:03.000000000 +0200
+++ xine-lib-1.2.4-patch/src/xine-utils/Makefile.am 2014-01-01 12:36:33.466894450 +0200
@@ -37,3 +37,4 @@
noinst_PROGRAMS = xmltest
xmltest_SOURCES = xmllexer.c xmlparser.c
xmltest_CFLAGS = -DLOG -DXINE_XML_PARSER_TEST $(AM_CFLAGS)
+xmltest_LDFLAGS = $(top_builddir)/lib/libxineposix.la
|
