shithub: sox

Download patch

ref: 8f5e4cd1964c0cee014722cf530a8b2377221aca
parent: 79480d816a28fc44269fa539457d4983162816fb
author: robs <robs>
date: Sun Nov 4 13:17:23 EST 2007

fix some small build issues

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,7 +84,7 @@
   optional(HAVE_MACHINE_SOUNDCARD_H machine/soundcard.h ossaudio _oss_ioctl oss)
 endif (NOT HAVE_SYS_SOUNDCARD_H)
 optional3(HAVE_OGG_VORBIS vorbis/codec.h vorbis vorbis_analysis_headerout vorbisfile ov_clear vorbisenc vorbis_encode_init_vbr vorbis)
-optional3(HAVE_FFMPEG ffmpeg/avformat.h avformat av_open_input_file avutil av_rescale_q avcodec avcodec_encode_audio ffmpeg)
+optional3(HAVE_FFMPEG ffmpeg/avformat.h avformat av_open_input_file avutil av_rescale_q avcodec avcodec_decode_audio2 ffmpeg)
 
 subdirs(src lpc10)
 
--- a/configure.ac
+++ b/configure.ac
@@ -271,7 +271,7 @@
     AC_CHECK_HEADER(ffmpeg/avformat.h,
         [AC_CHECK_LIB(avformat, av_open_input_file, FFMPEG_LIBS="$FFMPEG_LIBS -lavformat", using_ffmpeg=no)
         AC_CHECK_LIB(avutil, av_rescale_q, FFMPEG_LIBS="$FFMPEG_LIBS -lavutil", using_ffmpeg=no)
-        AC_CHECK_LIB(avcodec, avcodec_encode_audio, FFMPEG_LIBS="$FFMPEG_LIBS -lavcodec", using_ffmpeg=no)],
+        AC_CHECK_LIB(avcodec, avcodec_decode_audio2, FFMPEG_LIBS="$FFMPEG_LIBS -lavcodec", using_ffmpeg=no)],
         using_ffmpeg=no)
     if test "$with_ffmpeg" = "yes" -a "$using_ffmpeg" = "no"; then
         AC_MSG_FAILURE([cannot find ffmpeg])
--- a/src/soxconfig.h.cmake
+++ b/src/soxconfig.h.cmake
@@ -26,6 +26,7 @@
 #cmakedefine HAVE_STDINT_H            1
 #cmakedefine HAVE_STRCASECMP          1
 #cmakedefine HAVE_STRDUP              1
+#cmakedefine HAVE_STRINGS_H           1
 #cmakedefine HAVE_STRING_H            1
 #cmakedefine HAVE_STRRSTR             1
 #cmakedefine HAVE_SUN_AUDIOIO_H       1