File tree 3 files changed +14
-16
lines changed
3 files changed +14
-16
lines changed Original file line number Diff line number Diff line change @@ -21,12 +21,6 @@ RUN tar -xf cmake-3.26.5-linux-x86_64.tar.gz
21
21
RUN mv cmake-3.26.5-linux-x86_64 opt
22
22
ENV CMAKE_ROOT=/ffmpeg-static/opt/share/cmake-3.27
23
23
24
- # Install a recent version of pkg-config
25
- RUN wget https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz && \
26
- tar -xf pkg-config-0.28.tar.gz && \
27
- cd pkg-config-0.28 && \
28
- ./configure --with-internal-glib --prefix=/ffmpeg-static/opt && make && make install
29
-
30
24
# Install a recent version of yasm
31
25
RUN git clone https://github.com/yasm/yasm.git && \
32
26
cd yasm \
Original file line number Diff line number Diff line change @@ -6,8 +6,8 @@ set -euo pipefail
6
6
7
7
version=$( < VERSION)
8
8
9
- docker build -t linux . -f ./Dockerfile.linux
10
- docker build -t windows . -f ./Dockerfile.windows
9
+ docker build -t linux . -f ./Dockerfile.linux --progress=plain
10
+ docker build -t windows . -f ./Dockerfile.windows --progress=plain
11
11
12
12
mkdir dist
13
13
Original file line number Diff line number Diff line change @@ -3,14 +3,18 @@ function setup_cross {
3
3
}
4
4
5
5
function build {
6
- ./autogen.sh
7
- ./configure --prefix=$dist /$1 \
8
- $autotools_options \
9
- --enable-static \
10
- --without-iconv \
11
- --without-lzma \
12
- --without-python
13
- make -$MJ
6
+ mkdir build
7
+ cd build
8
+ cmake \
9
+ $cmake_options \
10
+ -DCMAKE_INSTALL_PREFIX=" $dist /$1 " \
11
+ -DLIBXML2_WITH_LZMA=OFF \
12
+ -DLIBXML2_WITH_ICONV=OFF \
13
+ -DLIBXML2_WITH_PYTHON=OFF \
14
+ -DLIBXML2_WITH_ZLIB=OFF \
15
+ -DBUILD_SHARED_LIBS=OFF \
16
+ -DCMAKE_BUILD_TYPE=Release \
17
+ ..
14
18
make install
15
19
}
16
20
You can’t perform that action at this time.
0 commit comments