Mercurial > mxe-octave

comparison src/xine-lib-3-more_build_fixes.patch @ 3629:5aba05f2226e

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