beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-25 00:50:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

CI+DevContainer+Documentation: Remove install steps for ffmpeg libs

Browse source
This commit is contained in:
Andrew Kaster 2024-11-08 10:11:24 -07:00 committed by Andrew Kaster
parent eda7f03994
commit f4124c7f40
Notes: github-actions[bot] 2024-11-08 18:17:55 +00:00 
Author: https://github.com/ADKaster
Commit: https://github.com/LadybirdBrowser/ladybird/commit/f4124c7f400
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/2214
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.devcontainer/features/ladybird/devcontainer-feature.json
View file

@ -1,7 +1,7 @@
{ {
"name": "Ladybird Development", "name": "Ladybird Development",
"id": "ladybird", "id": "ladybird",
"version": "2.0.0", "version": "2.0.1",
"description": "Enable development of Ladybird libraries and applications", "description": "Enable development of Ladybird libraries and applications",
"options": { "options": {
"llvm_version": { "llvm_version": {

2
.devcontainer/features/ladybird/install.sh
View file

@ -28,7 +28,7 @@ install_llvm_key() {
### Install packages ### Install packages
apt update -y apt update -y
apt install -y lsb-release git python3 autoconf autoconf-archive automake build-essential cmake libavcodec-dev libavformat-dev libavutil-dev libgl1-mesa-dev nasm ninja-build pkg-config qt6-base-dev qt6-tools-dev-tools qt6-multimedia-dev qt6-wayland ccache fonts-liberation2 zip unzip curl tar apt install -y lsb-release git python3 autoconf autoconf-archive automake build-essential cmake libgl1-mesa-dev nasm ninja-build pkg-config qt6-base-dev qt6-tools-dev-tools qt6-multimedia-dev qt6-wayland ccache fonts-liberation2 zip unzip curl tar
### Ensure new enough host compiler is available ### Ensure new enough host compiler is available
VERSION="0.0.0" VERSION="0.0.0"

4
.github/actions/setup/action.yml vendored
View file

@ -32,7 +32,7 @@ runs:
sudo apt-get update -y sudo apt-get update -y
sudo apt-get install -y autoconf autoconf-archive automake build-essential ccache clang-18 clang++-18 cmake curl fonts-liberation2 \ sudo apt-get install -y autoconf autoconf-archive automake build-essential ccache clang-18 clang++-18 cmake curl fonts-liberation2 \
gcc-13 g++-13 libavcodec-dev libavformat-dev libavutil-dev libegl1-mesa-dev libgl1-mesa-dev libpulse-dev libssl-dev \ gcc-13 g++-13 libegl1-mesa-dev libgl1-mesa-dev libpulse-dev libssl-dev \
libstdc++-13-dev lld-18 nasm ninja-build qt6-base-dev qt6-tools-dev-tools tar unzip zip libstdc++-13-dev lld-18 nasm ninja-build qt6-base-dev qt6-tools-dev-tools tar unzip zip
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100 sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100
@ -57,7 +57,7 @@ runs:
run: | run: |
set -e set -e
brew update brew update
brew install autoconf autoconf-archive automake bash ccache coreutils ffmpeg llvm@18 nasm ninja qt unzip wabt brew install autoconf autoconf-archive automake bash ccache coreutils llvm@18 nasm ninja qt unzip wabt
- name: 'Install vcpkg' - name: 'Install vcpkg'
shell: bash shell: bash

14
Documentation/BuildInstructionsLadybird.md
View file

@ -2,7 +2,7 @@
## Build Prerequisites ## Build Prerequisites
Qt6 development packages, FFmpeg, nasm, additional build tools, and a C++23 capable compiler like g++-13 or clang-17 are required. Qt6 development packages, nasm, additional build tools, and a C++23 capable compiler like g++-13 or clang-17 are required.
CMake 3.25 or newer must be available in $PATH. CMake 3.25 or newer must be available in $PATH.
@ -15,7 +15,7 @@ CMake 3.25 or newer must be available in $PATH.
<!-- Note: If you change something here, please also change it in the `devcontainer/devcontainer.json` file. --> <!-- Note: If you change something here, please also change it in the `devcontainer/devcontainer.json` file. -->
```bash ```bash
sudo apt install autoconf autoconf-archive automake build-essential ccache cmake curl fonts-liberation2 git libavcodec-dev libavformat-dev libavutil-dev libgl1-mesa-dev nasm ninja-build pkg-config qt6-base-dev qt6-tools-dev-tools qt6-wayland tar unzip zip sudo apt install autoconf autoconf-archive automake build-essential ccache cmake curl fonts-liberation2 git libgl1-mesa-dev nasm ninja-build pkg-config qt6-base-dev qt6-tools-dev-tools qt6-wayland tar unzip zip
``` ```
#### CMake 3.25 or newer: #### CMake 3.25 or newer:
@ -79,24 +79,24 @@ sudo apt install qt6-multimedia-dev
### Arch Linux/Manjaro: ### Arch Linux/Manjaro:
``` ```
sudo pacman -S --needed autoconf-archive automake base-devel ccache cmake curl ffmpeg libgl nasm ninja qt6-base qt6-multimedia qt6-tools qt6-wayland ttf-liberation tar unzip zip sudo pacman -S --needed autoconf-archive automake base-devel ccache cmake curl libgl nasm ninja qt6-base qt6-multimedia qt6-tools qt6-wayland ttf-liberation tar unzip zip
``` ```
### Fedora or derivatives: ### Fedora or derivatives:
``` ```
sudo dnf install autoconf-archive automake ccache cmake curl libavcodec-free-devel libavformat-free-devel liberation-sans-fonts libglvnd-devel nasm ninja-build perl-FindBin perl-IPC-Cmd qt6-qtbase-devel qt6-qtmultimedia-devel qt6-qttools-devel qt6-qtwayland-devel tar unzip zip zlib-ng-compat-static sudo dnf install autoconf-archive automake ccache cmake curl liberation-sans-fonts libglvnd-devel nasm ninja-build perl-FindBin perl-IPC-Cmd qt6-qtbase-devel qt6-qtmultimedia-devel qt6-qttools-devel qt6-qtwayland-devel tar unzip zip zlib-ng-compat-static
``` ```
### openSUSE: ### openSUSE:
``` ```
sudo zypper install autoconf-archive automake ccache cmake curl ffmpeg-7-libavcodec-devel ffmpeg-7-libavformat-devel gcc13 gcc13-c++ liberation-fonts libglvnd-devel nasm ninja qt6-base-devel qt6-multimedia-devel qt6-tools-devel qt6-wayland-devel tar unzip zip sudo zypper install autoconf-archive automake ccache cmake curl gcc13 gcc13-c++ liberation-fonts libglvnd-devel nasm ninja qt6-base-devel qt6-multimedia-devel qt6-tools-devel qt6-wayland-devel tar unzip zip
``` ```
The build process requires at least python3.7; openSUSE Leap only features Python 3.6 as default, so it is recommendable to install package python311 and create a virtual environment (venv) in this case. The build process requires at least python3.7; openSUSE Leap only features Python 3.6 as default, so it is recommendable to install package python311 and create a virtual environment (venv) in this case.
### Void Linux: ### Void Linux:
``` ```
sudo xbps-install -Su # (optional) ensure packages are up to date to avoid "Transaction aborted due to unresolved dependencies." sudo xbps-install -Su # (optional) ensure packages are up to date to avoid "Transaction aborted due to unresolved dependencies."
sudo xbps-install -S git bash gcc python3 curl cmake zip unzip linux-headers make pkg-config autoconf automake autoconf-archive nasm MesaLib-devel ninja ffmpeg-devel qt6-base-devel qt6-multimedia-devel qt6-tools-devel qt6-wayland-devel sudo xbps-install -S git bash gcc python3 curl cmake zip unzip linux-headers make pkg-config autoconf automake autoconf-archive nasm MesaLib-devel ninja qt6-base-devel qt6-multimedia-devel qt6-tools-devel qt6-wayland-devel
``` ```
### NixOS or with Nix: ### NixOS or with Nix:
@ -127,7 +127,7 @@ Xcode 14 versions before 14.3 might crash while building ladybird. Xcode 14.3 or
``` ```
xcode-select --install xcode-select --install
brew install autoconf autoconf-archive automake ccache cmake ffmpeg nasm ninja pkg-config brew install autoconf autoconf-archive automake ccache cmake nasm ninja pkg-config
``` ```
If you wish to use clang from homebrew instead: If you wish to use clang from homebrew instead: