From 2a138ac91de3253d51f633eb4bd4fef796a1fe60 Mon Sep 17 00:00:00 2001 From: Patrick Gehrsitz Date: Wed, 27 Mar 2024 20:16:45 +0100 Subject: [PATCH 1/3] chore: use official ustreamer repo with tag Signed-off-by: Patrick Gehrsitz --- bin/build.sh | 4 ++-- tools/configure.sh | 4 ++-- tools/libs/config.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index 5e8ed519..c62d5d81 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -32,10 +32,10 @@ CLONE_FLAGS=(--depth=1 --single-branch) # Ustreamer repo USTREAMER_PATH="ustreamer" if [[ -z "${CROWSNEST_USTREAMER_REPO_SHIP}" ]]; then - CROWSNEST_USTREAMER_REPO_SHIP="https://github.com/mryel00/ustreamer.git" + CROWSNEST_USTREAMER_REPO_SHIP="https://github.com/pikvm/ustreamer.git" fi if [[ -z "${CROWSNEST_USTREAMER_REPO_BRANCH}" ]]; then - CROWSNEST_USTREAMER_REPO_BRANCH="master" + CROWSNEST_USTREAMER_REPO_BRANCH="v5.57" fi # Camera-streamer repo diff --git a/tools/configure.sh b/tools/configure.sh index 8c3d9579..222a0481 100755 --- a/tools/configure.sh +++ b/tools/configure.sh @@ -26,8 +26,8 @@ CN_CONFIG_CONFIGPATH="${CN_CONFIG_ROOTPATH}/config" CN_CONFIG_LOGPATH="${CN_CONFIG_ROOTPATH}/logs" CN_CONFIG_ENVPATH="${CN_CONFIG_ROOTPATH}/systemd" CN_MOONRAKER_CONFIG_PATH="${CN_CONFIG_CONFIGPATH}/moonraker.conf" -CN_USTREAMER_REPO="https://github.com/mryel00/ustreamer.git" -CN_USTREAMER_BRANCH="master" +CN_USTREAMER_REPO="https://github.com/pikvm/ustreamer.git" +CN_USTREAMER_BRANCH="v5.57" CN_CAMERA_STREAMER_REPO="https://github.com/ayufan/camera-streamer.git" CN_CAMERA_STREAMER_BRANCH="master" diff --git a/tools/libs/config.sh b/tools/libs/config.sh index ba0b10b3..700e9af0 100755 --- a/tools/libs/config.sh +++ b/tools/libs/config.sh @@ -35,8 +35,8 @@ import_config() { [[ -n "${CROWSNEST_CONFIG_PATH}" ]] || CROWSNEST_CONFIG_PATH="/home/${BASE_USER}/printer_data/config" [[ -n "${CROWSNEST_LOG_PATH}" ]] || CROWSNEST_LOG_PATH="/home/${BASE_USER}/printer_data/logs" [[ -n "${CROWSNEST_ENV_PATH}" ]] || CROWSNEST_ENV_PATH="/home/${BASE_USER}/printer_data/systemd" - [[ -n "${CROWSNEST_USTREAMER_REPO_SHIP}" ]] || CROWSNEST_USTREAMER_REPO_SHIP="https://github.com/mryel00/ustreamer.git" - [[ -n "${CROWSNEST_USTREAMER_REPO_BRANCH}" ]] || CROWSNEST_USTREAMER_REPO_BRANCH="master" + [[ -n "${CROWSNEST_USTREAMER_REPO_SHIP}" ]] || CROWSNEST_USTREAMER_REPO_SHIP="https://github.com/pikvm/ustreamer.git" + [[ -n "${CROWSNEST_USTREAMER_REPO_BRANCH}" ]] || CROWSNEST_USTREAMER_REPO_BRANCH="v5.57" [[ -n "${CROWSNEST_CAMERA_STREAMER_REPO_SHIP}" ]] || CROWSNEST_CAMERA_STREAMER_REPO_SHIP="https://github.com/ayufan/camera-streamer.git" [[ -n "${CROWSNEST_CAMERA_STREAMER_REPO_BRANCH}" ]] || CROWSNEST_CAMERA_STREAMER_REPO_BRANCH="master" status_msg "Using default configuration ..." "0" From fd2dc2ba18e500027dcf92d290b2d67d501f646e Mon Sep 17 00:00:00 2001 From: Patrick Gehrsitz Date: Fri, 29 Mar 2024 19:28:43 +0100 Subject: [PATCH 2/3] chore: update ustreamer version Signed-off-by: Patrick Gehrsitz --- bin/build.sh | 2 +- tools/configure.sh | 2 +- tools/libs/config.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index c62d5d81..8552eae6 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -35,7 +35,7 @@ if [[ -z "${CROWSNEST_USTREAMER_REPO_SHIP}" ]]; then CROWSNEST_USTREAMER_REPO_SHIP="https://github.com/pikvm/ustreamer.git" fi if [[ -z "${CROWSNEST_USTREAMER_REPO_BRANCH}" ]]; then - CROWSNEST_USTREAMER_REPO_BRANCH="v5.57" + CROWSNEST_USTREAMER_REPO_BRANCH="v6.9" fi # Camera-streamer repo diff --git a/tools/configure.sh b/tools/configure.sh index 222a0481..6615cb74 100755 --- a/tools/configure.sh +++ b/tools/configure.sh @@ -27,7 +27,7 @@ CN_CONFIG_LOGPATH="${CN_CONFIG_ROOTPATH}/logs" CN_CONFIG_ENVPATH="${CN_CONFIG_ROOTPATH}/systemd" CN_MOONRAKER_CONFIG_PATH="${CN_CONFIG_CONFIGPATH}/moonraker.conf" CN_USTREAMER_REPO="https://github.com/pikvm/ustreamer.git" -CN_USTREAMER_BRANCH="v5.57" +CN_USTREAMER_BRANCH="v6.9" CN_CAMERA_STREAMER_REPO="https://github.com/ayufan/camera-streamer.git" CN_CAMERA_STREAMER_BRANCH="master" diff --git a/tools/libs/config.sh b/tools/libs/config.sh index 700e9af0..71fd62cb 100755 --- a/tools/libs/config.sh +++ b/tools/libs/config.sh @@ -36,7 +36,7 @@ import_config() { [[ -n "${CROWSNEST_LOG_PATH}" ]] || CROWSNEST_LOG_PATH="/home/${BASE_USER}/printer_data/logs" [[ -n "${CROWSNEST_ENV_PATH}" ]] || CROWSNEST_ENV_PATH="/home/${BASE_USER}/printer_data/systemd" [[ -n "${CROWSNEST_USTREAMER_REPO_SHIP}" ]] || CROWSNEST_USTREAMER_REPO_SHIP="https://github.com/pikvm/ustreamer.git" - [[ -n "${CROWSNEST_USTREAMER_REPO_BRANCH}" ]] || CROWSNEST_USTREAMER_REPO_BRANCH="v5.57" + [[ -n "${CROWSNEST_USTREAMER_REPO_BRANCH}" ]] || CROWSNEST_USTREAMER_REPO_BRANCH="v6.9" [[ -n "${CROWSNEST_CAMERA_STREAMER_REPO_SHIP}" ]] || CROWSNEST_CAMERA_STREAMER_REPO_SHIP="https://github.com/ayufan/camera-streamer.git" [[ -n "${CROWSNEST_CAMERA_STREAMER_REPO_BRANCH}" ]] || CROWSNEST_CAMERA_STREAMER_REPO_BRANCH="master" status_msg "Using default configuration ..." "0" From 74f43745a7e6a3fd6d48e0b3cef980ff092bdd26 Mon Sep 17 00:00:00 2001 From: Patrick Gehrsitz Date: Tue, 2 Apr 2024 16:10:43 +0200 Subject: [PATCH 3/3] chore: update ustreamer version Signed-off-by: Patrick Gehrsitz --- bin/build.sh | 2 +- tools/configure.sh | 2 +- tools/libs/config.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index 8552eae6..992d2f21 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -35,7 +35,7 @@ if [[ -z "${CROWSNEST_USTREAMER_REPO_SHIP}" ]]; then CROWSNEST_USTREAMER_REPO_SHIP="https://github.com/pikvm/ustreamer.git" fi if [[ -z "${CROWSNEST_USTREAMER_REPO_BRANCH}" ]]; then - CROWSNEST_USTREAMER_REPO_BRANCH="v6.9" + CROWSNEST_USTREAMER_REPO_BRANCH="v6.10" fi # Camera-streamer repo diff --git a/tools/configure.sh b/tools/configure.sh index 6615cb74..11c82467 100755 --- a/tools/configure.sh +++ b/tools/configure.sh @@ -27,7 +27,7 @@ CN_CONFIG_LOGPATH="${CN_CONFIG_ROOTPATH}/logs" CN_CONFIG_ENVPATH="${CN_CONFIG_ROOTPATH}/systemd" CN_MOONRAKER_CONFIG_PATH="${CN_CONFIG_CONFIGPATH}/moonraker.conf" CN_USTREAMER_REPO="https://github.com/pikvm/ustreamer.git" -CN_USTREAMER_BRANCH="v6.9" +CN_USTREAMER_BRANCH="v6.10" CN_CAMERA_STREAMER_REPO="https://github.com/ayufan/camera-streamer.git" CN_CAMERA_STREAMER_BRANCH="master" diff --git a/tools/libs/config.sh b/tools/libs/config.sh index 71fd62cb..6f9419bc 100755 --- a/tools/libs/config.sh +++ b/tools/libs/config.sh @@ -36,7 +36,7 @@ import_config() { [[ -n "${CROWSNEST_LOG_PATH}" ]] || CROWSNEST_LOG_PATH="/home/${BASE_USER}/printer_data/logs" [[ -n "${CROWSNEST_ENV_PATH}" ]] || CROWSNEST_ENV_PATH="/home/${BASE_USER}/printer_data/systemd" [[ -n "${CROWSNEST_USTREAMER_REPO_SHIP}" ]] || CROWSNEST_USTREAMER_REPO_SHIP="https://github.com/pikvm/ustreamer.git" - [[ -n "${CROWSNEST_USTREAMER_REPO_BRANCH}" ]] || CROWSNEST_USTREAMER_REPO_BRANCH="v6.9" + [[ -n "${CROWSNEST_USTREAMER_REPO_BRANCH}" ]] || CROWSNEST_USTREAMER_REPO_BRANCH="v6.10" [[ -n "${CROWSNEST_CAMERA_STREAMER_REPO_SHIP}" ]] || CROWSNEST_CAMERA_STREAMER_REPO_SHIP="https://github.com/ayufan/camera-streamer.git" [[ -n "${CROWSNEST_CAMERA_STREAMER_REPO_BRANCH}" ]] || CROWSNEST_CAMERA_STREAMER_REPO_BRANCH="master" status_msg "Using default configuration ..." "0"