diff -r 192e66b24747 src/aubio.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/aubio.mk Sat Jan 23 17:27:06 2010 +0100 @@ -0,0 +1,29 @@ +# This file is part of mingw-cross-env. +# See doc/index.html or doc/README for further information. + +# aubio +PKG := aubio +$(PKG)_IGNORE := +$(PKG)_VERSION := 0.3.2 +$(PKG)_CHECKSUM := 8ef7ccbf18a4fa6db712a9192acafc9c8d080978 +$(PKG)_SUBDIR := aubio-$($(PKG)_VERSION) +$(PKG)_FILE := aubio-$($(PKG)_VERSION).tar.gz +$(PKG)_WEBSITE := http://www.aubio.org +$(PKG)_URL := http://www.aubio.org/pub/$($(PKG)_FILE) +$(PKG)_DEPS := gcc fftw libsamplerate libsndfile + +define $(PKG)_UPDATE + wget -q -O- 'http://www.aubio.org/download' | \ + $(SED) -n 's,.*aubio-\([0-9][^>]*\)\.tar.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && autoconf && ./configure \ + --host='$(TARGET)' \ + --disable-shared \ + --disable-jack \ + --prefix='$(PREFIX)/$(TARGET)' + $(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 192e66b24747 src/fftw.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/fftw.mk Sat Jan 23 17:27:06 2010 +0100 @@ -0,0 +1,30 @@ +# This file is part of mingw-cross-env. +# See doc/index.html or doc/README for further information. + +# fftw +PKG := fftw +$(PKG)_IGNORE := +$(PKG)_VERSION := 3.2.2 +$(PKG)_CHECKSUM := d43b799eedfb9408f62f9f056f5e8a645618467b +$(PKG)_SUBDIR := fftw-$($(PKG)_VERSION) +$(PKG)_FILE := fftw-$($(PKG)_VERSION).tar.gz +$(PKG)_WEBSITE := http://www.fftw.org/ +$(PKG)_URL := http://www.fftw.org/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + wget -q -O- 'http://www.fftw.org/download.html' | \ + $(SED) -n 's,.*fftw-\([0-9][^>]*\)\.tar.*,\1,p' | \ + grep -v alpha | \ + grep -v beta | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --disable-shared \ + --prefix='$(PREFIX)/$(TARGET)' + $(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 192e66b24747 src/id3lib-win32.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/id3lib-win32.patch Sat Jan 23 17:27:06 2010 +0100 @@ -0,0 +1,75 @@ +diff -ru id3lib-3.8.3-orig/configure.in id3lib-3.8.3/configure.in +--- id3lib-3.8.3-orig/configure.in 2003-03-02 01:23:00.000000000 +0100 ++++ id3lib-3.8.3/configure.in 2010-01-23 14:15:24.000000000 +0100 +@@ -227,7 +227,6 @@ + ) + AC_CHECK_HEADERS( \ + string \ +- iomanip.h \ + ,,AC_MSG_ERROR([Missing a vital header file for id3lib]) + ) + +@@ -249,10 +248,10 @@ + AM_CONDITIONAL(ID3_NEEDGETOPT_LONG, test x$ac_cv_func_getopt_long = xno) + + AC_CHECK_FUNCS(mkstemp) +-AC_CHECK_FUNCS( +- truncate \ +- ,,AC_MSG_ERROR([Missing a vital function for id3lib]) +-) ++#AC_CHECK_FUNCS( ++# truncate \ ++# ,,AC_MSG_ERROR([Missing a vital function for id3lib]) ++#) + + dnl Checks for typedefs, structures, and compiler characteristics. + AC_TYPE_SIZE_T +diff -ru id3lib-3.8.3-orig/include/id3/globals.h id3lib-3.8.3/include/id3/globals.h +--- id3lib-3.8.3-orig/include/id3/globals.h 2003-03-02 01:23:00.000000000 +0100 ++++ id3lib-3.8.3/include/id3/globals.h 2010-01-23 14:22:58.000000000 +0100 +@@ -41,7 +41,7 @@ + * we prefix variable declarations so they can + * properly get exported in windows dlls. + */ +-#ifdef WIN32 ++#ifdef __MSVC_VER + # define LINKOPTION_STATIC 1 //both for use and creation of static lib + # define LINKOPTION_CREATE_DYNAMIC 2 //should only be used by prj/id3lib.dsp + # define LINKOPTION_USE_DYNAMIC 3 //if your project links id3lib dynamic +@@ -74,11 +74,11 @@ + # define CCONV __stdcall // Added for VB & Delphi Compatibility - By FrogPrince Advised By Lothar + # endif + # endif +-#else /* !WIN32 */ ++#else /* !__MSVC_VER */ + # define ID3_C_EXPORT + # define ID3_CPP_EXPORT + # define CCONV +-#endif /* !WIN32 */ ++#endif /* !__MSVC_VER */ + + #define ID3_C_VAR extern + +diff -ru id3lib-3.8.3-orig/include/id3/id3lib_strings.h id3lib-3.8.3/include/id3/id3lib_strings.h +--- id3lib-3.8.3-orig/include/id3/id3lib_strings.h 2003-03-02 01:23:00.000000000 +0100 ++++ id3lib-3.8.3/include/id3/id3lib_strings.h 2010-01-23 14:15:24.000000000 +0100 +@@ -30,6 +30,7 @@ + #define _ID3LIB_STRINGS_H_ + + #include ++#include + + #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000)) + namespace std +diff -ru id3lib-3.8.3-orig/include/id3/writers.h id3lib-3.8.3/include/id3/writers.h +--- id3lib-3.8.3-orig/include/id3/writers.h 2003-03-02 01:23:00.000000000 +0100 ++++ id3lib-3.8.3/include/id3/writers.h 2010-01-23 14:15:24.000000000 +0100 +@@ -30,7 +30,7 @@ + + #include "id3/writer.h" + #include "id3/id3lib_streams.h" +-//#include ++#include + + class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer + { diff -r 192e66b24747 src/id3lib.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/id3lib.mk Sat Jan 23 17:27:06 2010 +0100 @@ -0,0 +1,28 @@ +# This file is part of mingw-cross-env. +# See doc/index.html or doc/README for further information. + +# id3lib +PKG := id3lib +$(PKG)_IGNORE := +$(PKG)_VERSION := 3.8.3 +$(PKG)_CHECKSUM := c92c880da41d1ec0b242745a901702ae87970838 +$(PKG)_SUBDIR := id3lib-$($(PKG)_VERSION) +$(PKG)_FILE := id3lib-$($(PKG)_VERSION).tar.gz +$(PKG)_WEBSITE := http://id3lib.sourceforge.net/ +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/id3lib/id3lib/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/id3lib/files/id3lib/) | \ + $(SED) -n 's,.*id3lib-\([0-9][^>]*\)\.tar.*,\1,p' | \ + tail -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && autoconf && autoconf && ./configure \ + --host='$(TARGET)' \ + --disable-shared \ + --prefix='$(PREFIX)/$(TARGET)' + $(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 192e66b24747 src/liblo.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/liblo.mk Sat Jan 23 17:27:06 2010 +0100 @@ -0,0 +1,28 @@ +# This file is part of mingw-cross-env. +# See doc/index.html or doc/README for further information. + +# liblo +PKG := liblo +$(PKG)_IGNORE := +$(PKG)_VERSION := 0.26 +$(PKG)_CHECKSUM := 21942c8f19e9829b5842cb85352f98c49dfbc823 +$(PKG)_SUBDIR := liblo-$($(PKG)_VERSION) +$(PKG)_FILE := liblo-$($(PKG)_VERSION).tar.gz +$(PKG)_WEBSITE := http://liblo.sourceforge.net/ +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/liblo/liblo/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/liblo/files/liblo/) | \ + $(SED) -n 's,.*liblo-\([0-9][^>]*\)\.tar.*,\1,p' | \ + tail -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && autoconf && autoconf && ./configure \ + --host='$(TARGET)' \ + --disable-shared \ + --prefix='$(PREFIX)/$(TARGET)' + $(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 192e66b24747 src/libsamplerate.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libsamplerate.mk Sat Jan 23 17:27:06 2010 +0100 @@ -0,0 +1,32 @@ +# This file is part of mingw-cross-env. +# See doc/index.html or doc/README for further information. + +# libsamplerate +PKG := libsamplerate +$(PKG)_IGNORE := +$(PKG)_VERSION := 0.1.7 +$(PKG)_CHECKSUM := 98a52392eb97f9ba724ca024b3af29a8a0cc0206 +$(PKG)_SUBDIR := libsamplerate-$($(PKG)_VERSION) +$(PKG)_FILE := libsamplerate-$($(PKG)_VERSION).tar.gz +$(PKG)_WEBSITE := http://www.mega-nerd.com/SRC +$(PKG)_URL := http://www.mega-nerd.com/SRC/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + wget -q -O- 'http://www.mega-nerd.com/SRC/download.html' | \ + $(SED) -n 's,.*libsamplerate-\([0-9][^>]*\)\.tar.*,\1,p' | \ + grep -v alpha | \ + grep -v beta | \ + head -1 +endef + +define $(PKG)_BUILD + # wine confuses the cross-compiling detection, so set it explicitly + #$(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' + cd '$(1)' && ./configure \ + --host='$(TARGET)' \ + --disable-shared \ + --prefix='$(PREFIX)/$(TARGET)' + $(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 192e66b24747 src/portaudio-win32.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/portaudio-win32.patch Sat Jan 23 17:27:06 2010 +0100 @@ -0,0 +1,86 @@ +diff -ru portaudio-orig/configure.in portaudio/configure.in +--- portaudio-orig/configure.in 2007-11-13 22:22:56.000000000 +0100 ++++ portaudio/configure.in 2010-01-23 17:04:37.000000000 +0100 +@@ -139,6 +139,7 @@ + dnl Mac OS X configuration + + AC_DEFINE(PA_USE_COREAUDIO) ++ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix" + if [[ -d /Developer/SDKs/MacOSX10.5.sdk ]] ; then + SHARED_FLAGS="-Werror -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -dynamiclib -arch x86_64 -arch ppc64 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.3"; + CFLAGS="-Werror $CFLAGS -arch x86_64 -arch ppc64 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.3"; +@@ -167,6 +168,7 @@ + dnl MingW configuration + + echo "WINAPI: $with_winapi" ++ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/win" + if [[ $with_winapi = "directx" ]] ; then + if [[ $with_dxdir ]] ; then + DXDIR="$with_dxdir"; +@@ -174,15 +176,15 @@ + DXDIR="/usr/local/dx7sdk"; + fi + echo "DXDIR: $DXDIR" +- OTHER_OBJS="src/hostapi/dsound/pa_win_ds.o src/hostapi/dsound/pa_win_ds_dynlink.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o"; ++ OTHER_OBJS="src/hostapi/dsound/pa_win_ds.o src/hostapi/dsound/pa_win_ds_dynlink.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_waveformat.o"; + LIBS="-lwinmm -lm -ldsound -lole32"; + PADLL="portaudio.dll"; + THREAD_CFLAGS="-mthreads" + SHARED_FLAGS="-shared"; +- DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L./dx7sdk/lib -ldsound -lole32"; ++ DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L${DXDIR}/lib -ldsound -lole32"; + #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\""; + #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO"; +- CFLAGS="$CFLAGS -I\$(top_srcdir)/include -I$DXDIR/include -DPA_NO_WMME -DPA_NO_ASIO" -DPA_NO_WDMKS; ++ CFLAGS="$CFLAGS -I\$(top_srcdir)/include -I$DXDIR/include -DPA_NO_WMME -DPA_NO_ASIO -DPA_NO_WDMKS"; + elif [[ $with_winapi = "asio" ]] ; then + if [[ $with_asiodir ]] ; then + ASIODIR="$with_asiodir"; +@@ -228,9 +230,10 @@ + + cygwin* ) + dnl Cygwin configuration +- ++ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/win" + OTHER_OBJS="src/hostapi/wmme/pa_win_wmme.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o"; + CFLAGS="$CFLAGS -DPA_NO_DS -DPA_NO_WDMKS -DPA_NO_ASIO -DPA_NO_WASAPI" ++ + LIBS="-lwinmm -lm"; + PADLL="portaudio.dll"; + THREAD_CFLAGS="-mthreads" +@@ -242,6 +245,7 @@ + dnl SGI IRIX audio library (AL) configuration (Pieter, oct 2-13, 2003). + dnl The 'dmedia' library is needed to read the Unadjusted System Time (UST). + dnl ++ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix" + AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR([IRIX posix thread library not found!])) + AC_CHECK_LIB(audio, alOpenPort, , AC_MSG_ERROR([IRIX audio library not found!])) + AC_CHECK_LIB(dmedia, dmGetUST, , AC_MSG_ERROR([IRIX digital media library not found!])) +@@ -271,6 +275,7 @@ + , + AC_MSG_ERROR([libpthread not found!])) + ++ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix" + if [[ $have_alsa = "yes" ] && [ $with_alsa != "no" ]] ; then + DLL_LIBS="$DLL_LIBS -lasound" + OTHER_OBJS="$OTHER_OBJS src/hostapi/alsa/pa_linux_alsa.o" +@@ -305,6 +310,7 @@ + OTHER_OBJS="$OTHER_OBJS src/os/unix/pa_unix_hostapis.o src/os/unix/pa_unix_util.o" + esac + CFLAGS="$CFLAGS $THREAD_CFLAGS" ++echo CFLAGS: $CFLAGS + + if test "$enable_cxx" = "yes"; then + AC_CONFIG_SUBDIRS([bindings/cpp]) +diff -ru portaudio-orig/Makefile.in portaudio/Makefile.in +--- portaudio-orig/Makefile.in 2007-10-24 17:29:04.000000000 +0200 ++++ portaudio/Makefile.in 2010-01-23 17:00:40.000000000 +0100 +@@ -16,7 +16,7 @@ + libdir = @libdir@ + includedir = @includedir@ + CC = @CC@ +-CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src/common -I$(top_srcdir)/src/os/unix @CFLAGS@ @DEFS@ ++CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src/common @CFLAGS@ @DEFS@ + LIBS = @LIBS@ + AR = @AR@ + RANLIB = @RANLIB@ diff -r 192e66b24747 src/portaudio.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/portaudio.mk Sat Jan 23 17:27:06 2010 +0100 @@ -0,0 +1,31 @@ +# This file is part of mingw-cross-env. +# See doc/index.html or doc/README for further information. + +# portaudio +PKG := portaudio +$(PKG)_IGNORE := +$(PKG)_VERSION := 19_20071207 +$(PKG)_CHECKSUM := 3841453bb7be672a15b6b632ade6f225eb0a4efc +$(PKG)_SUBDIR := portaudio +$(PKG)_FILE := pa_stable_v$($(PKG)_VERSION).tar.gz +$(PKG)_WEBSITE := http://www.portaudio.com +$(PKG)_URL := http://www.portaudio.com/archives/$($(PKG)_FILE) +$(PKG)_DEPS := gcc directx + +define $(PKG)_UPDATE + wget -q -O- 'http://www.portaudio.com/download.html' | \ + $(SED) -n 's,.*pa_stable_v\([0-9][^>]*\)\.tar.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && autoconf && ./configure \ + --host='$(TARGET)' \ + --disable-shared \ + --with-host_os=mingw \ + --with-winapi=directx \ + --with-dxdir=$(PREFIX)/$(TARGET) \ + --prefix='$(PREFIX)/$(TARGET)' + $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= +endef