multimedia/QtAV: update to 1.13.0

4 files changed, 8 insertions, 120 deletions

diff --git a/multimedia/QtAV/Makefile b/multimedia/QtAV/Makefile
index 8e6a2daa89e9..357671b03a66 100644
--- a/multimedia/QtAV/Makefile
+++ b/multimedia/QtAV/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=		QtAV
-PORTVERSION=		1.12.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	7
+DISTVERSION=		1.13.0
 CATEGORIES=		multimedia
 DIST_SUBDIR=		KDE
 
diff --git a/multimedia/QtAV/distinfo b/multimedia/QtAV/distinfo
index 0e49df6bf072..1a42b3b4778d 100644
--- a/multimedia/QtAV/distinfo
+++ b/multimedia/QtAV/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498043307
-SHA256 (KDE/wang-bin-QtAV-v1.12.0_GH0.tar.gz) = 65ab859985d73521c2d17e72117baae0f3f6242b69f59994acada76fa5364193
-SIZE (KDE/wang-bin-QtAV-v1.12.0_GH0.tar.gz) = 998117
+TIMESTAMP = 1563002083
+SHA256 (KDE/wang-bin-QtAV-v1.13.0_GH0.tar.gz) = a493d54d105b32c526f05188e4d7a8cf3508ecac697aae088721ffad20982288
+SIZE (KDE/wang-bin-QtAV-v1.13.0_GH0.tar.gz) = 2213489
diff --git a/multimedia/QtAV/files/patch-ffmpeg4 b/multimedia/QtAV/files/patch-ffmpeg4
deleted file mode 100644
index 234b2ab6f682..000000000000
--- a/multimedia/QtAV/files/patch-ffmpeg4
+++ /dev/null
@@ -1,111 +0,0 @@
-https://github.com/wang-bin/QtAV/commit/7f6929b49c25
-https://github.com/wang-bin/QtAV/commit/1633f2962e19
-
---- src/AVMuxer.cpp.orig	2017-06-21 01:47:15 UTC
-+++ src/AVMuxer.cpp
-@@ -122,7 +122,7 @@ AVStream *AVMuxer::Private::addStream(AVFormatContext*
-     c->time_base = s->time_base;
-     /* Some formats want stream headers to be separate. */
-     if (ctx->oformat->flags & AVFMT_GLOBALHEADER)
--        c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+        c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-     // expose avctx to encoder and set properties in encoder?
-     // list codecs for a given format in ui
-     return s;
---- src/QtAV/private/AVCompat.h.orig	2017-06-21 01:47:15 UTC
-+++ src/QtAV/private/AVCompat.h
-@@ -59,6 +59,7 @@ extern "C"
- #include <libavutil/parseutils.h>
- #include <libavutil/pixdesc.h>
- #include <libavutil/avstring.h>
-+#include <libavfilter/version.h>
- 
- #if !FFMPEG_MODULE_CHECK(LIBAVUTIL, 51, 73, 101)
- #include <libavutil/channel_layout.h>
-@@ -79,8 +80,11 @@ extern "C"
- #endif //QTAV_HAVE(AVRESAMPLE)
- 
- #if QTAV_HAVE(AVFILTER)
-+#if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,8,0)
- #include <libavfilter/avfiltergraph.h> /*code is here for old version*/
-+#else
- #include <libavfilter/avfilter.h>
-+#endif
- #include <libavfilter/buffersink.h>
- #include <libavfilter/buffersrc.h>
- #endif //QTAV_HAVE(AVFILTER)
-@@ -456,3 +460,15 @@ const char *get_codec_long_name(AVCodecID id);
-      } } while(0)
- 
- #endif //QTAV_COMPAT_H
-+
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56,33,0)
-+#define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER
-+#endif
-+
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56,56,100)
-+#define AV_INPUT_BUFFER_MIN_SIZE FF_MIN_BUFFER_SIZE
-+#endif
-+
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56,56,100)
-+#define AV_INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_PADDING_SIZE
-+#endif
---- src/codec/audio/AudioEncoderFFmpeg.cpp.orig	2017-06-21 01:47:15 UTC
-+++ src/codec/audio/AudioEncoderFFmpeg.cpp
-@@ -153,8 +153,8 @@ bool AudioEncoderFFmpegPrivate::open()
-     } else {
-         buffer_size = frame_size*format_used.bytesPerSample()*format_used.channels()*2+200;
-     }
--    if (buffer_size < FF_MIN_BUFFER_SIZE)
--        buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     buffer.resize(buffer_size);
-     return true;
- }
---- src/codec/video/VideoEncoderFFmpeg.cpp.orig	2017-06-21 01:47:15 UTC
-+++ src/codec/video/VideoEncoderFFmpeg.cpp
-@@ -245,7 +245,7 @@ bool VideoEncoderFFmpegPrivate::open()
-     applyOptionsForContext();
-     AV_ENSURE_OK(avcodec_open2(avctx, codec, &dict), false);
-     // from mpv ao_lavc
--    const int buffer_size = qMax<int>(qMax<int>(width*height*6+200, FF_MIN_BUFFER_SIZE), sizeof(AVPicture));//??
-+    const int buffer_size = qMax<int>(qMax<int>(width*height*6+200, AV_INPUT_BUFFER_MIN_SIZE), sizeof(AVPicture));//??
-     buffer.resize(buffer_size);
-     return true;
- }
---- src/filter/LibAVFilter.cpp.orig	2017-06-21 01:47:15 UTC
-+++ src/filter/LibAVFilter.cpp
-@@ -120,7 +120,10 @@ class LibAVFilter::Private (public)
-         // pixel_aspect==sar, pixel_aspect is more compatible
-         QString buffersrc_args = args;
-         qDebug("buffersrc_args=%s", buffersrc_args.toUtf8().constData());
--        AVFilter *buffersrc  = avfilter_get_by_name(video ? "buffer" : "abuffer");
-+#if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(7,0,0)
-+        const
-+#endif
-+        AVFilter *buffersrc = avfilter_get_by_name(video ? "buffer" : "abuffer");
-         Q_ASSERT(buffersrc);
-         AV_ENSURE_OK(avfilter_graph_create_filter(&in_filter_ctx,
-                                                buffersrc,
-@@ -128,6 +131,9 @@ class LibAVFilter::Private (public)
-                                                filter_graph)
-                      , false);
-         /* buffer video sink: to terminate the filter chain. */
-+#if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(7,0,0)
-+        const
-+#endif
-         AVFilter *buffersink = avfilter_get_by_name(video ? "buffersink" : "abuffersink");
-         Q_ASSERT(buffersink);
-         AV_ENSURE_OK(avfilter_graph_create_filter(&out_filter_ctx, buffersink, "out",
---- src/subtitle/SubtitleProcessorFFmpeg.cpp.orig	2017-06-21 01:47:15 UTC
-+++ src/subtitle/SubtitleProcessorFFmpeg.cpp
-@@ -249,7 +249,7 @@ bool SubtitleProcessorFFmpeg::processHeader(const QByt
-     codec_ctx->time_base.den = 1000;
-     if (!data.isEmpty()) {
-         av_free(codec_ctx->extradata);
--        codec_ctx->extradata = (uint8_t*)av_mallocz(data.size() + FF_INPUT_BUFFER_PADDING_SIZE);
-+        codec_ctx->extradata = (uint8_t*)av_mallocz(data.size() + AV_INPUT_BUFFER_PADDING_SIZE);
-         if (!codec_ctx->extradata)
-             return false;
-         codec_ctx->extradata_size = data.size();
diff --git a/multimedia/QtAV/pkg-plist b/multimedia/QtAV/pkg-plist
index aa3a54965d70..d5aab177336e 100644
--- a/multimedia/QtAV/pkg-plist
+++ b/multimedia/QtAV/pkg-plist
@@ -82,13 +82,13 @@ include/QtAVWidgets/version.h
 lib/libQtAV.prl
 lib/libQtAV.so
 lib/libQtAV.so.1
-lib/libQtAV.so.1.12
-lib/libQtAV.so.1.12.0
+lib/libQtAV.so.1.13
+lib/libQtAV.so.1.13.0
 lib/libQtAVWidgets.prl
 lib/libQtAVWidgets.so
 lib/libQtAVWidgets.so.1
-lib/libQtAVWidgets.so.1.12
-lib/libQtAVWidgets.so.1.12.0
+lib/libQtAVWidgets.so.1.13
+lib/libQtAVWidgets.so.1.13.0
 %%QT_MKSPECDIR%%/features/av.prf
 %%QT_MKSPECDIR%%/features/avwidgets.prf
 %%QT_MKSPECDIR%%/modules/qt_lib_av.pri