Merge remote-tracking branch 'origin/master' into Eden

README.linux

@@ -55,7 +55,7 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake,
  libbluetooth-dev, zlib1g-dev, libsmbclient-dev, libboost-thread-dev
  libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev, libmicrohttpd-dev,
  libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl, python-dev, libyajl-dev,
- libplist-dev, libusb-dev, libudev-dev
+ libplist-dev, libusb-dev, libudev-dev, libltdl-dev
 
 *** For developers and anyone else who compiles frequently it is recommended to
 use ccache

README.osx

@@ -14,9 +14,9 @@ TOC
 -----------------------------------------------------------------------------
 
 This is a platform port of XBMC for the Apple OSX operating system. Both 10.5
-and 10.6 Intel development platforms are supported. The current build system
-is Xcode 3.1.2 There are two ways to build XBMC for Mac, from command-line or
-from Xcode.
+and 10.6 Intel development platforms are supported. Xcode 4.x is not supported.
+The current build system is Xcode 3.2.5 There are two ways to build XBMC for Mac,
+from command-line or from Xcode.
 
 Generally, Xcode is the easiest as it presents the build system in a GUI environment.
 The command-line build is still under development.
@@ -41,8 +41,10 @@ character itself should NOT be typed as part of the command.
 -----------------------------------------------------------------------------
 Install latest Xcode. You can download it from Apple's site after registration at
 (http://developer.apple.com/tools/download). You also need to install the 10.4
-sdk. If using Xcode 3.x, you MUST use Xcode 3.1.2 so update your existing version
-if you are running a previous Xcode 3.x version. Xcode 3.x only runs on 10.5.
+sdk. If using Xcode 3.x, you MUST use Xcode 3.1.2 or a newer version, so update
+your existing version. if you are running a previous Xcode 3.x version. 
+Xcode 3.x only runs on 10.5 and above. If you are running 10.7, DO NOT USE Xcode 4.x,
+it will fail. Use Xcode 3.x under 10.7.
 
 -----------------------------------------------------------------------------
 3.1 Install XBMC build depends

README.ubuntu

@@ -47,7 +47,7 @@ For Ubuntu (all versions >= 7.04):
    # sudo apt-get install git-core make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound2-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs python-dev libyajl-dev libboost-thread-dev libplist-dev libusb-dev libudev-dev
 
 For >= 10.10:
-   # sudo apt-get install autopoint
+   # sudo apt-get install autopoint libltdl-dev
 
 On 8.10 and older versions, libcurl is outdated and thus XBMC will not compile properly.
 In this case you will have to manually compile the latest version.

addons/metadata.artists.allmusic.com/addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.artists.allmusic.com"
        name="AllMusic"
-       version="2.0.6"
+       version="2.0.7"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>

addons/metadata.artists.allmusic.com/allmusic.xml

@@ -42,7 +42,7 @@
 				<expression noclean="1">&lt;meta name=&quot;title&quot; content=&quot;([^&quot;]*)</expression>
 			</RegExp>
 			<RegExp input="$$1" output="\1" dest="8">
-				<expression>http://www.allmusic.com/artist/([^&amp;&quot;/]*)</expression>
+				<expression>http://www.allmusic.com/artist/([^&amp;&quot;/]*)/</expression>
 			</RegExp>
 			<RegExp input="$$7" conditional="htbthumbs" output="&lt;chain function=&quot;GetHTBThumbs&quot;&gt;\1&lt;/chain&gt;" dest="5">
 				<expression/>

addons/metadata.common.imdb.com/addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.common.imdb.com"
        name="IMDB common scraper functions"
-       version="2.1.5"
+       version="2.1.9"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>

addons/metadata.common.imdb.com/changelog.txt

@@ -1,3 +1,15 @@
+[B]2.1.9[/B]
+- fixed: plot when contains html links (once again)
+
+[B]2.1.8[/B]
+- revert: two latest changes - cause crash some times
+
+[B]2.1.7[/B]
+- fixed: typo in fixing previous plot issue
+
+[B]2.1.6[/B]
+- fixed: plot when contains html links
+
 [B]2.1.5[/B]
 - fixed: Cleanup and factored out Genres to common
 

addons/metadata.common.imdb.com/imdb.xml

@@ -35,7 +35,7 @@
 	<ParseIMDBPlot dest="5">
 		<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
 			<RegExp input="$$1" output="&lt;plot&gt;\1&lt;/plot&gt;" dest="2">
-				<expression trim="1">&lt;h2&gt;Storyline&lt;/h2&gt;\n+&lt;p&gt;([^&lt;]+)</expression>
+				<expression trim="1">&lt;h2&gt;Storyline&lt;/h2&gt;\n+&lt;p&gt;(.*?)&lt;[^a/]</expression>
 			</RegExp>
 			<expression noclean="1" />
 		</RegExp>

addons/metadata.common.themoviedb.org/addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.common.themoviedb.org"
        name="The MovieDB common scraper functions"
-       version="2.1.0"
+       version="2.1.2"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>

addons/metadata.common.themoviedb.org/tmdb.xml

@@ -39,9 +39,6 @@
 			<RegExp input="$$9" output="&lt;plot&gt;\1&lt;/plot&gt;" dest="2">
 				<expression>(.+)</expression>
 			</RegExp>
-			<RegExp input="$$1" output="&lt;outline&gt;\1&lt;/outline&gt;" dest="2+">
-				<expression fixchars="1">&quot;overview&quot;:&quot;(.{180,}?)[.?!]</expression>
-			</RegExp>
 			<expression noclean="1" />
 		</RegExp>
 	</ParseTMDBPlot>
@@ -50,9 +47,6 @@
 			<RegExp input="$$1" output="&lt;plot&gt;\1&lt;/plot&gt;" dest="2">
 				<expression clear="yes" fixchars="1">&quot;overview&quot;:&quot;(.*?)&quot;,</expression>
 			</RegExp>
-			<RegExp input="$$1" output="&lt;outline&gt;\1&lt;/outline&gt;" dest="2+">
-				<expression fixchars="1">&quot;overview&quot;:&quot;(.{180,}?)[.?!]</expression>
-			</RegExp>
 			<expression noclean="1" />
 		</RegExp>
 	</ParseFallbackTMDBPlot>

addons/metadata.themoviedb.org/addon.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.themoviedb.org"
        name="The MovieDB"
-       version="3.0.0"
+       version="3.0.9"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
-    <import addon="metadata.common.themoviedb.org" version="2.1.0"/>
+    <import addon="metadata.common.themoviedb.org" version="2.1.2"/>
     <import addon="metadata.common.hdtrailers.net" version="1.0.7"/>
-    <import addon="metadata.common.imdb.com" version="2.1.5"/>
-    <import addon="plugin.video.youtube" version="2.1.0" optional="true"/>
+    <import addon="metadata.common.imdb.com" version="2.1.9"/>
+    <import addon="plugin.video.youtube" version="2.1.4" optional="true"/>
   </requires>
   <extension point="xbmc.metadata.scraper.movies"
              language="en"

addons/metadata.themoviedb.org/changelog.txt

@@ -1,3 +1,30 @@
+[B]3.0.9[/B]
+- fixed: missing language parameter name in NfoUrl
+
+[B]3.0.8[/B]
+- fixed: movies without release date won't find
+
+[B]3.0.7[/B]
+- fixed: keep originaltitle; IMDb ID; remove TMDb title fallback, because it became obsolate
+
+[B]3.0.6[/B]
+- updated chinese translation
+
+[B]3.0.5[/B]
+- reverted latest change
+
+[B]3.0.4[/B]
+- added: option to not scrape sets
+
+[B]3.0.3[/B]
+- fixed: plot outline includes trash on some movies
+
+[B]3.0.2[/B]
+- fixed: imdb IDs not properly handled
+
+[B]3.0.1[/B]
+- changed: also fallback to original_title to make sure a valid title gets scraped
+
 [B]3.0.0[/B]
 - major rewrite: utilize TMDb API v3, scraping set information, prioritize posters on the selected language
 

addons/metadata.themoviedb.org/tmdb.xml

@@ -9,21 +9,16 @@
 		</RegExp>
 	</CreateSearchUrl>
 	<NfoUrl dest="3">
-		<RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/\2?api_key=57983e31fb435df4df77afb854740ea9&amp;$INFO[language]&lt;/url&gt;&lt;id&gt;\2&lt;/id&gt;&lt;/details&gt;" dest="3">
+		<RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/\2?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;\2&lt;/id&gt;&lt;/details&gt;" dest="3">
 			<expression clear="yes" noclean="1">(themoviedb.org/movie/)([0-9]*)</expression>
 		</RegExp>
-		<RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;$INFO[language]&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;/details&gt;" dest="3">
+		<RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;tt\1&lt;/id&gt;&lt;/details&gt;" dest="3">
 			<expression>imdb....?/title/tt([0-9]*)</expression>
 		</RegExp>
-		<RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;$INFO[language]&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;/details&gt;" dest="3">
+		<RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;tt\1&lt;/id&gt;&lt;/details&gt;" dest="3">
 			<expression>imdb....?/Title\?([0-9]*)</expression>
 		</RegExp>
 	</NfoUrl>
-	<GetTMDBId dest="3">
-		<RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;/details&gt;" dest="3+">
-			<expression>&quot;movie&quot;,&quot;id&quot;:([0-9]*),</expression>
-		</RegExp>
-	</GetTMDBId>
 	<GetSearchResults dest="8">
 		<RegExp input="$$3" output="&lt;results&gt;\1&lt;/results&gt;" dest="8">
 			<RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\4&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;year&gt;\3&lt;/year&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3">
@@ -32,6 +27,9 @@
 			<RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;year&gt;\3&lt;/year&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3+">
 				<expression repeat="yes">&quot;id&quot;:([0-9]*),&quot;original_title&quot;:&quot;([^&quot;]*)&quot;,&quot;release_date&quot;:&quot;([0-9]+)-</expression>
 			</RegExp>
+			<RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3+">
+				<expression repeat="yes">&quot;id&quot;:([0-9]*),&quot;original_title&quot;:&quot;([^&quot;]*)&quot;,&quot;release_date&quot;:null</expression>
+			</RegExp>
 			<expression noclean="1" />
 		</RegExp>
 	</GetSearchResults>
@@ -46,18 +44,12 @@
 			<RegExp input="$$1" output="\1" dest="9">
 				<expression fixchars="1">&quot;original_title&quot;:&quot;([^&quot;]*)</expression>
 			</RegExp>
-			<RegExp input="$$1" output="\1" dest="10">
-				<expression fixchars="1">&quot;title&quot;:&quot;([^&quot;]*)</expression>
-			</RegExp>
-			<RegExp input="$$10" output="&lt;url function=&quot;ParseFallbackTMDBTitle&quot; cache=&quot;tmdb-en-$$2.json&quot;&gt;http://api.themoviedb.org/3/movie/$$2?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en&lt;/url&gt;" dest="5+">
-				<expression>^$</expression>
-			</RegExp>
-			<RegExp input="$$10" output="&lt;title&gt;\1&lt;/title&gt;" dest="5+">
-				<expression>(.+)</expression>
-			</RegExp>
 			<RegExp conditional="keeporiginaltitle" input="$$9" output="&lt;title&gt;\1&lt;/title&gt;" dest="5+">
 				<expression/>
 			</RegExp>
+			<RegExp input="$$1" output="&lt;title&gt;\1&lt;/title&gt;" dest="5+">
+				<expression fixchars="1">&quot;title&quot;:&quot;([^&quot;]*)</expression>
+			</RegExp>
 			<RegExp input="$$9" output="&lt;originaltitle&gt;\1&lt;/originaltitle&gt;" dest="5+">
 				<expression/>
 			</RegExp>
@@ -154,14 +146,6 @@
 			<expression noclean="1" />
 		</RegExp>
 	</GetDetails>
-	<ParseFallbackTMDBTitle dest="5">
-		<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
-			<RegExp input="$$1" output="&lt;title&gt;\1&lt;/title&gt;" dest="2">
-				<expression fixchars="1">&quot;title&quot;:&quot;([^&quot;]*)</expression>
-			</RegExp>
-			<expression noclean="1" />
-		</RegExp>
-	</ParseFallbackTMDBTitle>
 	<ParseFallbackTMDBRuntime dest="5">
 		<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
 			<RegExp input="$$1" output="&lt;runtime&gt;\1&lt;/runtime&gt;" dest="2">

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

@@ -246,7 +246,7 @@
 					<label>$LOCALIZE[31329] [B]$INFO[System.Alarmpos][/B]</label>
 				</control>
 			</control>
-			<control type="image" id="10">
+			<control type="image" id="12">
 				<description>background bottom image</description>
 				<posx>0</posx>
 				<width>340</width>

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

@@ -32,7 +32,7 @@
 			<include>ButtonHomeSubCommonValues</include>
 			<label>14022</label>
 			<onclick>ActivateWindow(Videos,Root)</onclick>
-			<visible>Library.HasContent(Videos)</visible>
+			<visible>Library.HasContent(Video)</visible>
 		</control>
 		<control type="button" id="90107">
 			<include>ButtonHomeSubCommonValues</include>