From 58d1f2d25941dd535fd52788d08fe7032fa47b49 Mon Sep 17 00:00:00 2001
From: Helge Norberg <helge.norberg@svt.se>
Date: Wed, 1 Feb 2017 13:20:48 +0100
Subject: [PATCH] [CHANGELOG] Updated

---
 CHANGELOG                                                | 4 ++++
 dependencies64/ffmpeg/ffmpeg-build-linux/build-ubuntu.sh | 1 -
 dependencies64/ffmpeg/ffmpeg-build-linux/build.sh        | 8 --------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index e88914889..f44bdeda6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -26,6 +26,10 @@ General
     folder.
   o Removed CMake platform specification in Linux build script
     (Krzysztof Pyrkosz).
+  o Build script for building FFmpeg for Linux now part of the repository.
+    Contributions during development (not w.r.t 2.1.0 Beta 1):
+    + Fix ffmpeg build dependencies on clean ubuntu desktop amd64 14.04.3 or
+      higher (Walter Sonius).
 
 Consumers
 ---------
diff --git a/dependencies64/ffmpeg/ffmpeg-build-linux/build-ubuntu.sh b/dependencies64/ffmpeg/ffmpeg-build-linux/build-ubuntu.sh
index 726dd65de..3d5bc7511 100755
--- a/dependencies64/ffmpeg/ffmpeg-build-linux/build-ubuntu.sh
+++ b/dependencies64/ffmpeg/ffmpeg-build-linux/build-ubuntu.sh
@@ -2,7 +2,6 @@
 #compile ffmpeg successful on ubuntu 14.04.3 & 16.04.1 amd64 using the CasparCG build requirments described here:
 #https://raw.githubusercontent.com/casparcg/Server/2.1.0/BUILDING
 
-sudo apt-get -y update
 sudo apt-get -y install curl tar pkg-config python2.7-dev zlib1g-dev autoconf libtool subversion libfontconfig1-dev ant default-jre default-jdk frei0r-plugins-dev libv4l-dev
 
 ./build.sh
diff --git a/dependencies64/ffmpeg/ffmpeg-build-linux/build.sh b/dependencies64/ffmpeg/ffmpeg-build-linux/build.sh
index a4a69435d..ea03146ed 100755
--- a/dependencies64/ffmpeg/ffmpeg-build-linux/build.sh
+++ b/dependencies64/ffmpeg/ffmpeg-build-linux/build.sh
@@ -449,11 +449,3 @@ CFLAGS="-I$TARGET_DIR/include -I$TARGET_DIR/usr/local/include" LDFLAGS="-L$TARGE
 	--enable-zlib
 make -j $jval && make install
 
-#dirty hack
-#replace shipped ffmpeg linux libs with compiled ones from here!
-#also check modules/ffmpeg/CMakeLists.txt for lib version/name changes!
-#cd $BUILD_DIR
-#mv ../../bin/linux ../../bin/linux-shipped
-#cp -r ../target/lib ../../bin/linux
-#some ffmpeg libs are build in a different shared target folder
-#cp ../target/usr/local/lib/* ../../bin/linux/
-- 
2.39.2