diff options
Diffstat (limited to 'src/xine-lib-1-fixes.patch')
| -rw-r--r-- | src/xine-lib-1-fixes.patch | 143 |
1 files changed, 0 insertions, 143 deletions
diff --git a/src/xine-lib-1-fixes.patch b/src/xine-lib-1-fixes.patch deleted file mode 100644 index 5db3279..0000000 --- a/src/xine-lib-1-fixes.patch +++ /dev/null @@ -1,143 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From 6dc46ed1253c1fce1cfa8d360e352b5bc12d0d3b 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 1/4] 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 bc40d4e..a613a89 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.10.4 - - -From 4a7cd803cbc3daa3f19fdc6b34fb93e1994bc2f5 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 2/4] force graphicsmagick over imagemagick - ---- - configure.ac | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9112b58..67f1147 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.10.4 - - -From 5b362f4aed3a814a351cd259efb62b40761ddb3d Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Sun, 27 May 2012 23:28:57 +0200 -Subject: [PATCH 3/4] 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.10.4 - - -From 0d3546c3c12a8bf311c9751f0d0d2e3a95569657 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Sun, 27 May 2012 23:23:19 +0200 -Subject: [PATCH 4/4] ffmpeg 0.11 removed avcodec_init - ---- - src/combined/ffmpeg/ffmpeg_decoder.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/combined/ffmpeg/ffmpeg_decoder.c b/src/combined/ffmpeg/ffmpeg_decoder.c -index 879df53..84ee1a3 100644 ---- a/src/combined/ffmpeg/ffmpeg_decoder.c -+++ b/src/combined/ffmpeg/ffmpeg_decoder.c -@@ -312,7 +312,6 @@ void avcodec_register_all(void) - - void init_once_routine(void) { - pthread_mutex_init(&ffmpeg_lock, NULL); -- avcodec_init(); - avcodec_register_all(); - } - --- -1.7.10.4 - |