CI Linux FFmpeg: updated SVT-HEVC patch

SVT-JPEG-XS has been merged, which was causing the conflicts

Author: MartinPulec

.github/scripts/Linux/ffmpeg-patches/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch

@@ -1,4 +1,4 @@
-From 19f4bd57e3d60dc6e40bc1ff96fbb91916dd7cc4 Mon Sep 17 00:00:00 2001
+From 6fe97a207e1094365f4be54dff0a2412d3130042 Mon Sep 17 00:00:00 2001
 From: Jing Sun <jing.a.sun@intel.com>
 Date: Wed, 21 Nov 2018 11:33:04 +0800
 Subject: [PATCH] lavc/svt_hevc: add libsvt hevc encoder wrapper
@@ -21,46 +21,46 @@ UPDATED 2025-06-20 by Martin Pulec: rebased against 45a30e036 + fix compile
  create mode 100644 libavcodec/libsvt_hevc.c
 
 diff --git a/configure b/configure
-index e1809a3e58..936cea82ab 100755
+index 60e33e26e4..da24e814a4 100755
 --- a/configure
 +++ b/configure
-@@ -339,6 +339,7 @@ External library support:
+@@ -345,6 +345,7 @@ External library support:
    --enable-whisper         enable whisper filter [no]
    --disable-xlib           disable xlib [autodetect]
    --disable-zlib           disable zlib [autodetect]
 +  --enable-libsvthevc      enable HEVC encoding via svt [no]
 
    The following libraries provide various hardware acceleration features:
    --disable-amf            disable AMF video encoding code [autodetect]
-@@ -1979,6 +1980,7 @@ EXTERNAL_LIBRARY_LIST="
+@@ -2052,6 +2053,7 @@ EXTERNAL_LIBRARY_LIST="
      libsrt
      libssh
      libsvtav1
 +    libsvthevc
+     libsvtjpegxs
      libtensorflow
      libtesseract
-     libtheora
-@@ -3678,6 +3680,7 @@ vapoursynth_demuxer_deps="vapoursynth"
+@@ -3792,6 +3794,7 @@ vapoursynth_demuxer_deps="vapoursynth"
  videotoolbox_suggest="coreservices"
  videotoolbox_deps="corefoundation coremedia corevideo VTDecompressionSessionDecodeFrame"
  videotoolbox_encoder_deps="videotoolbox VTCompressionSessionPrepareToEncodeFrames"
 +libsvt_hevc_encoder_deps="libsvthevc"
 
  # demuxers / muxers
  ac3_demuxer_select="ac3_parser"
-@@ -7149,6 +7152,7 @@ enabled libssh            && require_pkg_config libssh "libssh >= 0.6.0" libssh/
+@@ -7313,6 +7316,7 @@ enabled libssh            && require_pkg_config libssh "libssh >= 0.6.0" libssh/
  enabled libspeex          && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
  enabled libsrt            && require_pkg_config libsrt "srt >= 1.3.0" srt/srt.h srt_socket
  enabled libsvtav1         && require_pkg_config libsvtav1 "SvtAv1Enc >= 0.9.0" EbSvtAv1Enc.h svt_av1_enc_init_handle
 +enabled libsvthevc        && require_pkg_config libsvthevc SvtHevcEnc EbApi.h EbInitHandle
+ enabled libsvtjpegxs      && require_pkg_config libsvtjpegxs "SvtJpegxs >= 0.10.0" SvtJpegxsEnc.h svt_jpeg_xs_encoder_init
  enabled libtensorflow     && require libtensorflow tensorflow/c/c_api.h TF_Version -ltensorflow
  enabled libtesseract      && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate
- enabled libtheora         && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
 diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index 35408949ac..12f534a1d7 100644
+index 3d60347a19..db09ee37de 100644
 --- a/libavcodec/Makefile
 +++ b/libavcodec/Makefile
-@@ -1202,6 +1202,7 @@ OBJS-$(CONFIG_LIBWEBP_ANIM_ENCODER)       += libwebpenc_common.o libwebpenc_anim
+@@ -1225,6 +1225,7 @@ OBJS-$(CONFIG_LIBWEBP_ANIM_ENCODER)       += libwebpenc_common.o libwebpenc_anim
  OBJS-$(CONFIG_LIBX262_ENCODER)            += libx264.o
  OBJS-$(CONFIG_LIBX264_ENCODER)            += libx264.o
  OBJS-$(CONFIG_LIBX265_ENCODER)            += libx265.o
@@ -69,10 +69,10 @@ index 35408949ac..12f534a1d7 100644
  OBJS-$(CONFIG_LIBXAVS2_ENCODER)           += libxavs2.o
  OBJS-$(CONFIG_LIBXEVD_DECODER)            += libxevd.o
 diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
-index f5ec2e01e8..7844040a00 100644
+index 042b07c895..69005226ef 100644
 --- a/libavcodec/allcodecs.c
 +++ b/libavcodec/allcodecs.c
-@@ -827,6 +827,7 @@ extern const FFCodec ff_libxavs_encoder;
+@@ -841,6 +841,7 @@ extern const FFCodec ff_libxavs_encoder;
  extern const FFCodec ff_libxavs2_encoder;
  extern const FFCodec ff_libxvid_encoder;
  extern const FFCodec ff_libzvbi_teletext_decoder;
@@ -671,5 +671,5 @@ index 0000000000..07f62fa762
 +    .p.wrapper_name = "libsvt_hevc",
 +};
 -- 
-2.50.1
+2.52.0