git: e1633a5b4e6b - main - games/fs2open: fix build with recent ffmpeg

The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e1633a5b4e6b993286aaf0fe2f8676be240fad9d

commit e1633a5b4e6b993286aaf0fe2f8676be240fad9d
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2025-12-19 10:58:18 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2025-12-19 16:08:47 +0000

    games/fs2open: fix build with recent ffmpeg
---
 games/fs2open/Makefile                             |  3 +
 .../af833f059cc0cfc925792e019f6c2b754c6d53c1.patch | 66 ++++++++++++++++++++++
 2 files changed, 69 insertions(+)

diff --git a/games/fs2open/Makefile b/games/fs2open/Makefile
index 42b562c71f42..723f6532d838 100644
--- a/games/fs2open/Makefile
+++ b/games/fs2open/Makefile
@@ -7,6 +7,9 @@ MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Open source video engine of FreeSpace 2
 WWW=		http://scp.indiegames.us
 
+# fix build with recent ffmpeg
+EXTRA_PATCHES=	${FILESDIR}/af833f059cc0cfc925792e019f6c2b754c6d53c1.patch:-p1
+
 LICENSE=	VOLITION
 LICENSE_NAME=	Volition Copyright
 LICENSE_FILE=	${WRKSRC}/Copying.md
diff --git a/games/fs2open/files/af833f059cc0cfc925792e019f6c2b754c6d53c1.patch b/games/fs2open/files/af833f059cc0cfc925792e019f6c2b754c6d53c1.patch
new file mode 100644
index 000000000000..2c456bb22a5f
--- /dev/null
+++ b/games/fs2open/files/af833f059cc0cfc925792e019f6c2b754c6d53c1.patch
@@ -0,0 +1,66 @@
+From af833f059cc0cfc925792e019f6c2b754c6d53c1 Mon Sep 17 00:00:00 2001
+From: Taylor Richards <taylor@notimaginative.com>
+Date: Sun, 17 Aug 2025 17:09:41 -0400
+Subject: [PATCH] fix avcodec deprecation warnings
+
+---
+ code/cutscene/ffmpeg/internal.cpp    | 9 ++++++---
+ code/sound/ffmpeg/FFmpegWaveFile.cpp | 3 ++-
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/code/cutscene/ffmpeg/internal.cpp b/code/cutscene/ffmpeg/internal.cpp
+index be0920a5068..4f087d10191 100644
+--- a/code/cutscene/ffmpeg/internal.cpp
++++ b/code/cutscene/ffmpeg/internal.cpp
+@@ -12,9 +12,10 @@ DecoderStatus::~DecoderStatus() {
+ 	videoCodec = nullptr;
+ 
+ 	if (videoCodecCtx != nullptr) {
+-		avcodec_close(videoCodecCtx);
+ #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
+ 		avcodec_free_context(&videoCodecCtx);
++#else
++		avcodec_close(videoCodecCtx);
+ #endif
+ 		videoCodecCtx = nullptr;
+ 	}
+@@ -24,9 +25,10 @@ DecoderStatus::~DecoderStatus() {
+ 	audioCodec = nullptr;
+ 
+ 	if (audioCodecCtx != nullptr) {
+-		avcodec_close(audioCodecCtx);
+ #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
+ 		avcodec_free_context(&audioCodecCtx);
++#else
++		avcodec_close(audioCodecCtx);
+ #endif
+ 		audioCodecCtx = nullptr;
+ 	}
+@@ -36,9 +38,10 @@ DecoderStatus::~DecoderStatus() {
+ 	subtitleCodec = nullptr;
+ 
+ 	if (subtitleCodecCtx != nullptr) {
+-		avcodec_close(subtitleCodecCtx);
+ #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
+ 		avcodec_free_context(&subtitleCodecCtx);
++#else
++		avcodec_close(subtitleCodecCtx);
+ #endif
+ 		subtitleCodecCtx = nullptr;
+ 	}
+diff --git a/code/sound/ffmpeg/FFmpegWaveFile.cpp b/code/sound/ffmpeg/FFmpegWaveFile.cpp
+index ab1e0ddc520..77541d7b826 100644
+--- a/code/sound/ffmpeg/FFmpegWaveFile.cpp
++++ b/code/sound/ffmpeg/FFmpegWaveFile.cpp
+@@ -151,9 +151,10 @@ FFmpegWaveFile::~FFmpegWaveFile()
+ 	av_frame_free(&m_decodeFrame);
+ 
+ 	if (m_audioCodecCtx) {
+-		avcodec_close(m_audioCodecCtx);
+ #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
+ 		avcodec_free_context(&m_audioCodecCtx);
++#else
++		avcodec_close(m_audioCodecCtx);
+ #endif
+ 		m_audioCodecCtx = nullptr;
+ 	}