From dc8bda0e1b323dfbfaa4eb1d05e5e1a7d149cffa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Aug 2022 15:13:31 -0400 Subject: [PATCH 1/8] Bump KSXGitHub/github-actions-deploy-aur from 2.3.0 to 2.4.1 (#292) Bumps [KSXGitHub/github-actions-deploy-aur](https://github.com/KSXGitHub/github-actions-deploy-aur) from 2.3.0 to 2.4.1. - [Release notes](https://github.com/KSXGitHub/github-actions-deploy-aur/releases) - [Commits](https://github.com/KSXGitHub/github-actions-deploy-aur/compare/v2.3.0...v2.4.1) --- updated-dependencies: - dependency-name: KSXGitHub/github-actions-deploy-aur dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 649ab696..3dbc3346 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -149,7 +149,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 From b7ef109d95af574b15bb6c4cb87844df0f4868f4 Mon Sep 17 00:00:00 2001 From: sitiom Date: Thu, 4 Aug 2022 03:56:35 +0800 Subject: [PATCH 2/8] Update Winget badge link (#284) Co-authored-by: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> --- docs/source/about/third_party_packages.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/about/third_party_packages.rst b/docs/source/about/third_party_packages.rst index 456a201f..5ae51e8b 100644 --- a/docs/source/about/third_party_packages.rst +++ b/docs/source/about/third_party_packages.rst @@ -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 ------------------ From d38392aea0d12d9ba878d637b55ea43a8fc7f967 Mon Sep 17 00:00:00 2001 From: istori1 <107304850+istori1@users.noreply.github.com> Date: Fri, 5 Aug 2022 20:47:21 -0400 Subject: [PATCH 3/8] sunshine.conf and apps.json on user's home config dir (#269) --- .../linux/flatpak/dev.lizardbyte.sunshine.yml | 2 +- sunshine/config.cpp | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml index 9624abb0..15fdb1f2 100644 --- a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml +++ b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml @@ -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 diff --git a/sunshine/config.cpp b/sunshine/config.cpp index 21c27e2d..fd887605 100644 --- a/sunshine/config.cpp +++ b/sunshine/config.cpp @@ -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, }; From d963bd1daa843f6188e1c586b606aea98d53e432 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 7 Aug 2022 16:34:15 -0400 Subject: [PATCH 4/8] add discord widgetbot crate --- src_assets/common/assets/web/header.html | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src_assets/common/assets/web/header.html b/src_assets/common/assets/web/header.html index 336a609d..3957a994 100644 --- a/src_assets/common/assets/web/header.html +++ b/src_assets/common/assets/web/header.html @@ -68,4 +68,13 @@ .nav-link.active { font-weight: 500; } - \ No newline at end of file + + + + From 15aca474eb0cb5d147505c02d6912db11946df8c Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 7 Aug 2022 16:34:39 -0400 Subject: [PATCH 5/8] fix button formatting --- src_assets/common/assets/web/index.html | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src_assets/common/assets/web/index.html b/src_assets/common/assets/web/index.html index 32e8ed6c..55b41947 100644 --- a/src_assets/common/assets/web/index.html +++ b/src_assets/common/assets/web/index.html @@ -9,9 +9,13 @@

Resources for Sunshine!

- LizardByte Website - Discord - Github Discussions +
+ LizardByte Website + + Discord + + Github Discussions +
@@ -22,8 +26,12 @@

By continuing to use this software you agree to the terms and conditions in the following documents.

- License - Third Party Notice +
+ + License + + Third Party Notice +
From c184f16e28ba0f6d700d99b29d973c481dfd6215 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 7 Aug 2022 16:39:59 -0400 Subject: [PATCH 6/8] fix support link and... - remove AUR `sunshine-git` badge --- README.rst | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 1e1a156e..8d51ff09 100644 --- a/README.rst +++ b/README.rst @@ -48,7 +48,7 @@ Integrations Support --------- -Our support methods are listed in our `LizardByte Docs `_. +Our support methods are listed in our `LizardByte Docs `_. 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 From 094ab4eb1a33fd84c85583b57e90efe5c55f28b1 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 7 Aug 2022 16:46:02 -0400 Subject: [PATCH 7/8] fixed archlinux-package-action --- .github/workflows/CI.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 3dbc3346..ad690428 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -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' From 2afa3a439084ecd821a0c0df0903be1b734c5331 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 7 Aug 2022 17:01:25 -0400 Subject: [PATCH 8/8] Change docs nav header background color --- docs/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index f4873f15..5ef4356c 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -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,