diff options
Diffstat (limited to 'src/xine-lib-1-fixes.patch')
| -rw-r--r-- | src/xine-lib-1-fixes.patch | 120 |
1 files changed, 120 insertions, 0 deletions
diff --git a/src/xine-lib-1-fixes.patch b/src/xine-lib-1-fixes.patch new file mode 100644 index 0000000..ebbd3f0 --- /dev/null +++ b/src/xine-lib-1-fixes.patch @@ -0,0 +1,120 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +Contains ad hoc patches for cross building. + +From 4968ed3c3300976ce8b24c52c729db6bd264057c Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Sun, 13 Nov 2011 11:48:07 +0100 +Subject: [PATCH 1/3] fix-install-def-file + + +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.8 + + +From 86f2d23f9229e17aa4a54ca982b8f95de5ee4644 Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Sun, 13 Nov 2011 12:05:22 +0100 +Subject: [PATCH 2/3] fake missing definitions for WIN32 + +Taken from: +https://bugs.xine-project.org/show_bug.cgi?id=433 + +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.8 + + +From 42946ec1f900d22b62cb28996b9f12d11d7be7a8 Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Sun, 13 Nov 2011 13:45:21 +0100 +Subject: [PATCH 3/3] force graphicsmagick over imagemagick + + +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.8 + |