diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index ad386f42..af7c5b9a 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -87,7 +87,7 @@ jobs: - name: Update apt run: sudo apt update - name: Install dependencies - run: sudo apt-get install -y --no-install-recommends yasm nasm gperf libgles2-mesa-dev libx11-dev libxft-dev libxext-dev libxrandr-dev libxi-dev libxcursor-dev libxdamage-dev libxinerama-dev libdbus-1-dev libxtst-dev + run: sudo apt-get install -y --no-install-recommends yasm nasm gperf automake autoconf libtool pkg-config autoconf-archive libgles2-mesa-dev libx11-dev libxft-dev libxext-dev libxrandr-dev libxi-dev libxcursor-dev libxdamage-dev libxinerama-dev libdbus-1-dev libxtst-dev - name: Clean downloads run: sudo apt-get clean @@ -157,7 +157,7 @@ jobs: - name: Update apt run: sudo apt update - name: Install dependencies - run: sudo apt-get install -y --no-install-recommends yasm nasm gperf libgles2-mesa-dev libx11-dev libxft-dev libxext-dev libxrandr-dev libxi-dev libxcursor-dev libxdamage-dev libxinerama-dev libdbus-1-dev libxtst-dev + run: sudo apt-get install -y --no-install-recommends yasm nasm gperf automake autoconf libtool pkg-config autoconf-archive libgles2-mesa-dev libx11-dev libxft-dev libxext-dev libxrandr-dev libxi-dev libxcursor-dev libxdamage-dev libxinerama-dev libdbus-1-dev libxtst-dev - name: Clean downloads run: sudo apt-get clean @@ -210,7 +210,7 @@ jobs: - name: Update apt run: sudo apt update - name: Install dependencies - run: sudo apt-get install -y --no-install-recommends yasm nasm gperf libgles2-mesa-dev libx11-dev libxft-dev libxext-dev libxrandr-dev libxi-dev libxcursor-dev libxdamage-dev libxinerama-dev libdbus-1-dev libxtst-dev + run: sudo apt-get install -y --no-install-recommends yasm nasm gperf automake autoconf libtool pkg-config autoconf-archive libgles2-mesa-dev libx11-dev libxft-dev libxext-dev libxrandr-dev libxi-dev libxcursor-dev libxdamage-dev libxinerama-dev libdbus-1-dev libxtst-dev - name: Clean downloads run: sudo apt-get clean @@ -398,7 +398,7 @@ jobs: if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }} - name: Install dependencies - run: brew install libomp yasm nasm pkg-config + run: brew install libomp yasm nasm pkg-config automake autoconf-archive - uses: lukka/get-cmake@latest diff --git a/.github/workflows/on_pr.yml b/.github/workflows/on_pr.yml index 6e7d36b8..409523fd 100644 --- a/.github/workflows/on_pr.yml +++ b/.github/workflows/on_pr.yml @@ -73,7 +73,7 @@ jobs: - name: Update apt run: sudo apt update - name: Install dependencies - run: sudo apt-get install -y --no-install-recommends yasm nasm gperf libgles2-mesa-dev libx11-dev libxft-dev libxext-dev libxrandr-dev libxi-dev libxcursor-dev libxdamage-dev libxinerama-dev libdbus-1-dev libxtst-dev + run: sudo apt-get install -y --no-install-recommends yasm nasm gperf automake autoconf libtool pkg-config autoconf-archive libgles2-mesa-dev libx11-dev libxft-dev libxext-dev libxrandr-dev libxi-dev libxcursor-dev libxdamage-dev libxinerama-dev libdbus-1-dev libxtst-dev - name: Clean downloads run: sudo apt-get clean @@ -116,7 +116,7 @@ jobs: - name: Update apt run: sudo apt update - name: Install dependencies - run: sudo apt-get install -y --no-install-recommends yasm nasm gperf libgles2-mesa-dev libx11-dev libxft-dev libxext-dev libxrandr-dev libxi-dev libxcursor-dev libxdamage-dev libxinerama-dev libdbus-1-dev libxtst-dev + run: sudo apt-get install -y --no-install-recommends yasm nasm gperf automake autoconf libtool pkg-config autoconf-archive libgles2-mesa-dev libx11-dev libxft-dev libxext-dev libxrandr-dev libxi-dev libxcursor-dev libxdamage-dev libxinerama-dev libdbus-1-dev libxtst-dev - name: Clean downloads run: sudo apt-get clean @@ -159,7 +159,7 @@ jobs: - name: Update apt run: sudo apt update - name: Install dependencies - run: sudo apt-get install -y --no-install-recommends yasm nasm gperf libgles2-mesa-dev libx11-dev libxft-dev libxext-dev libxrandr-dev libxi-dev libxcursor-dev libxdamage-dev libxinerama-dev libdbus-1-dev libxtst-dev + run: sudo apt-get install -y --no-install-recommends yasm nasm gperf automake autoconf libtool pkg-config autoconf-archive libgles2-mesa-dev libx11-dev libxft-dev libxext-dev libxrandr-dev libxi-dev libxcursor-dev libxdamage-dev libxinerama-dev libdbus-1-dev libxtst-dev - name: Clean downloads run: sudo apt-get clean @@ -289,7 +289,7 @@ jobs: - uses: actions/checkout@v3 - name: Install dependencies - run: brew install libomp yasm nasm pkg-config + run: brew install libomp yasm nasm pkg-config automake autoconf-archive - uses: lukka/get-cmake@latest diff --git a/scripts/setup.sh b/scripts/setup.sh index e583e972..6cbc7be8 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -75,7 +75,7 @@ elif [[ $(cut -f2 <<< $(lsb_release -i)) == "Ubuntu" ]]; then if [ "$install_tools" = true ] ; then echo "Installing tools" sudo apt-get update - sudo apt-get install -y --no-install-recommends git ninja-build build-essential g++ nasm yasm gperf + sudo apt-get install -y --no-install-recommends git ninja-build build-essential g++ nasm yasm gperf sudo apt-get install -y --no-install-recommends apt-transport-https ca-certificates gnupg software-properties-common wget sudo apt-get install -y --no-install-recommends libgles2-mesa-dev libx11-dev libxft-dev libxext-dev libxrandr-dev libxi-dev libxcursor-dev libxdamage-dev libxinerama-dev libdbus-1-dev libxtst-dev wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null @@ -88,7 +88,8 @@ elif [[ $(cut -f2 <<< $(lsb_release -i)) == "Ubuntu" ]]; then sudo apt-get install -y --no-install-recommends cmake sudo apt-get install -y --no-install-recommends powershell sudo apt-get install -y --no-install-recommends curl zip unzip tar - sudo apt-get install -y --no-install-recommends pkg-config autoconf libtool bison + sudo apt-get install -y --no-install-recommends bison + sudo apt-get install -y --no-install-recommends automake autoconf libtool pkg-config autoconf-archive sudo apt-get clean fi else