6:35 p.m.
commit b244ed95f473bf4931fc3efcfc96c8d4e6d12ab1
Author: Neal Gompa <ngompa13(a)gmail.com>
Date: Tue Jun 1 14:22:27 2021 -0400
Bump to 27.0.0 final
- Move unversioned so files to -libs for third-party plugins (rfbz#5999)
- Make build for EL8
- Drop legacy EL7 stuff
obs-studio.spec | 45 ++++++++++++++-------------------------------
sources | 4 ++--
2 files changed, 16 insertions(+), 33 deletions(-)
---
diff --git a/obs-studio.spec b/obs-studio.spec
index cd8c6c0..2f52a01 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -1,6 +1,3 @@
-# Local definition of version_no_tilde when it doesn't exist
-%{!?version_no_tilde: %define version_no_tilde %{shrink:%(echo '%{version}' | tr
'~' '-')}}
-
%undefine __cmake_in_source_build
%if 0%{?fedora} || 0%{?rhel} > 7
# bytecompile with Python 3
@@ -9,22 +6,17 @@
%global __python %{__python2}
%endif
-%if 0%{?el7}
-# Developper toolset version
-%global dts_ver 8
-%endif
-
-%global commit1 1b9d20afd353a51b0fedf68a9e1b8c919312189d
+%global commit1 aaa7b7fa32c40b37f59e7d3d194672115451f198
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
Name: obs-studio
-Version: 27.0.0~rc6
+Version: 27.0.0
Release: 1%{?dist}
Summary: Open Broadcaster Software Studio
License: GPLv2+
URL: https://obsproject.com/
-Source0:
https://github.com/obsproject/obs-studio/archive/%{version_no_tilde}/%{na...
+Source0:
https://github.com/obsproject/obs-studio/archive/%{version}/%{name}-%{ver...
Source1:
https://github.com/obsproject/obs-vst/archive/%{commit1}/obs-vst-%{shortc...
BuildRequires: gcc
@@ -37,7 +29,9 @@ BuildRequires: devtoolset-%{dts_ver}-toolchain,
devtoolset-%{dts_ver}-libatomic-
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
+%if 0%{?fedora} || 0%{?rhel} >= 9
BuildRequires: fdk-aac-free-devel
+%endif
BuildRequires: ffmpeg-devel
BuildRequires: fontconfig-devel
BuildRequires: freetype-devel
@@ -59,21 +53,13 @@ BuildRequires: luajit-devel
BuildRequires: mbedtls-devel
BuildRequires: pipewire-devel
BuildRequires: pulseaudio-libs-devel
-%if 0%{?fedora} || 0%{?rhel} > 7
BuildRequires: python3-devel
-%else
-BuildRequires: python2-devel
-%endif
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtbase-private-devel
BuildRequires: qt5-qtsvg-devel
BuildRequires: qt5-qtwayland-devel
BuildRequires: qt5-qtx11extras-devel
-%if 0%{?fedora} || 0%{?rhel} > 7
BuildRequires: speexdsp-devel
-%else
-BuildRequires: speex-devel
-%endif
BuildRequires: swig
BuildRequires: systemd-devel
BuildRequires: vlc-devel
@@ -104,10 +90,7 @@ Header files for Open Broadcaster Software
%prep
-%if 0%{?el7}
-. /opt/rh/devtoolset-%{dts_ver}/enable
-%endif
-%autosetup -p1 -n %{name}-%{version_no_tilde}
+%autosetup -p1
# rpmlint reports E: hardcoded-library-path
# replace OBS_MULTIARCH_SUFFIX by LIB_SUFFIX
@@ -117,9 +100,6 @@ sed -i 's|OBS_MULTIARCH_SUFFIX|LIB_SUFFIX|g'
cmake/Modules/ObsHelpers.cmake
tar -xf %{SOURCE1} -C plugins/obs-vst --strip-components=1
%build
-%if 0%{?el7}
-. /opt/rh/devtoolset-%{dts_ver}/enable
-%endif
%cmake3 -DOBS_VERSION_OVERRIDE=%{version} \
-DUNIX_STRUCTURE=1 -GNinja \
-DBUILD_BROWSER=OFF \
@@ -135,9 +115,6 @@ install -Dm644 UI/obs-frontend-api/obs-frontend-api.h
%{buildroot}%{_includedir}
install -Dm644 cmake/external/ObsPluginHelpers.cmake
%{buildroot}%{_libdir}/cmake/LibObs/
%check
-%if 0%{?el7}
-. /opt/rh/devtoolset-%{dts_ver}/enable
-%endif
/usr/bin/desktop-file-validate
%{buildroot}/%{_datadir}/applications/com.obsproject.Studio.desktop
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
@@ -157,16 +134,22 @@ appstream-util validate-relax --nonet
%{buildroot}%{_datadir}/metainfo/*.appdata
%files libs
%{_libdir}/obs-plugins/
%{_libdir}/obs-scripting/
-%{_libdir}/libobs-scripting.so
+# unversioned so files packaged for third-party plugins (cf. rfbz#5999)
+%{_libdir}/*.so
%{_libdir}/*.so.*
%files devel
%{_libdir}/cmake/LibObs/
%{_libdir}/pkgconfig/libobs.pc
-%{_libdir}/*.so
%{_includedir}/obs/
%changelog
+* Tue Jun 01 2021 Neal Gompa <ngompa13(a)gmail.com> - 27.0.0
+- Bump to 27.0.0 final
+- Move unversioned so files to -libs for third-party plugins (rfbz#5999)
+- Make build for EL8
+- Drop legacy EL7 stuff
+
* Mon May 24 2021 Neal Gompa <ngompa13(a)gmail.com> - 27.0.0~rc6-1
- Bump to 27.0.0~rc6
diff --git a/sources b/sources
index c7a1d26..c09b279 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (obs-studio-27.0.0-rc6.tar.gz) =
efea2823e73b94041735f1ad10c08be83567a11b89e34bb0941a19b1959dbb2a27f5ffb7cc79dd02ce84f3c170057c766742b10e2e80bf7b51a86135182d0b35
-SHA512 (obs-vst-1b9d20a.tar.gz) =
dd3c722795ecdc07a4836513206b5678ca64da52c0d0f6da1ae98f7ae43815c9d904c5a2cc3eb86d237f55fc28dc9338a4e2541665bcf3d232d2881fa3494e6b
+SHA512 (obs-studio-27.0.0.tar.gz) =
105da97c2adaa4a8404742368ce75ce841264268f82ae39115232dcff65245b09bb252897935fd94b305546023ef762cf8487f47e096e88ce1c27d7820f8f788
+SHA512 (obs-vst-aaa7b7f.tar.gz) =
84e359da46e157e484f49f7e96bbd311d07a4373f474f7419f9791110fa450ec4e4e7531e1581d060fd9942939c4927e779cdc48bd8f2a2f57907a63453da0e3