Skip to content

Commit

Permalink
Merge pull request #345 from stappersg/i763
Browse files Browse the repository at this point in the history
More like the CI build
  • Loading branch information
rustdesk authored Feb 17, 2024
2 parents 86887a7 + a288d4e commit b840cc2
Show file tree
Hide file tree
Showing 11 changed files with 80 additions and 69 deletions.
13 changes: 7 additions & 6 deletions content/dev/build/linux/_index.de.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Desktop-Versionen nutzen [Sciter](https://sciter.com/) für die Benutzeroberflä
- Installieren Sie [vcpkg](https://github.com/microsoft/vcpkg) und setzen Sie die Umgebungsvariable `VCPKG_ROOT` korrekt

- Windows: `vcpkg install libvpx:x64-windows-static libyuv:x64-windows-static opus:x64-windows-static aom:x64-windows-static`
- Linux/macOS: `vcpkg install libvpx libyuv opus aom`
- Linux/macOS: `vcpkg install

- Nutzen Sie `cargo run`

Expand Down Expand Up @@ -47,11 +47,11 @@ sudo pacman -Syu --needed unzip git cmake gcc curl wget yasm nasm zip make pkg-c
```sh
git clone https://github.com/microsoft/vcpkg
cd vcpkg
git checkout 2023.04.15
git checkout 2023.10.19
cd ..
vcpkg/bootstrap-vcpkg.sh
export VCPKG_ROOT=$HOME/vcpkg
vcpkg/vcpkg install libvpx libyuv opus aom
export VCPKG_ROOT=$PWD/vcpkg
vcpkg/vcpkg install --x-install-root="$VCPKG_ROOT/installed"
```

#### libvpx reparieren (für Fedora)
Expand All @@ -63,7 +63,7 @@ cd *
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/
cp libvpx.a $VCPKG_ROOT/installed/x64-linux/lib/
cd
```

Expand All @@ -77,7 +77,8 @@ cd rustdesk
mkdir -p target/debug
wget https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so
mv libsciter-gtk.so target/debug
VCPKG_ROOT=$HOME/vcpkg cargo run
# Note: VCPKG_ROOT still set
cargo run
```

#### Wayland zu X11 ändern (Xorg)
Expand Down
13 changes: 7 additions & 6 deletions content/dev/build/linux/_index.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Desktop versions use [Sciter](https://sciter.com/) for GUI, please download Scit
- Install [vcpkg](https://github.com/microsoft/vcpkg) and set `VCPKG_ROOT` env variable correctly

- Windows: `vcpkg install libvpx:x64-windows-static libyuv:x64-windows-static opus:x64-windows-static aom:x64-windows-static`
- Linux/macOS: `vcpkg install libvpx libyuv opus aom`
- Linux/macOS: `vcpkg install

- Run `cargo run`

Expand Down Expand Up @@ -47,11 +47,11 @@ sudo pacman -Syu --needed unzip git cmake gcc curl wget yasm nasm zip make pkg-c
```sh
git clone https://github.com/microsoft/vcpkg
cd vcpkg
git checkout 2023.04.15
git checkout 2023.10.19
cd ..
vcpkg/bootstrap-vcpkg.sh
export VCPKG_ROOT=$HOME/vcpkg
vcpkg/vcpkg install libvpx libyuv opus aom
export VCPKG_ROOT=$PWD/vcpkg
vcpkg/vcpkg install --x-install-root="$VCPKG_ROOT/installed"
```

#### Fix libvpx (for Fedora)
Expand All @@ -63,7 +63,7 @@ cd *
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/
cp libvpx.a $VCPKG_ROOT/installed/x64-linux/lib/
cd
```

Expand All @@ -77,7 +77,8 @@ cd rustdesk
mkdir -p target/debug
wget https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so
mv libsciter-gtk.so target/debug
VCPKG_ROOT=$HOME/vcpkg cargo run
# Note: VCPKG_ROOT still set
cargo run
```

#### Change Wayland to X11 (Xorg)
Expand Down
13 changes: 7 additions & 6 deletions content/dev/build/linux/_index.es.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Uso de versiones de escritorio [sciter](https://sciter.com/) para GUI, descargue
- Instalar [vcpkg](https://github.com/microsoft/vcpkg), y establecer `VCPKG_ROOT` variable env correctamente

- Windows: vcpkg install libvpx:x64-windows-static libyuv:x64-windows-static opus:x64-windows-static aom:x64-windows-static
- Linux/MacOS: vcpkg install libvpx libyuv opus aom
- Linux/MacOS: vcpkg install

- run `cargo run`

Expand Down Expand Up @@ -47,11 +47,11 @@ sudo pacman -Syu --needed unzip git cmake gcc curl wget yasm nasm zip make pkg-c
```sh
git clone https://github.com/microsoft/vcpkg
cd vcpkg
git checkout 2023.04.15
git checkout 2023.10.19
cd ..
vcpkg/bootstrap-vcpkg.sh
export VCPKG_ROOT=$HOME/vcpkg
vcpkg/vcpkg install libvpx libyuv opus aom
export VCPKG_ROOT=$PWD/vcpkg
vcpkg/vcpkg install --x-install-root="$VCPKG_ROOT/installed"
```

### Arreglar libvpx (Para Fedora)
Expand All @@ -63,7 +63,7 @@ cd *
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/
cp libvpx.a $VCPKG_ROOT/installed/x64-linux/lib/
cd
```

Expand All @@ -77,7 +77,8 @@ cd rustdesk
mkdir -p target/debug
wget https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so
mv libsciter-gtk.so target/debug
VCPKG_ROOT=$HOME/vcpkg cargo run
# Note: VCPKG_ROOT still set
cargo run
```

### Cambiar Wayland a X11 (Xorg)
Expand Down
17 changes: 9 additions & 8 deletions content/dev/build/linux/_index.fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Les versions de bureau utilisent [sciter](https://sciter.com/) pour l'interface
- Installez [vcpkg](https://github.com/microsoft/vcpkg), et définissez correctement la variable d'environnement `VCPKG_ROOT`.

- Windows : vcpkg install libvpx:x64-windows-static libyuv:x64-windows-static opus:x64-windows-static aom:x64-windows-static
- Linux/Osx : vcpkg install libvpx libyuv opus aom
- Linux/Osx : vcpkg install

- Exécuter `cargo run`

Expand Down Expand Up @@ -47,11 +47,11 @@ sudo pacman -Syu --needed unzip git cmake gcc curl wget yasm nasm zip make pkg-c
```sh
git clone https://github.com/microsoft/vcpkg
cd vcpkg
git checkout 2023.04.15
git checkout 2023.10.19
cd ..
vcpkg/bootstrap-vcpkg.sh
export VCPKG_ROOT=$HOME/vcpkg
vcpkg/vcpkg install libvpx libyuv opus aom
export VCPKG_ROOT=$PWD/vcpkg
vcpkg/vcpkg install --x-install-root="$VCPKG_ROOT/installed"
```

### Corriger libvpx (Pour Fedora)
Expand All @@ -63,7 +63,7 @@ cd *
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/
cp libvpx.a $VCPKG_ROOT/installed/x64-linux/lib/
cd
```

Expand All @@ -74,12 +74,13 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
source $HOME/.cargo/env
git clone https://github.com/rustdesk/rustdesk
cd rustdesk
mkdir -p cible/debug
mkdir -p target/debug
wget https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so
mv libsciter-gtk.so target/debug
Exécution du cargo
# Note: VCPKG_ROOT still set
cargo run
```

### Changer Wayland en X11 (Xorg)

RustDesk ne supporte pas Wayland. Lisez [cela](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) pour configurer Xorg comme la session GNOME par défaut.
RustDesk ne supporte pas Wayland. Lisez [cela](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) pour configurer Xorg comme la session GNOME par défaut.
15 changes: 8 additions & 7 deletions content/dev/build/linux/_index.it.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ La versione Desktop utilizza [sciter](https://sciter.com/) per la GUI, per favor
- Installa [vcpkg](https://github.com/microsoft/vcpkg), e imposta correttamente la variabile d'ambiente `VCPKG_ROOT`

- Windows: vcpkg install libvpx:x64-windows-static libyuv:x64-windows-static opus:x64-windows-static aom:x64-windows-static
- Linux/MacOS: vcpkg install libvpx libyuv opus aom
- Linux/MacOS: vcpkg install

- Esegui `cargo run`

Expand Down Expand Up @@ -47,11 +47,11 @@ sudo pacman -Syu --needed unzip git cmake gcc curl wget yasm nasm zip make pkg-c
```sh
git clone https://github.com/microsoft/vcpkg
cd vcpkg
git checkout 2023.04.15
git checkout 2023.10.19
cd ..
vcpkg/bootstrap-vcpkg.sh
export VCPKG_ROOT=$HOME/vcpkg
vcpkg/vcpkg install libvpx libyuv opus aom
export VCPKG_ROOT=$PWD/vcpkg
vcpkg/vcpkg install --x-install-root="$VCPKG_ROOT/installed"
```

### Fix libvpx (Per Fedora)
Expand All @@ -63,7 +63,7 @@ cd *
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/
cp libvpx.a $VCPKG_ROOT/installed/x64-linux/lib/
cd
```

Expand All @@ -77,9 +77,10 @@ cd rustdesk
mkdir -p target/debug
wget https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so
mv libsciter-gtk.so target/debug
VCPKG_ROOT=$HOME/vcpkg cargo run
# Note: VCPKG_ROOT still set
cargo run
```

### Cambiare Wayland a X11 (Xorg)

RustDesk non supporta Wayland. Controlla [questo](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) per configurare Xorg come sessione di default di GNOME.
RustDesk non supporta Wayland. Controlla [questo](https://docs.fedoraproject.org/en-US/quick-docs/configuring-xorg-as-default-gnome-session/) per configurare Xorg come sessione di default di GNOME.
13 changes: 7 additions & 6 deletions content/dev/build/linux/_index.ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ weight: 10
- [vcpkg](https://github.com/microsoft/vcpkg), をインストールし、 `VCPKG_ROOT` 環境変数を正しく設定します。

- Windows: vcpkg install libvpx:x64-windows-static libyuv:x64-windows-static opus:x64-windows-static aom:x64-windows-static
- Linux/MacOS: vcpkg install libvpx libyuv opus aom
- Linux/MacOS: vcpkg install

- run `cargo run`

Expand Down Expand Up @@ -48,11 +48,11 @@ sudo pacman -Syu --needed unzip git cmake gcc curl wget yasm nasm zip make pkg-c
```sh
git clone https://github.com/microsoft/vcpkg
cd vcpkg
git checkout 2023.04.15
git checkout 2023.10.19
cd ..
vcpkg/bootstrap-vcpkg.sh
export VCPKG_ROOT=$HOME/vcpkg
vcpkg/vcpkg install libvpx libyuv opus aom
export VCPKG_ROOT=$PWD/vcpkg
vcpkg/vcpkg install --x-install-root="$VCPKG_ROOT/installed"
```

### Fix libvpx (For Fedora)
Expand All @@ -64,7 +64,7 @@ cd *
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/
cp libvpx.a $VCPKG_ROOT/installed/x64-linux/lib/
cd
```

Expand All @@ -78,7 +78,8 @@ cd rustdesk
mkdir -p target/debug
wget https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so
mv libsciter-gtk.so target/debug
VCPKG_ROOT=$HOME/vcpkg cargo run
# Note: VCPKG_ROOT still set
cargo run
```

### Wayland の場合、X11(Xorg)に変更します
Expand Down
13 changes: 7 additions & 6 deletions content/dev/build/linux/_index.nl.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Desktop versies gebruiken [sciter](https://sciter.com/) voor GUI, download dan z
- Installeer [vcpkg](https://github.com/microsoft/vcpkg), en stel `VCPKG_ROOT` omgevingsvariabele correct

- Windows: vcpkg installeer libvpx:x64-windows-static libyuv:x64-windows-static opus:x64-windows-static aom:x64-windows-static
- Linux/MacOS: vcpkg installeer libvpx libyuv opus
- Linux/MacOS: vcpkg install

- run `cargo run`

Expand Down Expand Up @@ -47,11 +47,11 @@ sudo pacman -Syu --needed unzip git cmake gcc curl wget yasm nasm zip make pkg-c
```sh
git clone https://github.com/microsoft/vcpkg
cd vcpkg
git checkout 2023.04.15
git checkout 2023.10.19
cd ..
vcpkg/bootstrap-vcpkg.sh
export VCPKG_ROOT=$HOME/vcpkg
vcpkg/vcpkg install libvpx libyuv opus aom
export VCPKG_ROOT=$PWD/vcpkg
vcpkg/vcpkg install --x-install-root="$VCPKG_ROOT/installed"
```

### Herstel libvpx (Voor Fedora)
Expand All @@ -63,7 +63,7 @@ cd *
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/
cp libvpx.a $VCPKG_ROOT/installed/x64-linux/lib/
cd
```

Expand All @@ -77,7 +77,8 @@ cd rustdesk
mkdir -p target/debug
wget https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so
mv libsciter-gtk.so target/debug
VCPKG_ROOT=$HOME/vcpkg cargo run
# Note: VCPKG_ROOT still set
cargo run
```

### Verander Wayland in X11 (Xorg)
Expand Down
13 changes: 7 additions & 6 deletions content/dev/build/linux/_index.pt.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Versões de desktop utilizam [sciter](https://sciter.com/) para a GUI, por favor
- Instale [vcpkg](https://github.com/microsoft/vcpkg), e configure a variável de ambiente `VCPKG_ROOT` corretamente

- Windows: vcpkg install libvpx:x64-windows-static libyuv:x64-windows-static opus:x64-windows-static aom:x64-windows-static
- Linux/MacOS: vcpkg install libvpx libyuv opus aom
- Linux/MacOS: vcpkg install

- Execute `cargo run`

Expand Down Expand Up @@ -47,11 +47,11 @@ sudo pacman -Syu --needed unzip git cmake gcc curl wget yasm nasm zip make pkg-c
```sh
git clone https://github.com/microsoft/vcpkg
cd vcpkg
git checkout 2023.04.15
git checkout 2023.10.19
cd ..
vcpkg/bootstrap-vcpkg.sh
export VCPKG_ROOT=$HOME/vcpkg
vcpkg/vcpkg install libvpx libyuv opus aom
export VCPKG_ROOT=$PWD/vcpkg
vcpkg/vcpkg install --x-install-root="$VCPKG_ROOT/installed"
```

### Conserte libvpx (Para o Fedora)
Expand All @@ -63,7 +63,7 @@ cd *
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/
cp libvpx.a $VCPKG_ROOT/installed/x64-linux/lib/
cd
```

Expand All @@ -77,7 +77,8 @@ cd rustdesk
mkdir -p target/debug
wget https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so
mv libsciter-gtk.so target/debug
VCPKG_ROOT=$HOME/vcpkg cargo run
# Note: VCPKG_ROOT still set
cargo run
```

### Mude Wayland para X11 (Xorg)
Expand Down
13 changes: 7 additions & 6 deletions content/dev/build/linux/_index.ru.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ weight: 10
- Установите [vcpkg](https://github.com/microsoft/vcpkg), и правильно установите переменную `VCPKG_ROOT`

- Windows: vcpkg install libvpx:x64-windows-static libyuv:x64-windows-static opus:x64-windows-static aom:x64-windows-static
- Linux/MacOS: vcpkg install libvpx libyuv opus aom
- Linux/MacOS: vcpkg install

- Запустите`cargo run`

Expand Down Expand Up @@ -48,11 +48,11 @@ sudo pacman -Syu --needed unzip git cmake gcc curl wget yasm nasm zip make pkg-c
```sh
git clone https://github.com/microsoft/vcpkg
cd vcpkg
git checkout 2023.04.15
git checkout 2023.10.19
cd ..
vcpkg/bootstrap-vcpkg.sh
export VCPKG_ROOT=$HOME/vcpkg
vcpkg/vcpkg install libvpx libyuv opus aom
export VCPKG_ROOT=$PWD/vcpkg
vcpkg/vcpkg install --x-install-root="$VCPKG_ROOT/installed"
```

### Исправления libvpx (для Fedora)
Expand All @@ -64,7 +64,7 @@ cd *
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/
cp libvpx.a $VCPKG_ROOT/installed/x64-linux/lib/
cd
```

Expand All @@ -78,7 +78,8 @@ cd rustdesk
mkdir -p target/debug
wget https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so
mv libsciter-gtk.so target/debug
VCPKG_ROOT=$HOME/vcpkg cargo run
# Note: VCPKG_ROOT still set
cargo run
```

### Смените Wayland на X11 (Xorg)
Expand Down
Loading

0 comments on commit b840cc2

Please sign in to comment.