vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <[email protected]> | Thu Dec 2 19:45:13 2010 +0100| [e4048e1a6aa4cd566982eb14801514bbffdc69e8] | committer: Jean-Baptiste Kempf
Contribs: move MPC to the modern SV7 & SV8 library Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=e4048e1a6aa4cd566982eb14801514bbffdc69e8 --- extras/contrib/src/Makefile | 20 +++------------- extras/contrib/src/Patches/libmpc-simple.patch | 16 +++++++++++++ extras/contrib/src/Patches/mpcdec.patch | 28 ------------------------ extras/contrib/src/packages.mak | 1 + 4 files changed, 21 insertions(+), 44 deletions(-) diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 8703ed5..6e11a1b 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -2039,24 +2039,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_DARWIN_OS - $(INSTALL_NAME) -endif - touch $@ + (cd $<; cmake . -DCMAKE_TOOLCHAIN_FILE=../../toolchain.cmake -DCMAKE_INSTALL_PREFIX=$(PREFIX) && make install) CLEAN_FILE += .mpcdec CLEAN_PKG += mpcdec diff --git a/extras/contrib/src/Patches/libmpc-simple.patch b/extras/contrib/src/Patches/libmpc-simple.patch new file mode 100644 index 0000000..ddcc14b --- /dev/null +++ b/extras/contrib/src/Patches/libmpc-simple.patch @@ -0,0 +1,16 @@ +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) diff --git a/extras/contrib/src/Patches/mpcdec.patch b/extras/contrib/src/Patches/mpcdec.patch deleted file mode 100644 index 94a39dc..0000000 --- a/extras/contrib/src/Patches/mpcdec.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- 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.])) diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak index 21cd8c2..2e1bed2 100644 --- a/extras/contrib/src/packages.mak +++ b/extras/contrib/src/packages.mak @@ -171,6 +171,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 _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
