[Meta] Getting this Module working with latest Media 2.x-dev

Any updates to this? I'm working with the HEAD of ckeditor 7.x-1.x and applied the patches in order.

1. #2159403: Make CKEditor plugin system modular and clean applies cleanly
2. #2158741: External plugin declarations are redundant. (Linkit, ckeditor_link, ckeditor_swf not working) fails

dking@dking-mbp ~/Projects/test/ckeditor (7.x-1.x)$ git apply -v ckeditor-remove-external-plugin-declarations-8-alt.patch
Checking patch ckeditor.ckeditor.inc...
error: while searching for:
  $plugin_dir_additional = ckeditor_plugins_path('local') . '/';

  /*
   * External plugins
   */
  if (module_exists('ckeditor_swf') && file_exists(drupal_get_path('module', 'ckeditor_swf') . '/plugins/swf/plugin.js')) {
    $plugins['ckeditor_swf'] = array(
      'name' => 'swf',
      'desc' => t('Support for the CKEditor SWF module'),
      'path' => drupal_get_path('module', 'ckeditor_swf') . '/plugins/swf/',
      'buttons' => FALSE,
      'default' => 't',
    );
  }

  if (module_exists('ckeditor_link') && file_exists(drupal_get_path('module', 'ckeditor_link') . '/plugins/link/plugin.js')) {
    $plugins['ckeditor_link'] = array(
      'name' => 'drupal_path',
      'desc' => t('Support for the CKEditor Link module'),
      'path' => drupal_get_path('module', 'ckeditor_link') . '/plugins/link/',
      'buttons' => FALSE,
      'default' => 't',
    );
  }

  if (module_exists('linkit') && file_exists(drupal_get_path('module', 'linkit') . '/editors/ckeditor/plugin.js')) {
    $plugins['linkit'] = array(
      'name' => 'Linkit',
      'desc' => t('Support for the Linkit module <em>(buttons: Linkit)</em>'),
      'path' => drupal_get_path('module', 'linkit') . '/editors/ckeditor/',
      'buttons' => array(
        'Linkit' => array(
          'label' => 'Linkit',
          'icon' => 'linkit.png',
        )
      ),
      'default' => 't',
    );
  }

  /*
   * CKEditor build-in plugins
   */
  $_editor_path = ltrim($editor_path, './');

error: patch failed: ckeditor.ckeditor.inc:10
error: ckeditor.ckeditor.inc: patch does not apply

Looks like this patch was incorporated into the last patch in #2159403: Make CKEditor plugin system modular and clean. Not sure if that was intentional.