From 85bf32fd38c926084e3df74166ff4d5dcaa66968 Mon Sep 17 00:00:00 2001
From: sparklyballs <sparklyballs@gmail.com>
Date: Sat, 22 Jun 2019 12:52:38 +0100
Subject: [PATCH] bring into line with branch pr'against

---
 Dockerfile.fetch | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/Dockerfile.fetch b/Dockerfile.fetch
index cf08d4b..5ca7966 100644
--- a/Dockerfile.fetch
+++ b/Dockerfile.fetch
@@ -8,25 +8,23 @@ ARG TARS_FOLDER="/tmp/tarballs"
 ENV \
  AOM=v1.0.0 \
  FDKAAC=0.1.5 \
- FONTCONFIG=2.12.4 \
- FREETYPE=2.5.5 \
+ FONTCONFIG=2.13.91 \
+ FREETYPE=2.9.1 \
  FRIBIDI=0.19.7 \
  KVAZAAR=1.2.0 \
  LAME=3.99.5 \
- LIBASS=0.13.7 \
+ LIBASS=0.14.0 \
  LIBDRM=2.4.98 \
  LIBVA=2.4.1 \
  LIBVDPAU=1.2 \
  LIBVIDSTAB=1.1.0 \
- NOUVEAU=1.0.16 \
  NVCODEC=n9.0.18.1 \
  OGG=1.3.2 \
  OPENCOREAMR=0.1.5 \
  OPENJPEG=2.3.1 \
- OPUS=1.2 \
+ OPUS=1.3 \
  THEORA=1.1.1 \
- VAAPI=2.3.0 \
- VORBIS=1.3.5 \
+ VORBIS=1.3.6 \
  VPX=1.8.0 \
  X265=3.0 \
  XVID=1.3.4
@@ -47,7 +45,6 @@ http://downloads.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-
 https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG}.tar.gz \
 https://archive.mozilla.org/pub/opus/opus-${OPUS}.tar.gz \
 http://downloads.xiph.org/releases/theora/libtheora-${THEORA}.tar.gz \
-https://github.com/intel/intel-vaapi-driver/archive/${VAAPI}.tar.gz \
 https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB}.tar.gz \
 http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS}.tar.gz \
 https://github.com/webmproject/libvpx/archive/v${VPX}.tar.gz \
@@ -89,10 +86,6 @@ RUN \
 	--branch libvdpau-${LIBVDPAU} \
 	--depth 1 https://gitlab.freedesktop.org/vdpau/libvdpau.git \
 	"${SOURCE_FOLDER}"/libvdpau && \
- git clone \
-	--branch xf86-video-nouveau-${NOUVEAU} \
-	--depth 1 git://anongit.freedesktop.org/nouveau/xf86-video-nouveau \
-	"${SOURCE_FOLDER}"/nouveau && \
  echo -e "\n**** fetch non-git source codes ****" && \
  set -ex && \
  echo -e "\n$NON_GIT_URL_LIST" | tr " " "\\n" >> /tmp/non_git_url_list && \