Mercurial > mxe-octave

view src/xine-lib-1-fixes.patch @ 2561:3978a82b1cb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package xine-lib: provide localtime_r from old pthreads
author Mark Brand <mabrand@mabrand.nl>
date Mon, 28 May 2012 01:00:23 +0200
parents 99516e73b368
children c4cd2fe180e4
line wrap: on
line source

This file is part of MXE.
See index.html for further information.

Contains ad hoc patches for cross building.

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/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
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -45,10 +45,10 @@ noinst_HEADERS = bswap.h ffmpeg_bswap.h xine_private.h
 
 if WIN32
 install-exec-local:
-	cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
+	-cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
 
 uninstall-local:
-	rm -f $(DEF_FILE)
+	-rm -f $(DESTDIR)$(libdir)/$(DEF_FILE)
 endif
 
 $(XINEUTILS_LIB):
diff --git a/src/xine-engine/Makefile.in b/src/xine-engine/Makefile.in
index 167a32b..0664e1f 100644
--- a/src/xine-engine/Makefile.in
+++ b/src/xine-engine/Makefile.in
@@ -905,10 +905,10 @@ $(LIBXINEPOSIX):
 	$(MAKE) -C $(top_builddir)/lib libxineposix.la
 
 @WIN32_TRUE@install-exec-local:
-@WIN32_TRUE@	cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
+@WIN32_TRUE@	-cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
 
 @WIN32_TRUE@uninstall-local:
-@WIN32_TRUE@	rm -f $(DEF_FILE)
+@WIN32_TRUE@	-rm -f $(DESTDIR)$(libdir)/$(DEF_FILE)
 
 $(XINEUTILS_LIB):
 	$(MAKE) -C $(top_builddir)/src/xine-utils libxineutils.la
-- 
1.7.9.2


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/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
--- a/src/audio_out/audio_file_out.c
+++ b/src/audio_out/audio_file_out.c
@@ -53,6 +53,18 @@
 #endif
 #endif
 
+#ifdef WIN32
+#ifndef S_IWUSR
+#define S_IWUSR 0x0000
+#endif
+#ifndef S_IRGRP
+#define S_IRGRP 0x0000
+#endif
+#ifndef S_IROTH
+#define S_IROTH 0x0000
+#endif
+#endif
+
 /* Taken (hStudlyCapsAndAll) from sox's wavwritehdr */
 
 struct wavhdr {
-- 
1.7.9.2


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/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
--- a/configure.ac
+++ b/configure.ac
@@ -1412,14 +1412,6 @@ AC_ARG_WITH([imagemagick],
 	AS_HELP_STRING([--without-imagemagick], [Build without ImageMagick image decoder (or GraphicsMagick's compat layer)]))
 
 if test "x$with_imagemagick" != "xno"; then
-   PKG_CHECK_MODULES([WAND], [Wand], [have_imagemagick=yes], [AC_MSG_RESULT([no]); have_imagemagick=no])
-   if test "x$have_imagemagick" = 'xno'; then
-      PKG_CHECK_MODULES([MAGICKWAND], [MagickWand], [have_imagemagick=yes], [AC_MSG_RESULT([no]); have_imagemagick=no])
-      dnl Avoid $(WAND_FLAGS) $(MAGICKWAND_FLAGS) ...
-      WAND_CFLAGS="$MAGICKWAND_CFLAGS"
-      WAND_LIBS="$MAGICKWAND_LIBS"
-   fi
-   if test "x$have_imagemagick" = 'xno'; then
       PKG_CHECK_MODULES([GRAPHICSMAGICK], [ImageMagick], [have_imagemagick=yes], [AC_MSG_RESULT([no]); have_imagemagick=no])
       PKG_CHECK_MODULES([GRAPHICSMAGICKWAND], [GraphicsMagickWand], [have_imagemagick=yes], [AC_MSG_RESULT([no]); have_imagemagick=no])
       dnl The following assignments are safe, since they include
@@ -1427,7 +1419,6 @@ if test "x$with_imagemagick" != "xno"; then
       WAND_CFLAGS="$GRAPHICSMAGICKWAND_CFLAGS"
       WAND_LIBS="$GRAPHICSMAGICKWAND_LIBS"
       AC_DEFINE([HAVE_GRAPHICSMAGICK], [1], [Define this if you have GraphicsMagick installed])
-   fi
    if test "x$with_imagemagick" = "xyes" && test "x$have_imagemagick" = "xno"; then
       AC_MSG_ERROR([ImageMagick support requested, but neither Wand, MagickWand, nor GraphicsMagick were found])
    elif test "x$have_imagemagick" = "xyes"; then
-- 
1.7.9.2


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/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
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -650,7 +650,7 @@ static void osd_set_position (osd_object_t *osd, int x, int y) {
   osd->display_y = y;
 }
 
-static uint16_t gzread_i16(gzFile *fp) {
+static uint16_t gzread_i16(gzFile fp) {
   uint16_t ret;
   ret = gzgetc(fp);
   ret |= (gzgetc(fp)<<8);
@@ -663,7 +663,7 @@ static uint16_t gzread_i16(gzFile *fp) {
 
 static int osd_renderer_load_font(osd_renderer_t *this, char *filename) {
 
-  gzFile      *fp;
+  gzFile      fp;
   osd_font_t  *font = NULL;
   int          i, ret = 0;
 
-- 
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