mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-05 08:19:02 +08:00
5962fd3c53
* [opencv4] Update t 4.7.0. * update versions. * [rtabmap] Support opencv 4.7. * Update versions. * [ffmpeg] Update to 5.1.2. * [ffmpeg] Use $VERSION * [ffmpeg] Update versions. * [nasm] Update to 2.16.01. * [ffmpeg] Fix linker crash with nasm. * [discordapi] Update to 2023-01-02 version. * Update versions. * [pangolin] Fix issue with ffmpeg 5.1. * Update versions * [ffmpeg] Fix nasm compilation with x86. * Update ffmpeg.json * Update ffmpeg.json * Update portfile.cmake * Update ffmpeg.json * Update baseline.json Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
70 lines
3.4 KiB
Diff
70 lines
3.4 KiB
Diff
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
|
|
--- a/libavcodec/x86/Makefile
|
|
+++ b/libavcodec/x86/Makefile
|
|
@@ -138,8 +138,11 @@ X86ASM-OBJS-$(CONFIG_QPELDSP) += x86/qpeldsp.o \
|
|
X86ASM-OBJS-$(CONFIG_RV34DSP) += x86/rv34dsp.o
|
|
X86ASM-OBJS-$(CONFIG_VC1DSP) += x86/vc1dsp_loopfilter.o \
|
|
x86/vc1dsp_mc.o
|
|
-X86ASM-OBJS-$(CONFIG_IDCTDSP) += x86/simple_idct10.o \
|
|
- x86/simple_idct.o
|
|
+ifdef ARCH_X86_64
|
|
+X86ASM-OBJS-$(CONFIG_IDCTDSP) += x86/simple_idct10.o
|
|
+else
|
|
+X86ASM-OBJS-$(CONFIG_IDCTDSP) += x86/simple_idct.o
|
|
+endif
|
|
X86ASM-OBJS-$(CONFIG_VIDEODSP) += x86/videodsp.o
|
|
X86ASM-OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp.o
|
|
X86ASM-OBJS-$(CONFIG_VP8DSP) += x86/vp8dsp.o \
|
|
@@ -157,6 +160,8 @@ X86ASM-OBJS-$(CONFIG_ALAC_DECODER) += x86/alacdsp.o
|
|
X86ASM-OBJS-$(CONFIG_APNG_DECODER) += x86/pngdsp.o
|
|
X86ASM-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsidct.o
|
|
+ifdef ARCH_X86_64
|
|
X86ASM-OBJS-$(CONFIG_CFHD_ENCODER) += x86/cfhdencdsp.o
|
|
+endif
|
|
X86ASM-OBJS-$(CONFIG_CFHD_DECODER) += x86/cfhddsp.o
|
|
X86ASM-OBJS-$(CONFIG_DCA_DECODER) += x86/dcadsp.o x86/synth_filter.o
|
|
X86ASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp.o \
|
|
@@ -175,15 +180,21 @@ x86/hevc_sao_10bit.o
|
|
X86ASM-OBJS-$(CONFIG_JPEG2000_DECODER) += x86/jpeg2000dsp.o
|
|
X86ASM-OBJS-$(CONFIG_LSCR_DECODER) += x86/pngdsp.o
|
|
+ifdef ARCH_X86_64
|
|
X86ASM-OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o
|
|
+endif
|
|
X86ASM-OBJS-$(CONFIG_MPEG4_DECODER) += x86/xvididct.o
|
|
X86ASM-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp.o
|
|
+ifdef ARCH_X86_64
|
|
X86ASM-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp.o
|
|
X86ASM-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp.o
|
|
+endif
|
|
X86ASM-OBJS-$(CONFIG_RV40_DECODER) += x86/rv40dsp.o
|
|
X86ASM-OBJS-$(CONFIG_SBC_ENCODER) += x86/sbcdsp.o
|
|
X86ASM-OBJS-$(CONFIG_SVQ1_ENCODER) += x86/svq1enc.o
|
|
X86ASM-OBJS-$(CONFIG_TAK_DECODER) += x86/takdsp.o
|
|
+ifdef ARCH_X86_64
|
|
X86ASM-OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o
|
|
+endif
|
|
X86ASM-OBJS-$(CONFIG_TTA_DECODER) += x86/ttadsp.o
|
|
X86ASM-OBJS-$(CONFIG_TTA_ENCODER) += x86/ttaencdsp.o
|
|
X86ASM-OBJS-$(CONFIG_UTVIDEO_DECODER) += x86/utvideodsp.o
|
|
diff --git a/libavfilter/x86/Makefile b/libavfilter/x86/Makefile
|
|
--- a/libavfilter/x86/Makefile
|
|
+++ b/libavfilter/x86/Makefile
|
|
@@ -44,6 +44,8 @@
|
|
X86ASM-OBJS-$(CONFIG_AFIR_FILTER) += x86/af_afir.o
|
|
X86ASM-OBJS-$(CONFIG_ANLMDN_FILTER) += x86/af_anlmdn.o
|
|
+ifdef ARCH_X86_64
|
|
X86ASM-OBJS-$(CONFIG_ATADENOISE_FILTER) += x86/vf_atadenoise.o
|
|
+endif
|
|
X86ASM-OBJS-$(CONFIG_BLEND_FILTER) += x86/vf_blend.o
|
|
X86ASM-OBJS-$(CONFIG_BWDIF_FILTER) += x86/vf_bwdif.o
|
|
X86ASM-OBJS-$(CONFIG_COLORSPACE_FILTER) += x86/colorspacedsp.o
|
|
@@ -62,6 +62,8 @@ X86ASM-OBJS-$(CONFIG_LUT3D_FILTER) += x86/vf_lut3d.o
|
|
X86ASM-OBJS-$(CONFIG_MASKEDCLAMP_FILTER) += x86/vf_maskedclamp.o
|
|
X86ASM-OBJS-$(CONFIG_MASKEDMERGE_FILTER) += x86/vf_maskedmerge.o
|
|
+ifdef ARCH_X86_64
|
|
X86ASM-OBJS-$(CONFIG_NLMEANS_FILTER) += x86/vf_nlmeans.o
|
|
+endif
|
|
X86ASM-OBJS-$(CONFIG_OVERLAY_FILTER) += x86/vf_overlay.o
|
|
X86ASM-OBJS-$(CONFIG_PP7_FILTER) += x86/vf_pp7.o
|
|
X86ASM-OBJS-$(CONFIG_PSNR_FILTER) += x86/vf_psnr.o
|