Commit 32fa00d8 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs MPCDEC bumps to 1.2.6. Patch has been submitted upstream.

parent 794dcc1e
...@@ -1890,7 +1890,7 @@ libmpcdec-$(MUSE_VERSION).tar.bz2: ...@@ -1890,7 +1890,7 @@ libmpcdec-$(MUSE_VERSION).tar.bz2:
mpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2 mpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2
$(EXTRACT_BZ2) $(EXTRACT_BZ2)
patch -p0 < Patches/mpcdec.patch patch -p0 < Patches/mpcdec.patch
(cd $@; ./autogen.sh) (cd $@; autoreconf -vif)
.mpcdec: mpcdec .mpcdec: mpcdec
ifdef HAVE_WIN32 ifdef HAVE_WIN32
......
--- mpcdec/include/Makefile.am 2005-06-18 23:23:33.000000000 +0100 Index: mpcdec/configure.ac
+++ mpcdec/include/Makefile.am 2005-11-02 19:51:19.000000000 +0000 ===================================================================
@@ -4,6 +4,7 @@ --- mpcdec/configure.ac (revision 276)
+++ mpcdec/configure.ac (revision 289)
@@ -59,11 +59,6 @@
fi
nobase_include_HEADERS = \ -AC_FUNC_MEMCMP
mpcdec/config_types.h \ -if test "x$ac_cv_func_memcmp_working" = "xno" ; then
+ mpcdec/config_win32.h \ - AC_MSG_ERROR([working memcmp is not available.])
mpcdec/decoder.h \ -fi
mpcdec/huffman.h \ -
mpcdec/math.h \ -AC_CHECK_FUNCS([memmove memset], [],
- AC_MSG_ERROR([memset or memmove is missing.]))
+AC_CHECK_FUNCS([memmove memset memcmp], [],
+ AC_MSG_ERROR([memmove memset or memcmp is missing.]))
dnl Make substitutions
...@@ -152,9 +152,9 @@ TIFF_VERSION=3.8.2 ...@@ -152,9 +152,9 @@ TIFF_VERSION=3.8.2
TIFF_URL=ftp://ftp.remotesensing.org/libtiff/tiff-$(TIFF_VERSION).tar.gz TIFF_URL=ftp://ftp.remotesensing.org/libtiff/tiff-$(TIFF_VERSION).tar.gz
SDL_VERSION=1.2.11 SDL_VERSION=1.2.11
SDL_URL=$(SF)/libsdl/SDL-$(SDL_VERSION).tar.gz SDL_URL=$(SF)/libsdl/SDL-$(SDL_VERSION).tar.gz
SDL_IMAGE_VERSION=1.2.5 SDL_IMAGE_VERSION=1.2.4
SDL_IMAGE_URL=$(SF)/libsdl/SDL_image-$(SDL_IMAGE_VERSION).tar.gz SDL_IMAGE_URL=$(SF)/libsdl/SDL_image-$(SDL_IMAGE_VERSION).tar.gz
MUSE_VERSION=1.2.4 MUSE_VERSION=1.2.6
#MUSE_URL=http://files.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2 #MUSE_URL=http://files.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
MUSE_URL=http://files2.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2 MUSE_URL=http://files2.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
WXWIDGETS_VERSION=2.6.3 WXWIDGETS_VERSION=2.6.3
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment