components/multimedia/sox/patches/9.disableencumbered.patch

   1 --- sox-14.4.2/configure.ac.orig
   2 +++ sox-14.4.2/configure.ac
   3 @@ -450,15 +450,8 @@
   4  fi
   5
   6  # Check for libgsm
   7 -found_libgsm=yes
   8 -AC_CHECK_HEADERS(gsm/gsm.h, ,
   9 -    [AC_CHECK_HEADERS(gsm.h, ,found_libgsm=no)])
  10 -    AC_CHECK_LIB(gsm, gsm_create, GSM_LIBS="$GSM_LIBS -lgsm", found_libgsm=no)
  11 -if test "$found_libgsm" = yes; then
  12 -    AC_DEFINE(EXTERNAL_GSM, 1, [Define if you are using an external GSM library])
  13 -else
  14 -    LIBGSM_LIBADD=../libgsm/libgsm.la
  15 -fi
  16 +found_libgsm=no
  17 +LIBGSM_LIBADD=../libgsm/libgsm.la
  18  AM_CONDITIONAL(EXTERNAL_GSM, test x$found_libgsm = xyes)
  19  AC_SUBST(LIBGSM_LIBADD)
  20
  21 @@ -509,58 +502,10 @@
  22  AC_OPTIONAL_FORMAT(flac, FLAC, [AC_CHECK_HEADER(FLAC/all.h, [AC_CHECK_DECL(FLAC_API_VERSION_CURRENT, [AC_CHECK_LIB(FLAC, FLAC__stream_encoder_new, FLAC_LIBS="-lFLAC $FLAC_LIBS $OGG_VORBIS_LIBS",using_flac=no, $FLAC_LIBS $OGG_VORBIS_LIBS)], using_flac=no, [#include <FLAC/all.h>])], using_flac=no)], using_flac=no)
  23
  24
  25 -dnl When enable_dl_amrbw, do not let add libraries to be linked in
  26 -dnl since they will be dlopen()'ed instead.
  27 -ac_sox_save_AMRWB_LIBS="$AMRWB_LIBS"
  28 -tmp_using_amrwb=$opt_default
  29 -AC_CHECK_HEADERS(opencore-amrwb/dec_if.h,
  30 -                [AC_CHECK_LIB(opencore-amrwb, D_IF_init,
  31 -                 AMRWB_LIBS="$AMRWB_LIBS -lopencore-amrwb", tmp_using_amrwb=no)],
  32 -                 [AC_CHECK_HEADERS(amrwb/dec.h,
  33 -                  [AC_CHECK_LIB(amrwb, D_IF_init,
  34 -                   AMRWB_LIBS="$AMRWB_LIBS -lamrwb",tmp_using_amrwb=no)],
  35 -                   tmp_using_amrwb=no)])
  36 -AC_ARG_ENABLE(dl_amrwb,
  37 -             AS_HELP_STRING([--enable-dl-amrwb],
  38 -                            [Dlopen amrbw instead of linking in.]),
  39 -                            enable_dl_amrwb=$enableval, enable_dl_amrwb=no)
  40 -if test "x$using_libltdl" = "xyes" -a "x$enable_dl_amrwb" = "xyes"; then
  41 -  AC_DEFINE(DL_AMRWB, 1, [Define to dlopen() amrwb.])
  42 -  dnl When enable_dl_amrwb, do not let SOX_PATH_AMRWB add libraries
  43 -  dnl to be linked in (since they will be dlopen()'ed instead).
  44 -  AMRWB_LIBS="$ac_sox_save_AMRWB_LIBS"
  45 -  dnl Force to using regardless if headers or libraries were found.
  46 -  tmp_using_amrwb=yes
  47 -else
  48 -  enable_dl_amrwb="no"
  49 -fi
  50 +tmp_using_amrwb=no
  51  AC_OPTIONAL_FORMAT(amrwb, AMRWB, [using_amrwb=$tmp_using_amrwb])
  52
  53 -dnl When enable_dl_amrnb, do not let add libraries to be linked in
  54 -dnl since they will be dlopen()'ed instead.
  55 -ac_sox_save_AMRNB_LIBS="$AMRNB_LIBS"
  56 -tmp_using_amrnb=$opt_default
  57 -AC_CHECK_HEADERS(opencore-amrnb/interf_dec.h,
  58 -                [AC_CHECK_LIB(opencore-amrnb, Decoder_Interface_init,
  59 -                 AMRNB_LIBS="$AMRNB_LIBS -lopencore-amrnb", tmp_using_amrnb=no)],
  60 -                 [AC_CHECK_HEADER(amrnb/sp_dec.h,
  61 -                  [AC_CHECK_LIB(amrnb, Decoder_Interface_init,
  62 -                   AMRNB_LIBS="$AMRNB_LIBS -lamrnb", tmp_using_amrnb=no)],
  63 -                   tmp_using_amrnb=no)])
  64 -AC_ARG_ENABLE(dl_amrnb,
  65 -             AS_HELP_STRING([--enable-dl-amrnb],
  66 -                            [Dlopen amrnb instead of linking in.]),
  67 -                            enable_dl_amrnb=$enableval, enable_dl_amrnb=no)
  68 -if test "x$using_libltdl" = "xyes" -a "x$enable_dl_amrnb" = "xyes"; then
  69 -  AC_DEFINE(DL_AMRNB, 1, [Define to dlopen() amrnb.])
  70 -  dnl When enable_dl_amrnb, do not let SOX_PATH_AMRNB add libraries
  71 -  dnl to be linked in (since they will be dlopen()'ed instead).
  72 -  AMRNB_LIBS="$ac_sox_save_AMRNB_LIBS"
  73 -  dnl Force to using regardless if headers or libraries were found.
  74 -  tmp_using_amrnb=yes
  75 -else
  76 -  enable_dl_amrnb="no"
  77 -fi
  78 +tmp_using_amrnb=no
  79  AC_OPTIONAL_FORMAT(amrnb, AMRNB, [using_amrnb=$tmp_using_amrnb])
  80
  81