diff --git a/0201-deps-Add-license-declaration-files.patch b/0201-deps-Add-license-declaration-files.patch deleted file mode 100644 index 1e5173c..0000000 --- a/0201-deps-Add-license-declaration-files.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 076024e724c4da11690735a0958b84650f449136 Mon Sep 17 00:00:00 2001 -From: Neal Gompa -Date: Tue, 29 Aug 2023 11:03:08 -0400 -Subject: [PATCH 201/204] deps: Add license declaration files - ---- - deps/blake2/LICENSE.blake2 | 19 +++++++++++++++++++ - deps/media-playback/LICENSE.media-playback | 18 ++++++++++++++++++ - 2 files changed, 37 insertions(+) - create mode 100644 deps/blake2/LICENSE.blake2 - create mode 100644 deps/media-playback/LICENSE.media-playback - -diff --git a/deps/blake2/LICENSE.blake2 b/deps/blake2/LICENSE.blake2 -new file mode 100644 -index 000000000..3a8abc787 ---- /dev/null -+++ b/deps/blake2/LICENSE.blake2 -@@ -0,0 +1,19 @@ -+BLAKE2 is licensed to permit usage under the terms of the CC0, the OpenSSL License, -+ or the Apache Public License 2.0 at the user's option. -+ -+The license grant is reproduced in full below. -+ -+/* -+ BLAKE2 reference source code package - reference C implementations -+ -+ Copyright 2012, Samuel Neves . You may use this under the -+ terms of the CC0, the OpenSSL Licence, or the Apache Public License 2.0, at -+ your option. The terms of these licenses can be found at: -+ -+ - CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0 -+ - OpenSSL license : https://www.openssl.org/source/license.html -+ - Apache 2.0 : http://www.apache.org/licenses/LICENSE-2.0 -+ -+ More information about the BLAKE2 hash function can be found at -+ https://blake2.net. -+*/ -diff --git a/deps/media-playback/LICENSE.media-playback b/deps/media-playback/LICENSE.media-playback -new file mode 100644 -index 000000000..592844ea1 ---- /dev/null -+++ b/deps/media-playback/LICENSE.media-playback -@@ -0,0 +1,18 @@ -+media-playback is licensed under the ISC license. The license terms are fully -+reproduced below: -+ -+/* -+ * Copyright (c) 2023 Lain Bailey -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ */ --- -2.41.0 - diff --git a/0202-libobs-Add-license-declaration-files.patch b/0202-libobs-Add-license-declaration-files.patch deleted file mode 100644 index 4c72f28..0000000 --- a/0202-libobs-Add-license-declaration-files.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 2a7e284c1396c68d17286d549c4ff451a12f6b4e Mon Sep 17 00:00:00 2001 -From: Neal Gompa -Date: Tue, 29 Aug 2023 11:03:29 -0400 -Subject: [PATCH 202/204] libobs: Add license declaration files - ---- - libobs/graphics/libnsgif/LICENSE.libnsgif | 33 +++++++++++++++++++ - libobs/util/simde/LICENSE.simde | 40 +++++++++++++++++++++++ - 2 files changed, 73 insertions(+) - create mode 100644 libobs/graphics/libnsgif/LICENSE.libnsgif - create mode 100644 libobs/util/simde/LICENSE.simde - -diff --git a/libobs/graphics/libnsgif/LICENSE.libnsgif b/libobs/graphics/libnsgif/LICENSE.libnsgif -new file mode 100644 -index 000000000..9b28c0b45 ---- /dev/null -+++ b/libobs/graphics/libnsgif/LICENSE.libnsgif -@@ -0,0 +1,33 @@ -+libnsgif is licensed under the MIT license. The licensing statement -+and the full license are reproduced below. -+ -+/* -+ * Copyright 2003 James Bursa -+ * Copyright 2004 John Tytgat -+ * Copyright 2004 Richard Wilson -+ * Copyright 2008 Sean Fox -+ * -+ * This file is part of NetSurf's libnsgif, http://www.netsurf-browser.org/ -+ * Licenced under the MIT License, -+ * http://www.opensource.org/licenses/mit-license.php -+ */ -+ -+The MIT License -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in -+all copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -+THE SOFTWARE. -diff --git a/libobs/util/simde/LICENSE.simde b/libobs/util/simde/LICENSE.simde -new file mode 100644 -index 000000000..78d482e75 ---- /dev/null -+++ b/libobs/util/simde/LICENSE.simde -@@ -0,0 +1,40 @@ -+simde is licensed as a combination of MIT and CC0 code. -+ -+License notices for both are reproduced below: -+ -+/* SPDX-License-Identifier: MIT -+ * -+ * Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, copy, -+ * modify, merge, publish, distribute, sublicense, and/or sell copies -+ * of the Software, and to permit persons to whom the Software is -+ * furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+ * SOFTWARE. -+ * -+ * Copyright: -+ * 2017-2020 Evan Nemerson -+ */ -+ -+/* Portable Snippets - https://gitub.com/nemequ/portable-snippets -+ * Created by Evan Nemerson -+ * -+ * To the extent possible under law, the authors have waived all -+ * copyright and related or neighboring rights to this code. For -+ * details, see the Creative Commons Zero 1.0 Universal license at -+ * https://creativecommons.org/publicdomain/zero/1.0/ -+ * -+ * SPDX-License-Identifier: CC0-1.0 -+ */ --- -2.41.0 - diff --git a/0203-decklink-Add-license-declaration-files.patch b/0203-decklink-Add-license-declaration-files.patch deleted file mode 100644 index 75a466b..0000000 --- a/0203-decklink-Add-license-declaration-files.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e044e6eb8f8f8a1ebde03f5d5da91c35eab9e2a2 Mon Sep 17 00:00:00 2001 -From: Neal Gompa -Date: Tue, 29 Aug 2023 11:07:53 -0400 -Subject: [PATCH 203/204] decklink: Add license declaration files - ---- - plugins/decklink/LICENSE.decklink-sdk | 30 +++++++++++++++++++++++++++ - 1 file changed, 30 insertions(+) - create mode 100644 plugins/decklink/LICENSE.decklink-sdk - -diff --git a/plugins/decklink/LICENSE.decklink-sdk b/plugins/decklink/LICENSE.decklink-sdk -new file mode 100644 -index 000000000..a5d1d156c ---- /dev/null -+++ b/plugins/decklink/LICENSE.decklink-sdk -@@ -0,0 +1,30 @@ -+decklink-sdk is licensed under the Boost Software License 1.0 (BSL-1.0). -+ -+The license text is reproduced in full below: -+ -+/* -LICENSE-START- -+** Copyright (c) 2020 Blackmagic Design -+** -+** Permission is hereby granted, free of charge, to any person or organization -+** obtaining a copy of the software and accompanying documentation covered by -+** this license (the "Software") to use, reproduce, display, distribute, -+** execute, and transmit the Software, and to prepare derivative works of the -+** Software, and to permit third-parties to whom the Software is furnished to -+** do so, all subject to the following: -+** -+** The copyright notices in the Software and this entire statement, including -+** the above license grant, this restriction and the following disclaimer, -+** must be included in all copies of the Software, in whole or in part, and -+** all derivative works of the Software, unless such copies or derivative -+** works are solely in the form of machine-executable object code generated by -+** a source language processor. -+** -+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+** DEALINGS IN THE SOFTWARE. -+** -LICENSE-END- -+*/ --- -2.41.0 - diff --git a/0204-obs-qsv11-Add-license-declaration-file.patch b/0204-obs-qsv11-Add-license-declaration-file.patch deleted file mode 100644 index 0adb40f..0000000 --- a/0204-obs-qsv11-Add-license-declaration-file.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 57920b4e6f972cecde91e1c55680511d631af5a8 Mon Sep 17 00:00:00 2001 -From: Neal Gompa -Date: Tue, 29 Aug 2023 11:08:18 -0400 -Subject: [PATCH 204/204] obs-qsv11: Add license declaration file - ---- - plugins/obs-qsv11/obs-qsv11-LICENSE.txt | 59 +++++++++++++++++++++++++ - 1 file changed, 59 insertions(+) - create mode 100644 plugins/obs-qsv11/obs-qsv11-LICENSE.txt - -diff --git a/plugins/obs-qsv11/obs-qsv11-LICENSE.txt b/plugins/obs-qsv11/obs-qsv11-LICENSE.txt -new file mode 100644 -index 000000000..fc8b0d7a8 ---- /dev/null -+++ b/plugins/obs-qsv11/obs-qsv11-LICENSE.txt -@@ -0,0 +1,59 @@ -+The OBS QSV plugin is licensed under either the BSD-3-Clause or GPL-2.0-only licenses. -+ -+The license declaration is reproduced below: -+ -+/* -+ -+This is provided under a dual BSD/GPLv2 license. When using or -+redistributing this, you may do so under either license. -+ -+GPL LICENSE SUMMARY -+ -+Copyright(c) Oct. 2015 Intel Corporation. -+ -+This program is free software; you can redistribute it and/or modify -+it under the terms of version 2 of the GNU General Public License as -+published by the Free Software Foundation. -+ -+This program is distributed in the hope that it will be useful, but -+WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+General Public License for more details. -+ -+Contact Information: -+ -+Seung-Woo Kim, seung-woo.kim@intel.com -+705 5th Ave S #500, Seattle, WA 98104 -+ -+BSD LICENSE -+ -+Copyright(c) Intel Corporation. -+ -+Redistribution and use in source and binary forms, with or without -+modification, are permitted provided that the following conditions -+are met: -+ -+* Redistributions of source code must retain the above copyright -+notice, this list of conditions and the following disclaimer. -+ -+* Redistributions in binary form must reproduce the above copyright -+notice, this list of conditions and the following disclaimer in -+the documentation and/or other materials provided with the -+distribution. -+ -+* Neither the name of Intel Corporation nor the names of its -+contributors may be used to endorse or promote products derived -+from this software without specific prior written permission. -+ -+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+*/ --- -2.41.0 - diff --git a/obs-studio.spec b/obs-studio.spec index a74d141..fae53c2 100644 --- a/obs-studio.spec +++ b/obs-studio.spec @@ -23,15 +23,15 @@ %global openh264_soversion 7 -%global obswebsocket_version 5.3.0 +%global obswebsocket_version 5.3.2 #global commit ad859a3f66daac0d30eebcc9b07b0c2004fb6040 #global snapdate 202303261743 #global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: obs-studio -Version: 30.0.0~beta3 -Release: 4%{?dist} +Version: 30.0.0~rc1 +Release: 1%{?dist} Summary: Open Broadcaster Software Studio # OBS itself is GPL-2.0-or-later, while various plugin dependencies are of various other licenses @@ -53,13 +53,6 @@ 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 -## From: https://github.com/obsproject/obs-studio/pull/8777 -Patch0201: 0201-deps-Add-license-declaration-files.patch -Patch0202: 0202-libobs-Add-license-declaration-files.patch -Patch0203: 0203-decklink-Add-license-declaration-files.patch -Patch0204: 0204-obs-qsv11-Add-license-declaration-file.patch - - # Downstream Fedora patches ## Downgrade to CMake 3.20 for RHEL 9 compatibility Patch1001: obs-studio-30-cmake-3.20.patch @@ -314,6 +307,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %changelog +* Fri Oct 13 2023 Neal Gompa - 30.0.0~rc1-1 +- Update to 30.0.0~rc1 + * Fri Oct 13 2023 Jan Grulich - 30.0.0~beta3-4 - Rebuild (qt6) diff --git a/sources b/sources index ce06999..86d2693 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (obs-studio-30.0.0-beta3.tar.gz) = 623099dfe5ff031441d7b2b169c0712b61b0dd74c848eae231e8937cbaa991e5ad92bb8a0bfd1a7ba40e193319ea0612f3290fe507739d6cafd2fc7f42986fa4 -SHA512 (obs-websocket-5.3.0.tar.gz) = 814fa721dce2e96e0ced63d3aac3db29fb051244937deea8a708cf621903710fabeec92b78b7ce304e8e15d7ec9fb38ded11edf56f6aa8b23d416b0fb87b5994 +SHA512 (obs-studio-30.0.0-rc1.tar.gz) = 291b15f554348a8897345b948d442960cf3365ae96d9468a2ceec6ae379009ced10fad99d2f754ec5d3ed42fd84ecf20797764c14287e9b393b0d9089cfb3c64 +SHA512 (obs-websocket-5.3.2.tar.gz) = f3d51046d3a8a9d99f7553ab8ec86a47440966d33635813d5feffdb9ad8c42182f48611f14b986c648ac133f5ab0a3b2e04d6072bcd323fd3fdaed24518e4b51