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