Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
GabrielL committed Apr 4, 2012
2 parents 2e75a73 + 4109fac commit fa8d7daac533ce1de3f89092ff5c1254f233e306
Showing 696 changed files with 27,752 additions and 11,663 deletions.
View
@@ -61,6 +61,8 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
xbmc/music/tags/musictags.a \
xbmc/music/windows/musicwindows.a \
xbmc/network/libscrobbler/scrobbler.a \
+ xbmc/network/httprequesthandler/httprequesthandlers.a \
+ xbmc/network/websocket/websocket.a \
xbmc/network/network.a \
xbmc/peripherals/bus/peripheral-bus.a \
xbmc/peripherals/devices/peripheral-devices.a \
View
@@ -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
View
@@ -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
View
@@ -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.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -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"/>
@@ -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/>
@@ -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"/>
@@ -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
@@ -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>
@@ -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.4"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
@@ -17,7 +17,7 @@
<summary lang="fi">TMDb elokuvatietojen lataajan kirjasto</summary>
<summary lang="fr">Scraper TMDb</summary>
<summary lang="hu">TMDb leolvasó-könyvtár</summary>
- <summary lang="nl">TMDb-scraperfuncties</summary> <!--Dit gaat over de functies, niet over de mediabibliotheek!-->
+ <summary lang="nl">TMDb-scraperfuncties</summary>
<summary lang="pl">Scraper biblioteki TMDb</summary>
<summary lang="pt">Scraper de filmes TMDb</summary>
<summary lang="ro">Bibliotecă catalog TMDb</summary>
@@ -31,27 +31,21 @@
<ParseTMDBPlot dest="5">
<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
<RegExp input="$$1" output="\1" dest="9">
- <expression clear="yes" fixchars="1">&quot;overview&quot;:&quot;(.*?)&quot;,</expression>
+ <expression clear="yes" fixchars="1">&quot;overview&quot;:&quot;(.*?)&quot;,&quot;</expression>
</RegExp>
<RegExp input="$$9" output="&lt;url function=&quot;ParseFallbackTMDBPlot&quot; cache=&quot;tmdb-en-$$8.json&quot;&gt;http://api.themoviedb.org/3/movie/$$8?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en&lt;/url&gt;" dest="2">
<expression>^$</expression>
</RegExp>
<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>
<ParseFallbackTMDBPlot 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 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>
+ <expression clear="yes" fixchars="1">&quot;overview&quot;:&quot;(.*?)&quot;,&quot;</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -180,7 +174,7 @@
<GetTMDBTrailerByIdChain dest="4">
<RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="4">
<RegExp input="$$1" output="&lt;url function=&quot;ParseTMDBTrailer&quot; cache=&quot;tmdb-trailer-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1/trailers?api_key=57983e31fb435df4df77afb854740ea9&lt;/url&gt;" dest="5">
- <expression>^([0-9]+)$</expression>
+ <expression />
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -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"
@@ -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
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<strings>
<string id="30000">启用同人画</string>
- <string id="30001">启用HD-Trailers.net预告片</string>
+ <string id="30001">首选HD-Trailers.net预告片</string>
+ <string id="30002">首选语言</string>
+ <string id="30003">获取评价信息于</string>
+ <string id="30004">启用预告片(YouTube)</string>
+ <string id="30005">保留原片名</string>
</strings>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<strings>
<string id="30000">Fanart inschakelen</string>
- <string id="30001">Trailer inschakelen (HD-Trailers.net)</string>
+ <string id="30001">Trailers van HD-Trailers.net inschakelen</string>
<string id="30002">Voorkeurstaal</string>
<string id="30003">Verkrijg waardering van IMDb</string>
<string id="30004">Trailer inschakelen (YouTube)</string>
@@ -2,8 +2,8 @@
<strings>
<string id="30000">Enable Fanart</string>
<string id="30004">Enable Trailer (YouTube)</string>
- <string id="30001">Enable Trailer (HD-Trailers.net)</string>
+ <string id="30001">Prefer Trailer from HD-Trailers.net</string>
<string id="30002">Preferred language</string>
- <string id="30003">Get rating from IMDb</string>
+ <string id="30003">Get rating from</string>
<string id="30005">Keep Original Title</string>
</strings>
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<strings>
<string id="30000">Fanitaide käytössä</string>
- <string id="30004">Trailerit käytössä (YouTube)</string>
- <string id="30001">Trailerit käytössä (HD-Trailers.net)</string>
+ <string id="30004">Trailerit käytössä</string>
+ <string id="30001">Valitse ensisijaisesti trailerit HD-Trailers.net -sivustolta</string>
<string id="30002">Ensisijainen kieli</string>
<string id="30003">Hae arvosana IMDb:stä</string>
<string id="30005">Näytä alkuperäinen nimi</string>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<strings>
<string id="30000">Aktiviere Fanart</string>
- <string id="30001">Aktiviere Trailer (HD-Trailers.net)</string>
+ <string id="30001">Aktiviere Trailer von HD-Trailers.net</string>
<string id="30002">Bevorzugte Sprache</string>
<string id="30003">Bewertung von IMDb nutzen</string>
<string id="30004">Aktiviere Trailer (YouTube)</string>
@@ -2,8 +2,8 @@
<strings>
<string id="30000">Fanartképek engedélyezése</string>
<string id="30004">Filmelőzetesek engedélyezése (YouTube)</string>
- <string id="30001">Filmelőzetesek engedélyezése (HD-Trailers.net)</string>
+ <string id="30001">Filmelőzetesek inkább a HD-Trailers.net-ről</string>
<string id="30002">Preferált nyelv</string>
- <string id="30003">Értékelés az IMDb-ről</string>
+ <string id="30003">Értékelés letöltése innen</string>
<string id="30005">Eredeti filmcím megtartása</string>
</strings>
@@ -6,7 +6,7 @@
<!--$Revision$-->
<strings>
<string id="30000">Aktivera fanart</string>
- <string id="30001">Aktivera trailers (HD-Trailers.net)</string>
+ <string id="30001">Aktivera trailers från HD-Trailers.net</string>
<string id="30002">Föredraget språk</string>
<string id="30003">Hämta betyg från IMDb</string>
<string id="30004">Aktivera trailers (YouTube)</string>
@@ -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">
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="repository.xbmc.org"
name="XBMC.org Add-ons"
- version="2.0.1"
+ version="2.0.3"
provider-name="Team XBMC">
+ <requires>
+ <import addon="xbmc.addon" version="11.0"/>
+ </requires>
<extension point="xbmc.addon.repository"
name="Official XBMC.org Add-on Repository">
- <info compressed="true">http://mirrors.xbmc.org/addons/eden-pre/addons.xml</info>
- <checksum>http://mirrors.xbmc.org/addons/eden-pre/addons.xml.md5</checksum>
- <datadir zip="true">http://mirrors.xbmc.org/addons/eden-pre</datadir>
+ <info compressed="true">http://mirrors.xbmc.org/addons/eden/addons.xml</info>
+ <checksum>http://mirrors.xbmc.org/addons/eden/addons.xml.md5</checksum>
+ <datadir zip="true">http://mirrors.xbmc.org/addons/eden</datadir>
<hashes>true</hashes>
</extension>
<extension point="xbmc.addon.metadata">
Oops, something went wrong.

0 comments on commit fa8d7da

Please sign in to comment.