feat: update to OBS Studio 30.0.0 and uplift assorted plugins

README.md

@@ -34,13 +34,13 @@ Running OBS Studio in Portable Mode means all settings (Profiles and Scene Colle
 
 ## Supported Software
 
-|                        | OBS Studio 29 | OBS Studio 30 |
-| ---------------------- | ------------- | ------------- |
-| Ubuntu 20.04 (Focal)   | 29.1.3 (Qt 5) | EOL           |
-| Ubuntu 22.04 (Jammy)   | 29.1.3 (Qt 6) | 30.0.0-rc1    |
-| Ubuntu 23.04 (Lunar)   | 29.1.3 (Qt 6) | 30.0.0-rc1    |
-| Ubuntu 23.10 (Mantic)  | 29.1.3 (Qt 6) | 30.0.0-rc1    |
-| Plugins                | 54            | 52            |
+|                        | OBS Studio 30 |
+| ---------------------- | ------------- |
+| Ubuntu 20.04 (Focal)   | EOL           |
+| Ubuntu 22.04 (Jammy)   | 30.0.0        |
+| Ubuntu 23.04 (Lunar)   | 30.0.0        |
+| Ubuntu 23.10 (Mantic)  | 30.0.0        |
+| Plugins                | 52            |
 
 # Install
 
@@ -58,11 +58,11 @@ The installation process is simple:
   - **You must use the `obs-portable` launcher** to ensure OBS Studio finds all the associated libraries and add-ons.
 
 ```bash
-wget "https://github.com/wimpysworld/obs-studio-portable/releases/download/r23287/obs-portable-29.1.3-r23287-ubuntu-$(lsb_release -rs).tar.bz2"
-wget "https://github.com/wimpysworld/obs-studio-portable/releases/download/r23287/obs-portable-29.1.3-r23287-ubuntu-$(lsb_release -rs).tar.bz2.sha256"
-sha256sum -c obs-portable-29.1.3-r23287-ubuntu-$(lsb_release -rs).tar.bz2.sha256
-tar xvf obs-portable-29.1.3-r23287-ubuntu-$(lsb_release -rs).tar.bz2
-cd obs-portable-29.1.3-r23287-ubuntu-$(lsb_release -rs)
+wget "https://github.com/wimpysworld/obs-studio-portable/releases/download/r23316/obs-portable-30.0.0-r23316-ubuntu-$(lsb_release -rs).tar.bz2"
+wget "https://github.com/wimpysworld/obs-studio-portable/releases/download/r23316/obs-portable-30.0.0-r23316-ubuntu-$(lsb_release -rs).tar.bz2.sha256"
+sha256sum -c obs-portable-30.0.0-r23316-ubuntu-$(lsb_release -rs).tar.bz2.sha256
+tar xvf obs-portable-30.0.0-r23316-ubuntu-$(lsb_release -rs).tar.bz2
+cd obs-portable-30.0.0-r23316-ubuntu-$(lsb_release -rs)
 sudo ./obs-dependencies
 ./obs-portable
 ```
@@ -137,9 +137,9 @@ For example:
 ```bash
 mkdir ~/OBS-Studio-again
 cd ~/OBS-Studio-again
-wget "https://github.com/wimpysworld/obs-studio-portable/releases/download/r23287/obs-portable-29.1.3-r23287-ubuntu-$(lsb_release -rs).tar.bz2"
-tar xvf obs-portable-29.1.3-r23287-ubuntu-$(lsb_release -rs).tar.bz2
-cd obs-portable-29.1.3-r23287-ubuntu-$(lsb_release -rs)
+wget "https://github.com/wimpysworld/obs-studio-portable/releases/download/r23316/obs-portable-30.0.0-r23316-ubuntu-$(lsb_release -rs).tar.bz2"
+tar xvf obs-portable-30.0.0-r23316-ubuntu-$(lsb_release -rs).tar.bz2
+cd obs-portable-30.0.0-r23316-ubuntu-$(lsb_release -rs)
 ```
 
 To launch the second instance of OBS Studio Portable in Distrobox, run the following command:
@@ -329,13 +329,13 @@ The actual build script, [`obs-build.sh`](builder/obs-build.sh), gets injected i
 
 ## Release numbers
 
-An OBS Studio Portable for Linux release number will be something like r23287, and the filename will indicate the version of OBS Studio and which Ubuntu release it is for:
+An OBS Studio Portable for Linux release number will be something like r23316, and the filename will indicate the version of OBS Studio and which Ubuntu release it is for:
 
 ```text
                      +-- OBS Portable for Ubuntu revision
                      |
                      v
-obs-portable-29.1.3-r23287-ubuntu-22.04.tar.bz2
+obs-portable-30.0.0-r23316-ubuntu-22.04.tar.bz2
               ^                    ^
               |                    |
               +-- OBS version      +-- Supported Ubuntu release

build-config

@@ -1,2 +1,2 @@
-TARGETABLE_DISTROS=("mantic" "lunar" "jammy" "focal")
-TARGETABLE_VERSIONS=("30.0.0-rc2" "29.1.3")
+TARGETABLE_DISTROS=("mantic" "lunar" "jammy")
+TARGETABLE_VERSIONS=("30.0.0")

builder/obs-build.sh

@@ -186,11 +186,12 @@ libudev-dev libv4l-dev libva-dev libvlc-dev"
     fi
 
     # Screne Switcher
-    PKG_LIST+=" libopencv-dev libxss-dev libxtst-dev"
-    case "${DISTRO_CMP_VER}" in
-        23*) PKG_LIST+=" libproc2-dev";;
-        *)   PKG_LIST+=" libprocps-dev";;
-    esac
+    PKG_LIST+=" libleptonica-dev libopencv-dev libtesseract-dev libxss-dev libxtst-dev"
+    if [ "${DISTRO_CMP_VER}" -ge 2304 ]; then
+        PKG_LIST+=" libproc2-dev"
+    else
+        PKG_LIST+=" libprocps-dev"
+    fi
 
     # Waveform
     PKG_LIST+=" libfftw3-dev"
@@ -212,6 +213,11 @@ libudev-dev libv4l-dev libva-dev libvlc-dev"
         PKG_LIST+=" libidn2-dev libpsl-dev libpugixml-dev libssl-dev"
     fi
 
+    if [ "${DISTRO_CMP_VER}" -ge 2304 ]; then
+        # Rewards Theatre
+        PKG_LIST+=" libboost-json1.81-dev libboost-url1.81-dev"
+    fi
+
     apt-get -y update
     apt-get -y upgrade
     #shellcheck disable=SC2086
@@ -361,6 +367,14 @@ function stage_06_plugins() {
             fi
         fi
 
+        # Rewards Theatre requires libboost 1.81, which first appeared in Ubuntu 23.04
+        if [ "${DISTRO_CMP_VER}" -lt 2304 ]; then
+            if [ "${PLUGIN}" == " RewardsTheater" ]; then
+                echo "Skipping ${PLUGIN} (not supported on ${DISTRO} ${DISTRO_VER})"
+                continue
+            fi
+        fi
+
         clone_source "${URL}.git" "${BRANCH}" "${DIR_PLUGIN}/${PLUGIN}"
 
         ERROR=""
@@ -615,10 +629,11 @@ function stage_09_make_scripts() {
 }
 
 function stage_10_make_tarball() {
+    local DIR_TARBALL="$(basename ${DIR_INSTALL})"
     cd "${DIR_BASE}"
-    tar cjf "${DIR_INSTALL}.tar.bz2" --exclude cmake --exclude include --exclude lib/pkgconfig "${DIR_INSTALL}"
-    sha256sum "${DIR_INSTALL}.tar.bz2" > "${DIR_INSTALL}.tar.bz2.sha256"
-    sed -i -r "s/ .*\/(.+)/  \1/g" "${DIR_INSTALL}.tar.bz2.sha256"
+    tar cjf "${DIR_TARBALL}.tar.bz2" --exclude cmake --exclude include --exclude lib/pkgconfig "${DIR_TARBALL}"
+    sha256sum "${DIR_TARBALL}.tar.bz2" > "${DIR_TARBALL}.tar.bz2.sha256"
+    sed -i -r "s/ .*\/(.+)/  \1/g" "${DIR_TARBALL}.tar.bz2.sha256"
 }
 
 stage_01_get_apt

builder/plugins-29.csv

@@ -16,12 +16,12 @@ https://github.com/exeldro/obs-freeze-filter,be6770fa822a6cf45d9537ad2801e093b75
 https://github.com/exeldro/obs-gradient-source,0.3.2,essential
 https://github.com/exeldro/obs-markdown,8b5c5fcd6d13d732e404a982399e0f30037a4ed8,essential
 https://github.com/exeldro/obs-media-controls,0ca9daadd55edf090ef07b8ebf29fd275a307a6c,auxiliary
-https://github.com/exeldro/obs-move-transition,07d625455f92d724cc74e8ee8c5cb187179989f1,essential
+https://github.com/exeldro/obs-move-transition,2.9.6,essential
 https://github.com/exeldro/obs-recursion-effect,bf726d0a3e9429c8c447fc1d87b3a932b2a6ad90,auxiliary
 https://github.com/exeldro/obs-replay-source,1.6.12,auxiliary
 https://github.com/exeldro/obs-scene-collection-manager,0.0.8,disabled
-https://github.com/exeldro/obs-scene-notes-dock,5d2b3eceaa60ecbd617fa0b9a3976b2191753968,auxiliary
-https://github.com/exeldro/obs-shaderfilter,2.1.1,essential
+https://github.com/exeldro/obs-scene-notes-dock,0.2.0,auxiliary
+https://github.com/exeldro/obs-shaderfilter,2.1.3,essential
 https://github.com/exeldro/obs-source-clone,87fe2720c2ef610c24335ea65709e5f0a68c5d56,essential
 https://github.com/exeldro/obs-source-copy,0.2.2,auxiliary
 https://github.com/exeldro/obs-source-dock,0.3.6,auxiliary
@@ -32,6 +32,7 @@ https://github.com/exeldro/obs-transition-table,0.2.7,essential
 https://github.com/fzwoch/obs-gstreamer,v0.4.0,essential
 https://github.com/fzwoch/obs-teleport,0.6.6,essential
 https://github.com/fzwoch/obs-vaapi,0.4.0,essential
+https://github.com/gottagofaster236/RewardsTheater,1.0.5,disabled
 https://github.com/iamscottxu/obs-rtspserver,v3.0.0,disabled
 https://github.com/norihiro/obs-async-source-duplication,0.4.1,disabled
 https://github.com/norihiro/obs-audio-pan-filter,0.2.3,auxiliary
@@ -43,15 +44,15 @@ https://github.com/norihiro/obs-mute-filter,0.2.2,essential
 https://github.com/norihiro/obs-text-pthread,2.0.2,essential
 https://github.com/nowrep/obs-vkcapture,v1.4.3,auxiliary
 https://github.com/obs-ai/obs-backgroundremoval,1.1.7,auxiliary
-https://github.com/obs-ai/obs-localvocal,0.0.5,essential
+https://github.com/obs-ai/obs-localvocal,0.0.6,essential
 https://github.com/obs-ai/obs-urlsource,0.2.0,essential
 https://github.com/obs-ndi/obs-ndi,4.11.1,auxiliary
 https://github.com/obsproject/obs-websocket,4.9.1-compat,essential
 https://github.com/phandasm/waveform,v1.7.0,essential
 https://github.com/univrsal/tuna,v1.9.7,essential
 https://github.com/wimpysworld/obs-dvd-screensaver,0.0.2,essential
 https://github.com/wimpysworld/obs-rgb-levels,1.0.2,essential
-https://github.com/FiniteSingularity/obs-advanced-masks,v0.0.2a,essential
+https://github.com/FiniteSingularity/obs-advanced-masks,v0.0.6a,essential
 https://github.com/FiniteSingularity/obs-composite-blur,v1.0.6,essential
 https://github.com/FiniteSingularity/obs-stroke-glow-shadow,v1.0.2,essential
 https://github.com/WarmUpTill/SceneSwitcher,1.23.1,essential

builder/plugins-30.csv

@@ -16,12 +16,12 @@ https://github.com/exeldro/obs-freeze-filter,be6770fa822a6cf45d9537ad2801e093b75
 https://github.com/exeldro/obs-gradient-source,0.3.2,essential
 https://github.com/exeldro/obs-markdown,8b5c5fcd6d13d732e404a982399e0f30037a4ed8,essential
 https://github.com/exeldro/obs-media-controls,0ca9daadd55edf090ef07b8ebf29fd275a307a6c,auxiliary
-https://github.com/exeldro/obs-move-transition,07d625455f92d724cc74e8ee8c5cb187179989f1,essential
+https://github.com/exeldro/obs-move-transition,2.9.6,essential
 https://github.com/exeldro/obs-recursion-effect,bf726d0a3e9429c8c447fc1d87b3a932b2a6ad90,auxiliary
 https://github.com/exeldro/obs-replay-source,1.6.12,auxiliary
 https://github.com/exeldro/obs-scene-collection-manager,0.0.8,disabled
-https://github.com/exeldro/obs-scene-notes-dock,5d2b3eceaa60ecbd617fa0b9a3976b2191753968,auxiliary
-https://github.com/exeldro/obs-shaderfilter,2.1.1,essential
+https://github.com/exeldro/obs-scene-notes-dock,0.2.0,auxiliary
+https://github.com/exeldro/obs-shaderfilter,2.1.3,essential
 https://github.com/exeldro/obs-source-clone,87fe2720c2ef610c24335ea65709e5f0a68c5d56,essential
 https://github.com/exeldro/obs-source-copy,0.2.2,auxiliary
 https://github.com/exeldro/obs-source-dock,0.3.6,auxiliary
@@ -32,6 +32,7 @@ https://github.com/exeldro/obs-transition-table,0.2.7,essential
 https://github.com/fzwoch/obs-gstreamer,v0.4.0,essential
 https://github.com/fzwoch/obs-teleport,0.6.6,essential
 https://github.com/fzwoch/obs-vaapi,0.4.0,essential
+https://github.com/gottagofaster236/RewardsTheater,1.0.5,disabled
 https://github.com/iamscottxu/obs-rtspserver,v3.0.0,disabled
 https://github.com/norihiro/obs-async-source-duplication,0.4.1,disabled
 https://github.com/norihiro/obs-audio-pan-filter,0.2.3,auxiliary
@@ -43,15 +44,15 @@ https://github.com/norihiro/obs-mute-filter,0.2.2,essential
 https://github.com/norihiro/obs-text-pthread,2.0.2,essential
 https://github.com/nowrep/obs-vkcapture,v1.4.3,auxiliary
 https://github.com/obs-ai/obs-backgroundremoval,1.1.7,auxiliary
-https://github.com/obs-ai/obs-localvocal,0.0.5,essential
+https://github.com/obs-ai/obs-localvocal,0.0.6,essential
 https://github.com/obs-ai/obs-urlsource,0.2.0,essential
 https://github.com/obs-ndi/obs-ndi,4.11.1,auxiliary
 https://github.com/obsproject/obs-websocket,4.9.1-compat,essential
 https://github.com/phandasm/waveform,v1.7.0,essential
 https://github.com/univrsal/tuna,v1.9.7,disabled
 https://github.com/wimpysworld/obs-dvd-screensaver,0.0.2,essential
 https://github.com/wimpysworld/obs-rgb-levels,1.0.2,essential
-https://github.com/FiniteSingularity/obs-advanced-masks,v0.0.2a,essential
+https://github.com/FiniteSingularity/obs-advanced-masks,v0.0.6a,essential
 https://github.com/FiniteSingularity/obs-composite-blur,v1.0.6,essential
 https://github.com/FiniteSingularity/obs-stroke-glow-shadow,v1.0.2,essential
 https://github.com/WarmUpTill/SceneSwitcher,1.23.1,essential