From 5884fd453dfc11e9e30ef1ebe02bec2aa7026fbd Mon Sep 17 00:00:00 2001 From: Botspot Date: Fri, 2 Jul 2021 16:42:11 -0500 Subject: [PATCH] OBS Studio: script cleanup --- apps/OBS Studio/install-32 | 17 +++++++---------- apps/OBS Studio/install-64 | 17 +++++++---------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/apps/OBS Studio/install-32 b/apps/OBS Studio/install-32 index e051af0..3922399 100755 --- a/apps/OBS Studio/install-32 +++ b/apps/OBS Studio/install-32 @@ -7,27 +7,24 @@ function error { exit 1 } -"${DIRECTORY}/pkg-install" "libmbedtls-dev libasound2-dev libavcodec-dev libavdevice-dev libavfilter-dev libavformat-dev libavutil-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev libgl1-mesa-dev libjack-jackd2-dev libjansson-dev libluajit-5.1-dev libpulse-dev libqt5x11extras5-dev libspeexdsp-dev libswresample-dev libswscale-dev libudev-dev libv4l-dev libvlc-dev libx11-dev libx11-xcb1 libx11-xcb-dev libxcb-xinput0 libxcb-xinput-dev libxcb-randr0 libxcb-randr0-dev libxcb-xfixes0 libxcb-xfixes0-dev libx264-dev libxcb-shm0-dev libxcb-xinerama0-dev libxcomposite-dev libxinerama-dev pkg-config python3-dev qtbase5-dev libqt5svg5-dev swig libxcb* " "$(dirname "$0")" || exit 1 - -#Removing Deb files if already downloaded +#Remove deb files if already downloaded rm -f ~/libfdk-aac2_2.0.1-1_armhf.deb ~/libfdk-aac-dev_2.0.1-1_armhf.deb ~/obs_armhf.deb -#Downloading deb files +#Download deb files wget http://ftp.debian.org/debian/pool/non-free/f/fdk-aac/libfdk-aac2_2.0.1-1_armhf.deb -O ~/libfdk-aac2_2.0.1-1_armhf.deb || error "Failed to download libfdk-aac2_2.0.1-1_armhf.deb" wget http://ftp.debian.org/debian/pool/non-free/f/fdk-aac/libfdk-aac-dev_2.0.1-1_armhf.deb -O ~/libfdk-aac-dev_2.0.1-1_armhf.deb || error "Failed to download libfdk-aac-dev_2.0.1-1_armhf.deb" wget https://github.com/techcoder20/RPIObsInstaller/blob/main/obs_armhf.deb?raw=true -O ~/obs_armhf.deb || error "Failed to download obs_armhf.deb" -#Installing Deb Files -sudo apt -y install --fix-missing ~/libfdk-aac2_2.0.1-1_armhf.deb || error "Failed to install ~/libfdk-aac2_2.0.1-1_armhf.deb" -sudo apt -y install --fix-missing ~/libfdk-aac-dev_2.0.1-1_armhf.deb || error "Failed to install ~/libfdk-aac-dev_2.0.1-1_armhf.deb" -sudo apt -y install --fix-missing ~/obs_armhf.deb || error "Failed to install ~/obs_armhf.deb" +#Install all debs. Local dependencies, obs_armhf.deb, normal dependencies, and libxcb* +"${DIRECTORY}/pkg-install" "$HOME/obs_armhf.deb $HOME/libfdk-aac2_2.0.1-1_armhf.deb $HOME/libfdk-aac-dev_2.0.1-1_armhf.deb libmbedtls-dev libasound2-dev libavcodec-dev libavdevice-dev libavfilter-dev libavformat-dev libavutil-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev libgl1-mesa-dev libjack-jackd2-dev libjansson-dev libluajit-5.1-dev libpulse-dev libqt5x11extras5-dev libspeexdsp-dev libswresample-dev libswscale-dev libudev-dev libv4l-dev libvlc-dev libx11-dev libx11-xcb1 libx11-xcb-dev libxcb-xinput0 libxcb-xinput-dev libxcb-randr0 libxcb-randr0-dev libxcb-xfixes0 libxcb-xfixes0-dev libx264-dev libxcb-shm0-dev libxcb-xinerama0-dev libxcomposite-dev libxinerama-dev pkg-config python3-dev qtbase5-dev libqt5svg5-dev swig libxcb* " "$(dirname "$0")" || exit 1 -#Removing deb files after installation +#Remove deb files after installation sudo rm -f ~/libfdk-aac2_2.0.1-1_armhf.deb ~/libfdk-aac-dev_2.0.1-1_armhf.deb ~/obs_armhf.deb +#Create workaround wrapper script to override MESA_GL_VERSION sudo mv /usr/bin/obs /usr/bin/obs-exec echo '#!/bin/bash -MESA_GL_VERSION_OVERRIDE=3.3 /usr/bin/obs-exec' | sudo tee /usr/bin/obs >/dev/null +MESA_GL_VERSION_OVERRIDE=3.3 /usr/bin/obs-exec "$@"' | sudo tee /usr/bin/obs >/dev/null sudo chmod +x /usr/bin/obs diff --git a/apps/OBS Studio/install-64 b/apps/OBS Studio/install-64 index 6ea3a64..c61f985 100755 --- a/apps/OBS Studio/install-64 +++ b/apps/OBS Studio/install-64 @@ -7,27 +7,24 @@ function error { exit 1 } -"${DIRECTORY}/pkg-install" "libmbedtls-dev libasound2-dev libavcodec-dev libavdevice-dev libavfilter-dev libavformat-dev libavutil-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev libgl1-mesa-dev libjack-jackd2-dev libjansson-dev libluajit-5.1-dev libpulse-dev libqt5x11extras5-dev libspeexdsp-dev libswresample-dev libswscale-dev libudev-dev libv4l-dev libvlc-dev libx11-dev libx11-xcb1 libx11-xcb-dev libxcb-xinput0 libxcb-xinput-dev libxcb-randr0 libxcb-randr0-dev libxcb-xfixes0 libxcb-xfixes0-dev libx264-dev libxcb-shm0-dev libxcb-xinerama0-dev libxcomposite-dev libxinerama-dev pkg-config python3-dev qtbase5-dev libqt5svg5-dev swig libxcb* " "$(dirname "$0")" || exit 1 - -#Removing Deb files if already downloaded +#Remove deb files if already downloaded rm -f ~/libfdk-aac2_2.0.1-1_arm64.deb ~/libfdk-aac-dev_2.0.1-1_arm64.deb ~/obs_arm64.deb -#Downloading deb files +#Download deb files wget http://ftp.debian.org/debian/pool/non-free/f/fdk-aac/libfdk-aac2_2.0.1-1_arm64.deb -O ~/libfdk-aac2_2.0.1-1_arm64.deb || error "Failed to download libfdk-aac2_2.0.1-1_arm64.deb" wget http://ftp.debian.org/debian/pool/non-free/f/fdk-aac/libfdk-aac-dev_2.0.1-1_arm64.deb -O ~/libfdk-aac-dev_2.0.1-1_arm64.deb || error "Failed to download libfdk-aac-dev_2.0.1-1_arm64.deb" wget https://github.com/techcoder20/RPIObsInstaller/blob/main/obs_arm64.deb?raw=true -O ~/obs_arm64.deb || error "Failed to download obs_arm64.deb" -#Installing Deb Files -sudo apt -y install --fix-missing ~/libfdk-aac2_2.0.1-1_arm64.deb || error "Failed to install ~/libfdk-aac2_2.0.1-1_arm64.deb" -sudo apt -y install --fix-missing ~/libfdk-aac-dev_2.0.1-1_arm64.deb || error "Failed to install ~/libfdk-aac-dev_2.0.1-1_arm64.deb" -sudo apt -y install --fix-missing ~/obs_arm64.deb || error "Failed to install ~/obs_arm64.deb" +#Install all debs. Local dependencies, obs_armhf.deb, normal dependencies, and libxcb* +"${DIRECTORY}/pkg-install" "$HOME/obs_arm64.deb $HOME/libfdk-aac2_2.0.1-1_arm64.deb $HOME/libfdk-aac-dev_2.0.1-1_arm64.deb libmbedtls-dev libasound2-dev libavcodec-dev libavdevice-dev libavfilter-dev libavformat-dev libavutil-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev libgl1-mesa-dev libjack-jackd2-dev libjansson-dev libluajit-5.1-dev libpulse-dev libqt5x11extras5-dev libspeexdsp-dev libswresample-dev libswscale-dev libudev-dev libv4l-dev libvlc-dev libx11-dev libx11-xcb1 libx11-xcb-dev libxcb-xinput0 libxcb-xinput-dev libxcb-randr0 libxcb-randr0-dev libxcb-xfixes0 libxcb-xfixes0-dev libx264-dev libxcb-shm0-dev libxcb-xinerama0-dev libxcomposite-dev libxinerama-dev pkg-config python3-dev qtbase5-dev libqt5svg5-dev swig libxcb* " "$(dirname "$0")" || exit 1 -#Removing deb files after installation +#Remove deb files after installation sudo rm -f ~/libfdk-aac2_2.0.1-1_arm64.deb ~/libfdk-aac-dev_2.0.1-1_arm64.deb ~/obs_arm64.deb +#Create workaround wrapper script to override MESA_GL_VERSION sudo mv /usr/bin/obs /usr/bin/obs-exec echo '#!/bin/bash -MESA_GL_VERSION_OVERRIDE=3.3 /usr/bin/obs-exec' | sudo tee /usr/bin/obs >/dev/null +MESA_GL_VERSION_OVERRIDE=3.3 /usr/bin/obs-exec "$@"' | sudo tee /usr/bin/obs >/dev/null sudo chmod +x /usr/bin/obs