wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

obs: Update to 31.0.2.

Browse source
This commit is contained in:
Michael Aldridge 2025-03-10 01:05:42 -05:00
parent 39036be099
commit bb9523db8d
4 changed files with 20 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/shlibs
View file

@ -2761,7 +2761,7 @@ libKDevPlatformVcs.so.60 kdevelop-24.08.0_1
libts.so.0 tslib-1.6_1 libts.so.0 tslib-1.6_1
libobs.so.0 obs-0.14.1_2 libobs.so.0 obs-0.14.1_2
libobsglad.so.1 obs-28.0.1_1 libobsglad.so.1 obs-28.0.1_1
libobs-opengl.so.1 obs-28.0.1_1 libobs-opengl.so.30 obs-31.0.2_1
libobs-frontend-api.so.0 obs-20.1.3_1 libobs-frontend-api.so.0 obs-20.1.3_1
libzimg.so.2 zimg-2.0.4_1 libzimg.so.2 zimg-2.0.4_1
libvapoursynth.so vapoursynth-R32_2 libvapoursynth.so vapoursynth-R32_2

24
srcpkgs/obs/patches/0001-disable-Werror.patch
View file

@ -1,24 +0,0 @@
From ff48fe5c97b2d36cecf7492c4c04b79cae8099d2 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Thu, 4 May 2023 09:27:39 +0200
Subject: [PATCH] disable -Werror
---
cmake/Modules/CompilerConfig.cmake | 1 -
1 file changed, 1 deletion(-)
diff --git a/cmake/Modules/CompilerConfig.cmake b/cmake/Modules/CompilerConfig.cmake
index 41c56da8b..b8f8bf330 100644
--- a/cmake/Modules/CompilerConfig.cmake
+++ b/cmake/Modules/CompilerConfig.cmake
@@ -101,7 +101,6 @@ else()
option(CALM_DEPRECATION "Keep deprecated-declarations as warnings" OFF)
add_compile_options(
- -Werror
-Wextra
-Wvla
-Wswitch
--
2.40.1

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

@ -1,22 +1,18 @@
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
@@ -68,26 +68,6 @@ static const struct obs_nix_hotkeys_vtab @@ -67,22 +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 = - char *module_bin_path = os_get_executable_path_ptr("../" OBS_PLUGIN_PATH);
- os_get_executable_path_ptr("../" OBS_PLUGIN_PATH); - char *module_data_path = os_get_executable_path_ptr("../" OBS_DATA_PATH "/obs-plugins/%module%");
- char *module_data_path = os_get_executable_path_ptr(
- "../" OBS_DATA_PATH "/obs-plugins/%module%");
- -
- if (module_bin_path && module_data_path) { - if (module_bin_path && module_data_path) {
- char *abs_module_bin_path = - char *abs_module_bin_path = os_get_abs_path_ptr(module_bin_path);
- os_get_abs_path_ptr(module_bin_path);
- -
- if (abs_module_bin_path && - if (abs_module_bin_path &&
- strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX - strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION) != 0) {
- "/" OBS_PLUGIN_DESTINATION) != 0) {
- obs_add_module_path(module_bin_path, module_data_path); - obs_add_module_path(module_bin_path, module_data_path);
- } - }
- bfree(abs_module_bin_path); - bfree(abs_module_bin_path);

27
srcpkgs/obs/template
View file

@ -1,22 +1,23 @@
# Template file for 'obs' # Template file for 'obs'
pkgname=obs pkgname=obs
version=30.2.3 version=31.0.2
revision=4 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
-DCMAKE_INSTALL_DATAROOTDIR=share -DCMAKE_INSTALL_DATAROOTDIR=share -DENABLE_RNNOISE=OFF
-DENABLE_VST=OFF -DENABLE_AJA=OFF -DCALM_DEPRECATION=ON -DENABLE_VST=OFF -DENABLE_AJA=OFF
-DENABLE_SCRIPTING_LUA=$(vopt_if luajit 'ON' 'OFF') -DENABLE_SCRIPTING_LUA=$(vopt_if luajit 'ON' 'OFF')
-DENABLE_NATIVE_NVENC=OFF -DENABLE_QSV11=$(vopt_if 'ON' 'OFF')" -DENABLE_NVENC=OFF -DENABLE_QSV11=$(vopt_if 'ON' 'OFF')
-DCMAKE_COMPILE_WARNING_AS_ERROR=OFF"
hostmakedepends="pkg-config swig python3-devel qt6-base" hostmakedepends="pkg-config swig python3-devel qt6-base"
makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-devel ffmpeg6-devel glu-devel makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-devel
jack-devel libXcomposite-devel libcurl-devel libva-devel ffmpeg6-devel glu-devel jack-devel libXcomposite-devel libcurl-devel
pulseaudio-devel python3-devel speexdsp-devel v4l-utils-devel libva-devel pulseaudio-devel python3-devel speexdsp-devel
vlc-devel qt6-svg-devel x264-devel mbedtls-devel jansson-devel v4l-utils-devel vlc-devel qt6-svg-devel x264-devel mbedtls-devel
wayland-devel pipewire-devel libxkbcommon-devel pciutils-devel jansson-devel wayland-devel pipewire-devel libxkbcommon-devel
librist-devel srt-devel libdatachannel-devel oneVPL-devel uthash pciutils-devel librist-devel srt-devel libdatachannel-devel
qt6-base-private-devel json-c++" oneVPL-devel uthash qt6-base-private-devel json-c++"
depends="xset xdg-desktop-portal" depends="xset xdg-desktop-portal"
short_desc="Open Broadcaster Software" short_desc="Open Broadcaster Software"
maintainer="lemmi <lemmi@nerd2nerd.org>" maintainer="lemmi <lemmi@nerd2nerd.org>"
@ -24,7 +25,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=3d5f37f564564b6e6fb32ba535285e062ee25d573b3a6a405e5a86d5ab029351 checksum=74563ebbee5fcd448e6a790569cf3ca1a01bdcbc6bc2b3f61a9421ff8dfa6eb2
build_options="luajit qsv" build_options="luajit qsv"
case $XBPS_TARGET_MACHINE in case $XBPS_TARGET_MACHINE in