[flowblade/f40] Update to 2.14.0.1
by Martin Gansser
Summary of changes:
ccf6911... Update to 2.14.0.1 (*)
(*) This commit already existed in another branch; no separate mail sent
7 months, 2 weeks
[flowblade] Update to 2.14.0.1
by Martin Gansser
commit ccf69118a8f6d9264ab8ef91295a88a9ba304fa2
Author: Martin Gansser <mgansser(a)online.de>
Date: Tue Apr 9 13:07:03 2024 +0200
Update to 2.14.0.1
.gitignore | 1 +
flowblade.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 48958e4..cfb9dd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
/flowblade-2.10.0.4.tar.gz
/flowblade-2.12.tar.gz
/flowblade-2.12.0.2.tar.gz
+/flowblade-2.14.0.1.tar.gz
diff --git a/flowblade.spec b/flowblade.spec
index cdb101b..2b51861 100644
--- a/flowblade.spec
+++ b/flowblade.spec
@@ -12,8 +12,8 @@ Name: flowblade
Version: 2.4.0.1
Release: 13%{?dist}
%else
-Version: 2.12.0.2
-Release: 2%{?dist}
+Version: 2.14.0.1
+Release: 1%{?dist}
%endif
License: GPLv3
Summary: Multitrack non-linear video editor for Linux
@@ -122,6 +122,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
%{python3_sitelib}/%{name}*
%changelog
+* Tue Apr 09 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 2.14.0.1-1
+- Update to 2.14.0.1
+
* Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.12.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/sources b/sources
index a23a6fd..4bf70ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (flowblade-2.12.0.2.tar.gz) = 59810b0047e33150dc2ac62ad29ad8cb2141dc2f0be11b369b16c22232b31a6d10e279fed11918039a917c4a144fb958db05fce1a1e01cc330a60781140791e1
+SHA512 (flowblade-2.14.0.1.tar.gz) = 294763b6296bbbd305b2f935c3d903c2f603d7a4f554a8f4e5980ae7585b1c1610c5b0bd8964fac81876f319bdcdff7c1424e17e59a93cc0caef19368c0319b5
7 months, 2 weeks
[gstreamer1-plugins-ugly] Update to 1.24.0
by Dominik Mierzejewski
commit 1c67f10dea2798ee393215a594bb10fe9e9229a4
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Tue Apr 9 12:55:01 2024 +0200
Update to 1.24.0
gstreamer1-plugins-ugly.spec | 9 +++++----
sources | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/gstreamer1-plugins-ugly.spec b/gstreamer1-plugins-ugly.spec
index b9e7354..40494b7 100644
--- a/gstreamer1-plugins-ugly.spec
+++ b/gstreamer1-plugins-ugly.spec
@@ -3,8 +3,8 @@
Summary: GStreamer 1.0 streaming media framework "ugly" plug-ins
Name: gstreamer1-plugins-ugly
Epoch: 1
-Version: 1.22.9
-Release: 2%{?dist}
+Version: 1.24.0
+Release: 1%{?dist}
License: LGPLv2+
URL: https://gstreamer.freedesktop.org/
Source0: %{url}/src/%{src_name}/%{src_name}-%{version}.tar.xz
@@ -45,8 +45,6 @@ gstreamer-plugins-good because:
-D dvdlpcmdec=disabled \
-D dvdsub=disabled \
-D realmedia=disabled \
- -D amrnb=disabled \
- -D amrwbdec=disabled \
-D doc=disabled \
-D cdio=disabled \
-D dvdread=disabled \
@@ -72,6 +70,9 @@ gstreamer-plugins-good because:
%changelog
+* Tue Apr 09 2024 Dominik Mierzejewski <dominik(a)greysector.net> - 1:1.24.0-1
+- Update to 1.24.0
+
* Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1:1.22.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/sources b/sources
index 5f3e3ce..0976e56 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gst-plugins-ugly-1.22.9.tar.xz) = b1748fedd44e718ea130d6bf25faee13c1d3a9fd3a36881f9e51f6018efab8d3cf6979d4f45a6c267efbea52a848927156320b83aa01230b684fc3743609c8a2
+SHA512 (gst-plugins-ugly-1.24.0.tar.xz) = 380e117c4d96d972296864bb12f424b556d8c6f1eca2d7058402246a5d91ef0a04a2b25d9798525609714d8216999e5fa04b4b21aa38008863b6be6b1bf063fe
7 months, 2 weeks
[gstreamer1-plugins-bad-freeworld] Update to 1.24.0
by Dominik Mierzejewski
commit 03e54ffecdc71f1bb2dbfe2beb72184440a8d4f0
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Tue Apr 9 12:38:27 2024 +0200
Update to 1.24.0
build_what_we_need_only.patch | 22 +++++++++++++---------
gstreamer1-plugins-bad-freeworld.spec | 7 +++++--
sources | 2 +-
3 files changed, 19 insertions(+), 12 deletions(-)
---
diff --git a/build_what_we_need_only.patch b/build_what_we_need_only.patch
index b963499..cc3077c 100644
--- a/build_what_we_need_only.patch
+++ b/build_what_we_need_only.patch
@@ -1,8 +1,9 @@
diff -uNrp a/ext/meson.build b/ext/meson.build
---- a/ext/meson.build 2023-01-23 19:29:34.000000000 +0000
-+++ b/ext/meson.build 2023-02-19 12:17:51.741137633 +0000
-@@ -1,75 +1,7 @@
+--- a/ext/meson.build 2024-03-05 00:51:42.000000000 +0100
++++ b/ext/meson.build 2024-04-09 12:33:30.676577192 +0200
+@@ -1,79 +1,7 @@
-subdir('aes')
+-subdir('analyticsoverlay')
-subdir('assrender')
-subdir('aom')
-subdir('avtp')
@@ -10,6 +11,7 @@ diff -uNrp a/ext/meson.build b/ext/meson.build
-subdir('bz2')
-subdir('chromaprint')
-subdir('closedcaption')
+-subdir('codec2json')
-subdir('colormanagement')
-subdir('curl')
-subdir('dash')
@@ -29,8 +31,8 @@ diff -uNrp a/ext/meson.build b/ext/meson.build
-subdir('hls')
-subdir('iqa')
-subdir('isac')
--subdir('kate')
-subdir('ladspa')
+-subdir('lc3')
-subdir('ldac')
subdir('libde265')
-subdir('lv2')
@@ -51,6 +53,7 @@ diff -uNrp a/ext/meson.build b/ext/meson.build
-subdir('openni2')
-subdir('opus')
-subdir('qroverlay')
+-subdir('qt6d3d11')
-subdir('resindvd')
-subdir('rsvg')
subdir('rtmp')
@@ -62,6 +65,7 @@ diff -uNrp a/ext/meson.build b/ext/meson.build
-subdir('spandsp')
-subdir('srt')
-subdir('srtp')
+-subdir('svtav1')
subdir('svthevcenc')
-subdir('teletextdec')
-subdir('ttml')
@@ -78,8 +82,8 @@ diff -uNrp a/ext/meson.build b/ext/meson.build
-subdir('zxing')
-subdir('zbar')
diff -uNrp a/gst/meson.build b/gst/meson.build
---- a/gst/meson.build 2023-01-23 19:29:34.000000000 +0000
-+++ b/gst/meson.build 2023-02-19 12:17:51.742137630 +0000
+--- a/gst/meson.build 2024-03-05 00:51:42.000000000 +0100
++++ b/gst/meson.build 2024-04-09 12:37:08.086453510 +0200
@@ -1,19 +1,4 @@
-foreach plugin : ['accurip', 'adpcmdec', 'adpcmenc', 'aiff', 'asfmux',
- 'audiobuffersplit', 'audiofxbad', 'audiomixmatrix',
@@ -88,13 +92,13 @@ diff -uNrp a/gst/meson.build b/gst/meson.build
- 'debugutils', 'dvbsubenc',
- 'dvbsuboverlay', 'dvdspu', 'faceoverlay', 'festival',
- 'fieldanalysis', 'freeverb', 'frei0r', 'gaudieffects', 'gdp',
-- 'geometrictransform', 'id3tag', 'inter', 'interlace',
+- 'geometrictransform', 'id3tag', 'insertbin', 'inter', 'interlace',
- 'ivfparse', 'ivtc', 'jp2kdecimator', 'jpegformat', 'librfb',
- 'midi', 'mpegdemux', 'mpegpsmux', 'mpegtsdemux', 'mpegtsmux',
-- 'mxf', 'netsim', 'onvif', 'pcapparse', 'pnm', 'proxy',
+- 'mse', 'mxf', 'netsim', 'onvif', 'pcapparse', 'pnm', 'proxy',
- 'rawparse', 'removesilence', 'rist', 'rtmp2', 'rtp', 'sdp',
- 'segmentclip', 'siren', 'smooth', 'speed', 'subenc', 'switchbin',
-- 'timecode', 'transcode', 'videofilters',
+- 'timecode', 'transcode', 'unixfd', 'videofilters',
- 'videoframe_audiolevel', 'videoparsers', 'videosignal',
- 'vmnc', 'y4m']
+foreach plugin : ['dvdspu']
diff --git a/gstreamer1-plugins-bad-freeworld.spec b/gstreamer1-plugins-bad-freeworld.spec
index ac1384e..3fd447e 100644
--- a/gstreamer1-plugins-bad-freeworld.spec
+++ b/gstreamer1-plugins-bad-freeworld.spec
@@ -1,8 +1,8 @@
Summary: GStreamer 1.0 streaming media framework "bad" plug-ins
Name: gstreamer1-plugins-bad-freeworld
Epoch: 1
-Version: 1.22.9
-Release: 3%{?dist}
+Version: 1.24.0
+Release: 1%{?dist}
License: LGPLv2+
URL: https://gstreamer.freedesktop.org/
Source0: %{url}/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.xz
@@ -91,6 +91,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
%changelog
+* Tue Apr 09 2024 Dominik Mierzejewski <dominik(a)greysector.net> - 1:1.24.0-1
+- Update to 1.24.0
+
* Sat Apr 06 2024 Leigh Scott <leigh123linux(a)gmail.com> - 1:1.22.9-3
- Rebuild for new x265 version
diff --git a/sources b/sources
index 30830eb..4e07d82 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gst-plugins-bad-1.22.9.tar.xz) = 14c236d2b4a41fd6fdc31eecf158117643b2c70923fc701afa8f4ff246ea6b975cff2d7646caf1ab84848ec2f9cd42e67baa92fd55c22ba184e59915486d154b
+SHA512 (gst-plugins-bad-1.24.0.tar.xz) = d312ea9ec9acae86fdec4acda07eef868b08712a28cb5611e7eb6f094441b187e2b562e6a523e5e61927e3943e09256dd9fcbc7aef23b7137f5e985668952136
7 months, 2 weeks
[obs-studio-freeworld] Update to 30.1.1
by Dominik Mierzejewski
commit 73ebced9e5edcea5f7f6f5cf7b314c9c7bc2c85c
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Tue Apr 9 10:19:37 2024 +0200
Update to 30.1.1
...ntly-reference-the-software-H264-encoder-.patch | 20 +-
...Add-initial-support-for-the-OpenH264-H.26.patch | 20 +-
...ort-for-OpenH264-as-the-worst-case-fallba.patch | 56 +--
obs-studio-30-cmake-3.20.patch | 423 ---------------------
obs-studio-freeworld.spec | 15 +-
sources | 4 +-
6 files changed, 58 insertions(+), 480 deletions(-)
---
diff --git a/0101-UI-Consistently-reference-the-software-H264-encoder-.patch b/0101-UI-Consistently-reference-the-software-H264-encoder-.patch
index 2d5992e..470544f 100644
--- a/0101-UI-Consistently-reference-the-software-H264-encoder-.patch
+++ b/0101-UI-Consistently-reference-the-software-H264-encoder-.patch
@@ -1,4 +1,4 @@
-From dfa857eceb0deaf1a273fbd3423364fd7268ea90 Mon Sep 17 00:00:00 2001
+From f6bc114c7d80f6344353619f51d9584ad022d91b Mon Sep 17 00:00:00 2001
From: Neal Gompa <neal(a)gompa.dev>
Date: Sat, 7 Jan 2023 23:15:13 -0500
Subject: [PATCH 101/103] UI: Consistently reference the software H264 encoder
@@ -15,11 +15,11 @@ the encoder string to indicate that it's an H.264 encoder from x264.
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/UI/data/locale/en-US.ini b/UI/data/locale/en-US.ini
-index e62f38a26..339ac4d86 100644
+index 9c3f38777..dd8f20f69 100644
--- a/UI/data/locale/en-US.ini
+++ b/UI/data/locale/en-US.ini
-@@ -996,7 +996,7 @@ Basic.Settings.Output.Simple.Warn.Encoder="Warning: Recording with a software en
- Basic.Settings.Output.Simple.Warn.Lossless="Warning: Lossless quality generates tremendously large file sizes! Lossless quality can use upward of 7 gigabytes of disk space per minute at high resolutions and framerates. Lossless is not recommended for long recordings unless you have a very large amount of disk space available."
+@@ -997,7 +997,7 @@ Basic.Settings.Output.Simple.Warn.Encoder="Warning: Recording with a software en
+ Basic.Settings.Output.Simple.Warn.Lossless="Warning: Lossless quality generates tremendously large file sizes! Lossless quality can use upward of 7 gigabytes of disk space per minute at high resolutions and framerates. Lossless is not recommended for long recordings unless you have a very large amount of disk space available. Replay buffer is unavailable when using lossless quality."
Basic.Settings.Output.Simple.Warn.Lossless.Msg="Are you sure you want to use lossless quality?"
Basic.Settings.Output.Simple.Warn.Lossless.Title="Lossless quality warning!"
-Basic.Settings.Output.Simple.Encoder.Software="Software (x264)"
@@ -27,7 +27,7 @@ index e62f38a26..339ac4d86 100644
Basic.Settings.Output.Simple.Encoder.Hardware.QSV.H264="Hardware (QSV, H.264)"
Basic.Settings.Output.Simple.Encoder.Hardware.QSV.AV1="Hardware (QSV, AV1)"
Basic.Settings.Output.Simple.Encoder.Hardware.AMD.H264="Hardware (AMD, H.264)"
-@@ -1007,7 +1007,7 @@ Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.AV1="Hardware (NVENC, AV1)"
+@@ -1008,7 +1008,7 @@ Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.AV1="Hardware (NVENC, AV1)"
Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.HEVC="Hardware (NVENC, HEVC)"
Basic.Settings.Output.Simple.Encoder.Hardware.Apple.H264="Hardware (Apple, H.264)"
Basic.Settings.Output.Simple.Encoder.Hardware.Apple.HEVC="Hardware (Apple, HEVC)"
@@ -68,10 +68,10 @@ index 7d7c4278e..a8b5d884a 100644
auto newLabel = [this](const char *str) -> QLabel * {
diff --git a/UI/window-basic-settings-stream.cpp b/UI/window-basic-settings-stream.cpp
-index 2ad275a44..e2ba4b677 100644
+index e28c5b189..de306efa9 100644
--- a/UI/window-basic-settings-stream.cpp
+++ b/UI/window-basic-settings-stream.cpp
-@@ -1670,7 +1670,7 @@ void OBSBasicSettings::ResetEncoders(bool streamOnly)
+@@ -1704,7 +1704,7 @@ void OBSBasicSettings::ResetEncoders(bool streamOnly)
#define ENCODER_STR(str) QTStr("Basic.Settings.Output.Simple.Encoder." str)
@@ -81,10 +81,10 @@ index 2ad275a44..e2ba4b677 100644
#ifdef _WIN32
if (service_supports_encoder(vcodecs, "obs_qsv11"))
diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp
-index b1e6bd6fb..ddf0adc56 100644
+index bee2c86ed..efb98c4ef 100644
--- a/UI/window-basic-settings.cpp
+++ b/UI/window-basic-settings.cpp
-@@ -5237,10 +5237,11 @@ void OBSBasicSettings::FillSimpleRecordingValues()
+@@ -5303,10 +5303,11 @@ void OBSBasicSettings::FillSimpleRecordingValues()
ADD_QUALITY("HQ");
ADD_QUALITY("Lossless");
@@ -100,5 +100,5 @@ index b1e6bd6fb..ddf0adc56 100644
ui->simpleOutRecEncoder->addItem(
ENCODER_STR("Hardware.QSV.H264"),
--
-2.41.0
+2.44.0
diff --git a/0102-obs-ffmpeg-Add-initial-support-for-the-OpenH264-H.26.patch b/0102-obs-ffmpeg-Add-initial-support-for-the-OpenH264-H.26.patch
index 519c5ea..08bf185 100644
--- a/0102-obs-ffmpeg-Add-initial-support-for-the-OpenH264-H.26.patch
+++ b/0102-obs-ffmpeg-Add-initial-support-for-the-OpenH264-H.26.patch
@@ -1,4 +1,4 @@
-From 939db8edca8161f4518900e750551814c2c6088e Mon Sep 17 00:00:00 2001
+From 7e13a4f5b407650b0eeacbc2322ec9fa7825828c Mon Sep 17 00:00:00 2001
From: Neal Gompa <neal(a)gompa.dev>
Date: Sun, 26 Mar 2023 06:06:31 -0400
Subject: [PATCH 102/103] obs-ffmpeg: Add initial support for the OpenH264
@@ -20,10 +20,10 @@ software codecs provided through FFmpeg.
create mode 100644 plugins/obs-ffmpeg/obs-ffmpeg-h264.c
diff --git a/plugins/obs-ffmpeg/CMakeLists.txt b/plugins/obs-ffmpeg/CMakeLists.txt
-index 04530ef39..b77f6366f 100644
+index 77c5ad8e4..81b847889 100644
--- a/plugins/obs-ffmpeg/CMakeLists.txt
+++ b/plugins/obs-ffmpeg/CMakeLists.txt
-@@ -36,6 +36,7 @@ target_sources(
+@@ -32,6 +32,7 @@ target_sources(
obs-ffmpeg-av1.c
obs-ffmpeg-compat.h
obs-ffmpeg-formats.h
@@ -32,17 +32,17 @@ index 04530ef39..b77f6366f 100644
obs-ffmpeg-mux.c
obs-ffmpeg-mux.h
diff --git a/plugins/obs-ffmpeg/cmake/legacy.cmake b/plugins/obs-ffmpeg/cmake/legacy.cmake
-index 4cc75b341..d2e11965d 100644
+index 0b3491a07..d22734264 100644
--- a/plugins/obs-ffmpeg/cmake/legacy.cmake
+++ b/plugins/obs-ffmpeg/cmake/legacy.cmake
-@@ -40,6 +40,7 @@ target_sources(
+@@ -41,6 +41,7 @@ target_sources(
obs-ffmpeg-video-encoders.c
obs-ffmpeg-audio-encoders.c
obs-ffmpeg-av1.c
+ obs-ffmpeg-h264.c
obs-ffmpeg-nvenc.c
obs-ffmpeg-output.c
- obs-ffmpeg-mux.c
+ obs-ffmpeg-output.h
diff --git a/plugins/obs-ffmpeg/data/locale/en-US.ini b/plugins/obs-ffmpeg/data/locale/en-US.ini
index 9652be160..e18e39f5a 100644
--- a/plugins/obs-ffmpeg/data/locale/en-US.ini
@@ -322,10 +322,10 @@ index 000000000..179a61ccf
+ .get_video_info = h264_video_info,
+};
diff --git a/plugins/obs-ffmpeg/obs-ffmpeg.c b/plugins/obs-ffmpeg/obs-ffmpeg.c
-index 7eb9a876d..fcce8ec3b 100644
+index 451b4f022..ee2e378bf 100644
--- a/plugins/obs-ffmpeg/obs-ffmpeg.c
+++ b/plugins/obs-ffmpeg/obs-ffmpeg.c
-@@ -38,6 +38,7 @@ extern struct obs_encoder_info pcm24_encoder_info;
+@@ -41,6 +41,7 @@ extern struct obs_encoder_info pcm24_encoder_info;
extern struct obs_encoder_info pcm32_encoder_info;
extern struct obs_encoder_info alac_encoder_info;
extern struct obs_encoder_info flac_encoder_info;
@@ -333,7 +333,7 @@ index 7eb9a876d..fcce8ec3b 100644
extern struct obs_encoder_info h264_nvenc_encoder_info;
#ifdef ENABLE_HEVC
extern struct obs_encoder_info hevc_nvenc_encoder_info;
-@@ -382,6 +383,7 @@ bool obs_module_load(void)
+@@ -364,6 +365,7 @@ bool obs_module_load(void)
obs_register_output(&ffmpeg_hls_muxer);
obs_register_output(&replay_buffer);
obs_register_encoder(&aac_encoder_info);
@@ -342,5 +342,5 @@ index 7eb9a876d..fcce8ec3b 100644
register_encoder_if_available(&aom_av1_encoder_info, "libaom-av1");
obs_register_encoder(&opus_encoder_info);
--
-2.41.0
+2.44.0
diff --git a/0103-UI-Add-support-for-OpenH264-as-the-worst-case-fallba.patch b/0103-UI-Add-support-for-OpenH264-as-the-worst-case-fallba.patch
index c8a3074..e144ce8 100644
--- a/0103-UI-Add-support-for-OpenH264-as-the-worst-case-fallba.patch
+++ b/0103-UI-Add-support-for-OpenH264-as-the-worst-case-fallba.patch
@@ -1,4 +1,4 @@
-From f26c32b97117273550b9dddea01b5b92684c6886 Mon Sep 17 00:00:00 2001
+From d5d1837245fb9a2f0dfc863c27f8ac77ea9625cd Mon Sep 17 00:00:00 2001
From: Neal Gompa <neal(a)gompa.dev>
Date: Tue, 28 Mar 2023 05:08:49 -0400
Subject: [PATCH 103/103] UI: Add support for OpenH264 as the worst-case
@@ -21,11 +21,11 @@ available.
10 files changed, 123 insertions(+), 48 deletions(-)
diff --git a/UI/data/locale/en-US.ini b/UI/data/locale/en-US.ini
-index 339ac4d86..ff8c649da 100644
+index dd8f20f69..6a8e4e1e7 100644
--- a/UI/data/locale/en-US.ini
+++ b/UI/data/locale/en-US.ini
-@@ -996,6 +996,7 @@ Basic.Settings.Output.Simple.Warn.Encoder="Warning: Recording with a software en
- Basic.Settings.Output.Simple.Warn.Lossless="Warning: Lossless quality generates tremendously large file sizes! Lossless quality can use upward of 7 gigabytes of disk space per minute at high resolutions and framerates. Lossless is not recommended for long recordings unless you have a very large amount of disk space available."
+@@ -997,6 +997,7 @@ Basic.Settings.Output.Simple.Warn.Encoder="Warning: Recording with a software en
+ Basic.Settings.Output.Simple.Warn.Lossless="Warning: Lossless quality generates tremendously large file sizes! Lossless quality can use upward of 7 gigabytes of disk space per minute at high resolutions and framerates. Lossless is not recommended for long recordings unless you have a very large amount of disk space available. Replay buffer is unavailable when using lossless quality."
Basic.Settings.Output.Simple.Warn.Lossless.Msg="Are you sure you want to use lossless quality?"
Basic.Settings.Output.Simple.Warn.Lossless.Title="Lossless quality warning!"
+Basic.Settings.Output.Simple.Encoder.Software.OpenH264.H264="Software (OpenH264)"
@@ -155,10 +155,10 @@ index a8b5d884a..e68a33bb5 100644
auto newLabel = [this](const char *str) -> QLabel * {
diff --git a/UI/window-basic-auto-config.cpp b/UI/window-basic-auto-config.cpp
-index d8ddbfa44..4707a5644 100644
+index f992c0719..d97a188f5 100644
--- a/UI/window-basic-auto-config.cpp
+++ b/UI/window-basic-auto-config.cpp
-@@ -979,6 +979,7 @@ AutoConfig::AutoConfig(QWidget *parent) : QWizard(parent)
+@@ -982,6 +982,7 @@ AutoConfig::AutoConfig(QWidget *parent) : QWizard(parent)
streamPage->ui->bitrate->setValue(bitrate);
streamPage->ServiceChanged();
@@ -166,7 +166,7 @@ index d8ddbfa44..4707a5644 100644
TestHardwareEncoding();
if (!hardwareEncodingAvailable) {
delete streamPage->ui->preferHardware;
-@@ -1007,6 +1008,16 @@ AutoConfig::~AutoConfig()
+@@ -1010,6 +1011,16 @@ AutoConfig::~AutoConfig()
EnableThreadedMessageBoxes(false);
}
@@ -183,7 +183,7 @@ index d8ddbfa44..4707a5644 100644
void AutoConfig::TestHardwareEncoding()
{
size_t idx = 0;
-@@ -1086,8 +1097,10 @@ inline const char *AutoConfig::GetEncoderId(Encoder enc)
+@@ -1089,8 +1100,10 @@ inline const char *AutoConfig::GetEncoderId(Encoder enc)
return SIMPLE_ENCODER_AMD;
case Encoder::Apple:
return SIMPLE_ENCODER_APPLE_H264;
@@ -224,10 +224,10 @@ index 5d966c795..c17e32a85 100644
bool CanTestServer(const char *server);
diff --git a/UI/window-basic-main-outputs.cpp b/UI/window-basic-main-outputs.cpp
-index a283d0fcc..4b3f25371 100644
+index f87e16dcd..0466cdff6 100644
--- a/UI/window-basic-main-outputs.cpp
+++ b/UI/window-basic-main-outputs.cpp
-@@ -547,7 +547,9 @@ void SimpleOutput::LoadStreamingPreset_Lossy(const char *encoderId)
+@@ -552,7 +552,9 @@ void SimpleOutput::LoadStreamingPreset_Lossy(const char *encoderId)
/* mistakes have been made to lead us to this. */
const char *get_simple_output_encoder(const char *encoder)
{
@@ -238,7 +238,7 @@ index a283d0fcc..4b3f25371 100644
return "obs_x264";
} else if (strcmp(encoder, SIMPLE_ENCODER_X264_LOWCPU) == 0) {
return "obs_x264";
-@@ -581,7 +583,7 @@ const char *get_simple_output_encoder(const char *encoder)
+@@ -586,7 +588,7 @@ const char *get_simple_output_encoder(const char *encoder)
#endif
}
@@ -371,10 +371,10 @@ index f9d3f4ea1..27899efc4 100644
}
#endif
diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
-index 943e8cac1..09251de75 100644
+index 0621d039c..c39266e9f 100644
--- a/UI/window-basic-main.cpp
+++ b/UI/window-basic-main.cpp
-@@ -1449,6 +1449,8 @@ extern void CheckExistingCookieId();
+@@ -1469,6 +1469,8 @@ extern void CheckExistingCookieId();
#define DEFAULT_CONTAINER "fragmented_mp4"
#endif
@@ -383,7 +383,7 @@ index 943e8cac1..09251de75 100644
bool OBSBasic::InitBasicConfigDefaults()
{
QList<QScreen *> screens = QGuiApplication::screens();
-@@ -1619,7 +1621,10 @@ bool OBSBasic::InitBasicConfigDefaults()
+@@ -1654,7 +1656,10 @@ bool OBSBasic::InitBasicConfigDefaults()
config_set_default_bool(basicConfig, "AdvOut", "UseRescale", false);
config_set_default_uint(basicConfig, "AdvOut", "TrackIndex", 1);
config_set_default_uint(basicConfig, "AdvOut", "VodTrackIndex", 2);
@@ -395,7 +395,7 @@ index 943e8cac1..09251de75 100644
config_set_default_string(basicConfig, "AdvOut", "RecType", "Standard");
-@@ -1744,7 +1749,6 @@ bool OBSBasic::InitBasicConfigDefaults()
+@@ -1780,7 +1785,6 @@ bool OBSBasic::InitBasicConfigDefaults()
return true;
}
@@ -403,7 +403,7 @@ index 943e8cac1..09251de75 100644
extern bool update_nvenc_presets(ConfigFile &config);
void OBSBasic::InitBasicConfigDefaults2()
-@@ -1753,12 +1757,14 @@ void OBSBasic::InitBasicConfigDefaults2()
+@@ -1789,12 +1793,14 @@ void OBSBasic::InitBasicConfigDefaults2()
"Pre23Defaults");
bool useNV = EncoderAvailable("ffmpeg_nvenc") && !oldEncDefaults;
@@ -422,7 +422,7 @@ index 943e8cac1..09251de75 100644
const char *aac_default = "ffmpeg_aac";
if (EncoderAvailable("CoreAudio_AAC"))
-@@ -2040,7 +2046,7 @@ void OBSBasic::OBSInit()
+@@ -2076,7 +2082,7 @@ void OBSBasic::OBSInit()
InitBasicConfigDefaults2();
@@ -432,7 +432,7 @@ index 943e8cac1..09251de75 100644
blog(LOG_INFO, STARTUP_SEPARATOR);
diff --git a/UI/window-basic-main.hpp b/UI/window-basic-main.hpp
-index b1eb39592..7d9e8d286 100644
+index 8c4104c11..2349d791a 100644
--- a/UI/window-basic-main.hpp
+++ b/UI/window-basic-main.hpp
@@ -69,6 +69,7 @@ class OBSBasicVCamConfig;
@@ -443,7 +443,7 @@ index b1eb39592..7d9e8d286 100644
#define SIMPLE_ENCODER_QSV "qsv"
#define SIMPLE_ENCODER_QSV_AV1 "qsv_av1"
#define SIMPLE_ENCODER_NVENC "nvenc"
-@@ -446,7 +447,7 @@ private:
+@@ -448,7 +449,7 @@ private:
void DeleteProfile(const char *profile_name, const char *profile_dir);
void RefreshProfiles();
void ChangeProfile();
@@ -453,10 +453,10 @@ index b1eb39592..7d9e8d286 100644
void SaveProjectNow();
diff --git a/UI/window-basic-settings-stream.cpp b/UI/window-basic-settings-stream.cpp
-index e2ba4b677..a08c697d4 100644
+index de306efa9..64e6c4b14 100644
--- a/UI/window-basic-settings-stream.cpp
+++ b/UI/window-basic-settings-stream.cpp
-@@ -1437,7 +1437,9 @@ static QString get_adv_fallback(const QString &enc)
+@@ -1471,7 +1471,9 @@ static QString get_adv_fallback(const QString &enc)
return "com.apple.videotoolbox.videoencoder.ave.avc";
if (enc == "obs_qsv11_av1")
return "obs_qsv11";
@@ -467,7 +467,7 @@ index e2ba4b677..a08c697d4 100644
}
static QString get_adv_audio_fallback(const QString &enc)
-@@ -1466,7 +1468,9 @@ static QString get_simple_fallback(const QString &enc)
+@@ -1500,7 +1502,9 @@ static QString get_simple_fallback(const QString &enc)
return SIMPLE_ENCODER_APPLE_H264;
if (enc == SIMPLE_ENCODER_QSV_AV1)
return SIMPLE_ENCODER_QSV;
@@ -478,7 +478,7 @@ index e2ba4b677..a08c697d4 100644
}
bool OBSBasicSettings::ServiceSupportsCodecCheck()
-@@ -1670,8 +1674,12 @@ void OBSBasicSettings::ResetEncoders(bool streamOnly)
+@@ -1704,8 +1708,12 @@ void OBSBasicSettings::ResetEncoders(bool streamOnly)
#define ENCODER_STR(str) QTStr("Basic.Settings.Output.Simple.Encoder." str)
@@ -494,10 +494,10 @@ index e2ba4b677..a08c697d4 100644
if (service_supports_encoder(vcodecs, "obs_qsv11"))
ui->simpleOutStrEncoder->addItem(
diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp
-index ddf0adc56..9b7324ab9 100644
+index efb98c4ef..65d173caf 100644
--- a/UI/window-basic-settings.cpp
+++ b/UI/window-basic-settings.cpp
-@@ -3779,6 +3779,11 @@ void OBSBasicSettings::SaveOutputSettings()
+@@ -3843,6 +3843,11 @@ void OBSBasicSettings::SaveOutputSettings()
do. This only exists to make sure that the x264 preset doesn't
get overwritten with empty data. */
presetType = "ApplePreset";
@@ -509,7 +509,7 @@ index ddf0adc56..9b7324ab9 100644
else
presetType = "Preset";
-@@ -5237,11 +5242,16 @@ void OBSBasicSettings::FillSimpleRecordingValues()
+@@ -5303,11 +5308,16 @@ void OBSBasicSettings::FillSimpleRecordingValues()
ADD_QUALITY("HQ");
ADD_QUALITY("Lossless");
@@ -531,7 +531,7 @@ index ddf0adc56..9b7324ab9 100644
if (EncoderAvailable("obs_qsv11"))
ui->simpleOutRecEncoder->addItem(
ENCODER_STR("Hardware.QSV.H264"),
-@@ -5414,6 +5424,9 @@ void OBSBasicSettings::SimpleStreamingEncoderChanged()
+@@ -5480,6 +5490,9 @@ void OBSBasicSettings::SimpleStreamingEncoderChanged()
defaultPreset = "balanced";
preset = curAMDAV1Preset;
@@ -542,5 +542,5 @@ index ddf0adc56..9b7324ab9 100644
#define PRESET_STR(val) \
--
-2.41.0
+2.44.0
diff --git a/obs-studio-freeworld.spec b/obs-studio-freeworld.spec
index 36e2e01..4c01e3e 100644
--- a/obs-studio-freeworld.spec
+++ b/obs-studio-freeworld.spec
@@ -14,7 +14,7 @@
%bcond_without x264
-%global obswebsocket_version 5.3.3
+%global obswebsocket_version 5.4.2
%global origname obs-studio
%if "%{__isa_bits}" == "64"
@@ -23,8 +23,8 @@
%global libvlc_soversion 5
Name: obs-studio-freeworld
-Version: 30.0.0
-Release: 4%{?dist}
+Version: 30.1.1
+Release: 1%{?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
@@ -48,17 +48,15 @@ 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
+Patch1001: obs-studio-UI-use-fdk-aac-by-default.patch
## Fix error: passing argument 4 of ‘query_dmabuf_modifiers’ from
## incompatible pointer type [-Wincompatible-pointer-types]
Patch1003: obs-studio-fix-incompatible-pointer-type.patch
BuildRequires: gcc
-BuildRequires: cmake >= 3.20
+BuildRequires: cmake >= 3.22
BuildRequires: ninja-build
BuildRequires: libappstream-glib
BuildRequires: desktop-file-utils
@@ -260,6 +258,9 @@ mv preserve/%{_prefix} %{buildroot}
%changelog
+* Tue Apr 02 2024 Neal Gompa <ngompa(a)fedoraproject.org> - 30.1.1-1
+- Update to 30.1.1
+
* Sun Feb 04 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 30.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/sources b/sources
index ef030c5..57cf76e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (obs-websocket-5.3.3.tar.gz) = 5726bd81a366940ab3b33f4997d5d66e8ff1bb7d456a6fbb1ebddbcc0bc847026294f74908b06460a358488abe9bf7372ff5076c48d06714813295cfbf6f4ad8
-SHA512 (obs-studio-30.0.0.tar.gz) = a99ec286dddea46e95a90b16b52bfb8033ce017faae039128509c561fef9bc71e02a9e55d1fee428c456dc48ce03ba7939e2488eaec35f791116ab4dfd1f34d0
+SHA512 (obs-websocket-5.4.2.tar.gz) = 639cdc3a53e4b6296c91b0105a36f37fb372526bdc218a4cadf3c790542a77046734a1941014f029785ebb3e39872e0083ad4bead34d838938b14f66e74fa8ae
+SHA512 (obs-studio-30.1.1.tar.gz) = 31aba14cf9db6b6c41d87ea0b814d38e1ba2794d07f1aff025c810e9dda32b0915d3f6d2679383755d0a4e47fc26c2aef981e26a80b792cf7fb893e672b6609a
7 months, 2 weeks
[obs-studio-freeworld] Fix i686 build
by Dominik Mierzejewski
commit b0321740ce8033bf207f36c64d5cd1a55b284850
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Feb 19 11:22:49 2024 +0100
Fix i686 build
obs-studio-fix-incompatible-pointer-type.patch | 13 +++++++++++++
obs-studio-freeworld.spec | 3 +++
2 files changed, 16 insertions(+)
---
diff --git a/obs-studio-fix-incompatible-pointer-type.patch b/obs-studio-fix-incompatible-pointer-type.patch
new file mode 100644
index 0000000..f34e81b
--- /dev/null
+++ b/obs-studio-fix-incompatible-pointer-type.patch
@@ -0,0 +1,13 @@
+diff --git a/libobs-opengl/gl-egl-common.c b/libobs-opengl/gl-egl-common.c
+index f06cd19..023068f 100644
+--- a/libobs-opengl/gl-egl-common.c
++++ b/libobs-opengl/gl-egl-common.c
+@@ -373,7 +373,7 @@ bool gl_egl_query_dmabuf_modifiers_for_format(EGLDisplay egl_display,
+ return false;
+ }
+ if (!query_dmabuf_modifiers(egl_display, drm_format, modifiers,
+- n_modifiers)) {
++ (EGLuint64KHR*)n_modifiers)) {
+ *n_modifiers = 0;
+ *modifiers = NULL;
+ return false;
diff --git a/obs-studio-freeworld.spec b/obs-studio-freeworld.spec
index f5e482e..36e2e01 100644
--- a/obs-studio-freeworld.spec
+++ b/obs-studio-freeworld.spec
@@ -52,6 +52,9 @@ Patch0103: 0103-UI-Add-support-for-OpenH264-as-the-worst-case-fallba.patch
Patch1001: obs-studio-30-cmake-3.20.patch
## Use fdk-aac by default
Patch1002: obs-studio-UI-use-fdk-aac-by-default.patch
+## Fix error: passing argument 4 of ‘query_dmabuf_modifiers’ from
+## incompatible pointer type [-Wincompatible-pointer-types]
+Patch1003: obs-studio-fix-incompatible-pointer-type.patch
BuildRequires: gcc
7 months, 2 weeks
[qmplay2/f38] Update to 24.04.07
by Martin Gansser
Summary of changes:
e315fa2... Update to 24.04.07 (*)
(*) This commit already existed in another branch; no separate mail sent
7 months, 2 weeks
