Remove depot_tools and yasm
They're actually unused
This commit is contained in:
@@ -12,7 +12,7 @@ RUN dnf -y install epel-release \
|
|||||||
&& dnf config-manager --set-enabled powertools \
|
&& dnf config-manager --set-enabled powertools \
|
||||||
&& dnf -y install cmake autoconf automake libtool pkgconfig make patch git \
|
&& dnf -y install cmake autoconf automake libtool pkgconfig make patch git \
|
||||||
python3.11-pip python3.11-devel gperf flex bison clang clang-tools-extra \
|
python3.11-pip python3.11-devel gperf flex bison clang clang-tools-extra \
|
||||||
lld nasm yasm file which wget perl-open perl-XML-Parser perl-IPC-Cmd \
|
lld nasm file which wget perl-open perl-XML-Parser perl-IPC-Cmd \
|
||||||
xorg-x11-util-macros $TOOLSET-gcc $TOOLSET-gcc-c++ $TOOLSET-binutils \
|
xorg-x11-util-macros $TOOLSET-gcc $TOOLSET-gcc-c++ $TOOLSET-binutils \
|
||||||
$TOOLSET-gdb $TOOLSET-libasan-devel libffi-devel fontconfig-devel \
|
$TOOLSET-gdb $TOOLSET-libasan-devel libffi-devel fontconfig-devel \
|
||||||
freetype-devel libX11-devel wayland-devel alsa-lib-devel \
|
freetype-devel libX11-devel wayland-devel alsa-lib-devel \
|
||||||
|
|||||||
@@ -87,8 +87,6 @@ pathPrefixes = [
|
|||||||
'ThirdParty\\gyp',
|
'ThirdParty\\gyp',
|
||||||
] if win else [
|
] if win else [
|
||||||
'ThirdParty/gyp',
|
'ThirdParty/gyp',
|
||||||
'ThirdParty/yasm',
|
|
||||||
'ThirdParty/depot_tools',
|
|
||||||
]
|
]
|
||||||
pathPrefix = ''
|
pathPrefix = ''
|
||||||
for singlePrefix in pathPrefixes:
|
for singlePrefix in pathPrefixes:
|
||||||
@@ -478,8 +476,7 @@ win:
|
|||||||
mingw-w64-x86_64-gperf ^
|
mingw-w64-x86_64-gperf ^
|
||||||
mingw-w64-x86_64-nasm ^
|
mingw-w64-x86_64-nasm ^
|
||||||
mingw-w64-x86_64-perl ^
|
mingw-w64-x86_64-perl ^
|
||||||
mingw-w64-x86_64-pkgconf ^
|
mingw-w64-x86_64-pkgconf
|
||||||
mingw-w64-x86_64-yasm
|
|
||||||
|
|
||||||
SET PATH=%PATH_BACKUP_%
|
SET PATH=%PATH_BACKUP_%
|
||||||
""", 'ThirdParty')
|
""", 'ThirdParty')
|
||||||
@@ -506,13 +503,6 @@ win:
|
|||||||
del jom.zip
|
del jom.zip
|
||||||
""", 'ThirdParty')
|
""", 'ThirdParty')
|
||||||
|
|
||||||
stage('depot_tools', """
|
|
||||||
mac:
|
|
||||||
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
|
|
||||||
cd depot_tools
|
|
||||||
./update_depot_tools
|
|
||||||
""", 'ThirdParty')
|
|
||||||
|
|
||||||
if not mac or 'build-stackwalk' in options:
|
if not mac or 'build-stackwalk' in options:
|
||||||
stage('gyp', """
|
stage('gyp', """
|
||||||
win:
|
win:
|
||||||
@@ -526,15 +516,6 @@ mac:
|
|||||||
git+https://chromium.googlesource.com/external/gyp@master six
|
git+https://chromium.googlesource.com/external/gyp@master six
|
||||||
""", 'ThirdParty')
|
""", 'ThirdParty')
|
||||||
|
|
||||||
stage('yasm', """
|
|
||||||
mac:
|
|
||||||
git clone https://github.com/yasm/yasm.git
|
|
||||||
cd yasm
|
|
||||||
git checkout 41762bea
|
|
||||||
./autogen.sh
|
|
||||||
make $MAKE_THREADS_CNT
|
|
||||||
""", 'ThirdParty')
|
|
||||||
|
|
||||||
stage('lzma', """
|
stage('lzma', """
|
||||||
win:
|
win:
|
||||||
git clone https://github.com/desktop-app/lzma.git
|
git clone https://github.com/desktop-app/lzma.git
|
||||||
@@ -1116,7 +1097,6 @@ depends:patches/build_libvpx_win.sh
|
|||||||
mac:
|
mac:
|
||||||
find ../patches/libvpx -type f -print0 | sort -z | xargs -0 git apply
|
find ../patches/libvpx -type f -print0 | sort -z | xargs -0 git apply
|
||||||
|
|
||||||
depends:yasm/yasm
|
|
||||||
./configure --prefix=$USED_PREFIX \
|
./configure --prefix=$USED_PREFIX \
|
||||||
--target=arm64-darwin20-gcc \
|
--target=arm64-darwin20-gcc \
|
||||||
--disable-examples \
|
--disable-examples \
|
||||||
@@ -1223,7 +1203,6 @@ depends:patches/build_ffmpeg_win.sh
|
|||||||
SET PATH=%PATH_BACKUP_%
|
SET PATH=%PATH_BACKUP_%
|
||||||
mac:
|
mac:
|
||||||
export PKG_CONFIG_PATH=$USED_PREFIX/lib/pkgconfig
|
export PKG_CONFIG_PATH=$USED_PREFIX/lib/pkgconfig
|
||||||
depends:yasm/yasm
|
|
||||||
|
|
||||||
configureFFmpeg() {
|
configureFFmpeg() {
|
||||||
arch=$1
|
arch=$1
|
||||||
|
|||||||
Reference in New Issue
Block a user