Re: [FFmpeg-devel] [PATCH 2/2] libavcodec: Don't include libavcodec/x86/vvc/Makefile on any architecture

[Sean McGovern]

Hi Martin,

On Fri, Mar 8, 2024 at 3:38 AM Martin Storsjö  wrote:
>
> This currently builds files in the libavcodec/x86/{vvc,h26x}
> subdirectories, which is somewhat unexpected when building for
> another architecture than x86.
>
> The regular arch subdirectories are handled with
>
> -include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
>
> in the toplevel Makefile. Switch this to a similar optional
> inclusion, using $(ARCH).
> ---
>  libavcodec/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> index 5d99120aa9..708434ac76 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -64,7 +64,7 @@ OBJS = ac3_parser.o 
> \
>
>  # subsystems
>  include $(SRC_PATH)/libavcodec/vvc/Makefile
> -include $(SRC_PATH)/libavcodec/x86/vvc/Makefile
> +-include $(SRC_PATH)/libavcodec/$(ARCH)/vvc/Makefile
>  OBJS-$(CONFIG_AANDCTTABLES)+= aandcttab.o
>  OBJS-$(CONFIG_AC3DSP)  += ac3dsp.o ac3.o ac3tab.o
>  OBJS-$(CONFIG_ADTS_HEADER) += adts_header.o 
> mpeg4audio_sample_rates.o
> --

This patch looks good to me.

Thanks,

Sean McGovern
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/2] libavcodec: Don't include libavcodec/x86/vvc/Makefile on any architecture

[Martin Storsjö]

This currently builds files in the libavcodec/x86/{vvc,h26x}
subdirectories, which is somewhat unexpected when building for
another architecture than x86.

The regular arch subdirectories are handled with

-include $(SRC_PATH)/$(1)/$(ARCH)/Makefile

in the toplevel Makefile. Switch this to a similar optional
inclusion, using $(ARCH).
---
 libavcodec/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 5d99120aa9..708434ac76 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -64,7 +64,7 @@ OBJS = ac3_parser.o   
  \
 
 # subsystems
 include $(SRC_PATH)/libavcodec/vvc/Makefile
-include $(SRC_PATH)/libavcodec/x86/vvc/Makefile
+-include $(SRC_PATH)/libavcodec/$(ARCH)/vvc/Makefile
 OBJS-$(CONFIG_AANDCTTABLES)+= aandcttab.o
 OBJS-$(CONFIG_AC3DSP)  += ac3dsp.o ac3.o ac3tab.o
 OBJS-$(CONFIG_ADTS_HEADER) += adts_header.o 
mpeg4audio_sample_rates.o
-- 
2.39.3 (Apple Git-145)

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".