Update to 29.1.0~rc1
This commit is contained in:
Neal Gompa
parent
85df4e68b4
commit
9f352155c5
|
|
@ -1,31 +0,0 @@
|
|||
From 67803fa3106cff4daefbdfd872045ca9cc7f4569 Mon Sep 17 00:00:00 2001
|
||||
From: derrod <dennis@obsproject.com>
|
||||
Date: Mon, 17 Apr 2023 03:42:56 +0200
|
||||
Subject: [PATCH] cmake: Set C11 for CMake < 3.21
|
||||
|
||||
---
|
||||
cmake/Modules/CompilerConfig.cmake | 11 +++++++++--
|
||||
1 file changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/cmake/Modules/CompilerConfig.cmake b/cmake/Modules/CompilerConfig.cmake
|
||||
index 763490008c848..41c56da8b4cee 100644
|
||||
--- a/cmake/Modules/CompilerConfig.cmake
|
||||
+++ b/cmake/Modules/CompilerConfig.cmake
|
||||
@@ -5,8 +5,15 @@ set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||
|
||||
-set(CMAKE_C_STANDARD 17)
|
||||
-set(CMAKE_C_STANDARD_REQUIRED ON)
|
||||
+# CMake < 3.21 only goes up to 11, but it's mostly identical to 17 anyway.
|
||||
+if(${CMAKE_VERSION} VERSION_LESS "3.21.0")
|
||||
+ set(CMAKE_C_STANDARD 11)
|
||||
+ set(CMAKE_C_STANDARD_REQUIRED ON)
|
||||
+else()
|
||||
+ set(CMAKE_C_STANDARD 17)
|
||||
+ set(CMAKE_C_STANDARD_REQUIRED ON)
|
||||
+endif()
|
||||
+
|
||||
# TODO/FIXME: Investigate disabling C extensions on Linux/POSIX
|
||||
if(OS_MACOS OR NOT OS_POSIX)
|
||||
set(CMAKE_C_EXTENSIONS OFF)
|
||||
|
|
@ -1,17 +1,19 @@
|
|||
From fc1e6bf09f9c9d1501cd1d46a443501b19080d8d Mon Sep 17 00:00:00 2001
|
||||
From b6be0b4bf5b0b2f26c8143641881cde23ac8ba9c Mon Sep 17 00:00:00 2001
|
||||
From: Neal Gompa <neal@gompa.dev>
|
||||
Date: Sat, 15 Apr 2023 22:48:21 -0400
|
||||
Subject: [PATCH] deps: Add license declaration files
|
||||
Date: Wed, 26 Apr 2023 07:56:35 -0400
|
||||
Subject: [PATCH 1/2] deps: Add license declaration files
|
||||
|
||||
---
|
||||
deps/blake2/LICENSE.blake2 | 19 +++++++++++
|
||||
deps/libff/LICENSE.libff | 18 ++++++++++
|
||||
libobs/graphics/libnsgif/LICENSE.libnsgif | 33 +++++++++++++++++++
|
||||
libobs/util/simde/LICENSE.simde | 40 +++++++++++++++++++++++
|
||||
plugins/decklink/LICENSE.decklink-sdk | 30 +++++++++++++++++
|
||||
5 files changed, 140 insertions(+)
|
||||
deps/blake2/LICENSE.blake2 | 19 ++++++++++
|
||||
deps/libff/LICENSE.libff | 18 ++++++++++
|
||||
deps/media-playback/LICENSE.media-playback | 19 ++++++++++
|
||||
libobs/graphics/libnsgif/LICENSE.libnsgif | 33 ++++++++++++++++++
|
||||
libobs/util/simde/LICENSE.simde | 40 ++++++++++++++++++++++
|
||||
plugins/decklink/LICENSE.decklink-sdk | 30 ++++++++++++++++
|
||||
6 files changed, 159 insertions(+)
|
||||
create mode 100644 deps/blake2/LICENSE.blake2
|
||||
create mode 100644 deps/libff/LICENSE.libff
|
||||
create mode 100644 deps/media-playback/LICENSE.media-playback
|
||||
create mode 100644 libobs/graphics/libnsgif/LICENSE.libnsgif
|
||||
create mode 100644 libobs/util/simde/LICENSE.simde
|
||||
create mode 100644 plugins/decklink/LICENSE.decklink-sdk
|
||||
|
|
@ -65,6 +67,31 @@ index 000000000..b6f51157a
|
|||
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
+ */
|
||||
diff --git a/deps/media-playback/LICENSE.media-playback b/deps/media-playback/LICENSE.media-playback
|
||||
new file mode 100644
|
||||
index 000000000..17d74f4b3
|
||||
--- /dev/null
|
||||
+++ b/deps/media-playback/LICENSE.media-playback
|
||||
@@ -0,0 +1,19 @@
|
||||
+media-playback is licensed under the ISC license. The license terms are fully
|
||||
+reproduced below:
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * Copyright (c) 2023 Hugh Bailey <obs.jim@gmail.com>
|
||||
+ *
|
||||
+ * 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.
|
||||
+ */
|
||||
diff --git a/libobs/graphics/libnsgif/LICENSE.libnsgif b/libobs/graphics/libnsgif/LICENSE.libnsgif
|
||||
new file mode 100644
|
||||
index 000000000..9b28c0b45
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 3a0f7532b9d9b83d90dd5b6c2096e7f9bca88879 Mon Sep 17 00:00:00 2001
|
||||
From fbfa25ade86c26088333b3c5e6c39d4a61fc748f Mon Sep 17 00:00:00 2001
|
||||
From: Neal Gompa <neal@gompa.dev>
|
||||
Date: Tue, 18 Apr 2023 02:58:37 -0400
|
||||
Subject: [PATCH] obs-qsv11: Add license declaration file
|
||||
Date: Wed, 26 Apr 2023 07:56:42 -0400
|
||||
Subject: [PATCH 2/2] obs-qsv11: Add license declaration file
|
||||
|
||||
---
|
||||
plugins/obs-qsv11/obs-qsv11-LICENSE.txt | 60 +++++++++++++++++++++++++
|
||||
|
|
@ -10,18 +10,18 @@ Subject: [PATCH] obs-qsv11: Add license declaration file
|
|||
|
||||
diff --git a/plugins/obs-qsv11/obs-qsv11-LICENSE.txt b/plugins/obs-qsv11/obs-qsv11-LICENSE.txt
|
||||
new file mode 100644
|
||||
index 000000000..216c02e41
|
||||
index 000000000..2e4f30941
|
||||
--- /dev/null
|
||||
+++ b/plugins/obs-qsv11/obs-qsv11-LICENSE.txt
|
||||
@@ -0,0 +1,60 @@
|
||||
+The OBS QSV plugin is licensed under either the BSD-3-Clause or GPL-2.0-only licenses.
|
||||
+
|
||||
+The license declaration is reproduced in full below:
|
||||
+The license declaration is reproduced below:
|
||||
+
|
||||
+/*
|
||||
+
|
||||
+This file is provided under a dual BSD/GPLv2 license. When using or
|
||||
+redistributing this file, you may do so under either license.
|
||||
+This is provided under a dual BSD/GPLv2 license. When using or
|
||||
+redistributing this, you may do so under either license.
|
||||
+
|
||||
+GPL LICENSE SUMMARY
|
||||
+
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@
|
|||
#global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
|
||||
Name: obs-studio
|
||||
Version: 29.1.0~beta4
|
||||
Release: 3%{?dist}
|
||||
Version: 29.1.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
|
||||
|
|
@ -45,8 +45,6 @@ Source1: https://github.com/obsproject/obs-websocket/archive/%{obswebsock
|
|||
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
|
||||
## From: https://github.com/obsproject/obs-studio/pull/8763
|
||||
Patch0104: obs-studio-PR8763.patch
|
||||
|
||||
|
||||
# Downstream Fedora patches
|
||||
|
|
@ -224,6 +222,7 @@ cp plugins/obs-qsv11/QSV11-License-Clarification-Email.txt .fedora-rpm/licenses/
|
|||
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/
|
||||
cp plugins/decklink/LICENSE.decklink-sdk .fedora-rpm/licenses/deps
|
||||
|
|
@ -297,6 +296,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Apr 26 2023 Neal Gompa <ngompa@fedoraproject.org> - 29.1.0~rc1-1
|
||||
- Update to 29.1.0~rc1
|
||||
|
||||
* Mon Apr 24 2023 Neal Gompa <ngompa@fedoraproject.org> - 29.1.0~beta4-3
|
||||
- Switch ffmpeg-free dependency to /usr/bin/ffmpeg
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (obs-studio-29.1.0-beta4.tar.gz) = fff4d1039884aab96f66e4dd4c0e51c95e62d7700f765645dc5c196af1039ddca1f793a99aab811cbcf3eefadcdc140c544547e0177bee4792a06c8ea5ac0a5b
|
||||
SHA512 (obs-studio-29.1.0-rc1.tar.gz) = 30372b714bf607ec56d6b9acc1e659c10d66d49d8057846b0683a22dd974b947566aa33c25838cc4997b7cf00a6f208c77c25529665c926cec730e331a97986b
|
||||
SHA512 (obs-websocket-5.2.2.tar.gz) = 7678e247b8cc4d9cbe650a7b45a63b47a0752ba8e08e3b02bc7bdff42ec7d122eff9bad9139edb0f268379e495bae5e8f05dd177c6f935c7b47c02858727cb28
|
||||
|
|
|
|||
Loading…
Reference in New Issue