[mythtv] FFmpeg 7.1 update

[Scott Theisen]

On 11/3/24 18:51, David Hampton via mythtv-dev wrote:
> On Sun, 2024-10-27 at 22:23 -0400, Scott Theisen wrote:
>> During my rebase of release/mythtv/7.1 onto ffmpeg/release/7.1 I
>> found a
>> few commits that may no longer be necessary, but I need some input.
>>
>> David Hampton:
>>
>> Is this still necessary for FreeBSD?
>> MythTV: Fix how configure finds libxml2.
>> https://github.com/ulmus-scott/FFmpeg/commit/aa0020365a3b474f1912fb5bb6cb5d3523669424
> No, it isn't necessary any longer.  I was able to revert it and still
> compile on FreeBSD 13/14/15.
>
> David

Can you test reverting the entirety of 
https://github.com/MythTV/mythtv/commit/641109a0c7f46a73c0fc08161f232839e2e5a17d 
and verify that libxml2 is still enabled on FreeBSD?

Apply:
diff --git a/mythtv/configure b/mythtv/configure
index 2a08ba01cd..f5a0055138 100755
--- a/mythtv/configure
+++ b/mythtv/configure
@@ -5584,7 +5584,7 @@ enabled libx264           && { use_pkg_config 
libx264 x264 x264.h x264_encoder_e
                               require_cpp_condition x264.h "X264_BUILD 
 >= 118" &&
                               { check_cpp_condition x264.h "X264_MPEG2" &&
                                 enable libx262; }
-enabled libxml2           && require_pkg_config libxml2 libxml-2.0 
libxml/xmlversion.h xmlCheckVersion
+enabled libxml2           && require_pkg_config libxml2 libxml-2.0 
libxml2/libxml/xmlversion.h xmlCheckVersion

  enabled drm && use_pkg_config libdrm libdrm xf86drm.h drmGetVersion || 
disable drm
  enabled drm && check_cpp_condition drm_fourcc.h 
'defined(DRM_FORMAT_MOD_LINEAR)' || disable drm
diff --git a/mythtv/external/FFmpeg/configure 
b/mythtv/external/FFmpeg/configure
index 2bc1a73e8a..76ac49ff8f 100755
--- a/mythtv/external/FFmpeg/configure
+++ b/mythtv/external/FFmpeg/configure
@@ -7061,7 +7061,7 @@ enabled libzmq            && require_pkg_config 
libzmq "libzmq >= 4.2.1" zmq.h z
  enabled libzvbi           && require_pkg_config libzvbi zvbi-0.2 
libzvbi.h vbi_decoder_new &&
                               { test_cpp_condition libzvbi.h 
"VBI_VERSION_MAJOR > 0 || VBI_VERSION_MINOR > 2 || VBI_VERSION_MINOR == 
2 && VBI_VERSION_MICRO >= 28" ||
                                 enabled gpl || die "ERROR: libzvbi 
requires version 0.2.28 or --enable-gpl."; }
-enabled libxml2           && require_pkg_config libxml2 libxml-2.0 
libxml/xmlversion.h xmlCheckVersion
+enabled libxml2           && require_pkg_config libxml2 libxml-2.0 
libxml2/libxml/xmlversion.h xmlCheckVersion
  enabled mbedtls           && { check_pkg_config mbedtls mbedtls 
mbedtls/x509_crt.h mbedtls_x509_crt_init ||
                                 check_pkg_config mbedtls mbedtls 
mbedtls/ssl.h mbedtls_ssl_init ||
                                 check_lib mbedtls mbedtls/ssl.h 
mbedtls_ssl_init -lmbedtls -lmbedx509 -lmbedcrypto ||

If the change to FFmpeg's configure is no longer necessary, the change 
to MythTV's configure is probably also no longer necessary.

Thanks,

Scott