[CHANGELOG] Updated

diff --git a/CHANGELOG b/CHANGELOG
index e88914889a8a4e09e215c1a0512b67d32fed1167..f44bdeda6180d8da464f54f8544abbfed637b362 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -26,6 +26,10 @@ General
     folder.\r
   o Removed CMake platform specification in Linux build script\r
     (Krzysztof Pyrkosz).\r
+  o Build script for building FFmpeg for Linux now part of the repository.\r
+    Contributions during development (not w.r.t 2.1.0 Beta 1):\r
+    + Fix ffmpeg build dependencies on clean ubuntu desktop amd64 14.04.3 or\r
+      higher (Walter Sonius).\r
 \r
 Consumers\r
 ---------\r

diff --git a/dependencies64/ffmpeg/ffmpeg-build-linux/build-ubuntu.sh b/dependencies64/ffmpeg/ffmpeg-build-linux/build-ubuntu.sh
index 726dd65de364927317469e1783f7ad107ac3e2d4..3d5bc75118ed31b954c12915a75ddea1d5cf47c2 100755 (executable)
--- 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 a4a69435d0ac49468caa1f7187ce5299642f67da..ea03146ed4662605fd87fab1c729d4ab3275cb12 100755 (executable)
--- 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/