Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (17569abab914ce5e75beb5bcde4a88243bfac75a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (17569abab914ce5e75beb5bcde4a88243bfac75a)
  • Date: Sun, 23 Jun 2024 16:22:18 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

video/obs-studio/BUILD
| 4 -
video/obs-studio/DEPENDS
| 28 ++++----
video/obs-studio/DETAILS
| 4 -
video/obs-studio/HISTORY
| 8 ++
video/obs-studio/PRE_BUILD
| 5 +

video/obs-studio/patches/0001-rnnoise-Fix-compilation-not-working-on-latest-gcc.patch
| 35 ++++++++++
6 files changed, 65 insertions(+), 19 deletions(-)

New commits:
commit 17569abab914ce5e75beb5bcde4a88243bfac75a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

obs-studio 30.1.2

diff --git a/video/obs-studio/BUILD b/video/obs-studio/BUILD
index 0fcd9a8..4899313 100755
--- a/video/obs-studio/BUILD
+++ b/video/obs-studio/BUILD
@@ -9,7 +9,5 @@ if ! is_depends_enabled $SPELL python3 && !
is_depends_enabled $SPELL luajit; th
OPTS="-DENABLE_SCRIPTING=OFF $OPTS"
fi &&

-if is_depends_enabled $SPELL qt6base; then
- OPTS="Qt6_DIR=/opt/qt6/cmake/Qt6 $OPTS"
-fi &&
+OPTS+=" Qt6_DIR=$INSTALL_ROOT/opt/qt6/cmake/Qt6" &&
default_build
diff --git a/video/obs-studio/DEPENDS b/video/obs-studio/DEPENDS
index 23a07d5..725727f 100755
--- a/video/obs-studio/DEPENDS
+++ b/video/obs-studio/DEPENDS
@@ -6,19 +6,9 @@ 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 &&
+depends qt6base &&
+depends qt6svg &&
+depends libxkbcommon &&

optional_depends luajit \
'-DENABLE_SCRIPTING_LUA=ON' \
@@ -65,6 +55,18 @@ if is_depends_enabled "$SPELL" mbedtls; then
depends zlib
fi &&

+# TODO: add missing libdatachannel package
+optional_depends libdatachannel \
+ -DENABLE_WEBRTC=ON \
+ -DENABLE_WEBRTC=OFF \
+ 'for WebRTC output support' &&
+
+# TODO: add missing libvpl package
+optional_depends libvpl \
+ -DENABLE_QSV11=ON \
+ -DENABLE_QSV11=OFF \
+ 'for Intel QSV11 hardware encoder support' &&
+
optional_depends vlc \
'-DENABLE_VLC=ON' \
'-DENABLE_VLC=OFF' \
diff --git a/video/obs-studio/DETAILS b/video/obs-studio/DETAILS
old mode 100644
new mode 100755
index f2b1cb6..0c9446b
--- a/video/obs-studio/DETAILS
+++ b/video/obs-studio/DETAILS
@@ -1,10 +1,10 @@
# Watch: https://github.com/obsproject/obs-studio/tags
/refs/tags/([0-9.]+)[.]tar
. "$GRIMOIRE"/CMAKE_FUNCTIONS
SPELL=obs-studio
- VERSION=29.1.3
+ VERSION=30.1.2
SOURCE="$SPELL-$VERSION.tar.gz"

SOURCE_URL[0]=https://github.com/obsproject/$SPELL/archive/refs/tags/$VERSION.tar.gz
-
SOURCE_HASH=sha512:563a9b71ebe273b604807b9c43be8bde58fb326e8a0b741afb84a481a99176c96bf63da2aa26b6dcc026573b7fb0bf53e0a296e2db0b93c28f0d4710cd7cf019
+
SOURCE_HASH=sha512:8d6102f3431c1c6c530f22b09612cb955c1877e5aba07aa0ba1d7b014471ebf9f0c1f8e898eb9373c64417455e75d8b9cf2ae4d9010b6a09330bac9f4e5aa01e
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
diff --git a/video/obs-studio/HISTORY b/video/obs-studio/HISTORY
index 477086a..8ce63ec 100644
--- a/video/obs-studio/HISTORY
+++ b/video/obs-studio/HISTORY
@@ -1,3 +1,11 @@
+2024-06-23 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 30.1.2
+ * BUILD, DEPENDS: removed Qt5; not compatible anymore
+ * DEPENDS: added libvpl & libdatachannel
+ * PRE_BUILD,
patches/0001-rnnoise-Fix-compilation-not-working-on-latest-gcc.patch:
+ fixed build with GCC 14.x
+ removed -Werror from compiler flags
+
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
diff --git a/video/obs-studio/PRE_BUILD b/video/obs-studio/PRE_BUILD
index eb5b7ed..da84b57 100755
--- a/video/obs-studio/PRE_BUILD
+++ b/video/obs-studio/PRE_BUILD
@@ -1,5 +1,8 @@
default_pre_build &&
-cd "${SOURCE_DIRECTORY}/plugins" &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
+sed -i '/^ *-Werror/d' cmake/Modules/CompilerConfig.cmake &&
+cd plugins &&

rm -d "${SOURCE_DIRECTORY}/plugins/obs-browser" &&
unpack_file 2 &&
diff --git
a/video/obs-studio/patches/0001-rnnoise-Fix-compilation-not-working-on-latest-gcc.patch

b/video/obs-studio/patches/0001-rnnoise-Fix-compilation-not-working-on-latest-gcc.patch
new file mode 100644
index 0000000..5494916
--- /dev/null
+++
b/video/obs-studio/patches/0001-rnnoise-Fix-compilation-not-working-on-latest-gcc.patch
@@ -0,0 +1,35 @@
+From f60d6bcfe2c6e58490b12e2c01b55316ccb3c3ea Mon Sep 17 00:00:00 2001
+From: cg2121 <claytong1214 AT gmail.com>
+Date: Sat, 11 May 2024 21:32:45 -0500
+Subject: [PATCH] rnnoise: Fix compilation not working on latest gcc
+
+The latest gcc spits out an error about calloc parameters that are
+in the wrong order.
+
+Upstream-Status: Backport
+Origin: Upstream
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ plugins/obs-filters/rnnoise/src/denoise.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/plugins/obs-filters/rnnoise/src/denoise.c
b/plugins/obs-filters/rnnoise/src/denoise.c
+index 7639f745630e..c1907f1442e7 100644
+--- a/plugins/obs-filters/rnnoise/src/denoise.c
++++ b/plugins/obs-filters/rnnoise/src/denoise.c
+@@ -265,9 +265,9 @@ int rnnoise_init(DenoiseState *st, RNNModel *model) {
+ st->rnn.model = model;
+ else
+ st->rnn.model = &rnnoise_model_orig;
+- st->rnn.vad_gru_state = calloc(sizeof(float),
st->rnn.model->vad_gru_size);
+- st->rnn.noise_gru_state = calloc(sizeof(float),
st->rnn.model->noise_gru_size);
+- st->rnn.denoise_gru_state = calloc(sizeof(float),
st->rnn.model->denoise_gru_size);
++ st->rnn.vad_gru_state = calloc(st->rnn.model->vad_gru_size,
sizeof(float));
++ st->rnn.noise_gru_state = calloc(st->rnn.model->noise_gru_size,
sizeof(float));
++ st->rnn.denoise_gru_state = calloc(st->rnn.model->denoise_gru_size,
sizeof(float));
+ return 0;
+ }
+
+--
+2.44.0
+


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (17569abab914ce5e75beb5bcde4a88243bfac75a), Ismael Luceno, 06/23/2024

Archive powered by MHonArc 2.6.24.

Top of Page