From 5f8335c1e49ce108ef3481863833c98efa00411b Mon Sep 17 00:00:00 2001 From: manuel Date: Thu, 2 Jul 2020 23:09:26 +0200 Subject: sync with upstream --- cmake/treedata/android/subdirs.txt | 3 ++- cmake/treedata/common/gbm/gbm.txt | 3 +++ cmake/treedata/common/pvr.txt | 20 ++++++++++++-------- cmake/treedata/common/rbpi/rbpi.txt | 2 ++ cmake/treedata/common/subdirs.txt | 13 +++++++++---- cmake/treedata/common/tests.txt | 1 + cmake/treedata/common/videoplayer.txt | 1 + cmake/treedata/common/wayland/wayland.txt | 3 +++ cmake/treedata/common/x11/X.txt | 3 +++ cmake/treedata/darwin_embedded/ios/ios.txt | 2 ++ cmake/treedata/darwin_embedded/subdirs.txt | 14 ++++++++++++++ cmake/treedata/darwin_embedded/tvos/tvos.txt | 5 +++++ cmake/treedata/freebsd/subdirs.txt | 5 +++-- cmake/treedata/ios/subdirs.txt | 15 --------------- cmake/treedata/linux/subdirs.txt | 2 ++ cmake/treedata/linux/tests.txt | 1 + cmake/treedata/optional/common/X.txt | 3 --- cmake/treedata/optional/common/aml.txt | 2 -- cmake/treedata/optional/common/avahi.txt | 1 + cmake/treedata/optional/common/gbm.txt | 2 -- cmake/treedata/optional/common/wayland.txt | 3 --- cmake/treedata/osx/subdirs.txt | 7 ++++--- cmake/treedata/windows/subdirs.txt | 1 + cmake/treedata/windowsstore/subdirs.txt | 1 + 24 files changed, 70 insertions(+), 43 deletions(-) create mode 100644 cmake/treedata/common/gbm/gbm.txt create mode 100644 cmake/treedata/common/rbpi/rbpi.txt create mode 100644 cmake/treedata/common/wayland/wayland.txt create mode 100644 cmake/treedata/common/x11/X.txt create mode 100644 cmake/treedata/darwin_embedded/ios/ios.txt create mode 100644 cmake/treedata/darwin_embedded/subdirs.txt create mode 100755 cmake/treedata/darwin_embedded/tvos/tvos.txt delete mode 100644 cmake/treedata/ios/subdirs.txt create mode 100644 cmake/treedata/linux/tests.txt delete mode 100644 cmake/treedata/optional/common/X.txt delete mode 100644 cmake/treedata/optional/common/aml.txt create mode 100644 cmake/treedata/optional/common/avahi.txt delete mode 100644 cmake/treedata/optional/common/gbm.txt delete mode 100644 cmake/treedata/optional/common/wayland.txt (limited to 'cmake/treedata') diff --git a/cmake/treedata/android/subdirs.txt b/cmake/treedata/android/subdirs.txt index 335c331..0c4cf88 100644 --- a/cmake/treedata/android/subdirs.txt +++ b/cmake/treedata/android/subdirs.txt @@ -3,6 +3,7 @@ xbmc/cores/VideoPlayer/Process/android cores/VideoPlayer/Process/android xbmc/input/touch input/touch xbmc/input/touch/generic input/touch/generic xbmc/media/decoderfilter media/decoderfilter +xbmc/platform/android platform/android xbmc/platform/android/activity platform/android/activity xbmc/platform/android/bionic_supplement platform/android/bionicsupplement xbmc/platform/android/filesystem platform/android/filesystem @@ -12,7 +13,7 @@ xbmc/platform/android/network platform/android/network xbmc/platform/android/peripherals platform/android/peripherals xbmc/platform/android/powermanagement platform/android/powermanagement xbmc/platform/android/storage platform/android/storage -xbmc/platform/linux platform/linux +xbmc/platform/android/utils platform/android/utils xbmc/platform/linux/peripherals platform/linux/peripherals xbmc/platform/posix platform/posix xbmc/platform/posix/filesystem platform/posix/filesystem diff --git a/cmake/treedata/common/gbm/gbm.txt b/cmake/treedata/common/gbm/gbm.txt new file mode 100644 index 0000000..113c47b --- /dev/null +++ b/cmake/treedata/common/gbm/gbm.txt @@ -0,0 +1,3 @@ +xbmc/cores/RetroPlayer/process/gbm cores/RetroPlayer/process/gbm +xbmc/cores/VideoPlayer/Process/gbm cores/VideoPlayer/Process/gbm +xbmc/windowing/gbm windowing/gbm diff --git a/cmake/treedata/common/pvr.txt b/cmake/treedata/common/pvr.txt index decdabb..74e766f 100644 --- a/cmake/treedata/common/pvr.txt +++ b/cmake/treedata/common/pvr.txt @@ -1,8 +1,12 @@ -xbmc/pvr pvr -xbmc/pvr/addons pvr/addons -xbmc/pvr/channels pvr/channels -xbmc/pvr/dialogs pvr/dialogs -xbmc/pvr/epg pvr/epg -xbmc/pvr/recordings pvr/recordings -xbmc/pvr/timers pvr/timers -xbmc/pvr/windows pvr/windows +xbmc/pvr pvr +xbmc/pvr/addons pvr/addons +xbmc/pvr/channels pvr/channels +xbmc/pvr/dialogs pvr/dialogs +xbmc/pvr/epg pvr/epg +xbmc/pvr/filesystem pvr/filesystem +xbmc/pvr/guilib pvr/guilib +xbmc/pvr/guilib/guiinfo pvr/guilib/guiinfo +xbmc/pvr/recordings pvr/recordings +xbmc/pvr/settings pvr/settings +xbmc/pvr/timers pvr/timers +xbmc/pvr/windows pvr/windows diff --git a/cmake/treedata/common/rbpi/rbpi.txt b/cmake/treedata/common/rbpi/rbpi.txt new file mode 100644 index 0000000..dc268e7 --- /dev/null +++ b/cmake/treedata/common/rbpi/rbpi.txt @@ -0,0 +1,2 @@ +xbmc/cores/omxplayer cores/omxplayer +xbmc/windowing/rpi windowing/rpi diff --git a/cmake/treedata/common/subdirs.txt b/cmake/treedata/common/subdirs.txt index 083e8ef..8131113 100644 --- a/cmake/treedata/common/subdirs.txt +++ b/cmake/treedata/common/subdirs.txt @@ -1,16 +1,21 @@ xbmc xbmc xbmc/addons addons +xbmc/addons/addoninfo addons_addoninfo xbmc/addons/binary-addons addons_binary-addons xbmc/addons/interfaces addons_interfaces -xbmc/addons/interfaces/Addon addons_interfaces_addon -xbmc/addons/interfaces/GUI addons_interfaces_gui -xbmc/addons/interfaces/GUI/controls addons_interfaces_gui_controls -xbmc/addons/interfaces/GUI/dialogs addons_interfaces_gui_dialogs +xbmc/addons/interfaces/gui addons_interfaces_gui +xbmc/addons/interfaces/gui/controls addons_interfaces_gui_controls +xbmc/addons/interfaces/gui/dialogs addons_interfaces_gui_dialogs xbmc/addons/kodi-addon-dev-kit/include/kodi addons_kodi-addon-dev-kit_include_kodi xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance addons_kodi-addon-dev-kit_include_kodi_addon-instance +xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr addons_kodi-addon-dev-kit_include_kodi_addon-instance_pvr +xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api addons_kodi-addon-dev-kit_include_kodi_c-api +xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance addons_kodi-addon-dev-kit_include_kodi_c-api_addon-instance +xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr addons_kodi-addon-dev-kit_include_kodi_c-api_addon-instance_pvr xbmc/addons/kodi-addon-dev-kit/include/kodi/gui addons_kodi-addon-dev-kit_include_kodi_gui xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls addons_kodi-addon-dev-kit_include_kodi_gui_controls xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs addons_kodi-addon-dev-kit_include_kodi_gui_dialogs +xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/gl addons_kodi-addon-dev-kit_include_kodi_gui_gl xbmc/addons/kodi-addon-dev-kit/include/kodi/tools addons_kodi-addon-dev-kit_include_kodi_tools xbmc/addons/settings addons_settings xbmc/commons commons diff --git a/cmake/treedata/common/tests.txt b/cmake/treedata/common/tests.txt index 415eae6..9573812 100644 --- a/cmake/treedata/common/tests.txt +++ b/cmake/treedata/common/tests.txt @@ -5,6 +5,7 @@ xbmc/interfaces/python/test test/python xbmc/music/tags/test test/music_tags xbmc/network/test test/network xbmc/playlists/test test/playlists +xbmc/pvr/channels/test test/pvrchannels xbmc/test test xbmc/threads/test test/threads xbmc/utils/test test/utils diff --git a/cmake/treedata/common/videoplayer.txt b/cmake/treedata/common/videoplayer.txt index ce6a757..8110f08 100644 --- a/cmake/treedata/common/videoplayer.txt +++ b/cmake/treedata/common/videoplayer.txt @@ -1,4 +1,5 @@ xbmc/cores/VideoPlayer cores/VideoPlayer +xbmc/cores/VideoPlayer/Buffers cores/VideoPlayer/Buffers xbmc/cores/VideoPlayer/DVDCodecs cores/VideoPlayer/codecs xbmc/cores/VideoPlayer/DVDCodecs/Audio cores/VideoPlayer/codecs/audio xbmc/cores/VideoPlayer/DVDCodecs/Overlay cores/VideoPlayer/codecs/overlay diff --git a/cmake/treedata/common/wayland/wayland.txt b/cmake/treedata/common/wayland/wayland.txt new file mode 100644 index 0000000..bbbb14e --- /dev/null +++ b/cmake/treedata/common/wayland/wayland.txt @@ -0,0 +1,3 @@ +xbmc/cores/RetroPlayer/process/wayland cores/RetroPlayer/process/wayland +xbmc/cores/VideoPlayer/Process/wayland cores/VideoPlayer/Process/wayland +xbmc/windowing/wayland windowing/wayland diff --git a/cmake/treedata/common/x11/X.txt b/cmake/treedata/common/x11/X.txt new file mode 100644 index 0000000..548c9dd --- /dev/null +++ b/cmake/treedata/common/x11/X.txt @@ -0,0 +1,3 @@ +xbmc/cores/RetroPlayer/process/X11 cores/RetroPlayer/process/X11 +xbmc/cores/VideoPlayer/Process/X11 cores/VideoPlayer/Process/X11 +xbmc/windowing/X11 windowing/X11 diff --git a/cmake/treedata/darwin_embedded/ios/ios.txt b/cmake/treedata/darwin_embedded/ios/ios.txt new file mode 100644 index 0000000..f5d13e3 --- /dev/null +++ b/cmake/treedata/darwin_embedded/ios/ios.txt @@ -0,0 +1,2 @@ +xbmc/platform/darwin/ios platform/ios +xbmc/windowing/ios windowing/ios diff --git a/cmake/treedata/darwin_embedded/subdirs.txt b/cmake/treedata/darwin_embedded/subdirs.txt new file mode 100644 index 0000000..718c5c5 --- /dev/null +++ b/cmake/treedata/darwin_embedded/subdirs.txt @@ -0,0 +1,14 @@ +xbmc/cores/RetroPlayer/process/ios cores/RetroPlayer/process/ios +xbmc/cores/VideoPlayer/Process/ios cores/VideoPlayer/Process/ios +xbmc/input/touch input/touch +xbmc/input/touch/generic input/touch/generic +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/peripherals platform/ios-common/peripherals +xbmc/platform/darwin/ios-common/storage platform/ios-common/storage +xbmc/platform/darwin/network platform/darwin/network +xbmc/platform/darwin/utils platform/darwin/utils +xbmc/platform/posix posix +xbmc/platform/posix/filesystem platform/posix/filesystem +xbmc/platform/posix/utils platform/posix/utils diff --git a/cmake/treedata/darwin_embedded/tvos/tvos.txt b/cmake/treedata/darwin_embedded/tvos/tvos.txt new file mode 100755 index 0000000..1335e66 --- /dev/null +++ b/cmake/treedata/darwin_embedded/tvos/tvos.txt @@ -0,0 +1,5 @@ +xbmc/platform/darwin/tvos platform/tvos +xbmc/platform/darwin/tvos/filesystem platform/darwin/tvos/filesystem +xbmc/platform/darwin/tvos/input platform/darwin/tvos/input +xbmc/platform/darwin/tvos/powermanagement platform/darwin/tvos/powermanagement +xbmc/windowing/tvos windowing/tvos diff --git a/cmake/treedata/freebsd/subdirs.txt b/cmake/treedata/freebsd/subdirs.txt index fd8ed5f..79e3462 100644 --- a/cmake/treedata/freebsd/subdirs.txt +++ b/cmake/treedata/freebsd/subdirs.txt @@ -3,13 +3,14 @@ xbmc/cores/VideoPlayer/Process/rbpi cores/VideoPlayer/Process/rbpi xbmc/input/touch input/touch xbmc/input/touch/generic input/touch/generic xbmc/platform/freebsd platform/freebsd -xbmc/platform/linux platform/linux +xbmc/platform/freebsd/network platform/freebsd/network xbmc/platform/linux/input platform/linux/input -xbmc/platform/linux/network platform/linux/network xbmc/platform/linux/peripherals platform/linux/peripherals xbmc/platform/linux/powermanagement platform/linux/powermanagement +xbmc/platform/linux/sse4 platform/linux/sse4 xbmc/platform/linux/storage platform/linux/storage xbmc/platform/posix platform/posix xbmc/platform/posix/filesystem platform/posix/filesystem +xbmc/platform/posix/network platform/posix/network xbmc/platform/posix/utils platform/posix/utils xbmc/windowing/linux windowing/linux diff --git a/cmake/treedata/ios/subdirs.txt b/cmake/treedata/ios/subdirs.txt deleted file mode 100644 index a3a03be..0000000 --- a/cmake/treedata/ios/subdirs.txt +++ /dev/null @@ -1,15 +0,0 @@ -xbmc/cores/RetroPlayer/process/ios cores/RetroPlayer/process/ios -xbmc/cores/VideoPlayer/Process/ios cores/VideoPlayer/Process/ios -xbmc/input/touch input/touch -xbmc/input/touch/generic input/touch/generic -xbmc/platform/darwin platform/darwin -xbmc/platform/darwin/ios platform/ios -xbmc/platform/darwin/ios-common platform/ios-common -xbmc/platform/darwin/network platform/darwin/network -xbmc/platform/darwin/storage platform/storage -xbmc/platform/linux platform/linux -xbmc/platform/linux/network platform/linux/network -xbmc/platform/posix posix -xbmc/platform/posix/filesystem platform/posix/filesystem -xbmc/platform/posix/utils platform/posix/utils -xbmc/windowing/ios windowing/ios diff --git a/cmake/treedata/linux/subdirs.txt b/cmake/treedata/linux/subdirs.txt index 7619e2e..51a7cbd 100644 --- a/cmake/treedata/linux/subdirs.txt +++ b/cmake/treedata/linux/subdirs.txt @@ -7,8 +7,10 @@ xbmc/platform/linux/input platform/linux/input xbmc/platform/linux/network platform/linux/network xbmc/platform/linux/peripherals platform/linux/peripherals xbmc/platform/linux/powermanagement platform/linux/powermanagement +xbmc/platform/linux/sse4 platform/linux/sse4 xbmc/platform/linux/storage platform/linux/storage xbmc/platform/posix platform/posix xbmc/platform/posix/filesystem platform/posix/filesystem +xbmc/platform/posix/network platform/posix/network xbmc/platform/posix/utils platform/posix/utils xbmc/windowing/linux windowing/linux diff --git a/cmake/treedata/linux/tests.txt b/cmake/treedata/linux/tests.txt new file mode 100644 index 0000000..3f3a3e3 --- /dev/null +++ b/cmake/treedata/linux/tests.txt @@ -0,0 +1 @@ +xbmc/platform/linux/test platform/linux/test diff --git a/cmake/treedata/optional/common/X.txt b/cmake/treedata/optional/common/X.txt deleted file mode 100644 index a250537..0000000 --- a/cmake/treedata/optional/common/X.txt +++ /dev/null @@ -1,3 +0,0 @@ -xbmc/cores/RetroPlayer/process/X11 cores/RetroPlayer/process/X11 # X -xbmc/cores/VideoPlayer/Process/X11 cores/VideoPlayer/Process/X11 # X -xbmc/windowing/X11 windowing/X11 # X diff --git a/cmake/treedata/optional/common/aml.txt b/cmake/treedata/optional/common/aml.txt deleted file mode 100644 index 09bf2db..0000000 --- a/cmake/treedata/optional/common/aml.txt +++ /dev/null @@ -1,2 +0,0 @@ -xbmc/cores/RetroPlayer/process/amlogic cores/RetroPlayer/process/amlogic # AML -xbmc/windowing/amlogic windowing/amlogic # AML diff --git a/cmake/treedata/optional/common/avahi.txt b/cmake/treedata/optional/common/avahi.txt new file mode 100644 index 0000000..41b82b9 --- /dev/null +++ b/cmake/treedata/optional/common/avahi.txt @@ -0,0 +1 @@ +xbmc/platform/linux/network/zeroconf platform/linux/network/zeroconf # AVAHI diff --git a/cmake/treedata/optional/common/gbm.txt b/cmake/treedata/optional/common/gbm.txt deleted file mode 100644 index 5d898d4..0000000 --- a/cmake/treedata/optional/common/gbm.txt +++ /dev/null @@ -1,2 +0,0 @@ -xbmc/cores/RetroPlayer/process/gbm cores/RetroPlayer/process/gbm # GBM -xbmc/windowing/gbm windowing/gbm # GBM diff --git a/cmake/treedata/optional/common/wayland.txt b/cmake/treedata/optional/common/wayland.txt deleted file mode 100644 index f8f77a6..0000000 --- a/cmake/treedata/optional/common/wayland.txt +++ /dev/null @@ -1,3 +0,0 @@ -xbmc/cores/RetroPlayer/process/wayland cores/RetroPlayer/process/wayland # WAYLANDPP -xbmc/cores/VideoPlayer/Process/wayland cores/VideoPlayer/Process/wayland # WAYLANDPP -xbmc/windowing/wayland windowing/wayland # WAYLANDPP diff --git a/cmake/treedata/osx/subdirs.txt b/cmake/treedata/osx/subdirs.txt index 943c366..fa28aa0 100644 --- a/cmake/treedata/osx/subdirs.txt +++ b/cmake/treedata/osx/subdirs.txt @@ -3,12 +3,13 @@ xbmc/cores/VideoPlayer/Process/osx cores/VideoPlayer/Process/osx xbmc/platform/darwin platform/darwin xbmc/platform/darwin/network platform/darwin/network xbmc/platform/darwin/osx platform/osx +xbmc/platform/darwin/osx/network platform/darwin/osx/network xbmc/platform/darwin/osx/peripherals platform/osx/peripherals xbmc/platform/darwin/osx/powermanagement platform/darwin/osx/powermanagement -xbmc/platform/darwin/storage platform/storage -xbmc/platform/linux platform/linux -xbmc/platform/linux/network platform/linux/network +xbmc/platform/darwin/osx/storage platform/osx/storage +xbmc/platform/darwin/utils platform/darwin/utils xbmc/platform/posix posix xbmc/platform/posix/filesystem platform/posix/filesystem +xbmc/platform/posix/network platform/posix/network xbmc/platform/posix/utils platform/posix/utils xbmc/windowing/osx windowing/osx diff --git a/cmake/treedata/windows/subdirs.txt b/cmake/treedata/windows/subdirs.txt index 0078758..c633977 100644 --- a/cmake/treedata/windows/subdirs.txt +++ b/cmake/treedata/windows/subdirs.txt @@ -1,6 +1,7 @@ xbmc/cores/RetroPlayer/process/windows cores/RetroPlayer/process/windows xbmc/cores/RetroPlayer/rendering/VideoShaders/windows cores/RetroPlayer/rendering/VideoShaders/windows xbmc/cores/VideoPlayer/Process/windows cores/VideoPlayer/Process/windows +xbmc/cores/VideoPlayer/VideoRenderers/windows cores/VideoPlayer/VideoRenderers/windows xbmc/input/touch input/touch xbmc/input/touch/generic input/touch/generic xbmc/network/mdns network/mdns diff --git a/cmake/treedata/windowsstore/subdirs.txt b/cmake/treedata/windowsstore/subdirs.txt index 0644fd2..da42566 100644 --- a/cmake/treedata/windowsstore/subdirs.txt +++ b/cmake/treedata/windowsstore/subdirs.txt @@ -1,4 +1,5 @@ xbmc/cores/VideoPlayer/Process/windows cores/VideoPlayer/Process/windows +xbmc/cores/VideoPlayer/VideoRenderers/windows cores/VideoPlayer/VideoRenderers/windows xbmc/input/touch input/touch xbmc/input/touch/generic input/touch/generic xbmc/network/mdns network/mdns -- cgit v1.2.3