Mercurial > mxe-octave
changeset 2077:f4fb89bb2724
package xine-lib: fix mng support
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Fri, 04 Nov 2011 00:11:36 +0100 |
| parents | c460d89dcc7c |
| children | 0b15485d2d6e |
| files | src/xine-lib-4-mng.patch src/xine-lib.mk |
| diffstat | 2 files changed, 45 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/xine-lib-4-mng.patch Fri Nov 04 00:11:36 2011 +0100 @@ -0,0 +1,43 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch taken from: +https://bugs.xine-project.org/show_bug.cgi?id=430 + +From 937ff31c13b06d22a094d6a91d2ae33471f2bc58 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Thu, 3 Nov 2011 23:48:50 +0100 +Subject: [PATCH] fix include order to avoid conflicting INT32 + +basetsd.h and jmorecfg.h both define INT32, but jmorecfg.h checks. +libmng.h introduces jmorecfg.h and so it must follow xine_internal.h +which introduces basetsd.h. +--- + src/demuxers/demux_mng.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c +index 2fccd0b..bf4dfec 100644 +--- a/src/demuxers/demux_mng.c ++++ b/src/demuxers/demux_mng.c +@@ -38,8 +38,6 @@ + #undef HAVE_STDLIB_H + #endif + +-#include <libmng.h> +- + #define LOG_MODULE "demux_mng" + #define LOG_VERBOSE + /* +@@ -50,6 +48,8 @@ + #include "xineutils.h" + #include "demux.h" + ++#include <libmng.h> ++ + typedef struct { + demux_plugin_t demux_plugin; + +-- +1.7.7 +
--- a/src/xine-lib.mk Thu Nov 03 17:08:47 2011 +0100 +++ b/src/xine-lib.mk Fri Nov 04 00:11:36 2011 +0100 @@ -57,7 +57,8 @@ --without-external-libdts \ --without-wavpack \ CFLAGS='-I$(1)/win32/include' \ - PTHREAD_LIBS='-lpthread -lws2_32' + PTHREAD_LIBS='-lpthread -lws2_32' \ + LIBS="`$(TARGET)-pkg-config --libs libmng`" $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef