Merge pull request #25 from stephengtuggy/glvnd-rpm

glvnd on RPM-based distros, etc.
vegastrike · Dec 17, 2021 · 0d40650 · 0d40650
2 parents 1a3dd88 + c247aa9
commit 0d40650
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 11 deletions.
diff --git a/.github/workflows/Anchore-Container-Scan.yml b/.github/workflows/Anchore-Container-Scan.yml
@@ -21,8 +21,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - FROM:     'ubuntu:impish'
           - FROM:     'ubuntu:hirsute'
-          - FROM:     'ubuntu:groovy'
           - FROM:     'ubuntu:focal'
           - FROM:     'ubuntu:bionic'
           - FROM:     'ubuntu:xenial'
@@ -31,9 +31,8 @@ jobs:
           - FROM:     'debian:buster'
           - FROM:     'debian:stretch'
           - FROM:     'opensuse/leap'
+          - FROM:     'fedora:35'
           - FROM:     'fedora:34'
-          - FROM:     'fedora:33'
-          - FROM:     'fedora:32'
           - FROM:     'rockylinux/rockylinux'
 
     # Steps represent a sequence of tasks that will be executed as part of the job

diff --git a/.github/workflows/gh-actions-pr.yml b/.github/workflows/gh-actions-pr.yml
@@ -11,8 +11,8 @@ jobs:
       fail-fast: true
       matrix:
         include:
+          - FROM:     'ubuntu:impish'
           - FROM:     'ubuntu:hirsute'
-          - FROM:     'ubuntu:groovy'
           - FROM:     'ubuntu:focal'
           - FROM:     'ubuntu:bionic'
           - FROM:     'ubuntu:xenial'
@@ -21,9 +21,8 @@ jobs:
           - FROM:     'debian:buster'
           - FROM:     'debian:stretch'
           - FROM:     'opensuse/leap'
+          - FROM:     'fedora:35'
           - FROM:     'fedora:34'
-          - FROM:     'fedora:33'
-          - FROM:     'fedora:32'
           - FROM:     'rockylinux/rockylinux'
 
     steps:

diff --git a/.github/workflows/gh-actions-release.yml b/.github/workflows/gh-actions-release.yml
@@ -18,8 +18,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - FROM:     'ubuntu:impish'
           - FROM:     'ubuntu:hirsute'
-          - FROM:     'ubuntu:groovy'
           - FROM:     'ubuntu:focal'
           - FROM:     'ubuntu:bionic'
           - FROM:     'ubuntu:xenial'
@@ -28,9 +28,8 @@ jobs:
           - FROM:     'debian:buster'
           - FROM:     'debian:stretch'
           - FROM:     'opensuse/leap'
+          - FROM:     'fedora:35'
           - FROM:     'fedora:34'
-          - FROM:     'fedora:33'
-          - FROM:     'fedora:32'
           - FROM:     'rockylinux/rockylinux'
 
     steps:

diff --git a/script/bootstrap b/script/bootstrap
@@ -25,7 +25,7 @@
 set -e
 
 echo "------------------------------"
-echo "--- bootstrap | 2021-09-16 ---"
+echo "--- bootstrap | 2021-12-12 ---"
 echo "------------------------------"
 
 if [ -f /etc/os-release ]
@@ -136,6 +136,39 @@ then
                     lsb-release \
                     python3-pip
     pip3 install --upgrade-strategy eager cmake
+elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "impish" ]
+then
+    apt-get update
+    apt-get -qy upgrade
+    apt-get -qy install \
+                    git \
+                    cmake \
+                    python3-dev \
+                    build-essential \
+                    automake \
+                    autoconf \
+                    libpng16-16 \
+                    libpng-dev \
+                    libpng-tools \
+                    libjpeg-turbo8-dev \
+                    libexpat1-dev \
+                    libgdk-pixbuf-2.0-dev \
+                    libgtk-3-dev \
+                    libopenal-dev \
+                    libogg-dev \
+                    libvorbis-dev \
+                    libglvnd-dev \
+                    libgl1-mesa-dev \
+                    libsdl1.2-dev \
+                    libopengl0 \
+                    libpostproc-dev \
+                    freeglut3-dev \
+                    libboost-python-dev \
+                    libboost-log-dev \
+                    libboost-regex-dev \
+                    libxmu-dev \
+                    clang \
+                    lsb-release
 elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "hirsute" ]
 then
     apt-get update
@@ -329,6 +362,7 @@ then
                             libSDL-1_2-0 \
                             libSDL-devel \
                             libvorbis-devel \
+                            libglvnd-devel \
                             libjpeg-turbo \
                             libjpeg62-devel \
                             libpng16-devel \
@@ -340,7 +374,7 @@ then
                             git \
                             rpm-build \
                             clang
-elif [ $LINUX_ID == "fedora" ] && ([ $LINUX_VERSION_ID -ge 34 ] && [ $LINUX_VERSION_ID -lt 35 ])
+elif [ $LINUX_ID == "fedora" ] && ([ $LINUX_VERSION_ID -ge 34 ] && [ $LINUX_VERSION_ID -lt 36 ])
 then
     dnf install -y \
                         git \
@@ -351,6 +385,7 @@ then
                         openal-soft-devel \
                         SDL-devel \
                         libvorbis-devel \
+                        libglvnd-devel \
                         libjpeg-turbo-devel \
                         libpng-devel \
                         expat-devel \
@@ -437,6 +472,7 @@ then
                         openal-soft-devel \
                         SDL-devel \
                         libvorbis-devel \
+                        libglvnd-devel \
                         libjpeg-turbo-devel \
                         libpng-devel \
                         expat-devel \
@@ -462,6 +498,7 @@ then
                         openal-soft-devel \
                         SDL-devel \
                         libvorbis-devel \
+                        libglvnd-devel \
                         libjpeg-turbo-devel \
                         libpng-devel \
                         expat-devel \