0005-Fixwontbuildontremor.patch 2.5 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758
  1. --- a/configure.in
  2. +++ a/configure.in
  3. @@ -449,7 +449,7 @@
  4. echo "-- dynamic libvorbisidec -> $ogg_lib"
  5. EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
  6. else
  7. - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec -lvorbis"
  8. + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec "
  9. fi
  10. else
  11. AC_MSG_WARN([*** Unable to find Ogg Vorbis Tremor library (http://www.xiph.org/)])
  12. @@ -457,7 +457,7 @@
  13. fi
  14. else
  15. AC_CHECK_HEADER([vorbis/vorbisfile.h], [have_ogg_hdr=yes])
  16. - AC_CHECK_LIB([vorbisfile], [ov_open_callbacks], [have_ogg_lib=yes], [], [-lvorbis -logg -lm])
  17. + AC_CHECK_LIB([vorbisfile], [ov_open_callbacks], [have_ogg_lib=yes], [], [ -logg -lm])
  18. if test x$have_ogg_hdr = xyes -a x$have_ogg_lib = xyes; then
  19. case "$host" in
  20. *-*-darwin*)
  21. @@ -479,7 +479,7 @@
  22. echo "-- dynamic libvorbisfile -> $ogg_lib"
  23. EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
  24. else
  25. - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile -lvorbis -logg -lm"
  26. + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile -logg -lm"
  27. fi
  28. else
  29. AC_MSG_WARN([*** Unable to find Ogg Vorbis library (http://www.xiph.org/)])
  30. --- a/configure
  31. +++ a/configure
  32. @@ -13936,7 +13936,7 @@
  33. echo "-- dynamic libvorbisidec -> $ogg_lib"
  34. EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
  35. else
  36. - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec -lvorbis"
  37. + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec "
  38. fi
  39. else
  40. { $as_echo "$as_me:$LINENO: WARNING: *** Unable to find Ogg Vorbis Tremor library (http://www.xiph.org/)" >&5
  41. @@ -14083,7 +14083,7 @@
  42. $as_echo_n "(cached) " >&6
  43. else
  44. ac_check_lib_save_LIBS=$LIBS
  45. -LIBS="-lvorbisfile -lvorbis -logg -lm $LIBS"
  46. +LIBS="-lvorbisfile -logg -lm $LIBS"
  47. cat >conftest.$ac_ext <<_ACEOF
  48. /* confdefs.h. */
  49. _ACEOF
  50. @@ -14167,7 +14167,7 @@
  51. echo "-- dynamic libvorbisfile -> $ogg_lib"
  52. EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
  53. else
  54. - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile -lvorbis -logg -lm"
  55. + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile -logg -lm"
  56. fi
  57. else
  58. { $as_echo "$as_me:$LINENO: WARNING: *** Unable to find Ogg Vorbis library (http://www.xiph.org/)" >&5