Commit fc2d56e3 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: move MPC to the modern SV7 & SV8 library

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 87ce9b02
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt (révision 468)
+++ CMakeLists.txt (copie de travail)
@@ -23,11 +23,9 @@
add_subdirectory(libmpcpsy)
add_subdirectory(libmpcenc)
add_subdirectory(libwavformat)
-add_subdirectory(mpcgain)
add_subdirectory(mpcdec)
add_subdirectory(mpcenc)
add_subdirectory(mpc2sv8)
add_subdirectory(mpccut)
-add_subdirectory(mpcchap)
add_subdirectory(wavcmp)
add_subdirectory(include)
--- mpcdec/configure.ac 2007-04-17 21:05:32.000000000 +0200
+++ mpcdec/configure.ac 2007-09-06 23:52:09.000000000 +0200
@@ -8,6 +8,9 @@
CFLAGS="$CFLAGS -O3 -fomit-frame-pointer -fPIC"
+AC_PROG_CC
+AC_PROG_CXX
+
AC_C_BIGENDIAN(,CFLAGS="$CFLAGS -DMPC_LITTLE_ENDIAN",)
AC_HEADER_STDC
@@ -58,10 +58,15 @@
ac_cv_c_int64_t=int64_t
fi
+if test "x$cross_compiling" = "xyes" ; then
+AC_CHECK_FUNCS([memcmp], [],
+ AC_MSG_ERROR([memcmp is missing.]))
+else
AC_FUNC_MEMCMP
if test "x$ac_cv_func_memcmp_working" = "xno" ; then
AC_MSG_ERROR([working memcmp is not available.])
fi
+fi
AC_CHECK_FUNCS([memmove memset], [],
AC_MSG_ERROR([memset or memmove is missing.]))
......@@ -2052,24 +2052,12 @@ DISTCLEAN_PKG += SDL_image-$(SDL_IMAGE_VERSION).tar.gz
# Musepack decoder library (libmpcdec)
# ***************************************************************************
libmpcdec-$(MUSE_VERSION).tar.bz2:
$(WGET) $(MUSE_URL)
mpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2
$(EXTRACT_BZ2)
patch -p0 < Patches/mpcdec.patch
(cd $@; autoreconf -ivf)
mpcdec:
$(SVN) co $(MUSE_SVN) -r 468 mpcdec
cd $@; patch -p0 < ../Patches/libmpc-simple.patch
.mpcdec: mpcdec
ifdef HAVE_WIN32
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS=-D_PTRDIFF_T=mpc_int32_t && make && make install)
else
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
endif
ifdef HAVE_MACOSX
$(INSTALL_NAME)
endif
touch $@
(cd $<; cmake . -DCMAKE_TOOLCHAIN_FILE=../../toolchain.cmake -DCMAKE_INSTALL_PREFIX=$(PREFIX) && make install)
CLEAN_FILE += .mpcdec
CLEAN_PKG += mpcdec
......
......@@ -170,6 +170,7 @@ SDL_IMAGE_VERSION=1.2.10
SDL_IMAGE_URL=http://www.libsdl.org/projects/SDL_image/release/SDL_image-$(SDL_IMAGE_VERSION).tar.gz
MUSE_VERSION=1.2.6
MUSE_URL=http://files.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
MUSE_SVN=http://svn.musepack.net/libmpc/trunk/
#MUSE_URL=http://files2.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
QT4_VERSION=4.6.2
QT4_URL=$(CONTRIB_VIDEOLAN)/qt4-$(QT4_VERSION)-win32-bin.tar.bz2
......
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