# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1404123045 14400
# Node ID 4e78b4a9e87c752f377dd4238a1bdad060e75d18
# Parent  f11ee3f8e632c592b656a0a708ebd2160f5f55e5
Add libcdio,mpcdec, vcdimager, a52dec, wavpack from mxe_devel

* dist-files.mk: add libcdio.mk,libmpcdec-1-configure_ac.patch,libmpcdec.mk, vcdimager-*

* index.html: add libcdio, libmpcdec, a52dec, wavpack

* src/libcdio.mk: new file

* src/libmpcdec-1-configure_ac.patch: new file

* src/libmpcdec.mk: new file

* src/vcdimager-1-configure.patch: new file

* src/vcdimager.mk: new file

* src/a52dec.mk: new file

* src/wavpack-1-exec_prefix.patch: new file

* src/wavpack.mk: new file

diff -r f11ee3f8e632 -r 4e78b4a9e87c dist-files.mk
--- a/dist-files.mk	Sun Jun 29 15:48:00 2014 -0400
+++ b/dist-files.mk	Mon Jun 30 06:10:45 2014 -0400
@@ -1,4 +1,5 @@
 SRC_FILES_1 := \
+  a52dec.mk \
   agg-1-fixes.patch \
   agg.mk \
   apr-util.mk \
@@ -189,6 +190,7 @@
   libarchive.mk \
   libass-test.c \
   libass.mk \
+  libcdio.mk \
   libcroco.mk \
   libdnet-1-fixes.patch \
   libdnet.mk \
@@ -239,6 +241,8 @@
   libmng.mk \
   libmodplug-test.c \
   libmodplug.mk \
+  libmpcdec-1-configure_ac.patch \
+  libmpcdec.mk \
   libntlm.mk \
   liboauth-test.c \
   liboauth.mk \
@@ -566,6 +570,8 @@
   units.mk \
   uuid.mk \
   vala.mk \
+  vcdimager-1-configure.patch \
+  vcdimager.mk \
   vigra-test.cpp \
   vigra.mk \
   vmime-1-fixes.patch \
@@ -581,6 +587,8 @@
   w32api-1-dinput-dsound.patch \
   w32api-2-directx-additions-for-qt.patch \
   w32api.mk \
+  wavpack-1-exec_prefix.patch \
+  wavpack.m \
   wget.mk \
   winpcap-1-fixes.patch \
   winpcap.mk \
diff -r f11ee3f8e632 -r 4e78b4a9e87c index.html
--- a/index.html	Sun Jun 29 15:48:00 2014 -0400
+++ b/index.html	Mon Jun 30 06:10:45 2014 -0400
@@ -927,6 +927,10 @@
     </p>
     <table id="package-list">
     <tr>
+        <td class="package">a52dec</td>
+        <td class="website"><a href="http://liba52.sourceforge.net">A52dec</a></td>
+    </tr>
+    <tr>
         <td class="package">agg</td>
         <td class="website"><a href="http://www.antigrain.com/">Anti-Grain Geometry</a></td>
     </tr>
@@ -1395,6 +1399,10 @@
         <td class="website"><a href="http://code.google.com/p/libass/">libass</a></td>
     </tr>
     <tr>
+        <td class="package">libcdio</td>
+        <td class="website"><a href="http://ftp.gnu.org/gnu/libcdio">Libcdio</a></td>
+    </tr>
+    <tr>
         <td class="package">libcroco</td>
         <td class="website"><a href="http://www.freespiders.org/projects/libcroco/">Libcroco</a></td>
     </tr>
@@ -1503,6 +1511,10 @@
         <td class="website"><a href="http://www.libmng.com/">libmng</a></td>
     </tr>
     <tr>
+        <td class="package">libmpcdec</td>
+        <td class="website"><a href="www.musepack.net/index.php">libmpcdec</a></td>
+    </tr>
+    <tr>
         <td class="package">libmodplug</td>
         <td class="website"><a href="http://modplug-xmms.sourceforge.net/">libmodplug</a></td>
     </tr>
@@ -2143,6 +2155,10 @@
         <td class="website"><a href="https://wiki.gnome.org/Vala/">Vala</a></td>
     </tr>
     <tr>
+        <td class="package">vcdimager</td>
+        <td class="website"><a href="http://ftp.gnu.org/gnu/vcdimager">vcdimager</a></td>
+    </tr>
+    <tr>
         <td class="package">vigra</td>
         <td class="website"><a href="http://hci.iwr.uni-heidelberg.de/vigra">vigra</a></td>
     </tr>
@@ -2163,6 +2179,10 @@
         <td class="website"><a href="http://www.mingw.org/">MinGW Windows API</a></td>
     </tr>
     <tr>
+        <td class="package">wavpack</td>
+        <td class="website"><a href="ttp://www.wavpack.com/">Wavpack</a></td>
+    </tr>
+    <tr>
         <td class="package">wget</td>
         <td class="website"><a href="http://www.gnu.org/software/wget/">wget</a></td>
     </tr>
diff -r f11ee3f8e632 -r 4e78b4a9e87c src/a52dec.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/a52dec.mk	Mon Jun 30 06:10:45 2014 -0400
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := a52dec
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.7.4
+$(PKG)_CHECKSUM := 79b33bd8d89dad7436f85b9154ad35667aa37321
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://liba52.sourceforge.net/files/$(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'http://liba52.sourceforge.net/downloads.html' | \
+    $(SED) -n 's,.*files/a52dec-\([0-9][^"]*\)\.tar.*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && autoreconf -fi # The autotools files came with a52dec is _ancient_
+    cd '$(1)' && ./configure \
+         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        $(ENABLE_SHARED_OR_STATIC) 
+    $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+endef
diff -r f11ee3f8e632 -r 4e78b4a9e87c src/libcdio.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libcdio.mk	Mon Jun 30 06:10:45 2014 -0400
@@ -0,0 +1,25 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := libcdio
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.92
+$(PKG)_CHECKSUM := 37f0b746181c9a3c2ff14e21147885addf357b5f
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
+$(PKG)_URL      := http://ftp.gnu.org/gnu/libcdio/$(PKG)-$($(PKG)_VERSION).tar.bz2
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    echo 'TODO: Updates for package libcdio need to be written.' >&2;
+    echo $(libcdio_VERSION)
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        $(ENABLE_SHARED_OR_STATIC) 
+    $(MAKE) -C '$(1)' -j $(JOBS)
+    $(MAKE) -C '$(1)' -j 1 install
+endef
diff -r f11ee3f8e632 -r 4e78b4a9e87c src/libmad.mk
--- a/src/libmad.mk	Sun Jun 29 15:48:00 2014 -0400
+++ b/src/libmad.mk	Mon Jun 30 06:10:45 2014 -0400
@@ -22,5 +22,5 @@
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install LDFLAGS='-no-undefined'
 endef
diff -r f11ee3f8e632 -r 4e78b4a9e87c src/libmpcdec-1-configure_ac.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libmpcdec-1-configure_ac.patch	Mon Jun 30 06:10:45 2014 -0400
@@ -0,0 +1,50 @@
+This file is part of MXE.
+See index.html for further information.
+
+diff -urN libmpcdec-1.2.6/configure.ac libmpcdec-1.2.6-patch/configure.ac
+--- libmpcdec-1.2.6/configure.ac	2007-04-17 22:05:32.000000000 +0300
++++ libmpcdec-1.2.6-patch/configure.ac	2013-12-17 15:45:49.892190871 +0200
+@@ -5,6 +5,7 @@
+ AM_CONFIG_HEADER(include/config.h)
+ 
+ AM_PROG_LIBTOOL
++AC_PROG_CXX
+ 
+ CFLAGS="$CFLAGS -O3 -fomit-frame-pointer -fPIC"
+ 
+@@ -58,14 +59,14 @@
+ 	ac_cv_c_int64_t=int64_t
+ fi
+ 
+-AC_FUNC_MEMCMP
+-if test "x$ac_cv_func_memcmp_working" = "xno" ; then
+-	AC_MSG_ERROR([working memcmp is not available.])
+-fi
+-
+-AC_CHECK_FUNCS([memmove memset], [],
+-        AC_MSG_ERROR([memset or memmove is missing.]))
+-
++dnl AC_FUNC_MEMCMP
++dnl if test "x$ac_cv_func_memcmp_working" = "xno" ; then
++dnl 	AC_MSG_ERROR([working memcmp is not available.])
++dnl fi
++
++dnl AC_CHECK_FUNCS([memmove memset], [],
++dnl         AC_MSG_ERROR([memset or memmove is missing.]))
++dnl
+ dnl Make substitutions
+ 
+ AC_SUBST(VERSION)
+diff -urN libmpcdec-1.2.6/include/Makefile.am libmpcdec-1.2.6-patch/include/Makefile.am
+--- libmpcdec-1.2.6/include/Makefile.am	2007-01-09 22:22:14.000000000 +0200
++++ libmpcdec-1.2.6-patch/include/Makefile.am	2013-12-17 15:49:30.054396946 +0200
+@@ -10,7 +10,8 @@
+ 	mpcdec/mpcdec.h \
+ 	mpcdec/reader.h \
+ 	mpcdec/requant.h \
+-	mpcdec/streaminfo.h
++	mpcdec/streaminfo.h \
++	mpcdec/config_win32.h
+ 
+ EXTRA_DIST = \
+ 	mpcdec/internal.h
diff -r f11ee3f8e632 -r 4e78b4a9e87c src/libmpcdec.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libmpcdec.mk	Mon Jun 30 06:10:45 2014 -0400
@@ -0,0 +1,30 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := libmpcdec
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.2.6
+$(PKG)_CHECKSUM := 32139ff5cb43a18f7c99637da76703c63a55485a
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
+$(PKG)_URL      := http://files.musepack.net/source/$(PKG)-$($(PKG)_VERSION).tar.bz2
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'http://files.musepack.net/source/$(PKG)-$($(PKG)_VERSION)' | \
+    $(SED) -n 's,.*$(PKG)-\([0-9][^>]*\)\.tar.*,\1,p' | \
+    grep -v 'alpha' | \
+    grep -v 'beta' | \
+    $(SORT) -Vr | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && autoreconf -fi
+    cd '$(1)' && ./configure \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        $(ENABLE_SHARED_OR_STATIC) 
+    $(MAKE) -C '$(1)' -j $(JOBS)
+    $(MAKE) -C '$(1)' -j 1 install
+endef
diff -r f11ee3f8e632 -r 4e78b4a9e87c src/vcdimager-1-configure.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/vcdimager-1-configure.patch	Mon Jun 30 06:10:45 2014 -0400
@@ -0,0 +1,54 @@
+This file is part of MXE.
+See index.html for further information.
+
+diff -urN vcdimager-0.7.24/configure.ac vcdimager-0.7.24-patch/configure.ac
+--- vcdimager-0.7.24/configure.ac	2011-03-18 01:43:53.000000000 +0200
++++ vcdimager-0.7.24-patch/configure.ac	2013-12-18 10:58:39.175296932 +0200
+@@ -154,9 +154,13 @@
+ fi
+ 
+ if test "x$enable_xml_fe" = "xyes"; then
+-  AM_PATH_XML2(2.3.8, , enable_xml_fe=no)
++  PKG_CHECK_MODULES(XML, libxml-2.0)
++  dnl Using this causes pain and suffering
++  dnl AM_PATH_XML2(2.3.8, , enable_xml_fe=no)
+ fi
+ 
++
++
+ dnl headers
+ 
+ dnl AC_DEFINE(_DEVELOPMENT_, [], enable warnings about being development release)
+diff -urN vcdimager-0.7.24/frontends/xml/Makefile.am vcdimager-0.7.24-patch/frontends/xml/Makefile.am
+--- vcdimager-0.7.24/frontends/xml/Makefile.am	2004-08-15 15:16:49.000000000 +0300
++++ vcdimager-0.7.24-patch/frontends/xml/Makefile.am	2013-12-18 11:07:39.344356593 +0200
+@@ -27,7 +27,7 @@
+ 
+ MAINTAINERCLEANFILES = $(man_MANS)
+ 
+-INCLUDES = -I$(top_srcdir) $(LIBPOPT_CFLAGS) $(LIBVCD_CFLAGS) $(XML_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS) $(XML_CPPFLAGS)
++INCLUDES = -I$(top_srcdir) $(LIBPOPT_CFLAGS) $(LIBVCD_CFLAGS) $(XML_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS) $(XML_CFLAGS)
+ 
+ BUILT_SOURCES = videocd_dtd.inc
+ MOSTLYCLEANFILES = videocd_dtd.inc
+diff -urN vcdimager-0.7.24/frontends/xml/Makefile.in vcdimager-0.7.24-patch/frontends/xml/Makefile.in
+--- vcdimager-0.7.24/frontends/xml/Makefile.in	2011-03-18 01:46:36.000000000 +0200
++++ vcdimager-0.7.24-patch/frontends/xml/Makefile.in	2013-12-18 11:08:17.458924350 +0200
+@@ -222,7 +222,7 @@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+ XML2_CONFIG = @XML2_CONFIG@
+-XML_CPPFLAGS = @XML_CPPFLAGS@
++XML_CFLAGS = @XML_CFLAGS@
+ XML_LIBS = @XML_LIBS@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -279,7 +279,7 @@
+ top_srcdir = @top_srcdir@
+ man_MANS = vcdxbuild.1 vcdxgen.1 vcdxrip.1 vcdxminfo.1
+ MAINTAINERCLEANFILES = $(man_MANS)
+-INCLUDES = -I$(top_srcdir) $(LIBPOPT_CFLAGS) $(LIBVCD_CFLAGS) $(XML_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS) $(XML_CPPFLAGS)
++INCLUDES = -I$(top_srcdir) $(LIBPOPT_CFLAGS) $(LIBVCD_CFLAGS) $(XML_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS) $(XML_CFLAGS)
+ BUILT_SOURCES = videocd_dtd.inc
+ MOSTLYCLEANFILES = videocd_dtd.inc
+ EXTRA_DIST = videocd.dtd $(man_MANS)
diff -r f11ee3f8e632 -r 4e78b4a9e87c src/vcdimager.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/vcdimager.mk	Mon Jun 30 06:10:45 2014 -0400
@@ -0,0 +1,26 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := vcdimager
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.7.24
+$(PKG)_CHECKSUM := 8c245555c3e21dcbc3d4dbb2ecca74f609545424
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://ftp.gnu.org/gnu/vcdimager/$(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_DEPS     := libcdio libxml2 popt
+
+define $(PKG)_UPDATE
+    echo 'TODO: Updates for package vcdimager need to be written.' >&2;
+    echo $(vcdimager_VERSION)
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && autoconf
+    cd '$(1)' && ./configure \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        $(ENABLE_SHARED_OR_STATIC) 
+    $(MAKE) -C '$(1)' -j $(JOBS)
+    $(MAKE) -C '$(1)' -j 1 install
+endef
diff -r f11ee3f8e632 -r 4e78b4a9e87c src/wavpack-1-exec_prefix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/wavpack-1-exec_prefix.patch	Mon Jun 30 06:10:45 2014 -0400
@@ -0,0 +1,14 @@
+This file is part of MXE.
+See index.html for further information.
+
+Make sure exec_prefix is defined in wavpack.pc.
+
+diff -ur a/wavpack.pc.in b/wavpack.pc.in
+--- a/wavpack.pc.in	2013-09-29 23:30:14.000000000 +0200
++++ b/wavpack.pc.in	2013-11-17 18:31:35.351567596 +0100
+@@ -1,4 +1,5 @@
+ prefix=@prefix@
++exec_prefix=${prefix}
+ libdir=@libdir@
+ includedir=${prefix}/include
+ 
diff -r f11ee3f8e632 -r 4e78b4a9e87c src/wavpack.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/wavpack.mk	Mon Jun 30 06:10:45 2014 -0400
@@ -0,0 +1,29 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := wavpack
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 4.70.0
+$(PKG)_CHECKSUM := 7bf2022c988c19067196ee1fdadc919baacf46d1
+$(PKG)_SUBDIR   := wavpack-$($(PKG)_VERSION)
+$(PKG)_FILE     := wavpack-$($(PKG)_VERSION).tar.bz2
+$(PKG)_URL      := http://www.wavpack.com/$($(PKG)_FILE)
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'http://www.wavpack.com/downloads.html' | \
+    grep '<a href="wavpack-.*\.tar\.bz2">' | \
+    head -n 1 | \
+    $(SED) -e 's/^.*<a href="wavpack-\([0-9.]*\)\.tar\.bz2">.*$$/\1/'
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)' \
+        $(ENABLE_SHARED_OR_STATIC) \
+        --without-iconv \
+        CFLAGS="-DWIN32"
+    $(MAKE) -C '$(1)' -j '$(JOBS)' SUBDIRS="src include"
+    $(MAKE) -C '$(1)' -j 1 install SUBDIRS="src include"
+endef