diff options
| author | Ulrich Klauer <ulrich@chirlu.de> | 2013-03-03 17:00:57 (GMT) |
|---|---|---|
| committer | Ulrich Klauer <ulrich@chirlu.de> | 2013-03-03 17:00:57 (GMT) |
| commit | f31c48e8ae619895066edf11fae1a4216477c14b (patch) | |
| tree | 4eb9de893237fdcf06c179723d430232b351bfaa | |
| parent | ef2b62d98b6f36e7e9a9270a1f79f749407098a4 (diff) | |
| download | mxe-f31c48e8ae619895066edf11fae1a4216477c14b.zip mxe-f31c48e8ae619895066edf11fae1a4216477c14b.tar.gz mxe-f31c48e8ae619895066edf11fae1a4216477c14b.tar.bz2 | |
Build xine-lib with wavpack support
Activate wavpack support in xine-lib. This reveals a latent bug
(missing include) in xine-lib, for which a patch is provided.
| -rw-r--r-- | src/xine-lib-2-wavpack-alloca.patch | 23 | ||||
| -rw-r--r-- | src/xine-lib.mk | 4 |
2 files changed, 25 insertions, 2 deletions
diff --git a/src/xine-lib-2-wavpack-alloca.patch b/src/xine-lib-2-wavpack-alloca.patch new file mode 100644 index 0000000..007c6b1 --- /dev/null +++ b/src/xine-lib-2-wavpack-alloca.patch @@ -0,0 +1,23 @@ +This file is part of MXE. +See index.html for further information. + +This patch has been taken from: +https://bugs.xine-project.org/show_bug.cgi?id=494 + +diff -urN xine-lib-1.1.21-orig/src/combined/decoder_wavpack.c xine-lib-1.1.21/src/combined/decoder_wavpack.c +--- xine-lib-1.1.21-orig/src/combined/decoder_wavpack.c 2010-03-09 23:17:05.000000000 +0100 ++++ xine-lib-1.1.21/src/combined/decoder_wavpack.c 2013-03-03 17:43:00.000000000 +0100 +@@ -27,6 +27,13 @@ + #define LOG_MODULE "decode_wavpack" + #define LOG_VERBOSE + ++#ifdef HAVE_ALLOCA_H ++#include <alloca.h> ++#endif ++#ifdef HAVE_MALLOC_H ++#include <malloc.h> ++#endif ++ + #include "xine_internal.h" + #include "attributes.h" + #include "bswap.h" diff --git a/src/xine-lib.mk b/src/xine-lib.mk index 1890c76..8880d6c 100644 --- a/src/xine-lib.mk +++ b/src/xine-lib.mk @@ -7,7 +7,7 @@ $(PKG)_CHECKSUM := 0adf20ef55d24f2a1b4a8974e57ad1be5133b236 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/xine/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc faad2 ffmpeg flac fontconfig freetype graphicsmagick libiconv libmng pthreads sdl speex theora vorbis zlib +$(PKG)_DEPS := gcc faad2 ffmpeg flac fontconfig freetype graphicsmagick libiconv libmng pthreads sdl speex theora vorbis wavpack zlib define $(PKG)_UPDATE $(WGET) -q -O- 'http://hg.debian.org/hg/xine-lib/xine-lib/tags' | \ @@ -51,7 +51,7 @@ define $(PKG)_BUILD --with-internal-vcdlibs \ --with-external-libfaad \ --without-external-libdts \ - --without-wavpack \ + --with-wavpack \ CFLAGS='-I$(1)/win32/include' \ PTHREAD_LIBS='-lpthread -lws2_32' \ LIBS="`$(TARGET)-pkg-config --libs libmng`" |