comparison configure @ 21607:092f4f92223f

Compilation fix hacks: disable libavformat X11 grabber and move -L flags from _libs_mplayer to _ld_extra

21606:ee21c7dff35f

else
  _def_color_console='#undef MSG_USE_COLORS'
fi
echores "$_color_console"

#############################################################################
echo "Creating config.mak"
cat > config.mak << EOF
# -------- Generated by configure -----------

`echo $_libavdecoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
`echo $_libavencoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
`echo $_libavparsers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
`echo $_libavdemuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
`echo $_libavmuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
CONFIG_FAAC=$_lavc_faac
CONFIG_MP3LAME=$_lavc_mp3lame
CONFIG_XVID=$_lavc_xvid
CONFIG_X264=$_lavc_x264
CONFIG_GPL=yes

     echo $part | tr '[a-z] ' '[A-Z]' | sed 's/^/#define ENABLE_/;s/$/ 1/'
   else
     echo $part | tr '[a-z] ' '[A-Z]' | sed 's/^/#define ENABLE_/;s/$/ 0/'
   fi
 done`

$_def_lavc_faac
$_def_lavc_xvid
$_def_lavc_mp3lame
$_def_lavc_x264

21607:092f4f92223f

else
  _def_color_console='#undef MSG_USE_COLORS'
fi
echores "$_color_console"

# linker paths should be the same for mencoder and mplayer
_ld_tmp=""
for I in $_libs_mplayer ; do
  _tmp=`echo $I | sed -e s/^-L.*$//`
  if test -z $_tmp ; then
    _ld_extra="$I $_ld_extra"
  else
    _ld_tmp="$_ld_tmp $I"
  fi
done
_libs_mplayer=$_ld_tmp

#############################################################################
echo "Creating config.mak"
cat > config.mak << EOF
# -------- Generated by configure -----------

`echo $_libavdecoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
`echo $_libavencoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
`echo $_libavparsers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
`echo $_libavdemuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
`echo $_libavmuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
CONFIG_X11_GRAB_DEVICE_DEMUXER=no
CONFIG_FAAC=$_lavc_faac
CONFIG_MP3LAME=$_lavc_mp3lame
CONFIG_XVID=$_lavc_xvid
CONFIG_X264=$_lavc_x264
CONFIG_GPL=yes

     echo $part | tr '[a-z] ' '[A-Z]' | sed 's/^/#define ENABLE_/;s/$/ 1/'
   else
     echo $part | tr '[a-z] ' '[A-Z]' | sed 's/^/#define ENABLE_/;s/$/ 0/'
   fi
 done`
// HACK: disable x11 demuxer for now
#undef CONFIG_X11_GRAB_DEVICE_DEMUXER
#undef ENABLE_X11_GRAB_DEVICE_DEMUXER
#define ENABLE_X11_GRAB_DEVICE_DEMUXER 0

$_def_lavc_faac
$_def_lavc_xvid
$_def_lavc_mp3lame
$_def_lavc_x264