update image libraries, D3005 with few mods

2 files changed, 3 insertions, 78 deletions

diff --git a/build_files/build_environment/patches/ffmpeg.diff b/build_files/build_environment/patches/ffmpeg.diff
index 75fc6490031..6e925399c95 100644
--- a/build_files/build_environment/patches/ffmpeg.diff
+++ b/build_files/build_environment/patches/ffmpeg.diff
@@ -1,32 +1,11 @@
---- libavutil/common.h	2016-02-14 19:29:42 -0700
-+++ libavutil/common.h	2016-03-30 09:50:29 -0600
-@@ -99,6 +99,11 @@
- #define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
- #define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
- 
-+//msvc helper
-+#ifdef _MSC_VER
-+#define inline __inline
-+#endif
-+
- /* misc math functions */
- 
- #ifdef HAVE_AV_CONFIG_H
 --- configure	2016-11-26 03:12:05.000000000 +0100
 +++ configure	2017-04-05 03:24:35.000000000 +0200
-@@ -1899,7 +1899,6 @@
-     access
-     aligned_malloc
-     arc4random
--    clock_gettime
-     closesocket
-     CommandLineToArgvW
-     CoTaskMemFree
-@@ -5494,7 +5493,6 @@
+@@ -5494,7 +5493,5 @@
  
  check_func  access
  check_func_headers stdlib.h arc4random
--check_func_headers time.h clock_gettime || { check_func_headers time.h clock_gettime -lrt && add_extralibs -lrt && LIBRT="-lrt"; }
+-check_func_headers time.h clock_gettime ||
+-    { check_lib clock_gettime time.h clock_gettime -lrt && LIBRT="-lrt"; }
  check_func  fcntl
  check_func  fork
  check_func  gethrtime
diff --git a/build_files/build_environment/patches/schroedinger.diff b/build_files/build_environment/patches/schroedinger.diff
deleted file mode 100644
index 6acb35f2a7b..00000000000
--- a/build_files/build_environment/patches/schroedinger.diff
+++ /dev/null
@@ -1,54 +0,0 @@
---- configure.orig	2012-01-22 19:06:43 -0700
-+++ configure	2016-04-06 20:00:50 -0600
-@@ -16492,10 +16492,10 @@
- 	HAVE_ORC=yes
- fi
- if test "x${HAVE_ORC}" != xyes ; then
--  as_fn_error $? "orc-0.4 >= $ORC_VER is required" "$LINENO" 5
-+  $as_echo "orc-0.4 >= $ORC_VER is required" 
- fi
- SCHRO_PKG_DEPS="$SCHRO_PKG_DEPS orc-0.4 >= $ORC_VER"
--ORCC=`$PKG_CONFIG --variable=orcc orc-0.4`
-+#ORCC=`$PKG_CONFIG --variable=orcc orc-0.4`
- 
-  if test "x$cross_compiling" != xyes; then
-   HAVE_ORCC_TRUE=
---- Makefile.in	2012-01-22 18:06:42 -0700
-+++ Makefile.in	2016-04-06 20:30:09 -0600
-@@ -291,7 +291,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign
--SUBDIRS = schroedinger doc tools testsuite
-+SUBDIRS = schroedinger doc tools 
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
- DIST_SUBDIRS = schroedinger doc tools testsuite
- EXTRA_DIST = COPYING COPYING.GPL COPYING.LGPL COPYING.MIT COPYING.MPL \
-
---- schroedinger.pc.in  2011-03-21 17:08:39 -0600
-+++ schroedinger.pc.in  2016-04-08 13:30:42 -0600
-@@ -7,9 +7,9 @@
-
- Name: schroedinger-@SCHRO_MAJORMINOR@
- Description: Dirac codec library
--Requires.private: @SCHRO_PKG_DEPS@
-+Requires: @SCHRO_PKG_DEPS@
- Version: @VERSION@
--Libs: -L${libdir} -lschroedinger-@SCHRO_MAJORMINOR@
-+Libs: -L${libdir} -lschroedinger-@SCHRO_MAJORMINOR@ -lorc-0.4
- Libs.private: @PTHREAD_LIBS@ @LIBM@
- Cflags: -I${includedir}
- 
---- ./schroedinger/schrodecoder.c	2012-01-23 00:38:57.000000000 +0100
-+++ ./schroedinger/schrodecoder.c	2016-05-15 06:07:24.000000000 +0200
-@@ -70,8 +70,8 @@
- };
- 
- 
--int _schro_decode_prediction_only;
--int _schro_telemetry;
-+int _schro_decode_prediction_only = 0;
-+int _schro_telemetry = 0;
- 
- static void schro_decoder_x_decode_motion (SchroAsyncStage * stage);
- static void schro_decoder_x_render_motion (SchroAsyncStage * stage);