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