From 5f8335c1e49ce108ef3481863833c98efa00411b Mon Sep 17 00:00:00 2001
From: manuel <manuel@mausz.at>
Date: Thu, 2 Jul 2020 23:09:26 +0200
Subject: sync with upstream

---
 cmake/installdata/common/certificates.txt        | 2 +-
 cmake/installdata/darwin_embedded/fontconfig.txt | 1 +
 cmake/installdata/darwin_embedded/packaging.txt  | 3 +++
 cmake/installdata/darwin_embedded/runtime.txt    | 2 ++
 cmake/installdata/ios/fontconfig.txt             | 1 -
 cmake/installdata/ios/packaging.txt              | 3 ---
 cmake/installdata/ios/runtime.txt                | 2 --
 cmake/installdata/test-reference-data.txt        | 8 ++++++++
 8 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 cmake/installdata/darwin_embedded/fontconfig.txt
 create mode 100644 cmake/installdata/darwin_embedded/packaging.txt
 create mode 100644 cmake/installdata/darwin_embedded/runtime.txt
 delete mode 100644 cmake/installdata/ios/fontconfig.txt
 delete mode 100644 cmake/installdata/ios/packaging.txt
 delete mode 100644 cmake/installdata/ios/runtime.txt

(limited to 'cmake/installdata')

diff --git a/cmake/installdata/common/certificates.txt b/cmake/installdata/common/certificates.txt
index 14e74a7..e802c04 100644
--- a/cmake/installdata/common/certificates.txt
+++ b/cmake/installdata/common/certificates.txt
@@ -1 +1 @@
-tools/depends/target/openssl/cacert.pem system/certs
\ No newline at end of file
+system/certs/*
diff --git a/cmake/installdata/darwin_embedded/fontconfig.txt b/cmake/installdata/darwin_embedded/fontconfig.txt
new file mode 100644
index 0000000..1f1bd9d
--- /dev/null
+++ b/cmake/installdata/darwin_embedded/fontconfig.txt
@@ -0,0 +1 @@
+system/players/VideoPlayer/etc/*
diff --git a/cmake/installdata/darwin_embedded/packaging.txt b/cmake/installdata/darwin_embedded/packaging.txt
new file mode 100644
index 0000000..3d5ae4a
--- /dev/null
+++ b/cmake/installdata/darwin_embedded/packaging.txt
@@ -0,0 +1,3 @@
+LICENSE.md
+privacy-policy.txt
+xbmc/platform/darwin/Credits.html
diff --git a/cmake/installdata/darwin_embedded/runtime.txt b/cmake/installdata/darwin_embedded/runtime.txt
new file mode 100644
index 0000000..3bb5467
--- /dev/null
+++ b/cmake/installdata/darwin_embedded/runtime.txt
@@ -0,0 +1,2 @@
+tools/darwin/runtime/preflight
+tools/darwin/runtime/org.xbmc.helper.plist
diff --git a/cmake/installdata/ios/fontconfig.txt b/cmake/installdata/ios/fontconfig.txt
deleted file mode 100644
index 1f1bd9d..0000000
--- a/cmake/installdata/ios/fontconfig.txt
+++ /dev/null
@@ -1 +0,0 @@
-system/players/VideoPlayer/etc/*
diff --git a/cmake/installdata/ios/packaging.txt b/cmake/installdata/ios/packaging.txt
deleted file mode 100644
index 3d5ae4a..0000000
--- a/cmake/installdata/ios/packaging.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-LICENSE.md
-privacy-policy.txt
-xbmc/platform/darwin/Credits.html
diff --git a/cmake/installdata/ios/runtime.txt b/cmake/installdata/ios/runtime.txt
deleted file mode 100644
index 3bb5467..0000000
--- a/cmake/installdata/ios/runtime.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-tools/darwin/runtime/preflight
-tools/darwin/runtime/org.xbmc.helper.plist
diff --git a/cmake/installdata/test-reference-data.txt b/cmake/installdata/test-reference-data.txt
index b6c94a7..91738ba 100644
--- a/cmake/installdata/test-reference-data.txt
+++ b/cmake/installdata/test-reference-data.txt
@@ -1,10 +1,18 @@
 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/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/lighttp-default.html
+xbmc/filesystem/test/data/httpdirectory/nginx-default.html
 xbmc/network/test/data/test.html
 xbmc/network/test/data/test.png
 xbmc/network/test/data/test-ranges.txt
-- 
cgit v1.2.3