diff options
| -rw-r--r-- | cmake/installdata/common/addons.txt | 48 | ||||
| -rw-r--r-- | cmake/installdata/common/common.txt | 12 | ||||
| -rw-r--r-- | cmake/installdata/darwin_embedded/runtime.txt | 2 | ||||
| -rw-r--r-- | cmake/installdata/osx/packaging.txt | 2 | ||||
| -rw-r--r-- | cmake/installdata/osx/runtime.txt | 2 | ||||
| -rw-r--r-- | cmake/installdata/test-reference-data.txt | 30 | ||||
| -rw-r--r-- | cmake/installdata/windows/dlls.txt | 2 | ||||
| -rw-r--r-- | cmake/treedata/darwin_embedded/subdirs.txt | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | cmake/treedata/darwin_embedded/tvos/tvos.txt | 0 | ||||
| -rw-r--r-- | system/addon-manifest.xml | 16 | ||||
| -rw-r--r-- | system/dialogcolors.xml | 72 |
11 files changed, 94 insertions, 94 deletions
diff --git a/cmake/installdata/common/addons.txt b/cmake/installdata/common/addons.txt index 18b747afbd..cad17de42e 100644 --- a/cmake/installdata/common/addons.txt +++ b/cmake/installdata/common/addons.txt @@ -8,27 +8,7 @@ addons/kodi.imagedecoder/* addons/kodi.inputstream/* addons/kodi.peripheral/* addons/kodi.resource/* -addons/xbmc.addon/metadata.xsd -addons/xbmc.addon/repository.xsd -addons/xbmc.audioencoder/* -addons/xbmc.codec/* -addons/xbmc.core/* -addons/xbmc.gui/* -addons/xbmc.metadata/* -addons/xbmc.pvr/* -addons/xbmc.python/* -addons/xbmc.webinterface/* -addons/repository.xbmc.org/* -addons/webinterface.default/* -addons/screensaver.xbmc.builtin.dim/* -addons/screensaver.xbmc.builtin.black/* -addons/script.module.pil/* -addons/script.module.pycryptodome/* -addons/resource.language.en_gb/* -addons/resource.uisounds.kodi/* -addons/resource.images.weathericons.default/* -addons/service.xbmc.versioncheck/* -addons/metadata.local/* +addons/kodi.vfs/* addons/metadata.album.universal/* addons/metadata.artists.universal/* addons/metadata.common.allmusic.com/* @@ -40,8 +20,28 @@ addons/metadata.common.theaudiodb.com/* addons/metadata.common.themoviedb.org/* addons/metadata.generic.albums/* addons/metadata.generic.artists/* -addons/metadata.themoviedb.org/* +addons/metadata.local/* addons/metadata.themoviedb.org.python/* -addons/metadata.tvshows.themoviedb.org/* +addons/metadata.themoviedb.org/* addons/metadata.tvshows.themoviedb.org.python/* -addons/kodi.vfs/* +addons/metadata.tvshows.themoviedb.org/* +addons/repository.xbmc.org/* +addons/resource.images.weathericons.default/* +addons/resource.language.en_gb/* +addons/resource.uisounds.kodi/* +addons/screensaver.xbmc.builtin.black/* +addons/screensaver.xbmc.builtin.dim/* +addons/script.module.pil/* +addons/script.module.pycryptodome/* +addons/service.xbmc.versioncheck/* +addons/webinterface.default/* +addons/xbmc.addon/metadata.xsd +addons/xbmc.addon/repository.xsd +addons/xbmc.audioencoder/* +addons/xbmc.codec/* +addons/xbmc.core/* +addons/xbmc.gui/* +addons/xbmc.metadata/* +addons/xbmc.pvr/* +addons/xbmc.python/* +addons/xbmc.webinterface/* diff --git a/cmake/installdata/common/common.txt b/cmake/installdata/common/common.txt index faf4bd944b..a3853b4e40 100644 --- a/cmake/installdata/common/common.txt +++ b/cmake/installdata/common/common.txt @@ -1,13 +1,13 @@ media/* sounds/* -system/keymaps/* -system/library/* -system/shaders/* -system/settings/* -userdata/* system/addon-manifest.xml system/colors.xml system/dialogcolors.xml +system/keyboardlayouts/* +system/keymaps/* +system/library/* system/peripherals.xml system/playercorefactory.xml -system/keyboardlayouts/* +system/settings/* +system/shaders/* +userdata/* diff --git a/cmake/installdata/darwin_embedded/runtime.txt b/cmake/installdata/darwin_embedded/runtime.txt index 3bb546754e..92595bd40f 100644 --- a/cmake/installdata/darwin_embedded/runtime.txt +++ b/cmake/installdata/darwin_embedded/runtime.txt @@ -1,2 +1,2 @@ -tools/darwin/runtime/preflight tools/darwin/runtime/org.xbmc.helper.plist +tools/darwin/runtime/preflight diff --git a/cmake/installdata/osx/packaging.txt b/cmake/installdata/osx/packaging.txt index f9ae368a18..d0ba0b7ab4 100644 --- a/cmake/installdata/osx/packaging.txt +++ b/cmake/installdata/osx/packaging.txt @@ -1,4 +1,4 @@ LICENSE.md privacy-policy.txt -xbmc/platform/darwin/Credits.html tools/darwin/packaging/media/osx/icon.iconset/* +xbmc/platform/darwin/Credits.html diff --git a/cmake/installdata/osx/runtime.txt b/cmake/installdata/osx/runtime.txt index 3bb546754e..92595bd40f 100644 --- a/cmake/installdata/osx/runtime.txt +++ b/cmake/installdata/osx/runtime.txt @@ -1,2 +1,2 @@ -tools/darwin/runtime/preflight tools/darwin/runtime/org.xbmc.helper.plist +tools/darwin/runtime/preflight diff --git a/cmake/installdata/test-reference-data.txt b/cmake/installdata/test-reference-data.txt index 25d29d23b8..ac6025ab89 100644 --- a/cmake/installdata/test-reference-data.txt +++ b/cmake/installdata/test-reference-data.txt @@ -1,29 +1,29 @@ +xbmc/cores/VideoPlayer/test/edl/testdata/comskipversion1.txt +xbmc/cores/VideoPlayer/test/edl/testdata/comskipversion2.txt +xbmc/cores/VideoPlayer/test/edl/testdata/edlautowindautowait.edl +xbmc/cores/VideoPlayer/test/edl/testdata/mplayerframebased.edl xbmc/cores/VideoPlayer/test/edl/testdata/mplayertimebased.edl xbmc/cores/VideoPlayer/test/edl/testdata/mplayertimebasedinterleavedcuts.edl -xbmc/cores/VideoPlayer/test/edl/testdata/mplayerframebased.edl xbmc/cores/VideoPlayer/test/edl/testdata/mplayertimebasedmixed.edl -xbmc/cores/VideoPlayer/test/edl/testdata/videoredo.Vprj xbmc/cores/VideoPlayer/test/edl/testdata/snapstream.mkv.chapters.xml -xbmc/cores/VideoPlayer/test/edl/testdata/comskipversion1.txt -xbmc/cores/VideoPlayer/test/edl/testdata/comskipversion2.txt -xbmc/cores/VideoPlayer/test/edl/testdata/edlautowindautowait.edl -xbmc/utils/test/CXBMCTinyXML-test.xml -xbmc/utils/test/data/language/Spanish/strings.po -xbmc/filesystem/test/extendedlocalheader.zip -xbmc/filesystem/test/reffile.txt -xbmc/filesystem/test/reffile.txt.rar -xbmc/filesystem/test/reffile.txt.zip -xbmc/filesystem/test/refRARnormal.rar -xbmc/filesystem/test/refRARstored.rar +xbmc/cores/VideoPlayer/test/edl/testdata/videoredo.Vprj xbmc/filesystem/test/data/httpdirectory/apache-default.html xbmc/filesystem/test/data/httpdirectory/apache-fancy.html xbmc/filesystem/test/data/httpdirectory/apache-html.html -xbmc/filesystem/test/data/httpdirectory/basic.html xbmc/filesystem/test/data/httpdirectory/basic-multiline.html +xbmc/filesystem/test/data/httpdirectory/basic.html xbmc/filesystem/test/data/httpdirectory/lighttp-default.html xbmc/filesystem/test/data/httpdirectory/nginx-default.html xbmc/filesystem/test/data/httpdirectory/nginx-fancyindex.html +xbmc/filesystem/test/extendedlocalheader.zip +xbmc/filesystem/test/reffile.txt +xbmc/filesystem/test/reffile.txt.rar +xbmc/filesystem/test/reffile.txt.zip +xbmc/filesystem/test/refRARnormal.rar +xbmc/filesystem/test/refRARstored.rar +xbmc/network/test/data/test-ranges.txt xbmc/network/test/data/test.html xbmc/network/test/data/test.png -xbmc/network/test/data/test-ranges.txt xbmc/playlists/test/test.xspf +xbmc/utils/test/CXBMCTinyXML-test.xml +xbmc/utils/test/data/language/Spanish/strings.po diff --git a/cmake/installdata/windows/dlls.txt b/cmake/installdata/windows/dlls.txt index a4bfb7949a..8cb5665c11 100644 --- a/cmake/installdata/windows/dlls.txt +++ b/cmake/installdata/windows/dlls.txt @@ -1,2 +1,2 @@ -project/BuildDependencies/${ARCH}/bin/libbluray*.jar . project/BuildDependencies/${ARCH}/bin/*.dll . +project/BuildDependencies/${ARCH}/bin/libbluray*.jar . diff --git a/cmake/treedata/darwin_embedded/subdirs.txt b/cmake/treedata/darwin_embedded/subdirs.txt index 20bfa02a70..a8d412271b 100644 --- a/cmake/treedata/darwin_embedded/subdirs.txt +++ b/cmake/treedata/darwin_embedded/subdirs.txt @@ -6,8 +6,8 @@ xbmc/platform/darwin platform/darwin xbmc/platform/darwin/ios-common platform/ios-common xbmc/platform/darwin/ios-common/network platform/ios-common/network xbmc/platform/darwin/ios-common/storage platform/ios-common/storage -xbmc/platform/darwin/peripherals platform/darwin/peripherals xbmc/platform/darwin/network platform/darwin/network +xbmc/platform/darwin/peripherals platform/darwin/peripherals xbmc/platform/darwin/utils platform/darwin/utils xbmc/platform/posix posix xbmc/platform/posix/filesystem platform/posix/filesystem diff --git a/cmake/treedata/darwin_embedded/tvos/tvos.txt b/cmake/treedata/darwin_embedded/tvos/tvos.txt index 1335e6694f..1335e6694f 100755..100644 --- a/cmake/treedata/darwin_embedded/tvos/tvos.txt +++ b/cmake/treedata/darwin_embedded/tvos/tvos.txt diff --git a/system/addon-manifest.xml b/system/addon-manifest.xml index e6de83fb02..a1a6ac5117 100644 --- a/system/addon-manifest.xml +++ b/system/addon-manifest.xml @@ -4,11 +4,11 @@ <addon>game.controller.default</addon> <addon>game.controller.snes</addon> <addon>kodi.binary.global.audioengine</addon> - <addon>kodi.binary.global.main</addon> + <addon>kodi.binary.global.filesystem</addon> <addon>kodi.binary.global.general</addon> - <addon>kodi.binary.global.network</addon> <addon>kodi.binary.global.gui</addon> - <addon>kodi.binary.global.filesystem</addon> + <addon>kodi.binary.global.main</addon> + <addon>kodi.binary.global.network</addon> <addon>kodi.binary.global.tools</addon> <addon>kodi.binary.instance.audiodecoder</addon> <addon>kodi.binary.instance.audioencoder</addon> @@ -33,10 +33,10 @@ <addon>metadata.generic.albums</addon> <addon>metadata.generic.artists</addon> <addon>metadata.local</addon> - <addon>metadata.themoviedb.org</addon> <addon>metadata.themoviedb.org.python</addon> - <addon>metadata.tvshows.themoviedb.org</addon> + <addon>metadata.themoviedb.org</addon> <addon>metadata.tvshows.themoviedb.org.python</addon> + <addon>metadata.tvshows.themoviedb.org</addon> <addon>repository.xbmc.org</addon> <addon>resource.images.weathericons.default</addon> <addon>resource.language.en_gb</addon> @@ -45,9 +45,8 @@ <addon>screensaver.xbmc.builtin.dim</addon> <addon>script.module.pil</addon> <addon>script.module.pycryptodome</addon> - <addon optional="true">service.xbmc.versioncheck</addon> - <addon>skin.estuary</addon> <addon>skin.estouchy</addon> + <addon>skin.estuary</addon> <addon>webinterface.default</addon> <addon>xbmc.addon</addon> <addon>xbmc.core</addon> @@ -56,6 +55,7 @@ <addon>xbmc.metadata</addon> <addon>xbmc.python</addon> <addon>xbmc.webinterface</addon> - <addon optional="true">peripheral.joystick</addon> <addon optional="true">inputstream.adaptive</addon> + <addon optional="true">peripheral.joystick</addon> + <addon optional="true">service.xbmc.versioncheck</addon> </addons> diff --git a/system/dialogcolors.xml b/system/dialogcolors.xml index df9f26f862..12af216380 100644 --- a/system/dialogcolors.xml +++ b/system/dialogcolors.xml @@ -1,44 +1,42 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- https://en.wikipedia.org/wiki/List_of_Crayola_crayon_colors --> <colors> - <color name="Gray Lotion">fffafafa</color> - <color name="Gray Cultured">fff5f5f5</color> - <color name="Bright Gray">ffeeeeee</color> - <color name="Chinese White">ffe0e0e0</color> - <color name="Gray XII">ffbdbdbd</color> - <color name="Spanish Gray">ff9e9e9e</color> - <color name="Sonic Silver">ff757575</color> - <color name="Granite Gray">ff616161</color> - <color name="Gray Arsenic">ff424242</color> - <color name="Raisin Black">ff212121</color> <color name="Almond">FFEFDECD</color> <color name="Antique Brass">FFCD9575</color> + <color name="Apple Orchard">FFBF3F3F</color> <color name="Apricot">FFFDD9B5</color> <color name="Aquamarine">FF78DBE2</color> <color name="Asparagus">FF87A96B</color> <color name="Atomic Tangerine">FFFFA474</color> <color name="Banana Mania">FFFAE7B5</color> <color name="Beaver">FF9F8170</color> + <color name="Berry Parfait">FFA43482</color> <color name="Bittersweet">FFFD7C6E</color> <color name="Black">FF000000</color> <color name="Blizzard Blue">FFACE5EE</color> - <color name="Blue">FF1F75FE</color> <color name="Blue Bell">FFA2A2D0</color> <color name="Blue Gray">FF6699CC</color> <color name="Blue Green">FF0D98BA</color> <color name="Blue Violet">FF7366BD</color> + <color name="Blue">FF1F75FE</color> <color name="Blush">FFDE5D83</color> <color name="Brick Red">FFCB4154</color> + <color name="Bright Gray">ffeeeeee</color> <color name="Brown">FFB4674D</color> + <color name="Bubble Gum">FFDF9ACA</color> <color name="Burnt Orange">FFFF7F49</color> <color name="Burnt Sienna">FFEA7E5D</color> + <color name="Butternut Squash">FFE74F00</color> <color name="Cadet Blue">FFB0B7C6</color> <color name="Canary">FFFFFF99</color> <color name="Caribbean Green">FF1CD3A2</color> + <color name="Caribbean Sea">FF67CD95</color> <color name="Carnation Pink">FFFFAACC</color> <color name="Cerise">FFDD4492</color> <color name="Cerulean">FF1DACD6</color> <color name="Chestnut">FFBC5D58</color> + <color name="Chinese White">ffe0e0e0</color> + <color name="Cloudy Sky">FF548CD0</color> <color name="Copper">FFDD9475</color> <color name="Cornflower">FF9ACEEB</color> <color name="Cotton Candy">FFFFBCD9</color> @@ -53,73 +51,96 @@ <color name="Fuzzy Wuzzy">FFCC6666</color> <color name="Gold">FFE7C697</color> <color name="Goldenrod">FFFCD975</color> + <color name="Granite Gray">ff616161</color> <color name="Granny Smith Apple">FFA8E4A0</color> - <color name="Green">FF1CAC78</color> + <color name="Gray Arsenic">ff424242</color> + <color name="Gray Cultured">fff5f5f5</color> + <color name="Gray Lotion">fffafafa</color> + <color name="Gray XII">ffbdbdbd</color> <color name="Green Blue">FF1164B4</color> <color name="Green Yellow">FFF0E891</color> + <color name="Green">FF1CAC78</color> + <color name="Hot Cocoa">FF8F482F</color> <color name="Hot Magenta">FFFF1DCE</color> <color name="Inchworm">FFB2EC5D</color> <color name="Indigo">FF5D76CB</color> + <color name="Iridescent Indigo">FF3C32CD</color> <color name="Jazzberry Jam">FFCA3767</color> <color name="Jungle Green">FF3BB08F</color> <color name="Laser Lemon">FFFEFE22</color> + <color name="Lavender Silk">FF6B4D82</color> <color name="Lavender">FFFCB4D5</color> + <color name="Leafy Canopy">FF94DDCB</color> <color name="Lemon Yellow">FFFFF44F</color> + <color name="Liquid Gold">FFFFD966</color> <color name="Macaroni and Cheese">FFFFBD88</color> <color name="Magenta">FFF664AF</color> <color name="Magic Mint">FFAAF0D1</color> <color name="Mahogany">FFCD4A4C</color> <color name="Maize">FFEDD19C</color> <color name="Manatee">FF979AAA</color> + <color name="Mango Purée">FFFF6137</color> <color name="Mango Tango">FFFF8243</color> <color name="Maroon">FFC8385A</color> <color name="Mauvelous">FFEF98AA</color> <color name="Melon">FFFDBCB4</color> <color name="Midnight Blue">FF1A4876</color> + <color name="Moonlit Pond">FF4F2CD0</color> <color name="Mountain Meadow">FF30BA8F</color> <color name="Mulberry">FFC54B8C</color> <color name="Navy Blue">FF1974D2</color> <color name="Neon Carrot">FFFFA343</color> + <color name="Ocean Foam">FF62C9D3</color> <color name="Olive Green">FFBAB86C</color> - <color name="Orange">FFFF7538</color> + <color name="Orange Peel">FFFF8021</color> <color name="Orange Red">FFFF2B2B</color> <color name="Orange Yellow">FFF8D568</color> + <color name="Orange">FFFF7538</color> <color name="Orchid">FFE6A8D7</color> <color name="Outer Space">FF414A4C</color> <color name="Outrageous Orange">FFFF6E4A</color> <color name="Pacific Blue">FF1CA9C9</color> <color name="Peach">FFFFCFAB</color> <color name="Periwinkle">FFC5D0E6</color> + <color name="Pesto">FF5F7B4A</color> <color name="Piggy Pink">FFFDDDE6</color> <color name="Pine Green">FF158078</color> <color name="Pink Flamingo">FFFC74FD</color> + <color name="Pink Luster">FFFFB2E7</color> <color name="Pink Sherbet">FFF78FA7</color> <color name="Plum">FF8E4585</color> <color name="Purple Heart">FF7442C8</color> <color name="Purple Mountain's Majesty">FF9D81BA</color> <color name="Purple Pizzazz">FFFE4EDA</color> <color name="Radical Red">FFFF496C</color> + <color name="Raisin Black">ff212121</color> <color name="Raw Sienna">FFD68A59</color> <color name="Raw Umber">FF714B23</color> <color name="Razzle Dazzle Rose">FFFF48D0</color> <color name="Razzmatazz">FFE3256B</color> - <color name="Red">FFEE204D</color> <color name="Red Orange">FFFF5349</color> + <color name="Red Satin">FF9F3434</color> <color name="Red Violet">FFC0448F</color> + <color name="Red">FFEE204D</color> <color name="Robin's Egg Blue">FF1FCECB</color> <color name="Royal Purple">FF7851A9</color> <color name="Salmon">FFFF9BAA</color> <color name="Scarlet">FFFC2847</color> <color name="Screamin' Green">FF76FF7A</color> + <color name="Sea Glass">FFC4EA7F</color> <color name="Sea Green">FF9FE2BF</color> <color name="Sepia">FFA5694F</color> <color name="Shadow">FF8A795D</color> <color name="Shamrock">FF45CEA2</color> <color name="Shocking Pink">FFFB7EFD</color> + <color name="Shooting Star">FFFFFF65</color> <color name="Sky Blue">FF80DAEB</color> + <color name="Sonic Silver">ff757575</color> + <color name="Spanish Gray">ff9e9e9e</color> <color name="Spring Green">FFECEABE</color> <color name="Sunglow">FFFFCF48</color> <color name="Sunset Orange">FFFD5E53</color> + <color name="Sunset Shimmer">FFF79015</color> <color name="Tan">FFFAA76C</color> <color name="Teal Blue">FF18A7B5</color> <color name="Thistle">FFEBC7DF</color> @@ -139,28 +160,7 @@ <color name="Wild Strawberry">FFFF43A4</color> <color name="Wild Watermelon">FFFC6C85</color> <color name="Wisteria">FFCDA4DE</color> - <color name="Yellow">FFFCE883</color> <color name="Yellow Green">FFC5E384</color> <color name="Yellow Orange">FFFFAE42</color> - <color name="Apple Orchard">FFBF3F3F</color> - <color name="Berry Parfait">FFA43482</color> - <color name="Bubble Gum">FFDF9ACA</color> - <color name="Butternut Squash">FFE74F00</color> - <color name="Caribbean Sea">FF67CD95</color> - <color name="Cloudy Sky">FF548CD0</color> - <color name="Hot Cocoa">FF8F482F</color> - <color name="Iridescent Indigo">FF3C32CD</color> - <color name="Lavender Silk">FF6B4D82</color> - <color name="Leafy Canopy">FF94DDCB</color> - <color name="Liquid Gold">FFFFD966</color> - <color name="Mango Purée">FFFF6137</color> - <color name="Moonlit Pond">FF4F2CD0</color> - <color name="Ocean Foam">FF62C9D3</color> - <color name="Orange Peel">FFFF8021</color> - <color name="Pesto">FF5F7B4A</color> - <color name="Pink Luster">FFFFB2E7</color> - <color name="Red Satin">FF9F3434</color> - <color name="Sea Glass">FFC4EA7F</color> - <color name="Shooting Star">FFFFFF65</color> - <color name="Sunset Shimmer">FFF79015</color> + <color name="Yellow">FFFCE883</color> </colors> |