diff options
| author |  Michael Niedermayer <michaelni@users.noreply.github.com> | 2021-06-01 21:03:04 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-06-01 19:03:04 +0000 |
| commit | 2c8b1d47e2878988a593ea8a00f39083a6bf74b7 (patch) | |
| tree | 9f94b7e5b7b2ce3bef93383d8f92392b682e4463 /projects/ffmpeg | |
| parent | 4fb4850860b5caf02ab7b964ef83ba3a9f238408 (diff) | |
[FFmpeg] remove libXfixes (#5863)
Fixes build (which apparently failed due to incompatibility of unneeded distro
packages being mixed with unneeded git packages)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'projects/ffmpeg')
| -rw-r--r-- | projects/ffmpeg/Dockerfile | 1 | ||||
| -rwxr-xr-x | projects/ffmpeg/build.sh | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/projects/ffmpeg/Dockerfile b/projects/ffmpeg/Dockerfile index bb0bb58a..ab25e338 100644 --- a/projects/ffmpeg/Dockerfile +++ b/projects/ffmpeg/Dockerfile @@ -28,7 +28,6 @@ RUN git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg RUN wget https://www.alsa-project.org/files/pub/lib/alsa-lib-1.1.0.tar.bz2 RUN git clone --depth 1 https://github.com/mstorsjo/fdk-aac.git RUN git clone --depth 1 git://anongit.freedesktop.org/xorg/lib/libXext -RUN git clone --depth 1 git://anongit.freedesktop.org/git/xorg/lib/libXfixes RUN git clone --depth 1 https://github.com/intel/libva RUN git clone --depth 1 -b libvdpau-1.2 git://people.freedesktop.org/~aplattner/libvdpau RUN git clone --depth 1 https://chromium.googlesource.com/webm/libvpx diff --git a/projects/ffmpeg/build.sh b/projects/ffmpeg/build.sh index b3bc5a5b..b2b0033c 100755 --- a/projects/ffmpeg/build.sh +++ b/projects/ffmpeg/build.sh @@ -50,13 +50,6 @@ make clean make -j$(nproc) make install -cd $SRC/libXfixes -./autogen.sh -./configure --prefix="$FFMPEG_DEPS_PATH" --enable-static -make clean -make -j$(nproc) -make install - cd $SRC/libva ./autogen.sh ./configure --prefix="$FFMPEG_DEPS_PATH" --enable-static --disable-shared |