Skip to Content.
Sympa Menu

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

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 (bcb6458bc9446ce02bcc753904c1551701684a13)
  • Date: Sat, 1 Feb 2025 18:46:13 +0000

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

crypto/mbedtls/CONFIGURE | 1
crypto/mbedtls/DEPENDS | 2
crypto/mbedtls/DETAILS | 10 ++--
crypto/mbedtls/HISTORY | 4 +
video/obs-studio/BUILD | 7 +-
video/obs-studio/DEPENDS | 13 +----
video/obs-studio/DETAILS | 19
+++----
video/obs-studio/HISTORY | 5 ++
video/obs-studio/PRE_BUILD | 10 ----
video/obs-studio/patches/0001-Fix-build-against-musl-libc.patch | 25
++++++++++
xorg/xserver/DETAILS | 3 -
xorg/xserver/HISTORY | 3 +
12 files changed, 62 insertions(+), 40 deletions(-)

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

obs-studio 31.0.1

commit d4c9d0e27b306f12b7739fad88a23da81d3d6486
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mbedtls 3.6.2

commit d5411ab1bb45ce9705030cce21b39e855677605e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

xserver 21.1.15

diff --git a/crypto/mbedtls/CONFIGURE b/crypto/mbedtls/CONFIGURE
new file mode 100755
index 0000000..b1e2770
--- /dev/null
+++ b/crypto/mbedtls/CONFIGURE
@@ -0,0 +1 @@
+. "$GRIMOIRE"/CMAKE_CONFIGURE
diff --git a/crypto/mbedtls/DEPENDS b/crypto/mbedtls/DEPENDS
index 2a0f37c..43183e4 100755
--- a/crypto/mbedtls/DEPENDS
+++ b/crypto/mbedtls/DEPENDS
@@ -1,2 +1,2 @@
-depends cmake &&
+. "$GRIMOIRE"/CMAKE_DEPENDS &&
optional_depends zlib '-DENABLE_ZLIB_SUPPORT=1' '' 'zlib support'
diff --git a/crypto/mbedtls/DETAILS b/crypto/mbedtls/DETAILS
index b68a26a..e0d2489 100755
--- a/crypto/mbedtls/DETAILS
+++ b/crypto/mbedtls/DETAILS
@@ -1,9 +1,11 @@
+# Watch: https://github.com/Mbed-TLS/mbedtls/tags
+. "$GRIMOIRE"/CMAKE_FUNCTIONS
SPELL=mbedtls
- VERSION=3.2.1
-
SOURCE_HASH=sha512:11e433d64a2c0474bb44f288551c1fc2c143fe9abf8a6e9df26deb8c3e6b575e1eab508a7f46d651003f41ce0ebb234e423260a3e0556d025c345faeb631d178
+ VERSION=3.6.2
+
SOURCE_HASH=sha512:7ab3b1ec179681949e1b0d171e04f75a605ae9ed8177cf3f6f27c401efca4aff930437ecc425c9a994d36f50ddd6f0f0dd7feeb42251128ac875b4c57fe3811b
SECURITY_PATCH=4
- SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=https://github.com/ARMmbed/$SPELL/archive/v$VERSION.tar.gz
+ SOURCE=$SPELL-$VERSION.tar.bz2
+
SOURCE_URL[0]=https://github.com/Mbed-TLS/mbedtls/releases/download/${SOURCE%.tar.bz2}/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://tls.mbed.org/
LICENSE[0]=Apache-2.0
diff --git a/crypto/mbedtls/HISTORY b/crypto/mbedtls/HISTORY
index 873521f..c4c3b09 100644
--- a/crypto/mbedtls/HISTORY
+++ b/crypto/mbedtls/HISTORY
@@ -1,3 +1,7 @@
+2025-02-01 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 3.6.2
+ * CONFIGURE, DEPENDS, DETAILS: transformed to grimoire's cmake support
+
2022-09-01 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 3.2.1

diff --git a/video/obs-studio/BUILD b/video/obs-studio/BUILD
index 5844e9b..a592bb2 100755
--- a/video/obs-studio/BUILD
+++ b/video/obs-studio/BUILD
@@ -1,10 +1,9 @@
# XXX Fix version number
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 \
+OPTS+=' -DOBS_COMPILE_DEPRECATION_AS_WARNING=ON \
+ -DENABLE_NEW_MPEGTS_OUTPUT=OFF \
-DENABLE_BROWSER=OFF \
- -DENABLE_NATIVE_NVENC=OFF \
+ -DENABLE_NVENC=OFF \
-DENABLE_WEBSOCKET=NO \
-DENABLE_VST=ON \
-DENABLE_AJA=OFF' &&
diff --git a/video/obs-studio/DEPENDS b/video/obs-studio/DEPENDS
index c1f6502..467e9d8 100755
--- a/video/obs-studio/DEPENDS
+++ b/video/obs-studio/DEPENDS
@@ -6,10 +6,12 @@ depends libxcb &&
depends x264 &&
depends jansson &&
depends uthash &&
-
depends qt6base &&
depends qt6svg &&
depends libxkbcommon &&
+depends rnnoise &&
+depends mbedtls &&
+depends zlib &&

optional_depends luajit \
'-DENABLE_SCRIPTING_LUA=ON' \
@@ -47,15 +49,6 @@ optional_depends pipewire
\

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 &&
-
# TODO: add missing libdatachannel package
optional_depends libdatachannel \
-DENABLE_WEBRTC=ON \
diff --git a/video/obs-studio/DETAILS b/video/obs-studio/DETAILS
index b26462e..8bb212b 100755
--- a/video/obs-studio/DETAILS
+++ b/video/obs-studio/DETAILS
@@ -1,20 +1,17 @@
# Watch: https://github.com/obsproject/obs-studio/tags
/refs/tags/([0-9.]+)[.]tar
. "$GRIMOIRE"/CMAKE_FUNCTIONS
SPELL=obs-studio
- VERSION=30.2.0-rc1
+ VERSION=31.0.1
SOURCE="$SPELL-$VERSION.tar.gz"

SOURCE_URL[0]=https://github.com/obsproject/$SPELL/archive/refs/tags/$VERSION.tar.gz
-
SOURCE_HASH=sha512:b85e144e08a9b7756c077097c5e116e45c864108d28f41bf30e5ef9f6668fdb3ccfab00e53a976a6459a896e5116eb428b01f8d9093914b3326a9a97453d849c
+
SOURCE_HASH=sha512:f0f520befa7e6644e31614a3900175e6afc277117b128acd1165835cbcddda67e216ea484d8db54b7e6c79aac3d48cf873221dd24e807ed9d2d38c4501267f12
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
+
SOURCE2="obs-browser-a76b4d8810a0a33e91ac5b76a0b1af2f22bf8efd.tar.gz"
+
SOURCE2_URL[0]=https://github.com/obsproject/obs-browser/archive/${SOURCE2##*-}
+
SOURCE2_HASH=sha512:70b428b5ab7e7d9e8c1402656530dbea590d122e098e4e1b3ca293061b3b5ee1f91d969f2c0bfc3efa581d539670e94a68c2ac80afce02b5ea0581fedc0fd243
+
SOURCE3="obs-websocket-eed8a49933786383d11f4868a4e5604a9ee303c6.tar.gz"
+
SOURCE3_URL[0]=https://github.com/obsproject/obs-websocket/archive/${SOURCE3##*-}
+
SOURCE3_HASH=sha512:21ff4a58465bcb8917f2e213b430dbcbfd56a1647e80c351f18479d7dd3ff2b4c64292132ca26b40054f2b994db9dd8d0a2cb97f32498cb5d59f2812272a6ec5
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 b6c5bad..ff4e758 100644
--- a/video/obs-studio/HISTORY
+++ b/video/obs-studio/HISTORY
@@ -1,3 +1,8 @@
+2025-02-01 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, PRE_BUILD: updated spell to 31.0.1
+ * patches/0001-Fix-build-against-musl-libc.patch:
+ fixed build against musl
+
2024-07-10 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 30.2.0-rc1
* DEPENDS: added uthash
diff --git a/video/obs-studio/PRE_BUILD b/video/obs-studio/PRE_BUILD
index 12c2106..6ca4563 100755
--- a/video/obs-studio/PRE_BUILD
+++ b/video/obs-studio/PRE_BUILD
@@ -1,18 +1,12 @@
default_pre_build &&
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 &&
-mv obs-browser-594115a27d40f0916e55db97cb61f7c7130cbe28 obs-browser &&
+mv "${SOURCE2%.tar.gz}" 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
+mv "${SOURCE3%.tar.gz}" obs-websocket
diff --git a/video/obs-studio/patches/0001-Fix-build-against-musl-libc.patch
b/video/obs-studio/patches/0001-Fix-build-against-musl-libc.patch
new file mode 100644
index 0000000..d31ab7e
--- /dev/null
+++ b/video/obs-studio/patches/0001-Fix-build-against-musl-libc.patch
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT sourcemage.org>
+Date: Sat, 1 Feb 2025 19:38:05 +0100
+Subject: [PATCH] Fix build against musl libc
+
+Upstream-Status: Pending
+Origin: Source Mage
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ libobs/util/threading-posix.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libobs/util/threading-posix.c b/libobs/util/threading-posix.c
+index 6d7c40ee74b6..8960e70cc95c 100644
+--- a/libobs/util/threading-posix.c
++++ b/libobs/util/threading-posix.c
+@@ -261,7 +261,7 @@ void os_set_thread_name(const char *name)
+ pthread_setname_np(name);
+ #elif defined(__FreeBSD__)
+ pthread_set_name_np(pthread_self(), name);
+-#elif defined(__GLIBC__) && !defined(__MINGW32__)
++#elif !defined(__MINGW32__)
+ if (strlen(name) <= 15) {
+ pthread_setname_np(pthread_self(), name);
+ } else {
diff --git a/xorg/xserver/DETAILS b/xorg/xserver/DETAILS
index 4a81a1a..0f52c67 100755
--- a/xorg/xserver/DETAILS
+++ b/xorg/xserver/DETAILS
@@ -2,8 +2,7 @@
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=xserver
SPELLX=xorg-server
- VERSION=21.1.8
- PATCHLEVEL=2
+ VERSION=21.1.15
SECURITY_PATCH=20
SOURCE=$SPELLX-$VERSION.tar.xz

SOURCE_URL[0]=https://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
diff --git a/xorg/xserver/HISTORY b/xorg/xserver/HISTORY
index b8a3f0e..b0d42b1 100644
--- a/xorg/xserver/HISTORY
+++ b/xorg/xserver/HISTORY
@@ -1,3 +1,6 @@
+2025-02-01 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 21.1.15
+
2024-11-01 Thomas Orgis <sobukus AT sourcemage.org>
* CONFIGURE, BUILD: add option to enable Security extension
* DETAILS: ++PATCHLEVEL


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (bcb6458bc9446ce02bcc753904c1551701684a13), Ismael Luceno, 02/01/2025

Archive powered by MHonArc 2.6.24.

Top of Page