Merge remote-tracking branch 'teamxbmc/master'

Conflicts solved:
	project/Win32BuildSetup/buildpvraddons.bat
	tools/depends/target/xbmc-pvr-addons/Makefile

.gitignore

@@ -365,6 +365,7 @@ lib/cpluff/stamp-h1
 /project/BuildDependencies/lib
 /project/BuildDependencies/msys
 /project/BuildDependencies/scripts/tmp
+/project/BuildDependencies/src
 /project/BuildDependencies/bin/swig
 /project/BuildDependencies/bin/doxygen
 /project/BuildDependencies/bin/json-rpc
@@ -398,6 +399,7 @@ lib/cpluff/stamp-h1
 /system/libexif.dll
 /system/libexpat.dll
 /system/libidn-11.dll
+/system/libgif.dll
 /system/libssh2.dll
 /system/libssl32.dll
 /system/hdhomerun.dll
@@ -491,14 +493,12 @@ lib/cpluff/stamp-h1
 /tools/Linux/kodi.sh
 /tools/Linux/kodi-standalone.sh
 /tools/Linux/kodi-xsession.desktop
-/tools/Linux/FEH-ARM.py
-/tools/Linux/FEH.py
 
 # /tools/osx
 /tools/osx/XBMCHelper
 
 # /tools/TexturePacker
-/tools/TexturePacker/TexturePacker
+/tools/TexturePacker/TexturePacker*
 /tools/TexturePacker/Makefile
 /tools/TexturePacker/*.dll
 

Makefile.in

@@ -289,6 +289,7 @@ GTEST_LIBS = $(GTEST_DIR)/lib/.libs/libgtest.a
 CHECK_DIRS = xbmc/addons/test \
              xbmc/filesystem/test \
              xbmc/music/tags/test \
+             xbmc/network/test \
              xbmc/utils/test \
              xbmc/video/test \
              xbmc/threads/test \
@@ -298,6 +299,7 @@ CHECK_DIRS = xbmc/addons/test \
 CHECK_LIBS = xbmc/addons/test/addonsTest.a \
              xbmc/filesystem/test/filesystemTest.a \
              xbmc/music/tags/test/tagsTest.a \
+             xbmc/network/test/networkTest.a \
              xbmc/utils/test/utilsTest.a \
              xbmc/video/test/videoTest.a \
              xbmc/threads/test/threadTest.a \
@@ -437,7 +439,7 @@ ifeq (@USE_ASAP_CODEC@,1)
   endif
 endif
 	$(MAKE) -C lib/stsound/StSoundLibrary
-ifeq ($(or $(findstring powerpc,@ARCH@),$(findstring x86_64-linux,@ARCH@),$(findstring arm, @ARCH@),$(findstring freebsd,@ARCH@)),)
+ifeq ($(or $(findstring powerpc,@ARCH@),$(findstring x86_64-linux,@ARCH@),$(findstring arm, @ARCH@),$(findstring freebsd,@ARCH@),$(findstring mips,@ARCH@)),)
 	$(MAKE) -C lib/snesapu/SNES/SNESAPU
 endif
 imagelib: dllloader
@@ -599,7 +601,6 @@ install-scripts:
 	@cd $(DESTDIR)$(bindir); [ -L xbmc-standalone ] || [ -f xbmc-standalone ] ||  ln -s @APP_NAME_LC@-standalone xbmc-standalone
 	@install -d $(DESTDIR)$(datarootdir)/@APP_NAME_LC@
 	@cd $(DESTDIR)$(datarootdir); [ -L xbmc ] || [ -d xbmc ] || ln -s @APP_NAME_LC@ xbmc
-	@install -m 0644 tools/Linux/FEH.py $(DESTDIR)$(datarootdir)/@APP_NAME_LC@/FEH.py
 	@install -d $(DESTDIR)$(datarootdir)/xsessions
 	@install -m 0644 tools/Linux/@APP_NAME_LC@-xsession.desktop $(DESTDIR)$(datarootdir)/xsessions/@APP_NAME_LC@.desktop
 	@cd $(DESTDIR)$(datarootdir)/xsessions; [ -L xbmc.desktop ] || [ -f xbmc.desktop ] || ln -s @APP_NAME_LC@.desktop xbmc.desktop

addons/library.xbmc.addon/libXBMC_addon.h

@@ -55,8 +55,8 @@ typedef intptr_t      ssize_t;
 #define ADDON_HELPER_ARCH       "powerpc64-linux"
 #elif defined(__ARMEL__)
 #define ADDON_HELPER_ARCH       "arm"
-#elif defined(_MIPSEL)
-#define ADDON_HELPER_ARCH       "mipsel-linux"
+#elif defined(__mips__)
+#define ADDON_HELPER_ARCH       "mips"
 #else
 #define ADDON_HELPER_ARCH       "i486-linux"
 #endif

addons/library.xbmc.gui/libXBMC_gui.h

@@ -36,7 +36,7 @@ typedef void* GUIHANDLE;
 #endif
 
 /* current ADDONGUI API version */
-#define XBMC_GUI_API_VERSION "5.6.0"
+#define XBMC_GUI_API_VERSION "5.7.0"
 
 /* min. ADDONGUI API version */
 #define XBMC_GUI_MIN_API_VERSION "5.3.0"

addons/skin.confluence/720p/DialogAddonInfo.xml

@@ -217,9 +217,9 @@
 					<control type="textbox" id="400">
 						<description>Description</description>
 						<left>10</left>
-						<top>195</top>
+						<top>197</top>
 						<width>600</width>
-						<height>190</height>
+						<height>188</height>
 						<font>font13</font>
 						<align>justify</align>
 						<textcolor>white</textcolor>
@@ -256,9 +256,9 @@
 					<control type="textbox">
 						<description>Disclaimer</description>
 						<left>10</left>
-						<top>425</top>
+						<top>427</top>
 						<width>600</width>
-						<height>66</height>
+						<height>64</height>
 						<font>font12</font>
 						<align>left</align>
 						<textcolor>white</textcolor>
@@ -283,9 +283,9 @@
 					<control type="textbox" id="401">
 						<description>Description</description>
 						<left>10</left>
-						<top>205</top>
+						<top>207</top>
 						<width>600</width>
-						<height>260</height>
+						<height>258</height>
 						<font>font13</font>
 						<align>left</align>
 						<textcolor>white</textcolor>
@@ -412,9 +412,9 @@
 				<control type="textbox">
 					<description>Reason label</description>
 					<left>100</left>
-					<top>35</top>
+					<top>37</top>
 					<width>800</width>
-					<height>50</height>
+					<height>48</height>
 					<font>font13</font>
 					<label>$INFO[ListItem.Property(Addon.broken)]</label>
 					<align>left</align>

addons/skin.confluence/720p/DialogAlbumInfo.xml

@@ -471,9 +471,9 @@
 				<control type="textbox" id="4">
 					<description>Description</description>
 					<left>210</left>
-					<top>515</top>
+					<top>517</top>
 					<width>1030</width>
-					<height>124</height>
+					<height>122</height>
 					<font>font13</font>
 					<align>justify</align>
 					<textcolor>white</textcolor>

addons/skin.confluence/720p/DialogButtonMenu.xml

@@ -237,9 +237,9 @@
 				</control>
 				<control type="textbox">
 					<left>25</left>
-					<top>20</top>
+					<top>22</top>
 					<width>290</width>
-					<height>50</height>
+					<height>48</height>
 					<font>font12</font>
 					<textcolor>white</textcolor>
 					<shadowcolor>black</shadowcolor>

addons/skin.confluence/720p/DialogOK.xml

@@ -56,9 +56,9 @@
 		<control type="textbox" id="9">
 			<description>text</description>
 			<left>30</left>
-			<top>60</top>
+			<top>62</top>
 			<width>550</width>
-			<height>100</height>
+			<height>98</height>
 			<align>left</align>
 			<label>-</label>
 			<font>font13</font>