wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-07-31 18:02:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

obs: update to 31.1.1.

Browse source 
Closes: #56222 [via git-merge-pr]
This commit is contained in:
Seltyk 2025-07-09 22:00:19 -05:00 • committed by lemmi
parent 1c730e1340
commit 10cff09a1c
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
srcpkgs/obs/patches/fix-double-free.patch
View file

@ -1,8 +1,8 @@
https://github.com/obsproject/obs-studio/issues/11029#issuecomment-2249747587 https://github.com/obsproject/obs-studio/issues/11029#issuecomment-2249747587
--- a/libobs/obs-nix.c --- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c +++ b/libobs/obs-nix.c
@@ -67,22 +67,6 @@ static const struct obs_nix_hotkeys_vtable *hotkeys_vtable = NULL; @@ -67,24 +67,6 @@ static const struct obs_nix_hotkeys_vtable *hotkeys_vtable = NULL;
void add_default_module_paths(void) void add_default_module_paths(void)
{ {
- char *module_bin_path = os_get_executable_path_ptr("../" OBS_PLUGIN_PATH); - char *module_bin_path = os_get_executable_path_ptr("../" OBS_PLUGIN_PATH);
@ -10,11 +10,13 @@ https://github.com/obsproject/obs-studio/issues/11029#issuecomment-2249747587
- -
- if (module_bin_path && module_data_path) { - if (module_bin_path && module_data_path) {
- char *abs_module_bin_path = os_get_abs_path_ptr(module_bin_path); - char *abs_module_bin_path = os_get_abs_path_ptr(module_bin_path);
- char *abs_module_install_path = os_get_abs_path_ptr(OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION);
- -
- if (abs_module_bin_path && - if (abs_module_bin_path &&
- strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION) != 0) { - (!abs_module_install_path || strcmp(abs_module_bin_path, abs_module_install_path) != 0)) {
- obs_add_module_path(module_bin_path, module_data_path); - obs_add_module_path(module_bin_path, module_data_path);
- } - }
- bfree(abs_module_install_path);
- bfree(abs_module_bin_path); - bfree(abs_module_bin_path);
- } - }
- -

8
srcpkgs/obs/template
View file

@ -1,7 +1,7 @@
# Template file for 'obs' # Template file for 'obs'
pkgname=obs pkgname=obs
version=31.0.2 version=31.1.1
revision=6 revision=1
archs="i686* x86_64* ppc64le* aarch64* riscv64*" archs="i686* x86_64* ppc64le* aarch64* riscv64*"
build_style=cmake build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
@ -18,7 +18,7 @@ makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-devel
v4l-utils-devel vlc-devel qt6-svg-devel x264-devel mbedtls-devel v4l-utils-devel vlc-devel qt6-svg-devel x264-devel mbedtls-devel
jansson-devel wayland-devel pipewire-devel libxkbcommon-devel jansson-devel wayland-devel pipewire-devel libxkbcommon-devel
pciutils-devel librist-devel srt-devel libdatachannel-devel pciutils-devel librist-devel srt-devel libdatachannel-devel
libvpl-devel uthash qt6-base-private-devel json-c++ libvpl-devel uthash qt6-base-private-devel json-c++ extra-cmake-modules
$(vopt_if nvenc nv-codec-headers)" $(vopt_if nvenc nv-codec-headers)"
depends="xset xdg-desktop-portal" depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software" short_desc="Open Broadcaster Software"
@ -27,7 +27,7 @@ license="GPL-2.0-or-later"
homepage="https://obsproject.com" homepage="https://obsproject.com"
changelog="https://github.com/obsproject/obs-studio/releases" changelog="https://github.com/obsproject/obs-studio/releases"
distfiles="https://github.com/obsproject/obs-studio/archive/refs/tags/$version.tar.gz" distfiles="https://github.com/obsproject/obs-studio/archive/refs/tags/$version.tar.gz"
checksum=74563ebbee5fcd448e6a790569cf3ca1a01bdcbc6bc2b3f61a9421ff8dfa6eb2 checksum=39751f067bacc13d44b116c5138491b5f1391f91516d3d590d874edd21292291
build_options="luajit qsv nvenc" build_options="luajit qsv nvenc"
case $XBPS_TARGET_MACHINE in case $XBPS_TARGET_MACHINE in