diff --git a/common/shlibs b/common/shlibs index a0dc03a3bb6..aadd28fd64a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2761,7 +2761,7 @@ libKDevPlatformVcs.so.60 kdevelop-24.08.0_1 libts.so.0 tslib-1.6_1 libobs.so.0 obs-0.14.1_2 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 libzimg.so.2 zimg-2.0.4_1 libvapoursynth.so vapoursynth-R32_2 diff --git a/srcpkgs/obs/patches/0001-disable-Werror.patch b/srcpkgs/obs/patches/0001-disable-Werror.patch deleted file mode 100644 index 4afb3627d54..00000000000 --- a/srcpkgs/obs/patches/0001-disable-Werror.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ff48fe5c97b2d36cecf7492c4c04b79cae8099d2 Mon Sep 17 00:00:00 2001 -From: lemmi -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 - diff --git a/srcpkgs/obs/patches/fix-double-free.patch b/srcpkgs/obs/patches/fix-double-free.patch index 6f1ab302063..34ba8688b17 100644 --- a/srcpkgs/obs/patches/fix-double-free.patch +++ b/srcpkgs/obs/patches/fix-double-free.patch @@ -1,22 +1,18 @@ https://github.com/obsproject/obs-studio/issues/11029#issuecomment-2249747587 --- a/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) { -- char *module_bin_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_bin_path = os_get_executable_path_ptr("../" OBS_PLUGIN_PATH); +- char *module_data_path = os_get_executable_path_ptr("../" OBS_DATA_PATH "/obs-plugins/%module%"); - - 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); - - if (abs_module_bin_path && -- strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX -- "/" OBS_PLUGIN_DESTINATION) != 0) { +- strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION) != 0) { - obs_add_module_path(module_bin_path, module_data_path); - } - bfree(abs_module_bin_path); diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template index 713ce5dade6..e7c148602a7 100644 --- a/srcpkgs/obs/template +++ b/srcpkgs/obs/template @@ -1,22 +1,23 @@ # Template file for 'obs' pkgname=obs -version=30.2.3 -revision=4 +version=31.0.2 +revision=1 archs="i686* x86_64* ppc64le* aarch64* riscv64*" build_style=cmake configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON - -DCMAKE_INSTALL_DATAROOTDIR=share - -DENABLE_VST=OFF -DENABLE_AJA=OFF -DCALM_DEPRECATION=ON + -DCMAKE_INSTALL_DATAROOTDIR=share -DENABLE_RNNOISE=OFF + -DENABLE_VST=OFF -DENABLE_AJA=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" -makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-devel ffmpeg6-devel glu-devel - jack-devel libXcomposite-devel libcurl-devel libva-devel - pulseaudio-devel python3-devel speexdsp-devel v4l-utils-devel - vlc-devel qt6-svg-devel x264-devel mbedtls-devel jansson-devel - wayland-devel pipewire-devel libxkbcommon-devel pciutils-devel - librist-devel srt-devel libdatachannel-devel oneVPL-devel uthash - qt6-base-private-devel json-c++" +makedepends="$(vopt_if luajit LuaJIT-devel) fdk-aac-devel + ffmpeg6-devel glu-devel jack-devel libXcomposite-devel libcurl-devel + libva-devel pulseaudio-devel python3-devel speexdsp-devel + v4l-utils-devel vlc-devel qt6-svg-devel x264-devel mbedtls-devel + jansson-devel wayland-devel pipewire-devel libxkbcommon-devel + pciutils-devel librist-devel srt-devel libdatachannel-devel + oneVPL-devel uthash qt6-base-private-devel json-c++" depends="xset xdg-desktop-portal" short_desc="Open Broadcaster Software" maintainer="lemmi " @@ -24,7 +25,7 @@ license="GPL-2.0-or-later" homepage="https://obsproject.com" changelog="https://github.com/obsproject/obs-studio/releases" distfiles="https://github.com/obsproject/obs-studio/archive/refs/tags/$version.tar.gz" -checksum=3d5f37f564564b6e6fb32ba535285e062ee25d573b3a6a405e5a86d5ab029351 +checksum=74563ebbee5fcd448e6a790569cf3ca1a01bdcbc6bc2b3f61a9421ff8dfa6eb2 build_options="luajit qsv" case $XBPS_TARGET_MACHINE in