Merge branch 'master' into master

.github/workflows/build_all.yml

@@ -0,0 +1,41 @@
+name: Build all
+on: workflow_dispatch
+
+jobs:
+  Ubuntu:
+    runs-on: ubuntu-latest
+    env:
+      TEST_BUILD_ALL: 1
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Fetch tags and unshallow
+        run: git fetch --unshallow --tags
+
+      - name: Install packages
+        run: |
+          sudo apt-get -y install build-essential python3-pip ninja-build nasm
+          pip install git+https://github.com/mesonbuild/meson
+
+      - name: Sanity Checks
+        run: |
+          ./tools/sanity_checks.py
+
+  VisualStudio:
+    runs-on: windows-latest
+    env:
+      TEST_BUILD_ALL: 1
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Fetch tags and unshallow
+        run: git fetch --unshallow --tags
+
+      - name: Install packages
+        run: |
+          pip install git+https://github.com/mesonbuild/meson
+
+      - uses: ilammy/msvc-dev-cmd@v1
+      - name: Sanity Checks
+        run: |
+          python tools/sanity_checks.py

.github/workflows/release.yml

@@ -20,26 +20,33 @@ jobs:
   # it requires a Personal Access Token. Instead clone meson and do it ourself.
   # This job is copied from Meson's workflows.
   update_website:
+    env:
+      HAS_SSH_KEY: ${{ secrets.WEBSITE_PRIV_KEY != '' }}
     runs-on: ubuntu-latest
     steps:
       - name: Install package
         run: |
           sudo apt-get -y install python3-pip ninja-build libjson-glib-dev
-          pip install meson hotdoc
+          pip install hotdoc chevron strictyaml
       - name: Setup SSH Keys and known_hosts
         env:
           SSH_AUTH_SOCK: /tmp/ssh_agent.sock
         run: |
           ssh-agent -a $SSH_AUTH_SOCK > /dev/null
           ssh-add - <<< "${{ secrets.WEBSITE_PRIV_KEY }}"
-      - name: Update website
-        env:
-          SSH_AUTH_SOCK: /tmp/ssh_agent.sock
+        if: env.HAS_SSH_KEY == 'true'
+      - name: Build website
         run: |
           git config --global user.name "github-actions"
           git config --global user.email "[email protected]"
           git clone https://github.com/mesonbuild/meson.git
           cd meson/docs
-          meson setup _build
+          ../meson.py setup _build
           ninja -C _build
+      - name: Update website
+        env:
+          SSH_AUTH_SOCK: /tmp/ssh_agent.sock
+        run: |
+          cd meson/docs
           ninja -C _build upload
+        if: env.HAS_SSH_KEY == 'true'

ci_config.json

@@ -1,4 +1,27 @@
 {
+  "skip_linux": [
+    "arduinocore-avr", "cpr", "glew", "glib", "hinnant-date", "imgui-sfml",
+    "jsoncpp", "libtomcrypt", "libxmlpp", "openal-soft", "openh264", "pcre2",
+    "protobuf-c", "pugixml", "quazip", "sdl2", "sdl2_image", "sdl2_mixer",
+    "sdl2_net", "sdl2_ttf", "zstd"
+  ],
+  "skip_windows":[
+    "arduinocore-avr", "box2d", "cjson", "cpr", "docopt",
+    "emilk-loguru", "enet", "facil", "flatbuffers", "fluidsynth", "freetype2",
+    "fuse", "gdbm", "glib", "google-benchmark", "google-snappy", "google-woff2",
+    "hinnant-date", "htslib", "icu", "imgui-sfml", "inih", "jbigkit", "json-c",
+    "jsoncpp", "libexif", "libgpiod", "libjpeg-turbo", "liblbfgs", "liblzma",
+    "libopenjp2", "libpng", "libtomcrypt", "liburing", "libuv", "libwebsockets",
+    "libxml2", "libxmlpp", "lua", "lzo2", "mocklibc", "mpdecimal", "netstring-c",
+    "nng", "openh264", "openssl", "pcre2", "protobuf", "protobuf-c", "pugixml",
+    "quazip", "rdkafka", "reflex", "sdl2", "sdl2_image", "sdl2_mixer",
+    "sdl2_net", "sdl2_ttf", "termbox", "unit-system", "xxhash", "zstd"
+  ],
+  "libxmlpp": {
+    "debian_packages": [
+      "libglibmm-2.4-dev"
+    ]
+  },
   "rdkafka": {
     "build_options": [
       "rdkafka:WITH_SASL=disabled",

releases.json

@@ -15,6 +15,7 @@
       "absl_types"
     ],
     "versions": [
+      "20210324.2-2",
       "20210324.2-1",
       "20210324.1-4",
       "20210324.1-3",
@@ -198,6 +199,14 @@
       "0.7.5-1"
     ]
   },
+  "fdk-aac": {
+    "dependency_names": [
+      "fdk-aac"
+    ],
+    "versions": [
+      "2.0.2-0"
+    ]
+  },
   "flac": {
     "dependency_names": [
       "flac"
@@ -624,6 +633,7 @@
   },
   "libxmlpp": {
     "versions": [
+      "3.0.1-2",
       "3.0.1-1"
     ]
   },
@@ -815,6 +825,7 @@
       "openssl"
     ],
     "versions": [
+      "1.1.1l-2",
       "1.1.1l-1",
       "1.1.1k-2",
       "1.1.1k-1"
@@ -1201,6 +1212,7 @@
       "libxxhash"
     ],
     "versions": [
+      "0.8.0-2",
       "0.8.0-1",
       "0.6.5-1"
     ]

subprojects/fdk-aac.wrap

@@ -0,0 +1,9 @@
+[wrap-file]
+directory = fdk-aac-2.0.2
+source_url = https://sourceforge.net/projects/opencore-amr/files/fdk-aac/fdk-aac-2.0.2.tar.gz/download
+source_filename = fdk-aac-2.0.2.tar.gz
+source_hash = c9e8630cf9d433f3cead74906a1520d2223f89bcd3fa9254861017440b8eb22f
+patch_directory = fdk-aac
+
+[provide]
+fdk-aac = fdk_aac_dep

subprojects/libxmlpp.wrap

@@ -1,7 +1,6 @@
 [wrap-file]
 directory = libxml++-3.0.1
-source_url = ftp://ftp.gnome.org/pub/GNOME/sources/libxml++/3.0/libxml++-3.0.1.tar.xz
+source_url = https://download.gnome.org/sources/libxml++/3.0/libxml++-3.0.1.tar.xz
 source_filename = libxml++-3.0.1.tar.xz
 source_hash = 19dc8d21751806c015179bc0b83f978e65c878724501bfc0b6c1bcead29971a6
 patch_directory = libxmlpp
-

subprojects/packagefiles/abseil-cpp/meson.build

@@ -100,7 +100,6 @@ absl_flags_sources = files(
 absl_hash_sources = files(
   'absl/hash/internal/city.cc',
   'absl/hash/internal/hash.cc',
-  'absl/hash/internal/print_hash_of.cc',
   'absl/hash/internal/wyhash.cc',
 )
 
@@ -195,26 +194,26 @@ absl_types_sources = files(
 )
 
 # Libraries
-absl_base_lib = library(
+absl_base_lib = static_library(
   'absl_base',
   absl_base_sources,
   include_directories: absl_include_dir,
   dependencies: [dependency('threads'), libatomic],
 )
 
-absl_hash_lib = library(
+absl_hash_lib = static_library(
   'absl_hash',
   absl_hash_sources,
   include_directories: absl_include_dir,
 )
 
-absl_numeric_lib = library(
+absl_numeric_lib = static_library(
   'absl_numeric',
   absl_numeric_sources,
   include_directories: absl_include_dir,
 )
 
-absl_strings_lib = library(
+absl_strings_lib = static_library(
   'absl_strings',
   absl_strings_sources,
   include_directories: absl_include_dir,
@@ -224,7 +223,7 @@ absl_strings_lib = library(
   ],
 )
 
-absl_debugging_lib = library(
+absl_debugging_lib = static_library(
   'absl_debugging',
   absl_debugging_sources,
   include_directories: absl_include_dir,
@@ -235,7 +234,7 @@ absl_debugging_lib = library(
   dependencies: libatomic,
 )
 
-absl_random_lib = library(
+absl_random_lib = static_library(
   'absl_random',
   absl_random_sources,
   include_directories: absl_include_dir,
@@ -246,7 +245,7 @@ absl_random_lib = library(
   dependencies: libatomic,
 )
 
-absl_time_lib = library(
+absl_time_lib = static_library(
   'absl_time',
   absl_time_sources,
   include_directories: absl_include_dir,
@@ -259,13 +258,13 @@ absl_time_lib = library(
   dependencies : [dependency('CoreFoundation', required : false)],
 )
 
-absl_types_lib = library(
+absl_types_lib = static_library(
   'absl_types',
   absl_types_sources,
   include_directories: absl_include_dir,
 )
 
-absl_synchronization_lib = library(
+absl_synchronization_lib = static_library(
   'absl_synchronization',
   absl_synchronization_sources,
   include_directories: absl_include_dir,
@@ -276,7 +275,7 @@ absl_synchronization_lib = library(
   ],
 )
 
-absl_container_lib = library(
+absl_container_lib = static_library(
   'absl_container',
   absl_container_sources,
   include_directories: absl_include_dir,
@@ -289,7 +288,7 @@ absl_container_lib = library(
   ],
 )
 
-absl_flags_lib = library(
+absl_flags_lib = static_library(
   'absl_flags',
   absl_flags_sources,
   include_directories: absl_include_dir,
@@ -303,7 +302,7 @@ absl_flags_lib = library(
   dependencies: libatomic,
 )
 
-absl_status_lib = library(
+absl_status_lib = static_library(
   'absl_status',
   absl_status_sources,
   include_directories: absl_include_dir,

subprojects/packagefiles/fdk-aac/fdk-aac/meson.build

@@ -0,0 +1,3 @@
+foreach header: fdk_aac_headers
+  configure_file(input: '..' / header, copy: true, output: header.split('/')[-1])
+endforeach