3rdparty/ext_ffmpeg/0010-theora-Update-to-1.2.0.patch

0001 From 6e49ef502d2eeb7793f35dc336d3a86e1a3525eb Mon Sep 17 00:00:00 2001
0002 From: "L. E. Segovia" <amy@amyspark.me>
0003 Date: Fri, 2 Dec 2022 15:59:05 +0000
0004 Subject: [PATCH 10/11] theora: Update to 1.2.0
0005
0006 ---
0007  examples/meson.build | 17 +++++++++++++++++
0008  lib/meson.build      | 13 +++++++++++++
0009  meson.build          | 18 +++++++++++++-----
0010  3 files changed, 43 insertions(+), 5 deletions(-)
0011
0012 diff --git a/examples/meson.build b/examples/meson.build
0013 index fc78b86..0c8c982 100644
0014 --- a/examples/meson.build
0015 +++ b/examples/meson.build
0016 @@ -48,6 +48,14 @@ dump_psnr = executable(
0017    dependencies: [m_dep, getopt_dep] + theoradec_libs,
0018  )
0019
0020 +libtheora_info_sources = files('libtheora_info.c')
0021 +
0022 +libtheora_info = executable(
0023 +  'libtheora_info',
0024 +  libtheora_info_sources,
0025 +  dependencies: [config_dep] + theoraenc_libs,
0026 +)
0027 +
0028  player_example_sources = files('player_example.c')
0029
0030  player_example = executable(
0031 @@ -78,3 +86,12 @@ png2theora = executable(
0032    dependencies: [ogg_dep, libpng_dep, unistd_dep, m_dep, getopt_dep, config_dep] +
0033    theoraenc_libs,
0034  )
0035 +
0036 +tiff2theora_sources = files('tiff2theora.c')
0037 +
0038 +tiff2theora = executable(
0039 +  'tiff2theora',
0040 +  tiff2theora_sources,
0041 +  dependencies: [ogg_dep, tiff_dep, unistd_dep, m_dep, getopt_dep, config_dep] +
0042 +  theoraenc_libs,
0043 +)
0044 diff --git a/lib/meson.build b/lib/meson.build
0045 index e5cfca7..5f15375 100644
0046 --- a/lib/meson.build
0047 +++ b/lib/meson.build
0048 @@ -47,14 +47,20 @@ if asm
0049          'x86/mmxfrag.c',
0050          'x86/mmxidct.c',
0051          'x86/mmxstate.c',
0052 +        'x86/sse2encfrag.c',
0053          'x86/sse2fdct.c',
0054 +        'x86/sse2idct.c',
0055 +        'x86/x86cpu.c',
0056          'x86/x86enc.c',
0057 +        'x86/x86enquant.c',
0058          'x86/x86state.c',
0059        )
0060        decoder_sources += files(
0061          'x86/mmxfrag.c',
0062          'x86/mmxidct.c',
0063          'x86/mmxstate.c',
0064 +        'x86/sse2idct.c',
0065 +        'x86/x86cpu.c',
0066          'x86/x86state.c',
0067        )
0068      endif
0069 @@ -72,8 +78,13 @@ if asm
0070          'x86/mmxfrag.c',
0071          'x86/mmxidct.c',
0072          'x86/mmxstate.c',
0073 +        'x86/sse2encfrag.c',
0074 +        'x86/sse2idct.c',
0075 +        'x86/x86cpu.c',
0076          'x86/x86enc.c',
0077 +        'x86/x86enquant.c',
0078          'x86/x86state.c',
0079 +
0080        )
0081      else
0082        encoder_sources += files(
0083 @@ -82,6 +93,7 @@ if asm
0084          'x86_vc/mmxfrag.c',
0085          'x86_vc/mmxidct.c',
0086          'x86_vc/mmxstate.c',
0087 +        'x86_vc/x86cpu.c',
0088          'x86_vc/x86enc.c',
0089          'x86_vc/x86state.c',
0090        )
0091 @@ -89,6 +101,7 @@ if asm
0092          'x86_vc/mmxfrag.c',
0093          'x86_vc/mmxidct.c',
0094          'x86_vc/mmxstate.c',
0095 +        'x86_vc/x86cpu.c',
0096          'x86_vc/x86state.c',
0097        )
0098      endif
0099 diff --git a/meson.build b/meson.build
0100 index e317a92..e9152c3 100644
0101 --- a/meson.build
0102 +++ b/meson.build
0103 @@ -2,7 +2,7 @@ project(
0104    'theora',
0105    'c',
0106    'cpp',
0107 -  version: '1.1.1',
0108 +  version: '1.2.0',
0109    meson_version: '>= 0.49.0',
0110    license: 'BSD-3-Clause',
0111    default_options: ['c_std=c11'],
0112 @@ -95,7 +95,18 @@ else
0113    unistd_dep = disabler()
0114  endif
0115
0116 +tiff_dep = dependency('tiff', required: false, disabler: true)
0117 +
0118 +if tiff_dep.found() and not cc.has_header_symbol(
0119 +    'tiffio.h',
0120 +    'TIFFReadRGBAImage',
0121 +    dependencies: tiff_dep
0122 +  )
0123 +  tiff_dep = disabler()
0124 +endif
0125 +
0126  cairo_dep = dependency('cairo', required: get_option('telemetry'))
0127 +
0128  if cairo_dep.found()
0129    conf.set('HAVE_CAIRO', true)
0130  endif
0131 @@ -216,10 +227,7 @@ if spec.auto() or spec.enabled()
0132      tex_pkg_ok = false
0133    endif
0134
0135 -  if tex_pkg_ok and meson.project_version() > '1.2.0alpha1'
0136 -    # libtheora <= 1.2.0alpha1 has a tex file which is incompatible
0137 -    # with TeX distributions < 2015 at the least.
0138 -    # See commit fbb275803696085225c310773474ef4dcf8a4528.
0139 +  if tex_pkg_ok
0140      subdir('doc/spec')
0141    else
0142      message('*** Format Specification will not be built.')
0143 --
0144 2.40.1.windows.1
0145