git.sesse.net Git - vlc/blob - extras/contrib/src/Patches/portaudio-cross.patch

   1 diff -uN portaudio/Makefile.in portaudio.new/Makefile.in
   2 --- portaudio/Makefile.in       2008-01-01 23:02:42.000000000 +0100
   3 +++ portaudio.new/Makefile.in   2008-03-07 05:22:21.000000000 +0100
   4 @@ -120,7 +120,7 @@
   5  SUBDIRS =
   6  @ENABLE_CXX_TRUE@SUBDIRS += bindings/cpp
   7
   8 -all: lib/$(PALIB) all-recursive tests
   9 +all: lib/$(PALIB) all-recursive
  10
  11  tests: bin-stamp $(TESTS)
  12
  13 diff -uN portaudio/configure.in portaudio.new/configure.in
  14 --- portaudio/configure.in      2008-01-27 03:03:30.000000000 +0100
  15 +++ portaudio.new/configure.in  2008-03-07 05:38:44.000000000 +0100
  16 @@ -99,9 +99,10 @@
  17
  18  dnl sizeof checks: we will need a 16-bit and a 32-bit type
  19
  20 -AC_CHECK_SIZEOF(short)
  21 -AC_CHECK_SIZEOF(int)
  22 -AC_CHECK_SIZEOF(long)
  23 +dnl don't work if you crosscompile
  24 +dnl AC_CHECK_SIZEOF(short)
  25 +dnl AC_CHECK_SIZEOF(int)
  26 +dnl AC_CHECK_SIZEOF(long)
  27
  28  save_LIBS="${LIBS}"
  29  AC_CHECK_LIB(rt, clock_gettime, [rt_libs=" -lrt"])
  30 @@ -235,7 +236,7 @@
  31              #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO";
  32              CFLAGS="$CFLAGS -I\$(top_srcdir)/src/common -I$DXDIR/include -DPA_NO_WMME -DPA_NO_DS -DPA_NO_ASIO";
  33          else   # WMME default
  34 -            OTHER_OBJS="src/hostapi/wmme/pa_win_wmme.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o";
  35 +            OTHER_OBJS="src/hostapi/wmme/pa_win_wmme.o src/os/win/pa_win_waveformat.o src/os/win/pa_win_waveformat.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o";
  36              LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid";
  37              PADLL="portaudio.dll";
  38             THREAD_CFLAGS="-mthreads"
  39 @@ -248,7 +249,7 @@
  40    cygwin* )
  41         dnl Cygwin configuration
  42
  43 -       OTHER_OBJS="src/hostapi/wmme/pa_win_wmme.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o";
  44 +       OTHER_OBJS="src/hostapi/wmme/pa_win_wmme.o src/os/win/pa_win_waveformat.o src/os/win/pa_win_waveformat.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o";
  45         CFLAGS="$CFLAGS -DPA_NO_DS -DPA_NO_WDMKS -DPA_NO_ASIO -DPA_NO_WASAPI"
  46         LIBS="-lwinmm -lm";
  47         PADLL="portaudio.dll";