Merge commit 'github-packaging-c++20' into master

.github/workflows/package-linux.yml

@@ -20,11 +20,15 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
+          sudo apt-get install gcc-10 g++-10
           sudo apt-get install -y scons libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libphysfs-dev
           
       - name: Configure and build
         run: scons -j`nproc` opengl=1 sdl2=1 sdlmixer=1
-      
+        env:
+          CC:   gcc-10
+          CXX:  g++-10
+        
       - name: Package AppImage
         run: ./contrib/packaging/linux/build_package.sh
         

.github/workflows/package-macos.yml

@@ -12,7 +12,7 @@ on:
 jobs:          
   macos:
     name: macOS Apps
-    runs-on: macos-10.15
+    runs-on: macos-11
     steps:
       - name: Clone repository
         uses: actions/checkout@v3
@@ -22,7 +22,7 @@ jobs:
         
       - name: Install dependencies
         run: |
-          brew install scons sdl2 sdl2_image sdl2_mixer physfs pkg-config dylibbundler
+          brew install scons sdl2 sdl2_image sdl2_mixer jpeg physfs pkg-config dylibbundler
           
       - name: Configure and build
         run: scons -j2 opengl=1 sdl2=1 sdlmixer=1 macos_add_frameworks=0 macos_bundle_libs=1