From 13308babd9d92f84cdea7f278bfad6991df01034 Mon Sep 17 00:00:00 2001 From: use Date: Wed, 29 Mar 2023 03:10:57 -0700 Subject: [PATCH] Properly prepend sdk file, and set nasm as assembler for vpx --- deps/05_intel-sdk/MediaSDK | 1 - deps/05_intel-sdk/build.sh | 2 +- deps/13_libvpx/build.sh | 2 +- deps/13_libvpx/libvpx | 1 - deps/16_x265/x265_git | 1 - 5 files changed, 2 insertions(+), 5 deletions(-) delete mode 160000 deps/05_intel-sdk/MediaSDK delete mode 160000 deps/13_libvpx/libvpx delete mode 160000 deps/16_x265/x265_git diff --git a/deps/05_intel-sdk/MediaSDK b/deps/05_intel-sdk/MediaSDK deleted file mode 160000 index 22dc85a..0000000 --- a/deps/05_intel-sdk/MediaSDK +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 22dc85a376ebe8be9cc43fc48654ea159419db79 diff --git a/deps/05_intel-sdk/build.sh b/deps/05_intel-sdk/build.sh index 25f2169..dfb06eb 100644 --- a/deps/05_intel-sdk/build.sh +++ b/deps/05_intel-sdk/build.sh @@ -10,7 +10,7 @@ then fi #Unsure if still needed: -echo "#include " >>./MediaSDK/api/mfx_dispatch/linux/mfxparser.cpp +sed -i "1s/^/#include \n/" ./MediaSDK/api/mfx_dispatch/linux/mfxparser.cpp cd "$pkg" diff --git a/deps/13_libvpx/build.sh b/deps/13_libvpx/build.sh index 1fe5bd2..901c854 100644 --- a/deps/13_libvpx/build.sh +++ b/deps/13_libvpx/build.sh @@ -34,7 +34,7 @@ make distclean --enable-realtime-only \ --enable-better-hw-compatibility \ --disable-unit-tests \ - --as=nsam \ + --as=nasm \ --prefix="/app/ffmpeg/install/" make -j8 diff --git a/deps/13_libvpx/libvpx b/deps/13_libvpx/libvpx deleted file mode 160000 index 972149c..0000000 --- a/deps/13_libvpx/libvpx +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 972149cafeb71d6f08df89e91a0130d6a38c4b15 diff --git a/deps/16_x265/x265_git b/deps/16_x265/x265_git deleted file mode 160000 index c07d076..0000000 --- a/deps/16_x265/x265_git +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c07d076cf20ab41d8077a804dda70fdbc3b97386