pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/multimedia/obs-studio



Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Aug 20 06:15:38 UTC 2025

Modified Files:
        pkgsrc/multimedia/obs-studio: Makefile distinfo
Added Files:
        pkgsrc/multimedia/obs-studio/patches:
            patch-deps_obs-scripting_obs-scripting-python.c

Log Message:
obs-studio: fix build with cmake 4

Fix build with latest Python


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/multimedia/obs-studio/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/multimedia/obs-studio/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/obs-studio/patches/patch-deps_obs-scripting_obs-scripting-python.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/obs-studio/Makefile
diff -u pkgsrc/multimedia/obs-studio/Makefile:1.72 pkgsrc/multimedia/obs-studio/Makefile:1.73
--- pkgsrc/multimedia/obs-studio/Makefile:1.72  Thu Apr 24 14:15:19 2025
+++ pkgsrc/multimedia/obs-studio/Makefile       Wed Aug 20 06:15:38 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2025/04/24 14:15:19 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2025/08/20 06:15:38 wiz Exp $
 
 DISTNAME=      obs-studio-26.1.2
 PKGREVISION=   42
@@ -15,12 +15,10 @@ USE_LANGUAGES=      c gnu++11
 
 CMAKE_CONFIGURE_ARGS+= -DDISABLE_LIBFDK=BOOL:ON
 CMAKE_CONFIGURE_ARGS+= -DOBS_VERSION_OVERRIDE="${PKGVERSION}"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
 TOOL_DEPENDS+= swig3>=3.0:../../devel/swig3
 
-# Python 3 only
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-
 .include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} != "FreeBSD"

Index: pkgsrc/multimedia/obs-studio/distinfo
diff -u pkgsrc/multimedia/obs-studio/distinfo:1.10 pkgsrc/multimedia/obs-studio/distinfo:1.11
--- pkgsrc/multimedia/obs-studio/distinfo:1.10  Tue Oct 26 11:01:13 2021
+++ pkgsrc/multimedia/obs-studio/distinfo       Wed Aug 20 06:15:38 2025
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 11:01:13 nia Exp $
+$NetBSD: distinfo,v 1.11 2025/08/20 06:15:38 wiz Exp $
 
 BLAKE2s (obs-studio-26.1.2.tar.gz) = 428c47c336bc563ad6050c0f89bd2fbfb8a4fb03e30c072131a050410c23d1e4
 SHA512 (obs-studio-26.1.2.tar.gz) = cd95fbf587f7edfe415cae75299d65c1d771bb118649fb839ae43d77145d87725c23df3360aa7b8c35ab8b62e5ec7983a8b02f8b102caa78f768eb58b4263417
 Size (obs-studio-26.1.2.tar.gz) = 16624899 bytes
 SHA1 (patch-UI_obs-app.cpp) = 262db99099ec044857d5c7080affbbc7ad07bf9f
+SHA1 (patch-deps_obs-scripting_obs-scripting-python.c) = 16e6c95df4e666c8c5a77ead763407de5cdd6691
 SHA1 (patch-libobs_graphics_graphics.h) = a6e403a03574f7628ac1f8b191b57f9d573c63f0
 SHA1 (patch-libobs_obs-nix.c) = 467faaa65062d2e6b0740c5e177ec67b0748ab45
 SHA1 (patch-plugins_CMakeLists.txt) = aa2bfe532b9214e46dc371fa295b6cddb9356b1f

Added files:

Index: pkgsrc/multimedia/obs-studio/patches/patch-deps_obs-scripting_obs-scripting-python.c
diff -u /dev/null pkgsrc/multimedia/obs-studio/patches/patch-deps_obs-scripting_obs-scripting-python.c:1.1
--- /dev/null   Wed Aug 20 06:15:38 2025
+++ pkgsrc/multimedia/obs-studio/patches/patch-deps_obs-scripting_obs-scripting-python.c        Wed Aug 20 06:15:38 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-deps_obs-scripting_obs-scripting-python.c,v 1.1 2025/08/20 06:15:38 wiz Exp $
+
+Fix build with newer Python.
+
+--- deps/obs-scripting/obs-scripting-python.c.orig     2025-08-20 06:13:55.296237069 +0000
++++ deps/obs-scripting/obs-scripting-python.c
+@@ -1628,8 +1628,6 @@ bool obs_scripting_load_python(const cha
+ #endif
+ 
+       PyEval_InitThreads();
+-      if (!PyEval_ThreadsInitialized())
+-              return false;
+ 
+       /* ---------------------------------------------- */
+       /* Must set arguments for guis to work            */



Home | Main Index | Thread Index | Old Index