kodi: update to kodi-14-e7ba06f

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2015-03-13 10:19:04 +01:00
parent a2cdb977b0
commit b525d6f5e1
4 changed files with 2 additions and 118 deletions

View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="kodi-theme-Confluence"
PKG_VERSION="14-4606179"
PKG_VERSION="14-e7ba06f"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="kodi"
PKG_VERSION="14-4606179"
PKG_VERSION="14-e7ba06f"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -893,64 +893,6 @@ index 6dd3cf2..1f04a0b 100644
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 aca7b82..2d735052 100644
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -426,6 +426,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" />
@@ -1751,6 +1752,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" />
@@ -2552,4 +2554,4 @@
</VisualStudio>
</ProjectExtensions>
<Import Project="$(SolutionDir)\$(ProjectFileName).targets.user" Condition="Exists('$(SolutionDir)\$(ProjectFileName).targets.user')" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
index 7603447..506b565 100644
--- a/project/VS2010Express/XBMC.vcxproj.filters
+++ b/project/VS2010Express/XBMC.vcxproj.filters
@@ -994,6 +994,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>
@@ -3894,6 +3897,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>
@@ -6073,4 +6079,4 @@
<Filter>interfaces\swig</Filter>
</None>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/xbmc/guilib/GUIFontCache.cpp b/xbmc/guilib/GUIFontCache.cpp
new file mode 100644
index 0000000..2c72f9c

View File

@ -893,64 +893,6 @@ index 6dd3cf2..1f04a0b 100644
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 aca7b82..2d735052 100644
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -426,6 +426,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" />
@@ -1751,6 +1752,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" />
@@ -2552,4 +2554,4 @@
</VisualStudio>
</ProjectExtensions>
<Import Project="$(SolutionDir)\$(ProjectFileName).targets.user" Condition="Exists('$(SolutionDir)\$(ProjectFileName).targets.user')" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
index 7603447..506b565 100644
--- a/project/VS2010Express/XBMC.vcxproj.filters
+++ b/project/VS2010Express/XBMC.vcxproj.filters
@@ -994,6 +994,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>
@@ -3894,6 +3897,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>
@@ -6073,4 +6079,4 @@
<Filter>interfaces\swig</Filter>
</None>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/xbmc/guilib/GUIFontCache.cpp b/xbmc/guilib/GUIFontCache.cpp
new file mode 100644
index 0000000..2c72f9c