From: Felix Paul Kühne <fkuehne@videolan.org>
Date: Sun, 9 Oct 2005 12:18:33 +0000 (+0000)
Subject: * added Musepack support to extras/contrib, AUTHORS, NEWS (refs #32)
X-Git-Tag: 0.8.4~307
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d2b0eb1c12f8032c5483ac6930383a55ab8c5f0c;p=vlc

* added Musepack support to extras/contrib, AUTHORS, NEWS (refs #32)
---

diff --git a/AUTHORS b/AUTHORS
index 7aefdd5b73..38f02400fe 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,7 +13,7 @@ D: input and decoders core improvements
 D: avi, asf/wmv/wma, mp4/mov, mp3, aac, wav demultiplexers
 D: MPEG-4, Div & OpenDivX and various decoders (ffmpeg)
 D: AAC decoder (libfaad2)
-D: cinepak, adpcm, araw decoders
+D: cinepak, adpcm, araw, musepack decoders
 D: Subtile file parser.
 D: mms, ftp access
 D: Stream output
diff --git a/NEWS b/NEWS
index b74e815fe7..b6c5569aee 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,7 @@ Input:
 
 Decoders:
  * Support for libSDL_image to import different image types
+ * Musepack decoder using libmpdec
 
 Services discovery:
  * UPnP service discovery
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 24ad859b6d..7508456485 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -92,7 +92,7 @@ ifdef HAVE_DARWIN_OS
 	.FLAC .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg .openslp \
 	.dvdcss .dvdread .dvdnav .dvbpsi .live .goom2k4 .caca .mod \
 	.png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \
-	.glib .libidl .gecko .aclocal
+	.glib .libidl .gecko .libmpcdec .aclocal
 # .mozilla will build an entire mozilla. it can be used if we need to create a new .gecko package
 else
 
@@ -1367,6 +1367,24 @@ CLEAN_FILE += .SDL_image
 CLEAN_PKG += SDL_image
 DISTCLEAN_PKG += SDL_image-$(SDL_IMAGE_VERSION).tar.gz
 
+# ***************************************************************************
+# Musepack decoder library (libmpcdec)
+# ***************************************************************************
+
+libmpcdec-$(MUSE_VERSION).tar.bz2:
+	$(WGET) $(MUSE_URL)
+
+libmpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2 
+	$(EXTRACT_BZ2)
+
+.libmpcdec: libmpcdec
+	(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+	touch $@
+
+CLEAN_FILE += .libmpcdec
+CLEAN_PKG += libmpcdec
+DISTCLEAN_PKG += libmpcdec-$(MUSE_VERSION).tar.bz2
+
 # ***************************************************************************
 # Copy aclocal files
 # This is necessary for --missing aclocal to succeed after a
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index f0284db3aa..b3bda3e4ea 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -141,3 +141,5 @@ SDL_VERSION=1.2.8
 SDL_URL=http://www.libsdl.org/release/SDL-$(SDL_VERSION).tar.gz
 SDL_IMAGE_VERSION=1.2.4
 SDL_IMAGE_URL=http://www.libsdl.org/projects/SDL_image/release/SDL_image-$(SDL_IMAGE_VERSION).tar.gz
+MUSE_VERSION=1.2.1
+MUSE_URL=http://files.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2