7 files changed, 9 insertions, 82 deletions

diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-ext_opencv_gstfacedetect.h b/multimedia/gstreamer1-plugins-bad/files/patch-ext_opencv_gstfacedetect.h
deleted file mode 100644
index 510d5d4c08be..000000000000
--- a/multimedia/gstreamer1-plugins-bad/files/patch-ext_opencv_gstfacedetect.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ext/opencv/gstfacedetect.h.orig	2018-03-23 20:45:15 UTC
-+++ ext/opencv/gstfacedetect.h
-@@ -50,7 +50,7 @@
- 
- #include <gst/gst.h>
- #include <opencv2/core/version.hpp>
--#include <cv.h>
-+#include <opencv/cv.h>
- #include <gst/opencv/gstopencvvideofilter.h>
- #include <opencv2/objdetect/objdetect.hpp>
- 
diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-ext_opencv_gsthanddetect.h b/multimedia/gstreamer1-plugins-bad/files/patch-ext_opencv_gsthanddetect.h
deleted file mode 100644
index 2e3aaa5d726a..000000000000
--- a/multimedia/gstreamer1-plugins-bad/files/patch-ext_opencv_gsthanddetect.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ext/opencv/gsthanddetect.h.orig	2018-03-23 20:45:15 UTC
-+++ ext/opencv/gsthanddetect.h
-@@ -45,7 +45,7 @@
- #ifndef __GST_HANDDETECT_H__
- #define __GST_HANDDETECT_H__
- 
--#include <cv.h>
-+#include <opencv/cv.h>
- 
- #include <gst/opencv/gstopencvvideofilter.h>
- /* opencv */
diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-ext_opencv_gsttemplatematch.cpp b/multimedia/gstreamer1-plugins-bad/files/patch-ext_opencv_gsttemplatematch.cpp
deleted file mode 100644
index 69fc6f89bf44..000000000000
--- a/multimedia/gstreamer1-plugins-bad/files/patch-ext_opencv_gsttemplatematch.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ext/opencv/gsttemplatematch.cpp.orig	2018-03-23 20:45:15 UTC
-+++ ext/opencv/gsttemplatematch.cpp
-@@ -64,6 +64,8 @@
- #include "../../gst-libs/gst/gst-i18n-plugin.h"
- #include "gsttemplatematch.h"
- #include <opencv2/imgproc/imgproc_c.h>
-+#include <opencv2/imgproc/types_c.h>
-+#include <opencv2/imgcodecs/imgcodecs_c.h>
- 
- GST_DEBUG_CATEGORY_STATIC (gst_template_match_debug);
- #define GST_CAT_DEFAULT gst_template_match_debug
diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-ext_openh264_gstopenh264enc.cpp b/multimedia/gstreamer1-plugins-bad/files/patch-ext_openh264_gstopenh264enc.cpp
deleted file mode 100644
index 923327d49ec7..000000000000
--- a/multimedia/gstreamer1-plugins-bad/files/patch-ext_openh264_gstopenh264enc.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/d2f6facbfb89
-
-gstopenh264enc.cpp:745:14: error: no member named 'bEnableSpsPpsIdAddition' in 'TagEncParamExt'
-  enc_params.bEnableSpsPpsIdAddition = 0;
-  ~~~~~~~~~~ ^
-
---- ext/openh264/gstopenh264enc.cpp.orig	2018-03-23 20:45:15 UTC
-+++ ext/openh264/gstopenh264enc.cpp
-@@ -739,7 +739,7 @@ gst_openh264enc_set_format (GstVideoEncoder * encoder,
-   enc_params.bEnableSceneChangeDetect = openh264enc->scene_change_detection;
-   enc_params.bEnableFrameSkip = openh264enc->enable_frame_skip;
-   enc_params.bEnableLongTermReference = 0;
--#if OPENH264_MINOR >= 4
-+#if (OPENH264_MAJOR > 1 || (OPENH264_MAJOR == 1 && OPENH264_MINOR >= 4))
-   enc_params.eSpsPpsIdStrategy = CONSTANT_ID;
- #else
-   enc_params.bEnableSpsPpsIdAddition = 0;
diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-ext_wayland_Makefile.in b/multimedia/gstreamer1-plugins-bad/files/patch-ext_wayland_Makefile.in
deleted file mode 100644
index afee6dd65800..000000000000
--- a/multimedia/gstreamer1-plugins-bad/files/patch-ext_wayland_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ext/wayland/Makefile.in.orig	2018-09-16 17:59:59 UTC
-+++ ext/wayland/Makefile.in
-@@ -1198,7 +1198,7 @@ $(shell echo $1 | sed 's/\([a-z\-]\+\)-[a-z]\+-v[0-9]\
- endef
-
- %-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml
--	$(AM_V_GEN)$(wayland_scanner) code < $< > $@
-+	$(AM_V_GEN)$(wayland_scanner) private-code < $< > $@
-
- %-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml
-	$(AM_V_GEN)$(wayland_scanner) client-header < $< > $@
diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_webrtc_webrtc__fwd.h b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_webrtc_webrtc__fwd.h
deleted file mode 100644
index 13713cc4c29b..000000000000
--- a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_webrtc_webrtc__fwd.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- gst-libs/gst/webrtc/webrtc_fwd.h.orig	2018-07-18 14:46:42 UTC
-+++ gst-libs/gst/webrtc/webrtc_fwd.h
-@@ -39,9 +39,6 @@ typedef struct _GstWebRTCDTLSTransportCl
- typedef struct _GstWebRTCICETransport GstWebRTCICETransport;
- typedef struct _GstWebRTCICETransportClass GstWebRTCICETransportClass;
- 
--typedef struct _GstWebRTCRTPReceiver GstWebRTCRTPReceiver;
--typedef struct _GstWebRTCRTPReceiverClass GstWebRTCRTPReceiverClass;
--
- typedef struct _GstWebRTCRTPSender GstWebRTCRTPSender;
- typedef struct _GstWebRTCRTPSenderClass GstWebRTCRTPSenderClass;
- 
diff --git a/multimedia/gstreamer1-plugins-bad/pkg-plist b/multimedia/gstreamer1-plugins-bad/pkg-plist
index 81841e82f704..4e41315a3fa0 100644
--- a/multimedia/gstreamer1-plugins-bad/pkg-plist
+++ b/multimedia/gstreamer1-plugins-bad/pkg-plist
@@ -1,5 +1,6 @@
 include/gstreamer-%%VERSION%%/gst/audio/audio-bad-prelude.h
 include/gstreamer-%%VERSION%%/gst/audio/gstnonstreamaudiodecoder.h
+include/gstreamer-%%VERSION%%/gst/audio/gstplanaraudioadapter.h
 include/gstreamer-%%VERSION%%/gst/basecamerabinsrc/basecamerabinsrc-prelude.h
 include/gstreamer-%%VERSION%%/gst/basecamerabinsrc/gstbasecamerasrc.h
 include/gstreamer-%%VERSION%%/gst/basecamerabinsrc/gstcamerabin-enum.h
@@ -40,13 +41,13 @@ include/gstreamer-%%VERSION%%/gst/player/gstplayer-visualization.h
 include/gstreamer-%%VERSION%%/gst/player/gstplayer.h
 include/gstreamer-%%VERSION%%/gst/player/player-prelude.h
 include/gstreamer-%%VERSION%%/gst/player/player.h
+include/gstreamer-%%VERSION%%/gst/sctp/sctp-prelude.h
+include/gstreamer-%%VERSION%%/gst/sctp/sctpreceivemeta.h
+include/gstreamer-%%VERSION%%/gst/sctp/sctpsendmeta.h
 include/gstreamer-%%VERSION%%/gst/uridownloader/gstfragment.h
 include/gstreamer-%%VERSION%%/gst/uridownloader/gsturidownloader.h
 include/gstreamer-%%VERSION%%/gst/uridownloader/gsturidownloader_debug.h
 include/gstreamer-%%VERSION%%/gst/uridownloader/uridownloader-prelude.h
-include/gstreamer-%%VERSION%%/gst/video/gstvideoaggregator.h
-include/gstreamer-%%VERSION%%/gst/video/gstvideoaggregatorpad.h
-include/gstreamer-%%VERSION%%/gst/video/video-bad-prelude.h
 include/gstreamer-%%VERSION%%/gst/webrtc/dtlstransport.h
 include/gstreamer-%%VERSION%%/gst/webrtc/icetransport.h
 include/gstreamer-%%VERSION%%/gst/webrtc/rtcsessiondescription.h
@@ -75,7 +76,6 @@ lib/gstreamer-%%VERSION%%/libgstbayer.so
 lib/gstreamer-%%VERSION%%/libgstbz2.so
 lib/gstreamer-%%VERSION%%/libgstcamerabin.so
 lib/gstreamer-%%VERSION%%/libgstcoloreffects.so
-lib/gstreamer-%%VERSION%%/libgstcompositor.so
 lib/gstreamer-%%VERSION%%/libgstdebugutilsbad.so
 lib/gstreamer-%%VERSION%%/libgstdvb.so
 lib/gstreamer-%%VERSION%%/libgstdvbsuboverlay.so
@@ -116,7 +116,6 @@ lib/gstreamer-%%VERSION%%/libgstshm.so
 lib/gstreamer-%%VERSION%%/libgstsiren.so
 lib/gstreamer-%%VERSION%%/libgstsmooth.so
 lib/gstreamer-%%VERSION%%/libgstspeed.so
-lib/gstreamer-%%VERSION%%/libgststereo.so
 lib/gstreamer-%%VERSION%%/libgstsubenc.so
 lib/gstreamer-%%VERSION%%/libgsttimecode.so
 lib/gstreamer-%%VERSION%%/libgstvideofiltersbad.so
@@ -132,9 +131,6 @@ lib/libgstadaptivedemux-%%VERSION%%.so.%%SOVERSION%%
 lib/libgstbadaudio-%%VERSION%%.so
 lib/libgstbadaudio-%%VERSION%%.so.0
 lib/libgstbadaudio-%%VERSION%%.so.%%SOVERSION%%
-lib/libgstbadvideo-%%VERSION%%.so
-lib/libgstbadvideo-%%VERSION%%.so.0
-lib/libgstbadvideo-%%VERSION%%.so.%%SOVERSION%%
 lib/libgstbasecamerabinsrc-%%VERSION%%.so
 lib/libgstbasecamerabinsrc-%%VERSION%%.so.0
 lib/libgstbasecamerabinsrc-%%VERSION%%.so.%%SOVERSION%%
@@ -156,6 +152,9 @@ lib/libgstphotography-%%VERSION%%.so.%%SOVERSION%%
 lib/libgstplayer-%%VERSION%%.so
 lib/libgstplayer-%%VERSION%%.so.0
 lib/libgstplayer-%%VERSION%%.so.%%SOVERSION%%
+lib/libgstsctp-%%VERSION%%.so
+lib/libgstsctp-%%VERSION%%.so.0
+lib/libgstsctp-%%VERSION%%.so.%%SOVERSION%%
 lib/libgsturidownloader-%%VERSION%%.so
 lib/libgsturidownloader-%%VERSION%%.so.0
 lib/libgsturidownloader-%%VERSION%%.so.%%SOVERSION%%
@@ -163,12 +162,12 @@ lib/libgstwebrtc-%%VERSION%%.so
 lib/libgstwebrtc-%%VERSION%%.so.0
 lib/libgstwebrtc-%%VERSION%%.so.%%SOVERSION%%
 libdata/pkgconfig/gstreamer-bad-audio-%%VERSION%%.pc
-libdata/pkgconfig/gstreamer-bad-video-%%VERSION%%.pc
 libdata/pkgconfig/gstreamer-codecparsers-%%VERSION%%.pc
 libdata/pkgconfig/gstreamer-insertbin-%%VERSION%%.pc
 libdata/pkgconfig/gstreamer-mpegts-%%VERSION%%.pc
 libdata/pkgconfig/gstreamer-player-%%VERSION%%.pc
 libdata/pkgconfig/gstreamer-plugins-bad-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-sctp-%%VERSION%%.pc
 libdata/pkgconfig/gstreamer-webrtc-%%VERSION%%.pc
 share/gir-1.0/GstInsertBin-%%VERSION%%.gir
 share/gir-1.0/GstMpegts-%%VERSION%%.gir
@@ -176,6 +175,7 @@ share/gir-1.0/GstPlayer-%%VERSION%%.gir
 share/gir-1.0/GstWebRTC-%%VERSION%%.gir
 %%DATADIR%%-%%VERSION%%/presets/GstFreeverb.prs
 share/locale/af/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
+share/locale/ast/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo