Skip to Content.
Sympa Menu

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

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 (8d0fa8a677e171c45e93d3b70e3b47a8fc24953a)
  • Date: Wed, 10 Jul 2024 21:17:00 +0000

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

video/obs-studio/BUILD
| 8 +-
video/obs-studio/DEPENDS
| 1
video/obs-studio/DETAILS
| 5 -
video/obs-studio/HISTORY
| 6 +

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

New commits:
commit 8d0fa8a677e171c45e93d3b70e3b47a8fc24953a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

obs-studio 30.2.0-rc1

diff --git a/video/obs-studio/BUILD b/video/obs-studio/BUILD
index 8a1f1c6..5844e9b 100755
--- a/video/obs-studio/BUILD
+++ b/video/obs-studio/BUILD
@@ -2,8 +2,12 @@
OPTS+=" -DOBS_VERSION_OVERRIDE=$VERSION" &&
# XXX obs-filters plugin can't build with -ffast-math
CFLAGS="${CFLAGS//-ffast-math}" &&
-OPTS+=' -DENABLE_NEW_MPEGTS_OUTPUT=OFF -DENABLE_BROWSER=OFF \
- -DENABLE_WEBSOCKET=NO -DENABLE_VST=ON -DENABLE_AJA=OFF' &&
+OPTS+=' -DENABLE_NEW_MPEGTS_OUTPUT=OFF \
+ -DENABLE_BROWSER=OFF \
+ -DENABLE_NATIVE_NVENC=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"
diff --git a/video/obs-studio/DEPENDS b/video/obs-studio/DEPENDS
index 725727f..c1f6502 100755
--- a/video/obs-studio/DEPENDS
+++ b/video/obs-studio/DEPENDS
@@ -5,6 +5,7 @@ depends curl &&
depends libxcb &&
depends x264 &&
depends jansson &&
+depends uthash &&

depends qt6base &&
depends qt6svg &&
diff --git a/video/obs-studio/DETAILS b/video/obs-studio/DETAILS
index 132ca36..b26462e 100755
--- a/video/obs-studio/DETAILS
+++ b/video/obs-studio/DETAILS
@@ -1,11 +1,10 @@
# Watch: https://github.com/obsproject/obs-studio/tags
/refs/tags/([0-9.]+)[.]tar
. "$GRIMOIRE"/CMAKE_FUNCTIONS
SPELL=obs-studio
- VERSION=30.1.2
- PATCHLEVEL=1
+ VERSION=30.2.0-rc1
SOURCE="$SPELL-$VERSION.tar.gz"

SOURCE_URL[0]=https://github.com/obsproject/$SPELL/archive/refs/tags/$VERSION.tar.gz
-
SOURCE_HASH=sha512:8d6102f3431c1c6c530f22b09612cb955c1877e5aba07aa0ba1d7b014471ebf9f0c1f8e898eb9373c64417455e75d8b9cf2ae4d9010b6a09330bac9f4e5aa01e
+
SOURCE_HASH=sha512:b85e144e08a9b7756c077097c5e116e45c864108d28f41bf30e5ef9f6668fdb3ccfab00e53a976a6459a896e5116eb428b01f8d9093914b3326a9a97453d849c
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 5c8fb45..b6c5bad 100644
--- a/video/obs-studio/HISTORY
+++ b/video/obs-studio/HISTORY
@@ -1,3 +1,9 @@
+2024-07-10 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 30.2.0-rc1
+ * DEPENDS: added uthash
+ *
patches/0001-rnnoise-Fix-compilation-not-working-on-latest-gcc.patch:
+ removed, no longer needed
+
2024-06-30 Ismael Luceno <ismael AT sourcemage.org>
* BUILD: removed Qt6_DIR; not needed
* PRE_BUILD: removed LD_LIBRARY_PATH from .desktop file; not needed
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
deleted file mode 100644
index 5494916..0000000
---
a/video/obs-studio/patches/0001-rnnoise-Fix-compilation-not-working-on-latest-gcc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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 (8d0fa8a677e171c45e93d3b70e3b47a8fc24953a), Ismael Luceno, 07/10/2024

Archive powered by MHonArc 2.6.24.

Top of Page