automatic version update by autodist [release 30.2.3-1mamba;Thu Nov 14 2024]

This commit is contained in:
Automatic Build System 2024-11-14 16:58:45 +01:00
parent e0a8b1379c
commit 43f2f8c42b
3 changed files with 34 additions and 60 deletions

View File

@ -1,30 +0,0 @@
From c7f84f8fc4e90ef779a204ac268f5ee1a962e324 Mon Sep 17 00:00:00 2001
From: Jimi Huotari <chiitoo@gentoo.org>
Date: Sun, 9 Feb 2020 05:23:55 +0200
Subject: [PATCH] deps/glad: Fix build with GCC-10
GCC-10 defaults to '-fno-common' [1], which triggers issues with
defining global variables multiple times. To fix the build, use
'extern' to turn the first definition of 'gladGetProcAddressPtr'
into a declaration.
1. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85678
Closes https://github.com/obsproject/obs-studio/issues/2828
---
deps/glad/src/glad_glx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/deps/glad/src/glad_glx.c b/deps/glad/src/glad_glx.c
index 7c55b9fc01..58086f1039 100644
--- a/deps/glad/src/glad_glx.c
+++ b/deps/glad/src/glad_glx.c
@@ -35,7 +35,7 @@ static void* libGL;
#ifndef __APPLE__
typedef void* (APIENTRYP PFNGLXGETPROCADDRESSPROC_PRIVATE)(const char*);
-PFNGLXGETPROCADDRESSPROC_PRIVATE gladGetProcAddressPtr;
+extern PFNGLXGETPROCADDRESSPROC_PRIVATE gladGetProcAddressPtr;
#endif
static

View File

@ -1,11 +0,0 @@
--- obs-studio-28.0.1/libobs/obs-nix.c.orig 2022-09-21 15:15:56.006332309 +0200
+++ obs-studio-28.0.1/libobs/obs-nix.c 2022-09-21 15:16:05.069285078 +0200
@@ -54,7 +54,7 @@
#define FLATPAK_PLUGIN_PATH "/app/plugins"
static const char *module_bin[] = {
- OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION,
+ OBS_PLUGIN_DESTINATION,
"../../obs-plugins/" BIT_STRING,
FLATPAK_PLUGIN_PATH "/" OBS_PLUGIN_DESTINATION,
};

View File

@ -1,6 +1,6 @@
Name: obs-studio Name: obs-studio
Epoch: 1 Epoch: 1
Version: 30.1.2 Version: 30.2.3
Release: 1mamba Release: 1mamba
Summary: Video recording and live streaming Summary: Video recording and live streaming
Group: Graphical Desktop/Applications/Multimedia Group: Graphical Desktop/Applications/Multimedia
@ -9,20 +9,26 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://obsproject.com/ URL: https://obsproject.com/
Source: https://github.com/jp9000/obs-studio.git/%{version}/obs-studio-%{version}.tar.bz2 Source: https://github.com/jp9000/obs-studio.git/%{version}/obs-studio-%{version}.tar.bz2
Patch0: obs-studio-25.0.8-gcc-10.0.1.patch Source1: https://github.com/FFmpeg/nv-codec-headers/releases/download/n12.1.14.0/nv-codec-headers-12.1.14.0.tar.gz
Patch1: obs-studio-28.0.1-fix-module-bin-search-path.patch
Patch2: obs-studio-30.0.0-cmake-build-destdir.patch Patch2: obs-studio-30.0.0-cmake-build-destdir.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRequires: libQt6Core
BuildRequires: libQt6DBus
BuildRequires: libQt6Gui
BuildRequires: libQt6Network
BuildRequires: libQt6Widgets
BuildRequires: libQt6Xml
BuildRequires: libX11-devel BuildRequires: libX11-devel
BuildRequires: libalsa-devel BuildRequires: libalsa-devel
BuildRequires: libavcodec-ffmpeg-devel BuildRequires: libavcodec-devel
BuildRequires: libavdevice-ffmpeg-devel BuildRequires: libavdevice-devel
BuildRequires: libavfilter-ffmpeg-devel BuildRequires: libavfilter-devel
BuildRequires: libavformat-ffmpeg-devel BuildRequires: libavformat-devel
BuildRequires: libavutil-ffmpeg-devel BuildRequires: libavutil-devel
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
BuildRequires: libdatachannel-devel
BuildRequires: libfdk-aac-devel BuildRequires: libfdk-aac-devel
BuildRequires: libfontconfig-devel BuildRequires: libfontconfig-devel
BuildRequires: libfreetype-devel BuildRequires: libfreetype-devel
@ -31,6 +37,7 @@ BuildRequires: libglib-devel
BuildRequires: libglvnd-devel BuildRequires: libglvnd-devel
BuildRequires: libjack-devel BuildRequires: libjack-devel
BuildRequires: libjansson-devel BuildRequires: libjansson-devel
BuildRequires: libluajit-devel
BuildRequires: libmbedtls-devel BuildRequires: libmbedtls-devel
BuildRequires: libonevpl-devel BuildRequires: libonevpl-devel
BuildRequires: libpci-devel BuildRequires: libpci-devel
@ -40,8 +47,8 @@ BuildRequires: libpython3-devel
BuildRequires: librnnoise-devel BuildRequires: librnnoise-devel
BuildRequires: libspeexdsp-devel BuildRequires: libspeexdsp-devel
BuildRequires: libstdc++6-devel BuildRequires: libstdc++6-devel
BuildRequires: libswresample-ffmpeg-devel BuildRequires: libswresample-devel
BuildRequires: libswscale-ffmpeg-devel BuildRequires: libswscale-devel
BuildRequires: libudev-devel BuildRequires: libudev-devel
BuildRequires: libuuid-devel BuildRequires: libuuid-devel
BuildRequires: libv4l-devel BuildRequires: libv4l-devel
@ -52,16 +59,17 @@ BuildRequires: libx264-devel
BuildRequires: libxcb-devel BuildRequires: libxcb-devel
BuildRequires: libxkbcommon-devel BuildRequires: libxkbcommon-devel
BuildRequires: libz-devel BuildRequires: libz-devel
BuildRequires: qt6-qtbase-devel
BuildRequires: qt6-qtsvg-devel BuildRequires: qt6-qtsvg-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: cmake BuildRequires: cmake
BuildRequires: libajantv2-devel BuildRequires: libajantv2-devel
BuildRequires: libasio-devel BuildRequires: libasio-devel
BuildRequires: libdatachannel-devel
BuildRequires: libmbedtls-devel >= 3.5.1-1mamba BuildRequires: libmbedtls-devel >= 3.5.1-1mamba
BuildRequires: libonevpl-devel BuildRequires: libonevpl-devel
BuildRequires: librist-devel BuildRequires: librist-devel
BuildRequires: libwebsocketpp-devel BuildRequires: libwebsocketpp-devel
BuildRequires: nv-codec-headers
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
%description %description
@ -85,15 +93,17 @@ This package contains libraries and header files for developing applications tha
%debug_package %debug_package
%prep %prep
%setup -q %setup -q -a1
#-D -T #% setup -q -D -T
#:<< _EOF #:<< _EOF
#%patch0 -p1
%patch 1 -p1
%patch 2 -p1 %patch 2 -p1
# Disable FFnvcodec detected via PkgConfig
sed -i "s|PC_FFnvcodec_VERSION VERSION_GREATER 0|0|" cmake/Modules/FindFFnvcodec.cmake
%build %build
%cmake -d build \ %cmake -d build \
-DFFnvcodec_INCLUDE_DIR="$PWD/../nv-codec-headers-12.1.14.0/include/" \
-DBUILD_BROWSER=OFF \ -DBUILD_BROWSER=OFF \
-DENABLE_VST=ON \ -DENABLE_VST=ON \
-DENABLE_VLC=OFF \ -DENABLE_VLC=OFF \
@ -101,9 +111,11 @@ This package contains libraries and header files for developing applications tha
-DENABLE_AJA=OFF \ -DENABLE_AJA=OFF \
-DENABLE_JACK=ON \ -DENABLE_JACK=ON \
-DENABLE_LIBFDK=ON \ -DENABLE_LIBFDK=ON \
-DENABLE_WEBRTC=OFF \ -DENABLE_WEBRTC=ON \
-Wno-dev \
-DOBS_VERSION_OVERRIDE="%{version}-%{release}" \ -DOBS_VERSION_OVERRIDE="%{version}-%{release}" \
-DCALM_DEPRECATION=ON \
-DENABLE_WEBSOCKET=OFF \
-Wno-dev \
-DCMAKE_SHARED_LINKER_FLAGS="-lgio-2.0" \ -DCMAKE_SHARED_LINKER_FLAGS="-lgio-2.0" \
%ifarch x86_64 %ifarch x86_64
-DOBS_MULTIARCH_SUFFIX=64 -DOBS_MULTIARCH_SUFFIX=64
@ -120,8 +132,6 @@ export
%clean %clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%post -n lib%{name} -p /sbin/ldconfig
%postun -n lib%{name} -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
@ -155,10 +165,15 @@ export
%{_libdir}/cmake/libobs/libobs*.cmake %{_libdir}/cmake/libobs/libobs*.cmake
%dir %{_libdir}/cmake/obs-frontend-api %dir %{_libdir}/cmake/obs-frontend-api
%{_libdir}/cmake/obs-frontend-api/obs-frontend*.cmake %{_libdir}/cmake/obs-frontend-api/obs-frontend*.cmake
%dir %{_libdir}/cmake/obs-websocket-api
%{_libdir}/cmake/obs-websocket-api/obs-websocket-api*.cmake
%{_libdir}/pkgconfig/libobs.pc %{_libdir}/pkgconfig/libobs.pc
%doc README.rst %doc README.rst
%changelog %changelog
* Thu Nov 14 2024 Automatic Build System <autodist@openmamba.org> 30.2.3-1mamba
- automatic version update by autodist
* Sun Apr 07 2024 Automatic Build System <autodist@openmamba.org> 30.1.2-1mamba * Sun Apr 07 2024 Automatic Build System <autodist@openmamba.org> 30.1.2-1mamba
- automatic version update by autodist - automatic version update by autodist