From ad646e176258a318021f504621fd2d0c280a80c4 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Fri, 8 Sep 2017 16:18:23 +0300 Subject: [PATCH 1/2] Fix Linux build --- ogles_gpgpu/common/gl/pbo.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/ogles_gpgpu/common/gl/pbo.cpp b/ogles_gpgpu/common/gl/pbo.cpp index ebaea15..4dfc17d 100644 --- a/ogles_gpgpu/common/gl/pbo.cpp +++ b/ogles_gpgpu/common/gl/pbo.cpp @@ -11,6 +11,7 @@ #include #include +#include // memcpy #include From c75cfbac19c695ceb67f03fe950a74f0cf5f28ac Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Tue, 12 Sep 2017 12:56:13 +0300 Subject: [PATCH 2/2] Fix '.travis.yml' for Linux --- .travis.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index cce8162..927e546 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,9 @@ # Original: https://github.com/forexample/hunter-simple/blob/master/.travis.yml +# Workaround for https://github.com/travis-ci/travis-ci/issues/8363 language: - - cpp + - minimal # Container-based infrastructure (Linux) # * https://docs.travis-ci.com/user/migrating-from-legacy/#How-can-I-use-container-based-infrastructure%3F @@ -24,6 +25,9 @@ addons: - libegl1-mesa-dev - libosmesa6-dev + # glapi + - libgl1-mesa-dev + # xorg-macros: https://github.com/BlueDragonX/xf86-input-mtrack/issues/27#issuecomment-186871891 - xutils-dev - xserver-xorg-dev-lts-trusty @@ -33,6 +37,8 @@ addons: - libstdc++6:i386 - zlib1g:i386 + - python3-pip + # Default GCC 4.8 is buggy: # * https://github.com/elucideye/drishti/issues/273#issuecomment-301297286 #- g++-5 @@ -46,8 +52,8 @@ matrix: include: # Linux { -# - os: linux -# env: CONFIG=Release TOOLCHAIN=gcc INSTALL=--strip MESA=ON TEST=--test + - os: linux + env: CONFIG=Release TOOLCHAIN=gcc INSTALL=--strip MESA=ON TEST=--test # }