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

@@ -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

.travis/install-alpine.sh

@@ -14,7 +14,7 @@ PACKAGES=(
 	g++
 	ccache
 	cmake
-	meson
+	ninja
 	pkgconf
 	git
 	linux-headers

.travis/install-archlinux.sh

@@ -10,9 +10,9 @@ PACKAGES=(
 	ccache
 	clang
 	cmake
-	meson
 	git
-	golang
+	go
+	ninja
 )
 
 PACKAGES+=(protobuf)

.travis/install-fedora.sh

@@ -12,7 +12,7 @@ PACKAGES=(
 	ccache
 	clang
 	cmake
-	meson
+	ninja-build
 	pkgconf-pkg-config
 	git
 	make

.travis/install-post.sh

@@ -4,7 +4,6 @@
 #
 
 cmake --version
-meson --version
 g++ --version
 clang++ --version
 uname -a

.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)