From 8aad3e4dbb5430bf9e7927ba40b89dd7ff9c9661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Tue, 23 Apr 2019 18:47:50 +0300
Subject: [PATCH] Update CI configuration for 1.16

---
 .gitlab-ci.yml |  5 +++--
 .travis.yml    | 39 ---------------------------------------
 2 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6072511d6..dae76f621 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,8 @@ stages:
     CARGO_HOME: "${CI_PROJECT_DIR}/.cargo_home"
     DEPENDENCIES: |
       curl
-      liborc-dev
+      libssl-dev
+      liborc-0.4-dev
       libglib2.0-dev
       libxml2-dev
       libgtk-3-dev
@@ -25,7 +26,7 @@ stages:
 
     - mkdir -p precompiled-gst && cd precompiled-gst
 
-    - curl -L https://people.freedesktop.org/~slomo/gstreamer-1.14.3.tar.gz | tar xz
+    - curl -L https://people.freedesktop.org/~slomo/gstreamer-1.16.0.tar.gz | tar xz
     - sed -i "s;prefix=/root/gstreamer;prefix=$PWD/gstreamer;g" $PWD/gstreamer/lib/x86_64-linux-gnu/pkgconfig/*.pc
     - export PKG_CONFIG_PATH=$PWD/gstreamer/lib/x86_64-linux-gnu/pkgconfig
     - export GST_PLUGIN_SYSTEM_PATH=$PWD/gstreamer/lib/x86_64-linux-gnu/gstreamer-1.0
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 640329d8a..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-dist: trusty
-sudo: required
-language: rust
-rust:
-  - stable
-  - beta
-  - nightly
-
-addons:
-  apt:
-    packages:
-      - libglib2.0-dev
-      - libxml2-dev
-      - libgtk-3-dev
-      - libegl1-mesa
-      - libgles2-mesa
-      - libgl1-mesa-dri
-      - libgl1-mesa-glx
-      - libwayland-egl1-mesa
-
-matrix:
-  allow_failures:
-    - rust: nightly
-
-script:
-    - rustc --version
-    - cargo build --all
-    - G_DEBUG=fatal_warnings cargo test --all
-    - cargo build --all --all-features
-    - G_DEBUG=fatal_warnings cargo test --all --all-features
-
-before_install:
-- curl -L https://people.freedesktop.org/~slomo/gstreamer-1.14.3.tar.gz | tar xz
-- sed -i "s;prefix=/root/gstreamer;prefix=$PWD/gstreamer;g" $PWD/gstreamer/lib/x86_64-linux-gnu/pkgconfig/*.pc
-- export PKG_CONFIG_PATH=$PWD/gstreamer/lib/x86_64-linux-gnu/pkgconfig
-- export GST_PLUGIN_SYSTEM_PATH=$PWD/gstreamer/lib/x86_64-linux-gnu/gstreamer-1.0
-- export GST_PLUGIN_SCANNER=$PWD/gstreamer/libexec/gstreamer-1.0/gst-plugin-scanner
-- export PATH=$PATH:$PWD/gstreamer/bin
-- export LD_LIBRARY_PATH=$PWD/gstreamer/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH