Changes of Revision 21
8376.patch
Deleted
x
1
2
-From 1603aaf4a2ef16b7aabb3cf330c7b3fde77ad8ca Mon Sep 17 00:00:00 20013
-From: pkv <pkv@obsproject.com>4
-Date: Tue, 28 Feb 2023 17:28:38 +01005
-Subject: PATCH obs-ffmpeg: Fix for FFmpeg 6 deprecating a flag6
-7
-Also modifies libobs & deps/media-playback.8
-AV_CODEC_CAP_TRUNCATED was removed in avcodec 60 1.9
-We ifdef the code depending on it to allow compilation.10
-11
-1 avcodec: remove FF_API_FLAG_TRUNCATED12
-https://github.com/FFmpeg/FFmpeg/commit/3ceffe783965767e62d59e8e68ecd265c98460ec13
-14
-Signed-off-by: pkv <pkv@obsproject.com>15
----16
- deps/media-playback/media-playback/decode.c | 2 ++17
- deps/media-playback/media-playback/decode.h | 2 ++18
- libobs/obs-ffmpeg-compat.h | 2 ++19
- plugins/obs-ffmpeg/obs-ffmpeg-compat.h | 2 ++20
- plugins/win-dshow/ffmpeg-decode.c | 2 ++21
- 5 files changed, 10 insertions(+)22
-23
-diff --git a/deps/media-playback/media-playback/decode.c b/deps/media-playback/media-playback/decode.c24
-index 05d6afcc649a2..e1aa9aec0577b 10064425
---- a/deps/media-playback/media-playback/decode.c26
-+++ b/deps/media-playback/media-playback/decode.c27
-@@ -230,8 +230,10 @@ bool mp_decode_init(mp_media_t *m, enum AVMediaType type, bool hw)28
- d->in_frame = d->sw_frame;29
- }30
- 31
-+#if LIBAVCODEC_VERSION_MAJOR < 6032
- if (d->codec->capabilities & CODEC_CAP_TRUNC)33
- d->decoder->flags |= CODEC_FLAG_TRUNC;34
-+#endif35
- 36
- d->orig_pkt = av_packet_alloc();37
- d->pkt = av_packet_alloc();38
-diff --git a/deps/media-playback/media-playback/decode.h b/deps/media-playback/media-playback/decode.h39
-index 1ca271b419fbd..6da34061b3dee 10064440
---- a/deps/media-playback/media-playback/decode.h41
-+++ b/deps/media-playback/media-playback/decode.h42
-@@ -37,8 +37,10 @@ extern "C" {43
- #endif44
- 45
- #if LIBAVCODEC_VERSION_MAJOR >= 5846
-+#if LIBAVCODEC_VERSION_MAJOR < 6047
- #define CODEC_CAP_TRUNC AV_CODEC_CAP_TRUNCATED48
- #define CODEC_FLAG_TRUNC AV_CODEC_FLAG_TRUNCATED49
-+#endif50
- #else51
- #define CODEC_CAP_TRUNC CODEC_CAP_TRUNCATED52
- #define CODEC_FLAG_TRUNC CODEC_FLAG_TRUNCATED53
-diff --git a/libobs/obs-ffmpeg-compat.h b/libobs/obs-ffmpeg-compat.h54
-index c4e23b9851242..ad633521e3b0b 10064455
---- a/libobs/obs-ffmpeg-compat.h56
-+++ b/libobs/obs-ffmpeg-compat.h57
-@@ -23,8 +23,10 @@58
- #endif59
- 60
- #if LIBAVCODEC_VERSION_MAJOR >= 5861
-+#if LIBAVCODEC_VERSION_MAJOR < 6062
- #define CODEC_CAP_TRUNC AV_CODEC_CAP_TRUNCATED63
- #define CODEC_FLAG_TRUNC AV_CODEC_FLAG_TRUNCATED64
-+#endif65
- #define INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_PADDING_SIZE66
- #else67
- #define CODEC_CAP_TRUNC CODEC_CAP_TRUNCATED68
-diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-compat.h b/plugins/obs-ffmpeg/obs-ffmpeg-compat.h69
-index 181167aff383d..39efa00c774b3 10064470
---- a/plugins/obs-ffmpeg/obs-ffmpeg-compat.h71
-+++ b/plugins/obs-ffmpeg/obs-ffmpeg-compat.h72
-@@ -27,8 +27,10 @@73
- #endif74
- 75
- #if LIBAVCODEC_VERSION_MAJOR >= 5876
-+#if LIBAVCODEC_VERSION_MAJOR < 6077
- #define CODEC_CAP_TRUNC AV_CODEC_CAP_TRUNCATED78
- #define CODEC_FLAG_TRUNC AV_CODEC_FLAG_TRUNCATED79
-+#endif80
- #define CODEC_FLAG_GLOBAL_H AV_CODEC_FLAG_GLOBAL_HEADER81
- #else82
- #define CODEC_CAP_TRUNC CODEC_CAP_TRUNCATED83
-diff --git a/plugins/win-dshow/ffmpeg-decode.c b/plugins/win-dshow/ffmpeg-decode.c84
-index d27c98441da15..49df62b7a79f2 10064485
---- a/plugins/win-dshow/ffmpeg-decode.c86
-+++ b/plugins/win-dshow/ffmpeg-decode.c87
-@@ -105,8 +105,10 @@ int ffmpeg_decode_init(struct ffmpeg_decode *decode, enum AVCodecID id,88
- return ret;89
- }90
- 91
-+#if LIBAVCODEC_VERSION_MAJOR < 6092
- if (decode->codec->capabilities & CODEC_CAP_TRUNC)93
- decode->decoder->flags |= CODEC_FLAG_TRUNC;94
-+#endif95
- 96
- return 0;97
- }98
project.diff
Deleted
38
1
2
---- obs-studio.changes.orig3
-+++ obs-studio.changes4
-@@ -1,4 +1,14 @@5
- -------------------------------------------------------------------6
-+Fri May 12 14:27:03 UTC 2023 - Hans-Peter Jansen <hp@urpla.net>7
-+8
-+- Apply upstream pull request 8376.patch to fix build with ffmpeg >= 69
-+10
-+-------------------------------------------------------------------11
-+Sat Apr 22 16:16:29 UTC 2023 - Hans-Peter Jansen <hpj@urpla.net>12
-+13
-+- Disable __requires_exclude_from for testing14
-+15
-+-------------------------------------------------------------------16
- Tue Apr 18 16:52:06 UTC 2023 - Hans-Peter Jansen <hp@urpla.net>17
- 18
- - Add more hidden deps19
---- obs-studio.spec.orig20
-+++ obs-studio.spec21
-@@ -20,6 +20,7 @@ Source17: %{cef_binary}.tar.bz222
- %endif23
- Patch0: 0002-Include-diverse-luajit.patch24
- Patch1: 0001-Prefix-modinfo-with-sbin-since-not-in-normal-path.patch25
-+Patch2: 8376.patch26
- BuildRoot: %{_tmppath}/%{name}-%{version}-build27
- BuildRequires: update-desktop-files28
- BuildRequires: cmake >= 2.8.1229
-@@ -81,7 +82,7 @@ ExclusiveArch: x86_64 aarch6430
- 31
- # these are plugins, built as libs and as such should not be mixed up with their originals32
- %global __provides_exclude_from ^(%{_libdir}/obs-plugins/.*\\.so.*|%{_libdir}/obs-scripting/.*\\.so.*)$33
--%global __requires_exclude_from ^(%{_libdir}/obs-plugins/.*|%{_libdir}/obs-scripting/.*)$34
-+#%%global __requires_exclude_from ^(%%{_libdir}/obs-plugins/.*|%%{_libdir}/obs-scripting/.*)$35
- %global __requires_exclude ^libcef\\.so$36
- 37
- %description38
_link
Changed
8
1
2
-<link project="Multimedia" package="obs-studio" baserev="80702d24e75b35b796412215317a3001">3
- <patches>4
- <apply name="project.diff"/>5
- </patches>6
-</link>7
+<link project="Multimedia" package="obs-studio"/>8