[obs-studio/f36] (8 commits) ...Use qt6 for rawhide only
by Leigh Scott
Summary of changes:
30a17ad... - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass (*)
44ecc3c... Trying to fix ffmpeg 5.1 build issue. (*)
4aec616... Apply ffmpeg workaround only for F37+. (*)
1ba0cdb... Added upstream patch with ffmpeg 5 fix. (*)
8732143... Update to 28.0.1 (*)
5c782b5... touch the missing sub-modules instead (*)
265c7d3... Fix wrong svg names (*)
ae3957c... Use qt6 for rawhide only (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 2 months
[obs-studio] Use qt6 for rawhide only
by Leigh Scott
commit ae3957c5a0f81b6eff3fa76bca6fd54bafb0ee9d
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Sep 13 21:41:00 2022 +0100
Use qt6 for rawhide only
obs-studio.spec | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
---
diff --git a/obs-studio.spec b/obs-studio.spec
index eac813c..a603681 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -11,7 +11,7 @@
Name: obs-studio
Version: 28.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Open Broadcaster Software Studio
License: GPLv2+
@@ -50,10 +50,18 @@ BuildRequires: pciutils-devel
BuildRequires: pipewire-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: python3-devel
+%if 0%{?fedora} && 0%{?fedora} > 37
BuildRequires: qt6-qtbase-devel
BuildRequires: qt6-qtbase-private-devel
BuildRequires: qt6-qtsvg-devel
BuildRequires: qt6-qtwayland-devel
+%else
+BuildRequires: qt5-qtbase-devel
+BuildRequires: qt5-qtbase-private-devel
+BuildRequires: qt5-qtsvg-devel
+BuildRequires: qt5-qtwayland-devel
+BuildRequires: qt5-qtx11extras-devel
+%endif
BuildRequires: speexdsp-devel
BuildRequires: swig
BuildRequires: systemd-devel
@@ -148,6 +156,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
%{_includedir}/obs/
%changelog
+* Tue Sep 13 2022 Leigh Scott <leigh123linux(a)gmail.com> - 28.0.1-4
+- Use qt6 for rawhide only
+
* Tue Sep 13 2022 Leigh Scott <leigh123linux(a)gmail.com> - 28.0.1-3
- Fix wrong svg names
2 years, 2 months
[obs-studio] Fix wrong svg names
by Leigh Scott
commit 265c7d3349c9b52caeb28e2eb1c982844ce05efc
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Sep 13 14:08:29 2022 +0100
Fix wrong svg names
obs-studio-28.0.1_fix_svg_names.patch | 70 +++++++++++++++++++++++++++++++++++
obs-studio.spec | 6 ++-
2 files changed, 75 insertions(+), 1 deletion(-)
---
diff --git a/obs-studio-28.0.1_fix_svg_names.patch b/obs-studio-28.0.1_fix_svg_names.patch
new file mode 100644
index 0000000..e9add50
--- /dev/null
+++ b/obs-studio-28.0.1_fix_svg_names.patch
@@ -0,0 +1,70 @@
+diff -uNrp a/UI/data/themes/Acri.qss b/UI/data/themes/Acri.qss
+--- a/UI/data/themes/Acri.qss 2022-09-03 04:09:59.000000000 +0100
++++ b/UI/data/themes/Acri.qss 2022-09-13 13:58:16.263225325 +0100
+@@ -300,8 +300,8 @@ QDockWidget {
+ font-size: 10.5pt;
+ font-weight: bold;
+
+- titlebar-close-icon: url('./Dark/Close.svg');
+- titlebar-normal-icon: url('./Dark/Popout.svg');
++ titlebar-close-icon: url('./Dark/close.svg');
++ titlebar-normal-icon: url('./Dark/popout.svg');
+ }
+
+ QDockWidget::title {
+diff -uNrp a/UI/data/themes/Grey.qss b/UI/data/themes/Grey.qss
+--- a/UI/data/themes/Grey.qss 2022-09-03 04:09:59.000000000 +0100
++++ b/UI/data/themes/Grey.qss 2022-09-13 13:58:16.265225322 +0100
+@@ -300,8 +300,8 @@ QDockWidget {
+ font-size: 10.5pt;
+ font-weight: bold;
+
+- titlebar-close-icon: url('./Dark/Close.svg');
+- titlebar-normal-icon: url('./Dark/Popout.svg');
++ titlebar-close-icon: url('./Dark/close.svg');
++ titlebar-normal-icon: url('./Dark/popout.svg');
+ }
+
+ QDockWidget::title {
+diff -uNrp a/UI/data/themes/Light.qss b/UI/data/themes/Light.qss
+--- a/UI/data/themes/Light.qss 2022-09-03 04:09:59.000000000 +0100
++++ b/UI/data/themes/Light.qss 2022-09-13 13:58:16.267225319 +0100
+@@ -300,8 +300,8 @@ QDockWidget {
+ font-size: 10.5pt;
+ font-weight: bold;
+
+- titlebar-close-icon: url('./Light/Close.svg');
+- titlebar-normal-icon: url('./Light/Popout.svg');
++ titlebar-close-icon: url('./Light/close.svg');
++ titlebar-normal-icon: url('./Light/popout.svg');
+ }
+
+ QDockWidget::title {
+diff -uNrp a/UI/data/themes/Rachni.qss b/UI/data/themes/Rachni.qss
+--- a/UI/data/themes/Rachni.qss 2022-09-03 04:09:59.000000000 +0100
++++ b/UI/data/themes/Rachni.qss 2022-09-13 13:58:16.269225316 +0100
+@@ -302,8 +302,8 @@ QDockWidget {
+ font-size: 10.5pt;
+ font-weight: bold;
+
+- titlebar-close-icon: url('./Dark/Close.svg');
+- titlebar-normal-icon: url('./Dark/Popout.svg');
++ titlebar-close-icon: url('./Dark/close.svg');
++ titlebar-normal-icon: url('./Dark/popout.svg');
+ }
+
+ QDockWidget::title {
+diff -uNrp a/UI/data/themes/Yami.qss b/UI/data/themes/Yami.qss
+--- a/UI/data/themes/Yami.qss 2022-09-03 04:09:59.000000000 +0100
++++ b/UI/data/themes/Yami.qss 2022-09-13 13:58:16.271225313 +0100
+@@ -304,8 +304,8 @@ QDockWidget {
+ font-size: 10.5pt;
+ font-weight: bold;
+
+- titlebar-close-icon: url('./Dark/Close.svg');
+- titlebar-normal-icon: url('./Dark/Popout.svg');
++ titlebar-close-icon: url('./Dark/close.svg');
++ titlebar-normal-icon: url('./Dark/popout.svg');
+ }
+
+ QDockWidget::title {
diff --git a/obs-studio.spec b/obs-studio.spec
index b66b45f..eac813c 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -11,12 +11,13 @@
Name: obs-studio
Version: 28.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Open Broadcaster Software Studio
License: GPLv2+
URL: https://obsproject.com/
Source0: https://github.com/obsproject/obs-studio/archive/%{version}/%{name}-%{ver...
+Patch0: %{name}-%{version}_fix_svg_names.patch
BuildRequires: gcc
BuildRequires: cmake >= 3.0
@@ -147,6 +148,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
%{_includedir}/obs/
%changelog
+* Tue Sep 13 2022 Leigh Scott <leigh123linux(a)gmail.com> - 28.0.1-3
+- Fix wrong svg names
+
* Tue Sep 13 2022 Leigh Scott <leigh123linux(a)gmail.com> - 28.0.1-2
- touch the missing sub-modules instead
2 years, 2 months
[obs-studio] touch the missing sub-modules instead
by Leigh Scott
commit 5c782b58c062c33c43afb0159d3b1cc521908869
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Sep 13 13:31:06 2022 +0100
touch the missing sub-modules instead
obs-studio.spec | 20 +++++++-------------
sources | 2 --
2 files changed, 7 insertions(+), 15 deletions(-)
---
diff --git a/obs-studio.spec b/obs-studio.spec
index 484e5b8..b66b45f 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -2,12 +2,6 @@
# bytecompile with Python 3
%global __python %{__python3}
-%global commit1 b6e0888084ab623f0a73e8cb7ee5dc341e56fda1
-%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
-
-%global commit2 5716577019b1ccda01a12db2cba35a023082b7ad
-%global shortcommit2 %(c=%{commit1}; echo ${c:0:7})
-
%ifarch %{power64}
# LuaJIT is not available for POWER
%bcond_with lua_scripting
@@ -17,15 +11,12 @@
Name: obs-studio
Version: 28.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Open Broadcaster Software Studio
License: GPLv2+
URL: https://obsproject.com/
Source0: https://github.com/obsproject/obs-studio/archive/%{version}/%{name}-%{ver...
-# Add the missing submodules and set as disabled
-Source1: https://github.com/obsproject/obs-browser/archive/%{commit1}/obs-browser-...
-Source2: https://github.com/obsproject/obs-websocket/archive/%{commit2}/obs-websoc...
BuildRequires: gcc
BuildRequires: cmake >= 3.0
@@ -99,9 +90,9 @@ Header files for Open Broadcaster Software
# replace OBS_MULTIARCH_SUFFIX by LIB_SUFFIX
sed -i 's|OBS_MULTIARCH_SUFFIX|LIB_SUFFIX|g' cmake/Modules/ObsHelpers.cmake
-# Prepare the missing submodules
-tar -xf %{SOURCE1} -C plugins/obs-browser --strip-components=1
-tar -xf %{SOURCE2} -C plugins/obs-websocket --strip-components=1
+# touch the missing submodules
+touch plugins/obs-browser/CMakeLists.txt
+touch plugins/obs-websocket/CMakeLists.txt
# remove -Werror flag to mitigate FTBFS with ffmpeg 5.1
sed -i 's|-Werror-implicit-function-declaration||g' CMakeLists.txt
@@ -156,6 +147,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
%{_includedir}/obs/
%changelog
+* Tue Sep 13 2022 Leigh Scott <leigh123linux(a)gmail.com> - 28.0.1-2
+- touch the missing sub-modules instead
+
* Tue Sep 13 2022 Leigh Scott <leigh123linux(a)gmail.com> - 28.0.1-1
- Update to 28.0.1
- Remove vst sub-module as it's qt5 only
diff --git a/sources b/sources
index 0423135..fec9630 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
SHA512 (obs-studio-28.0.1.tar.gz) = fc7b03ce116f61da281af430c8bcc44baee6ebef62aacb6ec6d41efdfc6f5440d86c1679dafc3608c0ced1513f19ed8aead29e26d77e3d3eb6bacb4a1038f6d6
-SHA512 (obs-browser-b6e0888.tar.gz) = 49d7033bc4b7ca867a4a0e76e45b487ad9a5ab395ce1cd68a92a78a9e12ddcfaf9fe3223729d9e0ee9910f05e084499ca689415e025528efd531eb1f542f3d08
-SHA512 (obs-websocket-b6e0888.tar.gz) = 9bb511c9693889f9837cd001fafe403762d44f2ecc80bad42e592d7555e3807a148ab19638724871b7807e71edf5f62a1e0ea62f362fd1b9a6e9bf49000b8a5c
2 years, 2 months
[obs-studio] Update to 28.0.1
by Leigh Scott
commit 8732143c4063398851ec583c2f6bddd541d979eb
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Sep 13 12:48:00 2022 +0100
Update to 28.0.1
.gitignore | 2 ++
obs-studio-27.2.4-ffmpeg5.patch | 39 ----------------------------------
obs-studio.spec | 46 ++++++++++++++++++++++++++---------------
sources | 5 +++--
4 files changed, 34 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c3ea7c9..64daa9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
/obs-studio-*.tar.gz
/obs-vst-*.tar.gz
+/obs-browser-b6e0888.tar.gz
+/obs-websocket-b6e0888.tar.gz
diff --git a/obs-studio.spec b/obs-studio.spec
index 58c5c21..484e5b8 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -1,10 +1,13 @@
-%undefine __cmake_in_source_build
+%global __brp_check_rpaths %{nil}
# bytecompile with Python 3
%global __python %{__python3}
-%global commit1 8ad3f64e702ac4f1799b209a511620eb1d096a01
+%global commit1 b6e0888084ab623f0a73e8cb7ee5dc341e56fda1
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
+%global commit2 5716577019b1ccda01a12db2cba35a023082b7ad
+%global shortcommit2 %(c=%{commit1}; echo ${c:0:7})
+
%ifarch %{power64}
# LuaJIT is not available for POWER
%bcond_with lua_scripting
@@ -13,17 +16,16 @@
%endif
Name: obs-studio
-Version: 27.2.4
-Release: 5%{?dist}
+Version: 28.0.1
+Release: 1%{?dist}
Summary: Open Broadcaster Software Studio
License: GPLv2+
URL: https://obsproject.com/
Source0: https://github.com/obsproject/obs-studio/archive/%{version}/%{name}-%{ver...
-Source1: https://github.com/obsproject/obs-vst/archive/%{commit1}/obs-vst-%{shortc...
-
-# https://github.com/obsproject/obs-studio/commit/e66542075d5d2cb51a14a0bdf...
-Patch100: %{name}-27.2.4-ffmpeg5.patch
+# Add the missing submodules and set as disabled
+Source1: https://github.com/obsproject/obs-browser/archive/%{commit1}/obs-browser-...
+Source2: https://github.com/obsproject/obs-websocket/archive/%{commit2}/obs-websoc...
BuildRequires: gcc
BuildRequires: cmake >= 3.0
@@ -56,11 +58,10 @@ BuildRequires: pciutils-devel
BuildRequires: pipewire-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: python3-devel
-BuildRequires: qt5-qtbase-devel
-BuildRequires: qt5-qtbase-private-devel
-BuildRequires: qt5-qtsvg-devel
-BuildRequires: qt5-qtwayland-devel
-BuildRequires: qt5-qtx11extras-devel
+BuildRequires: qt6-qtbase-devel
+BuildRequires: qt6-qtbase-private-devel
+BuildRequires: qt6-qtsvg-devel
+BuildRequires: qt6-qtwayland-devel
BuildRequires: speexdsp-devel
BuildRequires: swig
BuildRequires: systemd-devel
@@ -98,8 +99,9 @@ Header files for Open Broadcaster Software
# replace OBS_MULTIARCH_SUFFIX by LIB_SUFFIX
sed -i 's|OBS_MULTIARCH_SUFFIX|LIB_SUFFIX|g' cmake/Modules/ObsHelpers.cmake
-# Prepare plugins/obs-vst
-tar -xf %{SOURCE1} -C plugins/obs-vst --strip-components=1
+# Prepare the missing submodules
+tar -xf %{SOURCE1} -C plugins/obs-browser --strip-components=1
+tar -xf %{SOURCE2} -C plugins/obs-websocket --strip-components=1
# remove -Werror flag to mitigate FTBFS with ffmpeg 5.1
sed -i 's|-Werror-implicit-function-declaration||g' CMakeLists.txt
@@ -108,6 +110,9 @@ sed -i 's|-Werror-implicit-function-declaration||g' CMakeLists.txt
%cmake -DOBS_VERSION_OVERRIDE=%{version} \
-DUNIX_STRUCTURE=1 -GNinja \
-DBUILD_BROWSER=OFF \
+ -DENABLE_WEBSOCKET=OFF \
+ -DENABLE_NEW_MPEGTS_OUTPUT=OFF \
+ -DENABLE_AJA=OFF \
%if ! %{with lua_scripting}
-DDISABLE_LUA=ON \
%endif
@@ -120,7 +125,7 @@ sed -i 's|-Werror-implicit-function-declaration||g' CMakeLists.txt
# Add missing files to enable the build of obs-ndi
install -Dm644 UI/obs-frontend-api/obs-frontend-api.h %{buildroot}%{_includedir}/obs/
-install -Dm644 cmake/external/ObsPluginHelpers.cmake %{buildroot}%{_libdir}/cmake/LibObs/
+install -Dm644 cmake/external/ObsPluginHelpers.cmake %{buildroot}%{_libdir}/cmake/libobs/
%check
/usr/bin/desktop-file-validate %{buildroot}/%{_datadir}/applications/com.obsproject.Studio.desktop
@@ -145,11 +150,18 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
%{_libdir}/*.so.*
%files devel
-%{_libdir}/cmake/LibObs/
+%{_libdir}/cmake/libobs/
+%{_libdir}/cmake/obs-frontend-api/
%{_libdir}/pkgconfig/libobs.pc
%{_includedir}/obs/
%changelog
+* Tue Sep 13 2022 Leigh Scott <leigh123linux(a)gmail.com> - 28.0.1-1
+- Update to 28.0.1
+- Remove vst sub-module as it's qt5 only
+- Add browser and websocket sub-modules so the source compiles
+ Upstream can fix their own mess!
+
* Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 27.2.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
diff --git a/sources b/sources
index 2a88fb1..0423135 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-SHA512 (obs-studio-27.2.4.tar.gz) = 575341dd3d9240b21881517a16d01ca11f833e08b40ca7990f0360b4cd1076e8217a9bb8dddf174eca5429e6eadaadb6cfdbd61d24e0eb13ebeaa7f29cfad8bf
-SHA512 (obs-vst-8ad3f64.tar.gz) = b3608e856668671d9e245c7bc5bfa24c5ed2a53cf78d71ca210885bea64d4057644e97d21c8ad0c08595c1ee7556a894a3684aa286279f75c618f60bd868505e
+SHA512 (obs-studio-28.0.1.tar.gz) = fc7b03ce116f61da281af430c8bcc44baee6ebef62aacb6ec6d41efdfc6f5440d86c1679dafc3608c0ced1513f19ed8aead29e26d77e3d3eb6bacb4a1038f6d6
+SHA512 (obs-browser-b6e0888.tar.gz) = 49d7033bc4b7ca867a4a0e76e45b487ad9a5ab395ce1cd68a92a78a9e12ddcfaf9fe3223729d9e0ee9910f05e084499ca689415e025528efd531eb1f542f3d08
+SHA512 (obs-websocket-b6e0888.tar.gz) = 9bb511c9693889f9837cd001fafe403762d44f2ecc80bad42e592d7555e3807a148ab19638724871b7807e71edf5f62a1e0ea62f362fd1b9a6e9bf49000b8a5c
2 years, 2 months
[rpmfusion-nonfree-obsolete-packages] Add caja-dropbox
by Leigh Scott
commit dfd1b251fe09f18ad9255acb3c88c067eb695bfa
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Sep 13 01:38:50 2022 +0100
Add caja-dropbox
rpmfusion-nonfree-obsolete-packages.spec | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/rpmfusion-nonfree-obsolete-packages.spec b/rpmfusion-nonfree-obsolete-packages.spec
index ad10675..256b57c 100644
--- a/rpmfusion-nonfree-obsolete-packages.spec
+++ b/rpmfusion-nonfree-obsolete-packages.spec
@@ -1,6 +1,6 @@
Name: rpmfusion-nonfree-obsolete-packages
-Version: 31
-Release: 1%{?dist}
+Version: 37
+Release: 2%{?dist}
Summary: A package to obsolete retired packages from rpmfusion-nonfree
License: MIT
@@ -25,12 +25,17 @@ Obsoletes: gens-gs < 2.16.7-12
# Last build Mosaic-2.7-0.12.b5.fc29
Provides: Mosaic = 2.7-0.13
Obsoletes: Mosaic < 2.7-0.13
-# Last build pcsx2-1.4-11.fc29
-Provides: pcsx2 = 1.4-12
-Obsoletes: pcsx2 < 1.4-12
# Last build gstreamer-plugins-bad-nonfree-0.10.23-10.fc31
Provides: gstreamer-plugins-bad-nonfree = 0.10.23-11
Obsoletes: gstreamer-plugins-bad-nonfree < 0.10.23-11
+# Last build nautilus-dropbox-2020.03.04-3.fc35
+Provides: nautilus-dropbox = 2020.03.04-4
+Obsoletes: nautilus-dropbox < 2020.03.04-4
+Provides: dropbox = 2020.03.04-4
+Obsoletes: dropbox < 2020.03.04-4
+# Last build caja-dropbox-1.26.0-2.fc37
+Provides: caja-dropbox = 1.26.0-3
+Obsoletes: caja-dropbox < 1.26.0-3
%description
This package exists only to obsolete other packages which need to be removed
@@ -53,6 +58,14 @@ cp -p %{SOURCE0} .
%changelog
+* Tue Sep 13 2022 Leigh Scott <leigh123linux(a)gmail.com> - 37-2
+- Add caja-dropbox
+- Remove pcsx2
+
+* Mon Sep 12 2022 Alexander Ploumistos <alexpl(a)fedoraproject.org> - 37-1
+- Add nautilus-dropbox and it's sub-package
+- Bump version to 37
+
* Fri Aug 23 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 31-1
- Bump version to 31
- Add gstreamer-plugins-bad-nonfree
2 years, 2 months