Merge pull request #4831 from peters/master

[ffmpeg] Update to 4.1.

8 files changed, 80 insertions, 15 deletions

diff --git a/ports/aubio/CMakeLists.txt b/ports/aubio/CMakeLists.txt
index a405a48de..3e65666eb 100644
--- a/ports/aubio/CMakeLists.txt
+++ b/ports/aubio/CMakeLists.txt
@@ -62,6 +62,7 @@ target_link_libraries(aubio PUBLIC
     ${LIBLZMA_LIBRARIES}
     ws2_32.lib
     Secur32.lib
+	bcrypt.lib
 )
 
 if(BUILD_TOOLS)
diff --git a/ports/aubio/CONTROL b/ports/aubio/CONTROL
index 6f5daa30a..5c699e1dc 100644
--- a/ports/aubio/CONTROL
+++ b/ports/aubio/CONTROL
@@ -1,4 +1,4 @@
 Source: aubio
-Version: 0.4.6-2
+Version: 0.4.8
 Description: Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.
 Build-Depends: ffmpeg, libsndfile, libogg, libflac, libvorbis, bzip2, liblzma
diff --git a/ports/aubio/portfile.cmake b/ports/aubio/portfile.cmake
index 02b898246..fec30f57c 100644
--- a/ports/aubio/portfile.cmake
+++ b/ports/aubio/portfile.cmake
@@ -3,8 +3,8 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/aubio-3c230fae309e9ea3298783368dd7
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aubio/aubio
-    REF 0.4.6
-    SHA512 9bb787d81f39ab8e3440be9936552a712a24e009884818e13e80dde756ad3874055bcd931ca3af638122f6a0d0bc53e62e1abeedce3fd79af35fe9ddea6bc707
+    REF 0.4.8 
+    SHA512 0422ec9ceb645dd5cdb1ca8b17f552edf9197dbf9c929ca75aacfb89f092c02db8b6d2b8aec567ddc1df5b310770de77cd941b45ed74700c3d3584924f39b576
     HEAD_REF master
 )
 
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL
index 7688f67f9..35b3e257e 100644
--- a/ports/ffmpeg/CONTROL
+++ b/ports/ffmpeg/CONTROL
@@ -1,5 +1,5 @@
 Source: ffmpeg
-Version: 3.3.3-5
+Version: 4.1
 Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
   FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations.
 
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
index 994e057b3..f8c0c9f38 100644
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@@ -1,9 +1,9 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ffmpeg-3.3.3)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ffmpeg-4.1)
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://ffmpeg.org/releases/ffmpeg-3.3.3.tar.bz2"
-    FILENAME "ffmpeg-3.3.3.tar.bz2"
-    SHA512 1cc63bf73356f4e618c0d3572a216bdf5689f10deff56b4262f6d740b0bee5a4b3eac234f45fca3d4d2da77903a507b4fba725b76d2d2070f31b6dae9e7a2dab
+    URLS "http://ffmpeg.org/releases/ffmpeg-4.1.tar.bz2"
+    FILENAME "ffmpeg-4.1.tar.bz2"
+    SHA512 ccf6d07268dc47e08ca619eb182a003face2a8ee73ec1a28157330dd7de1df88939def1fc1c7e6b6ac7b59752cdad84657d589b2fafb73e14e5ef03fb6e33417
 )
 
 if (${SOURCE_PATH} MATCHES " ")
@@ -59,12 +59,6 @@ else()
     set(OPTIONS "${OPTIONS} --disable-ffplay")
 endif()
 
-if("ffserver" IN_LIST FEATURES)
-    set(OPTIONS "${OPTIONS} --enable-ffserver")
-else()
-    set(OPTIONS "${OPTIONS} --disable-ffserver")
-endif()
-
 if("ffprobe" IN_LIST FEATURES)
     set(OPTIONS "${OPTIONS} --enable-ffprobe")
 else()
diff --git a/ports/pangolin/CONTROL b/ports/pangolin/CONTROL
index a515ba50e..f7f242293 100644
--- a/ports/pangolin/CONTROL
+++ b/ports/pangolin/CONTROL
@@ -1,4 +1,4 @@
 Source: pangolin
-Version: 0.5-3
+Version: 0.5-4
 Build-Depends: eigen3, glew, libpng, libjpeg-turbo, ffmpeg
 Description: Lightweight GUI Library
diff --git a/ports/pangolin/deprecated_constants.patch b/ports/pangolin/deprecated_constants.patch
new file mode 100644
index 000000000..813d2360d
--- /dev/null
+++ b/ports/pangolin/deprecated_constants.patch
@@ -0,0 +1,69 @@
+diff --git a/src/video/drivers/ffmpeg.cpp b/src/video/drivers/ffmpeg.cpp

+index 435225d..ff30349 100644

+--- a/src/video/drivers/ffmpeg.cpp

++++ b/src/video/drivers/ffmpeg.cpp

+@@ -34,6 +34,8 @@ extern "C"

+ #include <libavutil/mathematics.h>

+ }

+ 

++#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER

++

+ namespace pangolin

+ {

+ 

+@@ -74,8 +76,10 @@ std::string FfmpegFmtToString(const AVPixelFormat fmt)

+     TEST_PIX_FMT_RETURN(YUVJ420P);

+     TEST_PIX_FMT_RETURN(YUVJ422P);

+     TEST_PIX_FMT_RETURN(YUVJ444P);

++#ifdef FF_API_XVMC

+     TEST_PIX_FMT_RETURN(XVMC_MPEG2_MC);

+     TEST_PIX_FMT_RETURN(XVMC_MPEG2_IDCT);

++#endif

+     TEST_PIX_FMT_RETURN(UYVY422);

+     TEST_PIX_FMT_RETURN(UYYVYY411);

+     TEST_PIX_FMT_RETURN(BGR8);

+@@ -95,11 +99,13 @@ std::string FfmpegFmtToString(const AVPixelFormat fmt)

+     TEST_PIX_FMT_RETURN(YUV440P);

+     TEST_PIX_FMT_RETURN(YUVJ440P);

+     TEST_PIX_FMT_RETURN(YUVA420P);

++#ifdef FF_API_VDPAU

+     TEST_PIX_FMT_RETURN(VDPAU_H264);

+     TEST_PIX_FMT_RETURN(VDPAU_MPEG1);

+     TEST_PIX_FMT_RETURN(VDPAU_MPEG2);

+     TEST_PIX_FMT_RETURN(VDPAU_WMV3);

+     TEST_PIX_FMT_RETURN(VDPAU_VC1);

++#endif

+     TEST_PIX_FMT_RETURN(RGB48BE );

+     TEST_PIX_FMT_RETURN(RGB48LE );

+     TEST_PIX_FMT_RETURN(RGB565BE);

+@@ -119,7 +125,9 @@ std::string FfmpegFmtToString(const AVPixelFormat fmt)

+     TEST_PIX_FMT_RETURN(YUV422P16BE);

+     TEST_PIX_FMT_RETURN(YUV444P16LE);

+     TEST_PIX_FMT_RETURN(YUV444P16BE);

++#ifdef FF_API_VDPAU

+     TEST_PIX_FMT_RETURN(VDPAU_MPEG4);

++#endif

+     TEST_PIX_FMT_RETURN(DXVA2_VLD);

+     TEST_PIX_FMT_RETURN(RGB444BE);

+     TEST_PIX_FMT_RETURN(RGB444LE);

+@@ -559,7 +567,8 @@ void FfmpegVideoOutputStream::WriteFrame(AVFrame* frame)

+ 

+     int ret;

+     int got_packet = 1;

+-

++	

++#if FF_API_LAVF_FMT_RAWPICTURE

+     // Setup AVPacket

+     if (recorder.oc->oformat->flags & AVFMT_RAWPICTURE) {

+         /* Raw video case - directly store the picture in the packet */

+@@ -569,6 +578,10 @@ void FfmpegVideoOutputStream::WriteFrame(AVFrame* frame)

+         pkt.pts           = frame->pts;

+         ret = 0;

+     } else {

++#else

++    {

++#endif

++

+         /* encode the image */

+ #if (LIBAVFORMAT_VERSION_MAJOR >= 54)

+         ret = avcodec_encode_video2(stream->codec, &pkt, frame, &got_packet);

diff --git a/ports/pangolin/portfile.cmake b/ports/pangolin/portfile.cmake
index 19763f0d6..b25378c56 100644
--- a/ports/pangolin/portfile.cmake
+++ b/ports/pangolin/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
     REF v0.5
     SHA512 7ebeec108f33f1aa8b1ad08e3ca128a837b22d33e3fc580021f981784043b023a1bf563bbfa8b51d46863db770b336d24fc84ee3d836b85e0da1848281b2a5b2
     HEAD_REF master
+	PATCHES deprecated_constants.patch # Change from upstream pangolin to address build failures from latest ffmpeg library
 )
 
 file(REMOVE ${SOURCE_PATH}/CMakeModules/FindGLEW.cmake)