sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Conner Clere (837571cbe218c003e9c80007fe8f369673bf2e6f)
- From: Conner Clere <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Conner Clere (837571cbe218c003e9c80007fe8f369673bf2e6f)
- Date: Thu, 14 Sep 2023 07:21:32 +0000
GIT changes to master grimoire by Conner Clere <xenanthropy AT sourcemage.org>:
video/obs-studio/BUILD | 11 +++
video/obs-studio/CONFIGURE | 1
video/obs-studio/DEPENDS | 131
+++++++++++++++++++++++++++++++--------------
video/obs-studio/DETAILS | 13 +++-
video/obs-studio/HISTORY | 9 +++
video/obs-studio/PRE_BUILD | 21 +++++++
6 files changed, 144 insertions(+), 42 deletions(-)
New commits:
commit 837571cbe218c003e9c80007fe8f369673bf2e6f
Author: Conner Clere <xenanthropy AT sourcemage.org>
Commit: Conner Clere <xenanthropy AT sourcemage.org>
video/obs-studio: version 29.1.3, reworked spell
Added 3 more sources (browser, websocket,websocket-qr) that are required
to build (regardless of if they're disabled...) also added missing
CONFIGURE for CMAKE_CONFIGURE. Fixed dependency flags and added these
optional deps: pipewire, vlc, qt6, luajit, python3, qt6svg, libxkbcommon
qtsvg, and qtquickcontrols. Missing hard dep jansson added.
added some flags in BUILD to disable some features (Browser and such
can't be enabled, didn't want to add the necessary CEF-browser stuff)
diff --git a/video/obs-studio/BUILD b/video/obs-studio/BUILD
index e7f1fbf..0fcd9a8 100755
--- a/video/obs-studio/BUILD
+++ b/video/obs-studio/BUILD
@@ -2,5 +2,14 @@
OPTS+=" -DOBS_VERSION_OVERRIDE=$VERSION" &&
# XXX obs-filters plugin can't build with -ffast-math
CFLAGS="${CFLAGS//-ffast-math}" &&
-OPTS+=' -DBUILD_BROWSER=OFF -DBUILD_VST=OFF' &&
+OPTS+=' -DENABLE_NEW_MPEGTS_OUTPUT=OFF -DENABLE_BROWSER=OFF \
+ -DENABLE_WEBSOCKET=NO -DENABLE_VST=ON -DENABLE_AJA=OFF' &&
+
+if ! is_depends_enabled $SPELL python3 && ! is_depends_enabled $SPELL
luajit; then
+ OPTS="-DENABLE_SCRIPTING=OFF $OPTS"
+fi &&
+
+if is_depends_enabled $SPELL qt6base; then
+ OPTS="Qt6_DIR=/opt/qt6/cmake/Qt6 $OPTS"
+fi &&
default_build
diff --git a/video/obs-studio/CONFIGURE b/video/obs-studio/CONFIGURE
new file mode 100755
index 0000000..90942b1
--- /dev/null
+++ b/video/obs-studio/CONFIGURE
@@ -0,0 +1 @@
+. "${GRIMOIRE}/CMAKE_CONFIGURE"
diff --git a/video/obs-studio/DEPENDS b/video/obs-studio/DEPENDS
index 35adccf..23a07d5 100755
--- a/video/obs-studio/DEPENDS
+++ b/video/obs-studio/DEPENDS
@@ -1,45 +1,98 @@
. "$GRIMOIRE"/CMAKE_DEPENDS &&
-depends LIBAVCODEC &&
-depends OPENGL &&
-depends curl &&
-depends libxcb &&
-depends qtbase &&
-depends x264 &&
-optional_depends JACK-DRIVER \
- '' -DDISABLE_JACK=1 \
- 'for JACK audio support' &&
-optional_depends LIBPULSE \
- '' -DDISABLE_PULSEAUDIO=1 \
- 'for PulseAudio support' &&
-optional_depends alsa-lib \
- '' -DDISABLE_ALSA=1 \
- 'for ALSA audio support' &&
-optional_depends glib2 \
- '' '' \
- 'for D-Bus and XDG portal support' &&
-optional_depends imagemagick \
- -DLIBOBS_PREFER_IMAGEMAGICK={1,0} \
- 'prefer ImageMagick over ffmpeg for image loading' &&
-optional_depends mbedtls \
- -DWITH_RTMPS={1,0} \
- 'for mbedtls support' &&
+depends LIBAVCODEC &&
+depends OPENGL &&
+depends curl &&
+depends libxcb &&
+depends x264 &&
+depends jansson &&
+
+optional_depends qt6base \
+ '-DQT_VERSION=6' \
+ '-DQT_VERSION=5' \
+ 'for qt6 support (uses qt5 otherwise)' &&
+
+if ! is_depends_enabled $SPELL qt6base; then
+ depends qtbase &&
+ depends qtsvg &&
+ depends qtquickcontrols
+else
+ depends qt6svg &&
+ depends libxkbcommon
+fi &&
+
+optional_depends luajit \
+ '-DENABLE_SCRIPTING_LUA=ON' \
+ '-DENABLE_SCRIPTING_LUA=OFF' \
+ 'for lua script support' &&
+
+optional_depends python3 \
+ '-DENABLE_SCRIPTING_PYTHON=ON' \
+ '-DENABLE_SCRIPTING_PYTHON=OFF' \
+ 'for python script support' &&
+
+if is_depends_enabled $SPELL luajit || is_depends_enabled $SPELL python3;
then
+ depends swig '-DENABLE_SCRIPTING=ON'
+fi &&
+
+optional_depends JACK-DRIVER \
+ '-DENABLE_JACK=ON' \
+ '-DENABLE_JACK=OFF' \
+ 'for JACK audio support' &&
+
+optional_depends LIBPULSE \
+ '-DENABLE_PULSEAUDIO=ON' \
+ '-DENABLE_PULSEAUDIO=OFF' \
+ 'for PulseAudio support' &&
+
+optional_depends alsa-lib \
+ '-DENABLE_ALSA=ON' \
+ '-DENABLE_ALSA=OFF' \
+ 'for ALSA audio support' &&
+
+optional_depends pipewire \
+ '-DENABLE_PIPEWIRE=ON' \
+ '-DENABLE_PIPEWIRE=OFF' \
+ 'for pipewire support' &&
+
+optional_depends glib2 '' '' 'for D-Bus & XDG portal support' &&
+
+optional_depends mbedtls \
+ '-DENABLE_RTMPS=ON' \
+ '-DENABLE_RTMPS=OFF' \
+ 'for mbedtls support' &&
+
if is_depends_enabled "$SPELL" mbedtls; then
depends zlib
fi &&
-optional_depends speexdsp \
- '' -DDISABLE_SPEEXDSP=1 \
- 'for SpeexDSP-based noise suppression filter' &&
-optional_depends v4l-utils \
- '' -DDISABLE_V4L2=1 \
- 'for V4L device support' &&
+
+optional_depends vlc \
+ '-DENABLE_VLC=ON' \
+ '-DENABLE_VLC=OFF' \
+ 'for VLC support' &&
+
+optional_depends speexdsp \
+ '-DENABLE_SPEEXDSP=ON' \
+ '-DENABLE_SPEEXDSP=OFF' \
+ 'for SpeexDSP-based noise suppression filter' &&
+
+optional_depends v4l-utils \
+ '-DENABLE_V4L2=ON' \
+ '-DENABLE_V4L2=OFF' \
+ 'for V4L device support' &&
+
if is_depends_enabled "$SPELL" v4l-utils; then
- optional_depends DEVICE-MANAGER \
- '' -DDISABLE_UDEV=1 \
- 'for device hotplug support in V4L plugin'
+ optional_depends DEVICE-MANAGER \
+ '-DENABLE_UDEV=ON' \
+ '-DENABLE_UDEV=OFF' \
+ 'for device hotplug support in V4L plugin'
fi &&
-optional_depends sndio \
- '' -DDISABLE_SNDIO=1 \
- 'for Sndio audio support' &&
-optional_depends wayland \
- -DENABLE_WAYLAND={1,0} \
- 'for Wayland support'
+
+optional_depends sndio \
+ '-DENABLE_SNDIO=ON' \
+ '-DENABLE_SNDIO=OFF' \
+ 'for Sndio audio support' &&
+
+optional_depends wayland \
+ '-DENABLE_WAYLAND=ON' \
+ '-DENABLE_WAYLAND=OFF' \
+ 'enable wayland support'
diff --git a/video/obs-studio/DETAILS b/video/obs-studio/DETAILS
index 7ca1fb5..fc8977f 100755
--- a/video/obs-studio/DETAILS
+++ b/video/obs-studio/DETAILS
@@ -1,10 +1,19 @@
. "$GRIMOIRE"/CMAKE_FUNCTIONS
SPELL=obs-studio
- VERSION=27.1.3
+ VERSION=29.1.3
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE_URL[0]=https://github.com/obsproject/$SPELL/archive/refs/tags/$VERSION.tar.gz
-
SOURCE_HASH=sha512:04c11c79e3b091aa9ea8fc6674c9fbcaa1c924fe049f68e9be63f63724c31305d6e4fb33aecdd4d0095d20013e2ee188983f6938b175257368d2260681c2fb39
+
SOURCE_HASH=sha512:563a9b71ebe273b604807b9c43be8bde58fb326e8a0b741afb84a481a99176c96bf63da2aa26b6dcc026573b7fb0bf53e0a296e2db0b93c28f0d4710cd7cf019
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+
SOURCE2="obs-browser-594115a27d40f0916e55db97cb61f7c7130cbe28.tar.gz"
+
SOURCE2_URL[0]=https://github.com/obsproject/obs-browser/archive/594115a27d40f0916e55db97cb61f7c7130cbe28.tar.gz
+
SOURCE2_HASH=sha512:ff1e5cbe76a1a4a7224b1b01f0f45df51dd60c7426a73008a744fb17be3e4c7a96dd3833f237a480dd4ec2dd3e544d847aced2256453919d8442f7857354afb2
+ SOURCE3="obs-websocket-6fd18a7ef1ecb149e8444154af1daab61d4241a9"
+
SOURCE3_URL[0]=https://github.com/obsproject/obs-websocket/archive/6fd18a7ef1ecb149e8444154af1daab61d4241a9.tar.gz
+
SOURCE3_HASH=sha512:94defd55e4a4dc65b4366d2e92c9604cff67cba2b24ed67d53fbd492605f339201e4d3896789c0ccb84b6fbff4b37be70475524fec5ca2b42f7b59b8596ce828
+ SOURCE4="qr-8518684c0f33d004fa93971be2c6a8eca3167d1e.tar.gz"
+
SOURCE4_URL[0]=https://github.com/nayuki/QR-Code-generator/archive/8518684c0f33d004fa93971be2c6a8eca3167d1e.tar.gz
+
SOURCE4_HASH=sha512:ba298de89411fecc8db3dc10850485da01f5183d68b6d91ea91a9e28c1f104eb110adbf143a37e5d1856abbba5d309ab8329a6359ca7225bacb033d8044fa72c
WEB_SITE="https://obsproject.com/";
LICENSE[0]="GPL-2.0-or-later"
ENTERED=20210904
diff --git a/video/obs-studio/HISTORY b/video/obs-studio/HISTORY
index 4303a3c..477086a 100644
--- a/video/obs-studio/HISTORY
+++ b/video/obs-studio/HISTORY
@@ -1,3 +1,12 @@
+2023-09-03 Conner Clere <xenanthropy AT sourcemage.org>
+ * DETAILS: version 29.1.3, add browser/websocket/websocket-qr sources
+ * DEPENDS: update dependency flags; add pipewire, vlc, qt6, luajit,
python
+ qt6svg, libxkbcommon, qtsvg, qtquickcontrols, optional deps
+ added jansson hard dep; remove qtbase dep if qt6base is enabled
+ * CONFIGURE: added for missing CMAKE_CONFIGURE
+ * BUILD: update existing flags, disable unsupported features
+ * PRE_BUILD: added, unpacking added plugin sources
+
2021-10-14 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 27.1.3
diff --git a/video/obs-studio/PRE_BUILD b/video/obs-studio/PRE_BUILD
new file mode 100755
index 0000000..eb5b7ed
--- /dev/null
+++ b/video/obs-studio/PRE_BUILD
@@ -0,0 +1,21 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}/plugins" &&
+
+rm -d "${SOURCE_DIRECTORY}/plugins/obs-browser" &&
+unpack_file 2 &&
+mv obs-browser-594115a27d40f0916e55db97cb61f7c7130cbe28 obs-browser &&
+
+rm -d "${SOURCE_DIRECTORY}/plugins/obs-websocket" &&
+unpack_file 3 &&
+mv obs-websocket-6fd18a7ef1ecb149e8444154af1daab61d4241a9 obs-websocket &&
+
+rm -d "${SOURCE_DIRECTORY}/plugins/obs-websocket/deps/qr" &&
+cd "${SOURCE_DIRECTORY}/plugins/obs-websocket/deps/" &&
+unpack_file 4 &&
+mv QR-Code-generator-8518684c0f33d004fa93971be2c6a8eca3167d1e qr &&
+
+if is_depends_enabled $SPELL qt6base; then
+ cd "${SOURCE_DIRECTORY}" &&
+ sed -i 's#Exec=obs#Exec=env LD_LIBRARY_PATH=/opt/qt6/lib:$LD_LIBRARY_PATH
obs#' \
+ UI/xdg-data/com.obsproject.Studio.desktop
+fi
- [SM-Commit] GIT changes to master grimoire by Conner Clere (837571cbe218c003e9c80007fe8f369673bf2e6f), Conner Clere, 09/14/2023
Archive powered by MHonArc 2.6.24.