mirror of https://git.wownero.com/dsc/mxe.git
package xine-lib: provide localtime_r from old pthreads
This commit is contained in:
parent
18070f103e
commit
1936f239c9
|
@ -3,11 +3,15 @@ See index.html for further information.
|
|||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From 4968ed3c3300976ce8b24c52c729db6bd264057c Mon Sep 17 00:00:00 2001
|
||||
From: MXE
|
||||
From d8274b609ad0b0dd56a6b64b60dad9bff960dd8c Mon Sep 17 00:00:00 2001
|
||||
From: "mxe@mxe.cc" <mxe@mxe.cc>
|
||||
Date: Sun, 13 Nov 2011 11:48:07 +0100
|
||||
Subject: [PATCH 1/4] fix-install-def-file
|
||||
Subject: [PATCH 1/5] fix-install-def-file
|
||||
|
||||
---
|
||||
src/xine-engine/Makefile.am | 4 ++--
|
||||
src/xine-engine/Makefile.in | 4 ++--
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
|
||||
index 67ae63f..0f94abf 100644
|
||||
|
@ -44,16 +48,19 @@ index 167a32b..0664e1f 100644
|
|||
$(XINEUTILS_LIB):
|
||||
$(MAKE) -C $(top_builddir)/src/xine-utils libxineutils.la
|
||||
--
|
||||
1.7.8.3
|
||||
1.7.9.2
|
||||
|
||||
|
||||
From 86f2d23f9229e17aa4a54ca982b8f95de5ee4644 Mon Sep 17 00:00:00 2001
|
||||
From: MXE
|
||||
From 939df00f8c1dfa7d138eddb19735d2ea826826fb Mon Sep 17 00:00:00 2001
|
||||
From: "mxe@mxe.cc" <mxe@mxe.cc>
|
||||
Date: Sun, 13 Nov 2011 12:05:22 +0100
|
||||
Subject: [PATCH 2/4] fake missing definitions for WIN32
|
||||
Subject: [PATCH 2/5] fake missing definitions for WIN32
|
||||
|
||||
Taken from:
|
||||
https://bugs.xine-project.org/show_bug.cgi?id=433
|
||||
---
|
||||
src/audio_out/audio_file_out.c | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c
|
||||
index 802461e..8b9b704 100644
|
||||
|
@ -79,14 +86,17 @@ index 802461e..8b9b704 100644
|
|||
|
||||
struct wavhdr {
|
||||
--
|
||||
1.7.8.3
|
||||
1.7.9.2
|
||||
|
||||
|
||||
From 42946ec1f900d22b62cb28996b9f12d11d7be7a8 Mon Sep 17 00:00:00 2001
|
||||
From: MXE
|
||||
From 6cd583034929bcdd0e3fa0424b4d4e026ef87728 Mon Sep 17 00:00:00 2001
|
||||
From: "mxe@mxe.cc" <mxe@mxe.cc>
|
||||
Date: Sun, 13 Nov 2011 13:45:21 +0100
|
||||
Subject: [PATCH 3/4] force graphicsmagick over imagemagick
|
||||
Subject: [PATCH 3/5] force graphicsmagick over imagemagick
|
||||
|
||||
---
|
||||
configure.ac | 9 ---------
|
||||
1 file changed, 9 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index b175301..d37ba36 100644
|
||||
|
@ -116,14 +126,17 @@ index b175301..d37ba36 100644
|
|||
AC_MSG_ERROR([ImageMagick support requested, but neither Wand, MagickWand, nor GraphicsMagick were found])
|
||||
elif test "x$have_imagemagick" = "xyes"; then
|
||||
--
|
||||
1.7.8.3
|
||||
1.7.9.2
|
||||
|
||||
|
||||
From f0fa8b5b9570cdf88788067b1a76669c6863ac9f Mon Sep 17 00:00:00 2001
|
||||
From: MXE
|
||||
From 7b7304ef66f91f6f9d94a84f38b70c4d13935f93 Mon Sep 17 00:00:00 2001
|
||||
From: "mxe@mxe.cc" <mxe@mxe.cc>
|
||||
Date: Mon, 30 Jan 2012 09:21:33 +0100
|
||||
Subject: [PATCH 4/4] zlib 1.2.6 compatibility
|
||||
Subject: [PATCH 4/5] zlib 1.2.6 compatibility
|
||||
|
||||
---
|
||||
src/xine-engine/osd.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
|
||||
index 1d22ea3..0fbde93 100644
|
||||
|
@ -148,5 +161,43 @@ index 1d22ea3..0fbde93 100644
|
|||
int i, ret = 0;
|
||||
|
||||
--
|
||||
1.7.8.3
|
||||
1.7.9.2
|
||||
|
||||
|
||||
From 1a39e224fae0895f964e7c1ba1f1a77b4cd0492d Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Sun, 27 May 2012 23:28:57 +0200
|
||||
Subject: [PATCH 5/5] add missing localtime_r
|
||||
|
||||
Previously provided by pthreads-w32-2-8-0-release, which is also
|
||||
the source of this version.
|
||||
---
|
||||
src/localtime_r.h | 3 +++
|
||||
src/xine-engine/scratch.c | 1 +
|
||||
2 files changed, 4 insertions(+)
|
||||
create mode 100644 src/localtime_r.h
|
||||
|
||||
diff --git a/src/localtime_r.h b/src/localtime_r.h
|
||||
new file mode 100644
|
||||
index 0000000..ec778c5
|
||||
--- /dev/null
|
||||
+++ b/src/localtime_r.h
|
||||
@@ -0,0 +1,3 @@
|
||||
+#define localtime_r( _clock, _result ) \
|
||||
+ ( *(_result) = *localtime( (_clock) ), \
|
||||
+ (_result) )
|
||||
diff --git a/src/xine-engine/scratch.c b/src/xine-engine/scratch.c
|
||||
index 39bb592..41d561b 100644
|
||||
--- a/src/xine-engine/scratch.c
|
||||
+++ b/src/xine-engine/scratch.c
|
||||
@@ -36,6 +36,7 @@
|
||||
|
||||
#include "xineutils.h"
|
||||
#include "scratch.h"
|
||||
+#include "localtime_r.h"
|
||||
|
||||
static void XINE_FORMAT_PRINTF(2, 0)
|
||||
scratch_printf (scratch_buffer_t *this, const char *format, va_list argp)
|
||||
--
|
||||
1.7.9.2
|
||||
|
||||
|
|
Loading…
Reference in New Issue