From 54c339026a6bacca643527b57aaaaedf411e0031 Mon Sep 17 00:00:00 2001 From: istori1 <107304850+istori1@users.noreply.github.com> Date: Wed, 27 Jul 2022 23:45:55 -0400 Subject: [PATCH 1/4] Config and app.json on user home config --- sunshine/config.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sunshine/config.cpp b/sunshine/config.cpp index 21c27e2d94b..2f49d2d6aaa 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 { @@ -292,7 +292,7 @@ sunshine_t sunshine { {}, // Username {}, // Password {}, // Password Salt - SUNSHINE_CONFIG_DIR "/sunshine.conf", // config file + platf::appdata().string() "/sunshine.conf", // config file {}, // cmd args 47989, }; From a9157d417c9af942a8567429cf02082346c97826 Mon Sep 17 00:00:00 2001 From: istori1 <107304850+istori1@users.noreply.github.com> Date: Thu, 28 Jul 2022 00:00:46 -0400 Subject: [PATCH 2/4] Update config.cpp --- sunshine/config.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sunshine/config.cpp b/sunshine/config.cpp index 2f49d2d6aaa..c46974dcfdd 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 platf::appdata().string() "/apps.json" +#define APPS_JSON_PATH platf::appdata().string() + "/apps.json" namespace config { namespace nv { @@ -292,7 +292,7 @@ sunshine_t sunshine { {}, // Username {}, // Password {}, // Password Salt - platf::appdata().string() "/sunshine.conf", // config file + platf::appdata().string() + "/sunshine.conf", // config file {}, // cmd args 47989, }; From df286ea95ff122608c7203b5e4056d5bfe580734 Mon Sep 17 00:00:00 2001 From: istori1 <107304850+istori1@users.noreply.github.com> Date: Thu, 28 Jul 2022 21:04:21 -0400 Subject: [PATCH 3/4] Update config.cpp --- sunshine/config.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sunshine/config.cpp b/sunshine/config.cpp index c46974dcfdd..fd887605019 100644 --- a/sunshine/config.cpp +++ b/sunshine/config.cpp @@ -286,14 +286,14 @@ input_t input { }; sunshine_t sunshine { - 2, // min_log_level - 0, // flags - {}, // User file - {}, // Username - {}, // Password - {}, // Password Salt + 2, // min_log_level + 0, // flags + {}, // User file + {}, // Username + {}, // Password + {}, // Password Salt platf::appdata().string() + "/sunshine.conf", // config file - {}, // cmd args + {}, // cmd args 47989, }; From a6d6b48d88f93c30147992aaba8de01d03fe8b7d Mon Sep 17 00:00:00 2001 From: istori1 <107304850+istori1@users.noreply.github.com> Date: Fri, 5 Aug 2022 19:52:15 -0400 Subject: [PATCH 4/4] Update dev.lizardbyte.sunshine.yml --- packaging/linux/flatpak/dev.lizardbyte.sunshine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml index 9624abb0b34..15fdb1f2796 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