diff --git a/projects/RPi/patches/xbmc/xbmc-001-newclock4.patch b/projects/RPi/patches/xbmc/xbmc-001-newclock4.patch
index d422469274..6fc278652f 100644
--- a/projects/RPi/patches/xbmc/xbmc-001-newclock4.patch
+++ b/projects/RPi/patches/xbmc/xbmc-001-newclock4.patch
@@ -595,9 +595,9 @@ index 4e51166..3c405ab 100644
 --- a/xbmc/utils/log.cpp
 +++ b/xbmc/utils/log.cpp
 @@ -23,6 +23,7 @@
- #include "threads/SingleLock.h"
  #include "threads/Thread.h"
  #include "utils/StringUtils.h"
+ #include "CompileInfo.h"
 +#include "utils/TimeUtils.cpp"
  
  static const char* const levelNames[] =
@@ -1338,106 +1338,6 @@ applicable transformation matrices permit the use of hardware clipping.
  create mode 100644 xbmc/guilib/GUIFontCache.cpp
  create mode 100644 xbmc/guilib/GUIFontCache.h
 
-diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj
-index 415d73b..1a5dc91 100644
---- a/XBMC.xcodeproj/project.pbxproj
-+++ b/XBMC.xcodeproj/project.pbxproj
-@@ -168,6 +168,9 @@
- 		1D638128161E211E003603ED /* PeripheralImon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1D638126161E211E003603ED /* PeripheralImon.cpp */; };
- 		1DAFDB7C16DFDCA7007F8C68 /* PeripheralBusCEC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1DAFDB7A16DFDCA7007F8C68 /* PeripheralBusCEC.cpp */; };
- 		1DE0443515828F4B005DDB4D /* Exception.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1DE0443315828F4B005DDB4D /* Exception.cpp */; };
-+		2F4564D51970129A00396109 /* GUIFontCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F4564D31970129A00396109 /* GUIFontCache.cpp */; };
-+		2F4564D61970129A00396109 /* GUIFontCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F4564D31970129A00396109 /* GUIFontCache.cpp */; };
-+		2F4564D71970129A00396109 /* GUIFontCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F4564D31970129A00396109 /* GUIFontCache.cpp */; };
- 		32C631281423A90F00F18420 /* JpegIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32C631261423A90F00F18420 /* JpegIO.cpp */; };
- 		36A9443D15821E2800727135 /* DatabaseUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36A9443B15821E2800727135 /* DatabaseUtils.cpp */; };
- 		36A9444115821E7C00727135 /* SortUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36A9443F15821E7C00727135 /* SortUtils.cpp */; };
-@@ -4017,6 +4020,8 @@
- 		1DAFDB7B16DFDCA7007F8C68 /* PeripheralBusCEC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PeripheralBusCEC.h; sourceTree = "<group>"; };
- 		1DE0443315828F4B005DDB4D /* Exception.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Exception.cpp; path = commons/Exception.cpp; sourceTree = "<group>"; };
- 		1DE0443415828F4B005DDB4D /* Exception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Exception.h; path = commons/Exception.h; sourceTree = "<group>"; };
-+		2F4564D31970129A00396109 /* GUIFontCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIFontCache.cpp; sourceTree = "<group>"; };
-+		2F4564D41970129A00396109 /* GUIFontCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIFontCache.h; sourceTree = "<group>"; };
- 		32C631261423A90F00F18420 /* JpegIO.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JpegIO.cpp; sourceTree = "<group>"; };
- 		32C631271423A90F00F18420 /* JpegIO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JpegIO.h; sourceTree = "<group>"; };
- 		36A9443B15821E2800727135 /* DatabaseUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseUtils.cpp; sourceTree = "<group>"; };
-@@ -6529,6 +6534,8 @@
- 				18B7C7101294222D009E7A26 /* GUIFixedListContainer.h */,
- 				18B7C76B1294222E009E7A26 /* GUIFont.cpp */,
- 				18B7C7111294222D009E7A26 /* GUIFont.h */,
-+				2F4564D31970129A00396109 /* GUIFontCache.cpp */,
-+				2F4564D41970129A00396109 /* GUIFontCache.h */,
- 				18B7C76C1294222E009E7A26 /* GUIFontManager.cpp */,
- 				18B7C7121294222D009E7A26 /* GUIFontManager.h */,
- 				18B7C76D1294222E009E7A26 /* GUIFontTTF.cpp */,
-@@ -11024,6 +11031,7 @@
- 				7C5608C70F1754930056433A /* ExternalPlayer.cpp in Sources */,
- 				F584E12E0F257C5100DB26A5 /* HTTPDirectory.cpp in Sources */,
- 				F54C51D20F1E783200D46E3C /* GUIDialogKaraokeSongSelector.cpp in Sources */,
-+				2F4564D51970129A00396109 /* GUIFontCache.cpp in Sources */,
- 				F54C51D50F1E784800D46E3C /* karaokelyricscdg.cpp in Sources */,
- 				F54C51D80F1E785700D46E3C /* karaokelyrics.cpp in Sources */,
- 				F54C51E50F1E787700D46E3C /* karaokelyricstextkar.cpp in Sources */,
-@@ -12695,6 +12703,7 @@
- 				DFF0F45B17528350002DA3A4 /* Control.cpp in Sources */,
- 				DFF0F45C17528350002DA3A4 /* Dialog.cpp in Sources */,
- 				DFF0F45D17528350002DA3A4 /* File.cpp in Sources */,
-+				2F4564D71970129A00396109 /* GUIFontCache.cpp in Sources */,
- 				DFF0F45E17528350002DA3A4 /* InfoTagMusic.cpp in Sources */,
- 				DFF0F45F17528350002DA3A4 /* InfoTagVideo.cpp in Sources */,
- 				DFF0F46017528350002DA3A4 /* Keyboard.cpp in Sources */,
-@@ -13494,6 +13503,7 @@
- 				E499131D174E5DAD00741B6D /* GUIVisualisationControl.cpp in Sources */,
- 				E499131E174E5DAD00741B6D /* GUIWindow.cpp in Sources */,
- 				E499131F174E5DAD00741B6D /* GUIWindowManager.cpp in Sources */,
-+				2F4564D61970129A00396109 /* GUIFontCache.cpp in Sources */,
- 				E4991320174E5DAD00741B6D /* GUIWrappingListContainer.cpp in Sources */,
- 				E4991321174E5DAD00741B6D /* imagefactory.cpp in Sources */,
- 				E4991322174E5DAD00741B6D /* IWindowManagerCallback.cpp in Sources */,
-diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
-index ed5ad2a..bc1db7e 100644
---- a/project/VS2010Express/XBMC.vcxproj
-+++ b/project/VS2010Express/XBMC.vcxproj
-@@ -427,6 +427,7 @@
-     <ClCompile Include="..\..\xbmc\guilib\GUIFadeLabelControl.cpp" />
-     <ClCompile Include="..\..\xbmc\guilib\GUIFixedListContainer.cpp" />
-     <ClCompile Include="..\..\xbmc\guilib\GUIFont.cpp" />
-+    <ClCompile Include="..\..\xbmc\guilib\GUIFontCache.cpp" />
-     <ClCompile Include="..\..\xbmc\guilib\GUIFontManager.cpp" />
-     <ClCompile Include="..\..\xbmc\guilib\GUIFontTTF.cpp" />
-     <ClCompile Include="..\..\xbmc\guilib\GUIFontTTFDX.cpp" />
-@@ -1752,6 +1753,7 @@
-     <ClInclude Include="..\..\xbmc\guilib\GUIFadeLabelControl.h" />
-     <ClInclude Include="..\..\xbmc\guilib\GUIFixedListContainer.h" />
-     <ClInclude Include="..\..\xbmc\guilib\GUIFont.h" />
-+    <ClInclude Include="..\..\xbmc\guilib\GUIFontCache.h" />
-     <ClInclude Include="..\..\xbmc\guilib\GUIFontManager.h" />
-     <ClInclude Include="..\..\xbmc\guilib\GUIFontTTF.h" />
-     <ClInclude Include="..\..\xbmc\guilib\GUIFontTTFDX.h" />
-diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
-index ca16ec8..a79aec4 100644
---- a/project/VS2010Express/XBMC.vcxproj.filters
-+++ b/project/VS2010Express/XBMC.vcxproj.filters
-@@ -991,6 +991,9 @@
-     <ClCompile Include="..\..\xbmc\guilib\GUIFont.cpp">
-       <Filter>guilib</Filter>
-     </ClCompile>
-+    <ClCompile Include="..\..\xbmc\guilib\GUIFontCache.cpp">
-+      <Filter>guilib</Filter>
-+    </ClCompile>
-     <ClCompile Include="..\..\xbmc\guilib\GUIFontManager.cpp">
-       <Filter>guilib</Filter>
-     </ClCompile>
-@@ -3891,6 +3894,9 @@
-     <ClInclude Include="..\..\xbmc\guilib\GUIFont.h">
-       <Filter>guilib</Filter>
-     </ClInclude>
-+    <ClInclude Include="..\..\xbmc\guilib\GUIFontCache.h">
-+      <Filter>guilib</Filter>
-+    </ClInclude>
-     <ClInclude Include="..\..\xbmc\guilib\GUIFontManager.h">
-       <Filter>guilib</Filter>
-     </ClInclude>
 diff --git a/xbmc/guilib/GUIFontCache.cpp b/xbmc/guilib/GUIFontCache.cpp
 new file mode 100644
 index 0000000..2c72f9c