diff --git a/Dockerfile b/Dockerfile index e880e8021..b8c320b44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM debian WORKDIR / RUN apt update -y && apt install -y g++ gcc git curl wget nasm yasm libgtk-3-dev clang libxcb-randr0-dev libxdo-dev libxfixes-dev libxcb-shape0-dev libxcb-xfixes0-dev libasound2-dev libpulse-dev cmake unzip zip sudo -RUN git clone https://github.com/microsoft/vcpkg --branch 2020.11-1 +RUN git clone https://github.com/microsoft/vcpkg && cd vcpkg && git checkout 134505003bb46e20fbace51ccfb69243fbbc5f82 RUN /vcpkg/bootstrap-vcpkg.sh -disableMetrics RUN /vcpkg/vcpkg --disable-metrics install libvpx libyuv opus diff --git a/README-DE.md b/README-DE.md index 12556a5ca..5ce995bc4 100644 --- a/README-DE.md +++ b/README-DE.md @@ -65,24 +65,15 @@ sudo pacman -Syu --needed unzip git cmake gcc curl wget yasm nasm zip make pkg-c ### vcpkg installieren ```sh -git clone https://github.com/microsoft/vcpkg --branch 2020.11-1 +git clone https://github.com/microsoft/vcpkg +cd vcpkg +git checkout 134505003bb46e20fbace51ccfb69243fbbc5f82 +cd .. vcpkg/bootstrap-vcpkg.sh export VCPKG_ROOT=$HOME/vcpkg vcpkg/vcpkg install libvpx libyuv opus ``` -### libvpx reparieren (Für Fedora) -```sh -cd vcpkg/buildtrees/libvpx/src -cd * -./configure -sed -i 's/CFLAGS+=-I/CFLAGS+=-fPIC -I/g' Makefile -sed -i 's/CXXFLAGS+=-I/CXXFLAGS+=-fPIC -I/g' Makefile -make -cp libvpx.a $HOME/vcpkg/installed/x64-linux/lib/ -cd -``` - ### Kompilieren ```sh curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh diff --git a/README-ES.md b/README-ES.md index 7f0d4975d..452ec1d7f 100644 --- a/README-ES.md +++ b/README-ES.md @@ -62,24 +62,15 @@ sudo pacman -Syu --needed unzip git cmake gcc curl wget yasm nasm zip make pkg-c ### Install vcpkg ```sh -git clone https://github.com/microsoft/vcpkg --branch 2020.11-1 +git clone https://github.com/microsoft/vcpkg +cd vcpkg +git checkout 134505003bb46e20fbace51ccfb69243fbbc5f82 +cd .. vcpkg/bootstrap-vcpkg.sh export VCPKG_ROOT=$HOME/vcpkg vcpkg/vcpkg install libvpx libyuv opus ``` -### Soluciona libvpx (For Fedora) -```sh -cd vcpkg/buildtrees/libvpx/src -cd * -./configure -sed -i 's/CFLAGS+=-I/CFLAGS+=-fPIC -I/g' Makefile -sed -i 's/CXXFLAGS+=-I/CXXFLAGS+=-fPIC -I/g' Makefile -make -cp libvpx.a $HOME/vcpkg/installed/x64-linux/lib/ -cd -``` - ### Compila ```sh curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh diff --git a/README-FR.md b/README-FR.md index f660587f6..8fdac4b90 100644 --- a/README-FR.md +++ b/README-FR.md @@ -62,24 +62,15 @@ sudo pacman -Syu --needed unzip git cmake gcc curl wget yasm nasm zip make pkg-c ### Installer vcpkg ```sh -git clone https://github.com/microsoft/vcpkg --branch 2020.11-1 +git clone https://github.com/microsoft/vcpkg +cd vcpkg +git checkout 134505003bb46e20fbace51ccfb69243fbbc5f82 +cd .. vcpkg/bootstrap-vcpkg.sh export VCPKG_ROOT=$HOME/vcpkg vcpkg/vcpkg install libvpx libyuv opus ``` -### Corriger libvpx (Pour Fedora) -```sh -cd vcpkg/buildtrees/libvpx/src -cd * -./configure -sed -i 's/CFLAGS+=-I/CFLAGS+=-fPIC -I/g' Makefile -sed -i 's/CXXFLAGS+=-I/CXXFLAGS+=-fPIC -I/g' Makefile -make -cp libvpx.a $HOME/vcpkg/installed/x64-linux/lib/ -cd -``` - ### Construire ```sh curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh diff --git a/README-PL.md b/README-PL.md index 0bc3048a9..6b6928e28 100644 --- a/README-PL.md +++ b/README-PL.md @@ -64,24 +64,15 @@ sudo pacman -Syu --needed unzip git cmake gcc curl wget yasm nasm zip make pkg-c ### Zainstaluj vcpkg ```sh -git clone https://github.com/microsoft/vcpkg --branch 2020.11-1 +git clone https://github.com/microsoft/vcpkg +cd vcpkg +git checkout 134505003bb46e20fbace51ccfb69243fbbc5f82 +cd .. vcpkg/bootstrap-vcpkg.sh export VCPKG_ROOT=$HOME/vcpkg vcpkg/vcpkg install libvpx libyuv opus ``` -### Fix libvpx (For Fedora) -```sh -cd vcpkg/buildtrees/libvpx/src -cd * -./configure -sed -i 's/CFLAGS+=-I/CFLAGS+=-fPIC -I/g' Makefile -sed -i 's/CXXFLAGS+=-I/CXXFLAGS+=-fPIC -I/g' Makefile -make -cp libvpx.a $HOME/vcpkg/installed/x64-linux/lib/ -cd -``` - ### Kompilacja ```sh curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh diff --git a/README-ZH.md b/README-ZH.md index 0cc3ed657..3a7d4cecd 100644 --- a/README-ZH.md +++ b/README-ZH.md @@ -63,24 +63,15 @@ sudo pacman -Syu --needed unzip git cmake gcc curl wget yasm nasm zip make pkg-c ### 安装vcpkg ```sh -git clone https://github.com/microsoft/vcpkg --branch 2020.11-1 +git clone https://github.com/microsoft/vcpkg +cd vcpkg +git checkout 134505003bb46e20fbace51ccfb69243fbbc5f82 +cd .. vcpkg/bootstrap-vcpkg.sh export VCPKG_ROOT=$HOME/vcpkg vcpkg/vcpkg install libvpx libyuv opus ``` -### 修复libvpx (For Fedora) -```sh -cd vcpkg/buildtrees/libvpx/src -cd * -./configure -sed -i 's/CFLAGS+=-I/CFLAGS+=-fPIC -I/g' Makefile -sed -i 's/CXXFLAGS+=-I/CXXFLAGS+=-fPIC -I/g' Makefile -make -cp libvpx.a $HOME/vcpkg/installed/x64-linux/lib/ -cd -``` - ### 构建 ```sh curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh diff --git a/README.md b/README.md index 0d834d9ce..4114ed394 100644 --- a/README.md +++ b/README.md @@ -64,24 +64,15 @@ sudo pacman -Syu --needed unzip git cmake gcc curl wget yasm nasm zip make pkg-c ### Install vcpkg ```sh -git clone https://github.com/microsoft/vcpkg --branch 2020.11-1 +git clone https://github.com/microsoft/vcpkg +cd vcpkg +git checkout 134505003bb46e20fbace51ccfb69243fbbc5f82 +cd .. vcpkg/bootstrap-vcpkg.sh export VCPKG_ROOT=$HOME/vcpkg vcpkg/vcpkg install libvpx libyuv opus ``` -### Fix libvpx (For Fedora) -```sh -cd vcpkg/buildtrees/libvpx/src -cd * -./configure -sed -i 's/CFLAGS+=-I/CFLAGS+=-fPIC -I/g' Makefile -sed -i 's/CXXFLAGS+=-I/CXXFLAGS+=-fPIC -I/g' Makefile -make -cp libvpx.a $HOME/vcpkg/installed/x64-linux/lib/ -cd -``` - ### Build ```sh curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh