From b48e7eb08bb0395b9ba6d2f6e11128c03420187f Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@valvesoftware.com>
Date: Wed, 2 Sep 2020 21:21:58 -0700
Subject: [PATCH] travis: fix build dependencies

- Replace "meson" with "ninja" or "ninja-build" where appropriate, since
  we got rid of the meson build system.

- Replace "golang" with "go" on Arch Linux

Signed-off-by: Steven Noonan <steven@valvesoftware.com>
---
 .travis/build.sh             | 4 ----
 .travis/install-alpine.sh    | 2 +-
 .travis/install-archlinux.sh | 4 ++--
 .travis/install-fedora.sh    | 2 +-
 .travis/install-post.sh      | 1 -
 .travis/install-ubuntu.sh    | 2 +-
 6 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.travis/build.sh b/.travis/build.sh
index 8602789..7ea5ddf 100755
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -63,16 +63,12 @@ ccache -M4G
 
 if has_clang; then
 	msg "Beginning build tests with Clang"
-	#export CC="ccache clang" CXX="ccache clang++"
-	#has meson && bash .travis/build-meson.sh
 	export CC=clang CXX=clang++
 	has cmake && bash .travis/build-cmake.sh
 fi
 
 if has_gcc; then
 	msg "Beginning build tests with GCC"
-	#export CC="ccache gcc" CXX="ccache g++"
-	#has meson && bash .travis/build-meson.sh
 	export CC=gcc CXX=g++
 	has cmake && bash .travis/build-cmake.sh
 fi
diff --git a/.travis/install-alpine.sh b/.travis/install-alpine.sh
index 1cd9c48..c5b68e9 100755
--- a/.travis/install-alpine.sh
+++ b/.travis/install-alpine.sh
@@ -14,7 +14,7 @@ PACKAGES=(
 	g++
 	ccache
 	cmake
-	meson
+	ninja
 	pkgconf
 	git
 	linux-headers
diff --git a/.travis/install-archlinux.sh b/.travis/install-archlinux.sh
index b25900e..3c1e2f5 100755
--- a/.travis/install-archlinux.sh
+++ b/.travis/install-archlinux.sh
@@ -10,9 +10,9 @@ PACKAGES=(
 	ccache
 	clang
 	cmake
-	meson
 	git
-	golang
+	go
+	ninja
 )
 
 PACKAGES+=(protobuf)
diff --git a/.travis/install-fedora.sh b/.travis/install-fedora.sh
index fcf46bb..4fd0ebc 100755
--- a/.travis/install-fedora.sh
+++ b/.travis/install-fedora.sh
@@ -12,7 +12,7 @@ PACKAGES=(
 	ccache
 	clang
 	cmake
-	meson
+	ninja-build
 	pkgconf-pkg-config
 	git
 	make
diff --git a/.travis/install-post.sh b/.travis/install-post.sh
index 17b8517..0958786 100755
--- a/.travis/install-post.sh
+++ b/.travis/install-post.sh
@@ -4,7 +4,6 @@
 #
 
 cmake --version
-meson --version
 g++ --version
 clang++ --version
 uname -a
diff --git a/.travis/install-ubuntu.sh b/.travis/install-ubuntu.sh
index 063d31c..d447e03 100755
--- a/.travis/install-ubuntu.sh
+++ b/.travis/install-ubuntu.sh
@@ -10,7 +10,7 @@ apt-get update
 apt-get install -y locales
 locale-gen en_US.UTF-8
 
-PACKAGES=(build-essential pkg-config ccache cmake meson clang git golang)
+PACKAGES=(build-essential pkg-config ccache cmake ninja-build clang git golang)
 
 PACKAGES+=(libprotobuf-dev protobuf-compiler)
 PACKAGES+=(libssl-dev)