commit b0d0033c63355e32b307f721a0a3765770a8261f Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net&gt; Date: Thu Nov 16 19:19:34 2023 +0100 sync with Fedora ...ntly-reference-the-software-H264-encoder-.patch | 0 ...Add-initial-support-for-the-OpenH264-H.26.patch | 0 ...ort-for-OpenH264-as-the-worst-case-fallba.patch | 0 obs-studio-UI-use-fdk-aac-by-default.patch | 36 ++++ ...studio-deps-Add-license-declaration-files.patch | 218 --------------------- obs-studio-freeworld.spec | 18 +- ...io-obs-qsv11-Add-license-declaration-file.patch | 79 -------- obs-studio-websocket-use-system-qrcodegencpp.patch | 107 ---------- 8 files changed, 46 insertions(+), 412 deletions(-) --- diff --git a/0001-UI-Consistently-reference-the-software-H264-encoder-.patch b/0101-UI-Consistently-reference-the-software-H264-encoder-.patch similarity index 100% rename from 0001-UI-Consistently-reference-the-software-H264-encoder-.patch rename to 0101-UI-Consistently-reference-the-software-H264-encoder-.patch diff --git a/0002-obs-ffmpeg-Add-initial-support-for-the-OpenH264-H.26.patch b/0102-obs-ffmpeg-Add-initial-support-for-the-OpenH264-H.26.patch similarity index 100% rename from 0002-obs-ffmpeg-Add-initial-support-for-the-OpenH264-H.26.patch rename to 0102-obs-ffmpeg-Add-initial-support-for-the-OpenH264-H.26.patch diff --git a/0003-UI-Add-support-for-OpenH264-as-the-worst-case-fallba.patch b/0103-UI-Add-support-for-OpenH264-as-the-worst-case-fallba.patch similarity index 100% rename from 0003-UI-Add-support-for-OpenH264-as-the-worst-case-fallba.patch rename to 0103-UI-Add-support-for-OpenH264-as-the-worst-case-fallba.patch diff --git a/obs-studio-UI-use-fdk-aac-by-default.patch b/obs-studio-UI-use-fdk-aac-by-default.patch new file mode 100644 index 0000000..5f9d1e1 --- /dev/null +++ b/obs-studio-UI-use-fdk-aac-by-default.patch @@ -0,0 +1,36 @@ +From 841fd01b7a529b7c1d0e0a509190a26eb1220d5a Mon Sep 17 00:00:00 2001 +From: Neal Gompa <neal(a)gompa.dev&gt; +Date: Thu, 4 May 2023 13:52:01 -0400 +Subject: [PATCH] UI: Default to fdk-aac for AAC when auto-configuring settings + +We always have the FDK-AAC codec available, and it's a better +codec anyway. +--- + UI/window-basic-auto-config-test.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/UI/window-basic-auto-config-test.cpp b/UI/window-basic-auto-config-test.cpp +index c791c8b8b..7dabfd93f 100644 +--- a/UI/window-basic-auto-config-test.cpp ++++ b/UI/window-basic-auto-config-test.cpp +@@ -202,7 +202,7 @@ void AutoConfigTestPage::TestBandwidthThread() + (wiz->x264Available ? "obs_x264" : "ffmpeg_openh264"), + "test_h264", nullptr, nullptr); + OBSEncoderAutoRelease aencoder = obs_audio_encoder_create( +- "ffmpeg_aac", "test_aac", nullptr, 0, nullptr); ++ "libfdk_aac", "test_aac", nullptr, 0, nullptr); + OBSServiceAutoRelease service = obs_service_create( + serverType, "test_service", nullptr, nullptr); + +@@ -572,7 +572,7 @@ bool AutoConfigTestPage::TestSoftwareEncoding() + (wiz->x264Available ? "obs_x264" : "ffmpeg_openh264"), + "test_h264", nullptr, nullptr); + OBSEncoderAutoRelease aencoder = obs_audio_encoder_create( +- "ffmpeg_aac", "test_aac", nullptr, 0, nullptr); ++ "libfdk_aac", "test_aac", nullptr, 0, nullptr); + OBSOutputAutoRelease output = + obs_output_create("null_output", "null", nullptr, nullptr); + +-- +2.40.0 + diff --git a/obs-studio-freeworld.spec b/obs-studio-freeworld.spec index e15736b..51317b8 100644 --- a/obs-studio-freeworld.spec +++ b/obs-studio-freeworld.spec @@ -25,12 +25,12 @@ Name: obs-studio-freeworld Version: 30.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open Broadcaster Software Studio -- Freeworld plugins # OBS itself is GPL-2.0-or-later, while various plugin dependencies are of various other licenses # The licenses for those dependencies are captured with the bundled provides statements -License: GPL-2.0-or-later and ISC and MIT and BSD-1-Clause and BSD-2-Clause and BSD-3-Clause and BSL-1.0 and LGPL-2.1-or-later and CC0-1.0 and (CC0-1.0 or OpenSSL or Apache-2.0) and LicenseRef-Fedora-Public-Domain and (BSD-3-Clause or GPL-2.0-only) +License: GPL-2.0-or-later and MIT and BSD-1-Clause and BSD-2-Clause and BSD-3-Clause and BSL-1.0 and LGPL-2.1-or-later and CC0-1.0 and (CC0-1.0 or OpenSSL or Apache-2.0) and LicenseRef-Fedora-Public-Domain and (BSD-3-Clause or GPL-2.0-only) URL: https://obsproject.com/ %if 0%{?snapdate} Source0: https://github.com/obsproject/obs-studio/archive/%{commit}/%{origname}-%{... @@ -43,14 +43,16 @@ Source1: https://github.com/obsproject/obs-websocket/archive/%{obswebsock # Proposed upstream ## From: https://github.com/obsproject/obs-studio/pull/8529 -Patch0101: 0001-UI-Consistently-reference-the-software-H264-encoder-.patch -Patch0102: 0002-obs-ffmpeg-Add-initial-support-for-the-OpenH264-H.26.patch -Patch0103: 0003-UI-Add-support-for-OpenH264-as-the-worst-case-fallba.patch +Patch0101: 0101-UI-Consistently-reference-the-software-H264-encoder-.patch +Patch0102: 0102-obs-ffmpeg-Add-initial-support-for-the-OpenH264-H.26.patch +Patch0103: 0103-UI-Add-support-for-OpenH264-as-the-worst-case-fallba.patch # Downstream Fedora patches ## Downgrade to CMake 3.20 for RHEL 9 compatibility Patch1001: obs-studio-30-cmake-3.20.patch +## Use fdk-aac by default +Patch1002: obs-studio-UI-use-fdk-aac-by-default.patch BuildRequires: gcc @@ -130,8 +132,6 @@ Provides: bundled(blake2) Provides: bundled(json11) ## License: MIT Provides: bundled(libcaption) -## License: ISC -Provides: bundled(libff) ## License: BSD-1-Clause Provides: bundled(uthash) ## License: BSD-3-Clause @@ -244,7 +244,6 @@ cp deps/libcaption/LICENSE.txt .fedora-rpm/licenses/deps/libcaption-LICENSE.txt cp plugins/obs-qsv11/QSV11-License-Clarification-Email.txt .fedora-rpm/licenses/plugins/QSV11-License-Clarification-Email.txt cp deps/uthash/uthash/LICENSE .fedora-rpm/licenses/deps/uthash-LICENSE cp deps/blake2/LICENSE.blake2 .fedora-rpm/licenses/deps/ -#cp deps/libff/LICENSE.libff .fedora-rpm/licenses/deps/ cp deps/media-playback/LICENSE.media-playback .fedora-rpm/licenses/deps/ cp libobs/graphics/libnsgif/LICENSE.libnsgif .fedora-rpm/licenses/deps/ cp libobs/util/simde/LICENSE.simde .fedora-rpm/licenses/deps/ @@ -290,6 +289,9 @@ mv preserve/%{_prefix} %{buildroot} %changelog +* Thu Nov 16 2023 Dominik Mierzejewski <dominik(a)greysector.net&gt; - 30.0.0-2 +- sync with Fedora + * Wed Nov 15 2023 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 30.0.0-1 - Update to 30.0.0