--- a/breakdeps/SVGDocumentImpl.cpp	Fri Oct 15 09:56:49 2010 +0100
+++ b/breakdeps/SVGDocumentImpl.cpp	Fri Oct 15 10:02:23 2010 +0100
@@ -61,7 +61,7 @@
 #include "SVGDiscardElementImpl.h"
 #include "SVGScriptElementImpl.h"
 
-#include "SVGAudioElementImpl.h"
+//#include "SVGAudioElementImpl.h"
 
 //#ifdef RD_SVGT_MEDIAANIMATION_SUPPORT
 #include "SVGMediaAnimationElementImpl.h"
@@ -515,13 +515,14 @@
 #else
             return ( MXmlElement * ) CSvgGElementImpl::NewL( _L( "g" )(TUint8) position, this );
 #endif
-
+#if 0
         case KSvgAudioElement:
             {
             CSvgAudioElementImpl* lAudioElement = CSvgAudioElementImpl::NewL( (TUint8) position, this );
             iSvgAnimations.Append(lAudioElement);
             return ( MXmlElement * ) lAudioElement;
             }
+#endif
 //#ifdef RD_SVGT_MEDIAANIMATION_SUPPORT
         case KSvgMediaAnimationElement:
             {
@@ -1275,8 +1276,7 @@
 	    }
 	
 	// Add only media elements, currently animation and audio
-	if ( aRoot->ElemID() == KSvgMediaAnimationElement || 
-	    aRoot->ElemID() == KSvgAudioElement )	
+	if ( aRoot->ElemID() == KSvgMediaAnimationElement )	
 	    {
 	    aPostOrderList.Append( aRoot );	    
 	    }

--- a/breakdeps/SVGEngine.mmp	Fri Oct 15 09:56:49 2010 +0100
+++ b/breakdeps/SVGEngine.mmp	Fri Oct 15 10:02:23 2010 +0100
@@ -14,13 +14,15 @@
 * Description:  This mmp file generates makefile for SVG Engine
 *
 */
-
+// Modified to build stem_SVGEngine.dll to break dependency on mediaclientaudio.dll
+// Assumes that the sf/mw/svgt package is accessible and adjusts the paths
+// to refer back to /sf/mw/svgt/svgtopt/SVG/(SVGEngine or SVGImpl) where needed
 
 #include <platform_paths.hrh>
 
 ALWAYS_BUILD_AS_ARM
 OPTION_REPLACE ARMCC --cpu 5T -O3 -Otime
-TARGET SVGEngine.dll
+TARGET stem_SVGEngine.dll
 TARGETTYPE dll
 
 
@@ -30,9 +32,9 @@
 
 
 	#if defined( ARMCC )
-	deffile ../eabi/SVGENGINE-OpenVG.def
+	deffile /sf/mw/svgt/svgtopt/SVG/SVGEngine/eabi/SVGENGINE-OpenVG.def
 	#elif defined( WINSCW )
-	deffile ../BWINSCW/SVGENGINE-OpenVG.def
+	deffile /sf/mw/svgt/svgtopt/SVG/SVGEngine/BWINSCW/SVGENGINE-OpenVG.def
 	#elif defined( WINS )
 	deffile ../bwins/SVGENGINE-OpenVG.def
 	#else
@@ -41,10 +43,14 @@
 
 CAPABILITY  CAP_GENERAL_DLL DRM
 
-SOURCEPATH ../src
+SOURCEPATH .
 
+SOURCE SVGEngineImpl.cpp
+SOURCE Svgdecoder.cpp
+SOURCE SVGDocumentImpl.cpp
+
+SOURCEPATH /sf/mw/svgt/svgtopt/SVG/SVGEngine/src
 //SOURCE SVGEngineMain.cpp
-SOURCE SVGEngineImpl.cpp
 SOURCE SVGEngineInterfaceImpl.cpp
 SOURCE SVGTimer.cpp
 SOURCE SVGEventHandler.cpp
@@ -54,13 +60,11 @@
 //SOURCE SVGXmlParser.cpp
 SOURCE SVGAttributeVerifier.cpp
 SOURCE SVGErrorImpl.cpp
-SOURCE Svgdecoder.cpp
 SOURCE SVGFourPointRect.cpp
 
-SOURCEPATH ../../SVGImpl/src
+SOURCEPATH /sf/mw/svgt/svgtopt/SVG/SVGImpl/src
 
 SOURCE SVGElementImpl.cpp
-SOURCE SVGDocumentImpl.cpp
 SOURCE SVGDOMImplementationImpl.cpp
 
 // Structure Elements
@@ -156,22 +160,21 @@
 SOURCE SVGTokenizer.cpp
 
 // Media Element Classes
-SOURCE SVGAudioElementImpl.cpp
 SOURCE SVGMediaAnimationElementImpl.cpp
 SOURCE SVGMediaElementBase.cpp
 SOURCE SVGTimeContainer.cpp
 SOURCE SVGLockedRealTimeEntity.cpp
 
-SOURCEPATH ../../Xmldomimpl/src
+SOURCEPATH /sf/mw/svgt/svgtopt/SVG/Xmldomimpl/src
 
 SOURCE SVGXmlElementImpl.cpp
 
 
-USERINCLUDE ../inc
-USERINCLUDE ../../Xmldomimpl/inc
-USERINCLUDE ../../SVGImpl/inc/SVGDOM
-USERINCLUDE ../../SVGImpl/inc
-USERINCLUDE ../../../VGRenderer/inc
+USERINCLUDE /sf/mw/svgt/svgtopt/SVG/SVGEngine/inc
+USERINCLUDE /sf/mw/svgt/svgtopt/SVG/Xmldomimpl/inc
+USERINCLUDE /sf/mw/svgt/svgtopt/SVG/SVGImpl/inc/SVGDOM
+USERINCLUDE /sf/mw/svgt/svgtopt/SVG/SVGImpl/inc
+USERINCLUDE /sf/mw/svgt/svgtopt/VGRenderer/inc
 
 // This is a SYSTEMINCLUDE macro containing the middleware
 // layer specific include directories
@@ -220,7 +223,6 @@
 // CAF library: for DRM
 LIBRARY         caf.lib
 
-LIBRARY  mediaclientaudio.lib
 // Added for localized bidirectional textArea wrapping support
 LIBRARY         avkon.lib
 
@@ -228,7 +230,7 @@
 // Graphics library Information--------
 //LIBRARY Gfx2D.lib
 //--------------------------------------------
-SOURCEPATH ../../../gfx2d/src
+SOURCEPATH /sf/mw/svgt/svgtopt/gfx2d/src
 SOURCE GfxMath.c
 SOURCE GfxFloatFixPt.cpp
 SOURCE Gfxtrignometric.cpp
@@ -236,7 +238,7 @@
 SOURCE RastSymbianWrapper.cpp
 
 // GFXGC source files
-SOURCEPATH ../../../gfx2d/src/GfxGc
+SOURCEPATH /sf/mw/svgt/svgtopt/gfx2d/src/GfxGc
 SOURCE          GfxStroke.cpp
 SOURCE          GfxColor.cpp
 SOURCE          GfxRenderingHints.cpp
@@ -246,7 +248,7 @@
 
 
 // GFXGEOM source files
-SOURCEPATH      ../../../gfx2d/src/GfxGeom
+SOURCEPATH      /sf/mw/svgt/svgtopt/gfx2d/src/GfxGeom
 SOURCE          GfxEllipse2D.cpp
 SOURCE          GfxEllipseIteratorP.cpp
 SOURCE          GfxFlatteningPathIterator.cpp
@@ -263,15 +265,15 @@
 SOURCE          GfxPoint2D.cpp
 
 // GFXIMAGE source files
-SOURCEPATH      ../../../gfx2d/src/GfxImage
+SOURCEPATH      /sf/mw/svgt/svgtopt/gfx2d/src/GfxImage
 SOURCE          GfxImageTransformer.cpp
 
 // Internal Rendering Engine source files
-SOURCEPATH      ../../../gfx2d/src/GfxRenderer
+SOURCEPATH      /sf/mw/svgt/svgtopt/gfx2d/src/GfxRenderer
 SOURCE          GfxRendererInfoP.cpp
 
 
-USERINCLUDE     ../../../gfx2d/inc
+USERINCLUDE     /sf/mw/svgt/svgtopt/gfx2d/inc
 
 
 LIBRARY VGRenderer.lib

--- a/breakdeps/SVGEngineImpl.cpp	Fri Oct 15 09:56:49 2010 +0100
+++ b/breakdeps/SVGEngineImpl.cpp	Fri Oct 15 10:02:23 2010 +0100
@@ -33,7 +33,7 @@
 #include "SVGAnimationElementImpl.h"
 #include "SVGTextElementImpl.h"
 
-#include "SVGAudioElementImpl.h"
+//#include "SVGAudioElementImpl.h"
 
 
 #include "Gfx2dGcOpenVG.h"
@@ -2684,7 +2684,7 @@
 // --------------------------------------------------------------------------
 void CSvgEngineImpl::SetAudioVolume( TInt aPercentage )
     {
-    
+#if 0    
     if ( !iSvgDocument )
         {
         return;
@@ -2703,6 +2703,7 @@
         lAudioElement->SetVolume( aPercentage );
         }
     lAudioElementList.Close();
+#endif
     }
 
 // --------------------------------------------------------------------------

--- a/breakdeps/Svgdecoder.cpp	Fri Oct 15 09:56:49 2010 +0100
+++ b/breakdeps/Svgdecoder.cpp	Fri Oct 15 10:02:23 2010 +0100
@@ -37,7 +37,7 @@
 #include "SVGMediaElementBase.h"
 #include "SVGMediaAnimationElementImpl.h"
 #include "SVGTimedEntityInterface.h"
-#include "SVGAudioElementImpl.h"
+//#include "SVGAudioElementImpl.h"
 
 #include "SVGDocumentImpl.h"
 #include "SVGEngineImpl.h"
@@ -610,6 +610,7 @@
 
 		return DecodeAttributeDesL(aName);
 		}
+#if 0
  else if (aName== KAtrVolume)
 			{
 			if (iIsFixPt)
@@ -658,7 +659,7 @@
 			}
 			return ETrue;
 			}
-
+#endif
 	switch( aName )
 		{
 		case KAtrType:
@@ -680,6 +681,7 @@
 				((CSvgAnimateTransformElementImpl*)iCurrentElement)->SetMatrixDataSize(lSize);
 				return ETrue;
 				}
+#if 0
 			else if(iCurrentElement->ElemID()== KSvgAudioElement)
 				    {
 				    TPtrC lPtr(DecodeTDesCLC());
@@ -687,6 +689,7 @@
 		            CleanupStack::PopAndDestroy( 1 );				    
 				return ETrue;
 				}
+#endif
 			else
 				{
 				return DecodeAttributeDesL(aName);

--- a/group/bld.inf	Fri Oct 15 09:56:49 2010 +0100
+++ b/group/bld.inf	Fri Oct 15 10:02:23 2010 +0100
@@ -24,4 +24,5 @@
 ..\startup\ssmstartuppolicy.mmp
 ..\breakdeps\backend.mmp
 ..\breakdeps\cone.mmp
+..\breakdeps\SVGEngine.mmp