mirror/Sunshine
1
0
Fork 0
mirror of https://github.com/LizardByte/Sunshine.git synced 2025-03-15 19:20:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'nightly' into winget-releaser

Browse Source
This commit is contained in:
ReenigneArcher 2022-08-07 18:35:09 -04:00 committed by GitHub
commit b464902f25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/CI.yml vendored
View File

@ -130,9 +130,7 @@ jobs:
mv ./build/PKGBUILD ./artifacts/
- name: Validate package
# uses: hapakaien/archlinux-package-action@v2
# the above action has an issue with the archlinux-keychain
uses: lizardbyte/archlinux-package-action@main
uses: hapakaien/archlinux-package-action@v2.2.0
with:
path: artifacts
flags: '--syncdeps --noconfirm'
@ -149,7 +147,7 @@ jobs:
- name: Publish AUR package
if: ${{ env.aur_publish == 'true' }}
uses: KSXGitHub/github-actions-deploy-aur@v2.3.0
uses: KSXGitHub/github-actions-deploy-aur@v2.4.1
with:
pkgname: ${{ env.aur_pkg }}
pkgbuild: ./artifacts/PKGBUILD

6
README.rst
View File

@ -48,7 +48,7 @@ Integrations
Support
---------
Our support methods are listed in our `LizardByte Docs <https:docs.lizardbyte.dev/about/support.html>`_.
Our support methods are listed in our `LizardByte Docs <https://docs.lizardbyte.dev/en/latest/about/support.html>`_.
Downloads
---------
@ -61,10 +61,6 @@ Downloads
:alt: AUR votes
:target: https://aur.archlinux.org/packages/sunshine
.. image:: https://img.shields.io/badge/dynamic/json?color=blue&label=AUR-git&style=for-the-badge&query=$.results.0.NumVotes&url=https%3A%2F%2Fapp.lizardbyte.dev%2Funo%2Faur%2Fsunshine-git.json&logo=archlinux
:alt: AUR-git votes
:target: https://aur.archlinux.org/packages/sunshine-git
.. comment
image:: https://img.shields.io/docker/pulls/lizardbyte/sunshine?style=for-the-badge&logo=docker
:alt: Docker

2
docs/source/about/third_party_packages.rst
View File

@ -26,7 +26,7 @@ Winget
------
.. image:: https://img.shields.io/badge/dynamic/xml?color=orange&label=Winget&style=for-the-badge&prefix=v&query=%2F%2Ftr%5B%40id%3D%27winget%27%5D%2Ftd%5B3%5D%2Fspan%2Fa&url=https%3A%2F%2Frepology.org%2Fproject%2Fsunshine%2Fversions&logo=microsoft
:alt: Winget Version
:target: https://github.com/microsoft/winget-pkgs/tree/master/manifests/s/SunshineStream/Sunshine
:target: https://github.com/microsoft/winget-pkgs/tree/master/manifests/l/LizardByte/Sunshine
Legacy GitHub Repo
------------------

2
docs/source/conf.py
View File

@ -83,7 +83,7 @@ html_theme_options = {
'prev_next_buttons_location': 'bottom',
'style_external_links': True,
'vcs_pageview_mode': 'blob',
# 'style_nav_header_background': 'white',
'style_nav_header_background': '#151515',
# Toc options
'collapse_navigation': True,
'sticky_navigation': True,

2
packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
View File

@ -90,7 +90,7 @@ modules:
- /share/ffmpeg/examples
sources:
- type: archive
url: https://ffmpeg.org/releases/ffmpeg-4.4.2.tar.xz
url: http://archive.ubuntu.com/ubuntu/pool/universe/f/ffmpeg/ffmpeg_4.4.2.orig.tar.xz
sha256: af419a7f88adbc56c758ab19b4c708afbcae15ef09606b82b855291f6a6faa93
modules:
- name: vmaf

11
src_assets/common/assets/web/header.html
View File

@ -68,4 +68,13 @@
.nav-link.active {
font-weight: 500;
}
</style>
</style>
<!-- Discord WidgetBot Crate-->
<script src="https://cdn.jsdelivr.net/npm/@widgetbot/crate@3" async defer>
new Crate({
server: '804382334370578482',
channel: '804383092822900797',
defer: false,
})
</script>

18
src_assets/common/assets/web/index.html
View File

@ -9,9 +9,13 @@
<p>
Resources for Sunshine!
</p>
<a class="btn btn-primary" href="https://app.lizardbyte.dev" target="_blank">LizardByte Website</a>
<a class="btn btn-warning" href="https://app.lizardbyte.dev/discord" target="_blank"><i class="fab fa-fw fa-discord"></i> Discord</a>
<a class="btn btn-warning" href="https://github.com/LizardByte/Sunshine/discussions" target="_blank"><i class="fab fa-fw fa-github"></i> Github Discussions</a>
<div class="card-group p-4 align-items-center">
<a class="btn btn-success m-1" href="https://app.lizardbyte.dev" target="_blank">LizardByte Website</a>
<a class="btn btn-primary m-1" href="https://app.lizardbyte.dev/discord" target="_blank">
<i class="fab fa-fw fa-discord"></i> Discord</a>
<a class="btn btn-secondary m-1" href="https://github.com/LizardByte/Sunshine/discussions" target="_blank">
<i class="fab fa-fw fa-github"></i> Github Discussions</a>
</div>
</div>
</div>
<!--Legal-->
@ -22,8 +26,12 @@
<p>
By continuing to use this software you agree to the terms and conditions in the following documents.
</p>
<a class="btn btn-danger" href="https://github.com/LizardByte/Sunshine/blob/master/LICENSE" target="_blank"><i class="fas fa-fw fa-file-alt"></i> License</a>
<a class="btn btn-danger" href="https://github.com/LizardByte/Sunshine/blob/master/NOTICE" target="_blank"><i class="fas fa-fw fa-exclamation"></i> Third Party Notice</a>
<div class="card-group p-4 align-items-center">
<a class="btn btn-danger m-1" href="https://github.com/LizardByte/Sunshine/blob/master/LICENSE" target="_blank">
<i class="fas fa-fw fa-file-alt"></i> License</a>
<a class="btn btn-danger m-1" href="https://github.com/LizardByte/Sunshine/blob/master/NOTICE" target="_blank">
<i class="fas fa-fw fa-exclamation"></i> Third Party Notice</a>
</div>
</div>
</div>
</div>

18
sunshine/config.cpp
View File

@ -20,7 +20,7 @@ using namespace std::literals;
#define PRIVATE_KEY_FILE CA_DIR "/cakey.pem"
#define CERTIFICATE_FILE CA_DIR "/cacert.pem"
#define APPS_JSON_PATH SUNSHINE_CONFIG_DIR "/apps.json"
#define APPS_JSON_PATH platf::appdata().string() + "/apps.json"
namespace config {
namespace nv {
@ -286,14 +286,14 @@ input_t input {
};
sunshine_t sunshine {
2, // min_log_level
0, // flags
{}, // User file
{}, // Username
{}, // Password
{}, // Password Salt
SUNSHINE_CONFIG_DIR "/sunshine.conf", // config file
{}, // cmd args
2, // min_log_level
0, // flags
{}, // User file
{}, // Username
{}, // Password
{}, // Password Salt
platf::appdata().string() + "/sunshine.conf", // config file
{}, // cmd args
47989,
};