[vlc-commits] [Git][videolan/vlc][master] 5 commits: contrib: ffmpeg: don't add dummy emscripten target OS
Steve Lhomme (@robUx4)
gitlab at videolan.org
Mon Oct 7 08:20:51 UTC 2024
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
21fc8365 by Steve Lhomme at 2024-10-07T09:45:17+02:00
contrib: ffmpeg: don't add dummy emscripten target OS
Using none should have the same effect and uses the standard FFmpeg options.
- - - - -
5e370813 by Steve Lhomme at 2024-10-07T09:45:25+02:00
contrib: ffmpeg: remove armv7 patch
This should compile fine on recent NDK or it should be merged upstream.
- - - - -
08efb3f4 by Steve Lhomme at 2024-10-07T09:45:25+02:00
contrib: ffmpeg: move the config flags in FFMPEGCONF
They are supposed to match HOSTCONF but ffmpeg refuses
options it doesn't understand.
- - - - -
78e7c43d by Steve Lhomme at 2024-10-07T09:45:25+02:00
contrib: ffmpeg: remove forced -lm
It's automatically added.
Reverts d58a64505dd5488b328201ac6ea11919055279e9.
The issue was fixed in 4.0 via c94b09485811b58a49e6769943509880922ff0bd.
- - - - -
ec5c03d7 by Steve Lhomme at 2024-10-07T09:45:25+02:00
contrib: ffmpeg: use BUILDCC for native compilation
- - - - -
3 changed files:
- − contrib/src/ffmpeg/0001-ffmpeg-add-target_os-support-for-emscripten.patch
- − contrib/src/ffmpeg/armv7_fixup.patch
- contrib/src/ffmpeg/rules.mak
Changes:
=====================================
contrib/src/ffmpeg/0001-ffmpeg-add-target_os-support-for-emscripten.patch deleted
=====================================
@@ -1,25 +0,0 @@
-From 6c9566016d1be55ff159d884ac3498dc2d1b7857 Mon Sep 17 00:00:00 2001
-From: Mehdi Sabwat <mehdi at videolabs.io>
-Date: Mon, 6 Sep 2021 11:49:03 +0200
-Subject: [PATCH 10/10] ffmpeg: add target_os support for emscripten
-
----
- configure | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure b/configure
-index a89cfa6d95..a3ba6eeae9 100755
---- a/configure
-+++ b/configure
-@@ -5802,6 +5802,8 @@ case $target_os in
- ;;
- minix)
- ;;
-+ emscripten)
-+ ;;
- none)
- ;;
- *)
---
-2.37.3.windows.1
-
=====================================
contrib/src/ffmpeg/armv7_fixup.patch deleted
=====================================
@@ -1,26 +0,0 @@
-From e5945a2bbe0dcd1d467cfd556fb7b5acca339cbb Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Kempf <jb at videolan.org>
-Date: Wed, 6 Dec 2017 23:46:29 +0100
-Subject: [PATCH 01/10] fix compilation for ARMv7 on Android
-
----
- libavcodec/arm/hevcdsp_idct_neon.S | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavcodec/arm/hevcdsp_idct_neon.S b/libavcodec/arm/hevcdsp_idct_neon.S
-index 66ed1c6785..cff4eb0899 100644
---- a/libavcodec/arm/hevcdsp_idct_neon.S
-+++ b/libavcodec/arm/hevcdsp_idct_neon.S
-@@ -938,8 +938,8 @@ endfunc
- tr_16x4 firstpass, 7, 512, 1
- tr_16x4 secondpass_8, 20 - 8, 512, 1
- tr_16x4 secondpass_10, 20 - 10, 512, 1
--tr_16x4 noscale, 0, 2048, 4
- .ltorg
-+tr_16x4 noscale, 0, 2048, 4
- tr_32x4 firstpass, 7
- tr_32x4 secondpass_8, 20 - 8
- tr_32x4 secondpass_10, 20 - 10
---
-2.37.3.windows.1
-
=====================================
contrib/src/ffmpeg/rules.mak
=====================================
@@ -12,8 +12,10 @@ FFMPEG_LAVC_MIN := 57.37.100
FFMPEG_BASENAME := $(subst .,_,$(subst \,_,$(subst /,_,$(FFMPEG_HASH))))
# bsf=vp9_superframe is needed to mux VP9 inside webm/mkv
-FFMPEGCONF = \
+FFMPEGCONF = --prefix="$(PREFIX)" --enable-static --disable-shared \
+ --extra-ldflags="$(LDFLAGS)" \
--cc="$(CC)" \
+ --host-cc="$(BUILDCC)" \
--pkg-config="$(PKG_CONFIG)" \
--disable-doc \
--disable-encoder=vorbis \
@@ -153,7 +155,7 @@ endif
# Linux
ifdef HAVE_LINUX
-FFMPEGCONF += --target-os=linux --enable-pic --extra-libs="-lm"
+FFMPEGCONF += --target-os=linux --enable-pic
endif
@@ -202,7 +204,7 @@ FFMPEGCONF += --target-os=sunos --enable-pic
endif
ifdef HAVE_EMSCRIPTEN
-FFMPEGCONF+= --arch=wasm32 --target-os=emscripten --enable-pic
+FFMPEGCONF+= --arch=wasm32 --target-os=none --enable-pic
endif
# Build
@@ -227,7 +229,6 @@ $(TARBALLS)/ffmpeg-$(FFMPEG_VERSION).tar.xz:
ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.xz .sum-ffmpeg
$(UNPACK)
- $(APPLY) $(SRC)/ffmpeg/armv7_fixup.patch
$(APPLY) $(SRC)/ffmpeg/dxva_vc1_crash.patch
$(APPLY) $(SRC)/ffmpeg/h264_early_SAR.patch
$(APPLY) $(SRC)/ffmpeg/0001-avcodec-dxva2_hevc-add-support-for-parsing-HEVC-Rang.patch
@@ -236,16 +237,13 @@ ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.xz .sum-ffmpeg
$(APPLY) $(SRC)/ffmpeg/0001-avcodec-mpeg12dec-don-t-call-hw-end_frame-when-start.patch
$(APPLY) $(SRC)/ffmpeg/0002-avcodec-mpeg12dec-don-t-end-a-slice-without-first_sl.patch
$(APPLY) $(SRC)/ffmpeg/0001-fix-mf_utils-compilation-with-mingw64.patch
- $(APPLY) $(SRC)/ffmpeg/0001-ffmpeg-add-target_os-support-for-emscripten.patch
$(APPLY) $(SRC)/ffmpeg/0011-avcodec-videotoolboxenc-disable-calls-on-unsupported.patch
$(APPLY) $(SRC)/ffmpeg/avcodec-fix-compilation-visionos.patch
$(MOVE)
.ffmpeg: ffmpeg
$(MAKEBUILDDIR)
- $(MAKECONFDIR)/configure \
- --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) \
- --prefix="$(PREFIX)" --enable-static --disable-shared
+ $(MAKECONFDIR)/configure $(FFMPEGCONF)
+$(MAKEBUILD)
+$(MAKEBUILD) install-libs install-headers
touch $@
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/befb2d0aa69378e75d4b9f09464ad07dd998ed3f...ec5c03d7a6ca89b3b843138eca042af685947a2b
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/befb2d0aa69378e75d4b9f09464ad07dd998ed3f...ec5c03d7a6ca89b3b843138eca042af685947a2b
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list