--- a/symbian4/mw/mmmw/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/mmmw/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
+<SystemDefinition schema="3.0.1">
  <package id="mmmw" name="Multimedia Middleware" levels="plugin framework server generic specific">
   <collection id="mmmw_plat" name="Multimedia Middleware Platform Interfaces" level="specific">
    <component id="multimedia_data_source_api" name="Multimedia Data Source API" class="api" filter="s60">
     <meta rel="Api" href="mmmw_plat/multimedia_data_source_api/multimedia_data_source_api.metaxml"/>
     <unit bldFile="mmmw_plat/multimedia_data_source_api/group"/>
    </component>
-   <component id="progressive_download_api" name="Progressive Download API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/progressive_download_api/progressive_download_api.metaxml"/>
-    <unit bldFile="mmmw_plat/progressive_download_api/group"/>
-   </component>
-   <component id="equalizer_ui_api" name="Equalizer UI API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/equalizer_ui_api/equalizer_ui_api.metaxml"/>
-    <unit bldFile="mmmw_plat/equalizer_ui_api/group"/>
-   </component>
    <component id="enhanced_media_client_api" name="Enhanced Media Client API" class="api" filter="s60">
     <meta rel="Api" href="mmmw_plat/enhanced_media_client_api/enhanced_media_client_api.metaxml"/>
     <unit bldFile="mmmw_plat/enhanced_media_client_api/group"/>
@@ -34,10 +26,6 @@
     <meta rel="Api" href="mmmw_plat/audio_metadata_reader_api/audio_metadata_reader_api.metaxml"/>
     <unit bldFile="mmmw_plat/audio_metadata_reader_api/group"/>
    </component>
-   <component id="emc_progressive_download_source_api" name="EMC Progressive Download Source API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/emc_progressive_download_source_api/emc_progressive_download_source_api.metaxml"/>
-    <unit bldFile="mmmw_plat/emc_progressive_download_source_api/group"/>
-   </component>
    <component id="emc_volume_effect_api" name="EMC Volume Effect API" class="api" filter="s60">
     <meta rel="Api" href="mmmw_plat/emc_volume_effect_api/emc_volume_effect_api.metaxml"/>
     <unit bldFile="mmmw_plat/emc_volume_effect_api/group"/>
@@ -101,10 +89,19 @@
       <meta rel="Api" href="mmmw_plat/openmax_al_api/openmax_al_api.metaxml"/>
       <unit bldFile="mmmw_plat/openmax_al_api/group"/>
    </component>
+   <component id="openmax_al_ext_api" name="OpenMAX AL Extensions API" class="api" filter="s60" introduced="^4">
+      <meta rel="Api" href="mmmw_plat/openmax_al_ext_api/openmax_al_ext_api.metaxml"/>
+      <unit bldFile="mmmw_plat/openmax_al_ext_api/group"/>
+   </component>
    <component id="system_tone_service_api" name="System Tone Service API" class="api" filter="s60" introduced="^4">
       <unit bldFile="mmmw_plat/system_tone_service_api/group"/>
    </component>
   </collection>
+  <collection id="khronosfws" name="Khronos Frameworks" level="framework">
+      <component id="openmax_al" filter="s60" name="OpenMAX AL" introduced="^4">
+        <unit bldFile="khronosfws/openmax_al/group"/>
+      </component>
+  </collection>
   <collection id="mmfenh" name="MMF Enhancements" level="generic">
    <component id="advancedaudiocontroller" filter="s60" name="Advanced Audio Controllers" class="plugin">
     <unit bldFile="mmfenh/advancedaudiocontroller/group"/>
@@ -124,21 +121,11 @@
    <component id="profilesettingsmonitor" filter="s60" name="Profile Settings Monitor">
     <unit bldFile="mmfenh/profilesettingsmonitor/group"/>
    </component>
-   <component id="progressivedownload" filter="s60" name="Progressive Download">
-    <unit bldFile="mmfenh/progressivedownload/group"/>
-   </component>
    <component id="mmfenh_test" filter="s60,test,module_test,pref_test" name="MMF Enhancements Tests" purpose="development">
     <unit bldFile="mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group"/>
    </component>
   </collection>
-  <collection id="mm_fw" name="Multimedia Frameworks" level="framework">
-   <!-- Id needs to be unique, mmfw already in use -->
-   <!-- Placeholder for OpenAX AL and other stuff -->
-  </collection>
   <collection id="mmserv" name="Multimedia Services" level="specific">
-   <component id="audioeffectsui" filter="s60" name="Audio Effects UI">
-    <unit bldFile="mmserv/audioeffectsui/group"/>
-   </component>
    <component id="callaudiocontrol" filter="s60" name="Call Audio Control">
     <unit bldFile="mmserv/callaudiocontrol/group"/>
    </component>