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

diff --git a/AUTHORS b/AUTHORS
index 7aefdd5b73749efa65b7af62b8992bd4dd093427..38f02400fec70a830bafbf5e3fcea9d32ae4faf9 100644 (file)
--- 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 b74e815fe71ddba15d5894478dcdf86db32bc6a0..b6c5569aeed5c993710da895803f68c77b736b98 100644 (file)
--- 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 24ad859b6d4bd80d24415f7bcdbe9821dd3a967f..750845648582e1f62e509566be1161c7cda5b15f 100644 (file)
--- 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 f0284db3aa7a6bdeb2f25c10a51a19bc6c0445fe..b3bda3e4eac375ca0423cf1057c4d6d8e9215b41 100644 (file)
--- 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