[ptxdist] [PATCH 02/10] gst-plugins-base1: version bump 1.20.5 -> 1.22.0

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.za...@pengutronix.de>
---
 rules/gst-plugins-base1.in   | 8 ++------
 rules/gst-plugins-base1.make | 9 ++++-----
 rules/wpewebkit.in           | 2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/rules/gst-plugins-base1.in b/rules/gst-plugins-base1.in
index c076a9a4b4a8..3765e5fb4345 100644
--- a/rules/gst-plugins-base1.in
+++ b/rules/gst-plugins-base1.in
@@ -125,18 +125,14 @@ config GST_PLUGINS_BASE1_TYPEFIND
        bool
        prompt "typefind"
 
-config GST_PLUGINS_BASE1_VIDEOCONVERT
+config GST_PLUGINS_BASE1_VIDEOCONVERTSCALE
        bool
-       prompt "videoconvert"
+       prompt "videoconvertscale"
 
 config GST_PLUGINS_BASE1_VIDEORATE
        bool
        prompt "videorate"
 
-config GST_PLUGINS_BASE1_VIDEOSCALE
-       bool
-       prompt "videoscale"
-
 config GST_PLUGINS_BASE1_VIDEOTESTSRC
        bool
        prompt "videotestsrc"
diff --git a/rules/gst-plugins-base1.make b/rules/gst-plugins-base1.make
index fb29bf7e31c9..b78a072ed494 100644
--- a/rules/gst-plugins-base1.make
+++ b/rules/gst-plugins-base1.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_BASE1) += gst-plugins-base1
 #
 # Paths and names
 #
-GST_PLUGINS_BASE1_VERSION      := 1.20.5
-GST_PLUGINS_BASE1_MD5          := b6f7b3b2a65e6e7e5615ee63f57ac146
+GST_PLUGINS_BASE1_VERSION      := 1.22.0
+GST_PLUGINS_BASE1_MD5          := c559f23bb746bda732e85ba7b76c2074
 GST_PLUGINS_BASE1              := gst-plugins-base-$(GST_PLUGINS_BASE1_VERSION)
 GST_PLUGINS_BASE1_SUFFIX       := tar.xz
 GST_PLUGINS_BASE1_URL          := 
http://gstreamer.freedesktop.org/src/gst-plugins-base/$(GST_PLUGINS_BASE1).$(GST_PLUGINS_BASE1_SUFFIX)
@@ -57,13 +57,12 @@ 
GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_TREMOR)               += 
tremor
 GST_PLUGINS_BASE1_ENABLEP-$(PTXCONF_GST_PLUGINS_BASE1_TREMOR)          += 
ivorbisdec
 GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_TYPEFIND)                
+= typefind
 GST_PLUGINS_BASE1_ENABLEP-$(PTXCONF_GST_PLUGINS_BASE1_TYPEFIND)                
+= typefindfunctions
-GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_VIDEOCONVERT)     += 
videoconvert
+GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_VIDEOCONVERTSCALE)        
+= videoconvertscale
 GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_VIDEORATE)                
+= videorate
-GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_VIDEOSCALE)       += 
videoscale
 GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_VIDEOTESTSRC)     += 
videotestsrc
 GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_VOLUME)           += 
volume
 GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_VORBIS)           += 
vorbis
-GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_X)               += xshm 
xvideo
+GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_X)               += xshm 
xvideo xi
 GST_PLUGINS_BASE1_ENABLEP-$(PTXCONF_GST_PLUGINS_BASE1_X)               += 
ximagesink xvimagesink
 
 GST_PLUGINS_BASE1_ENABLEC- += $(GST_PLUGINS_BASE1_ENABLE-)
diff --git a/rules/wpewebkit.in b/rules/wpewebkit.in
index 3f11e921b526..54a2025a1e40 100644
--- a/rules/wpewebkit.in
+++ b/rules/wpewebkit.in
@@ -53,7 +53,7 @@ menuconfig WPEWEBKIT
        select GST_PLUGINS_BASE1_OPENGL         if WPEWEBKIT_VIDEO
        select GST_PLUGINS_BASE1_PLAYBACK       if WPEWEBKIT_VIDEO || 
WPEWEBKIT_AUDIO
        select GST_PLUGINS_BASE1_TYPEFIND       if WPEWEBKIT_VIDEO || 
WPEWEBKIT_AUDIO
-       select GST_PLUGINS_BASE1_VIDEOCONVERT   if WPEWEBKIT_VIDEO
+       select GST_PLUGINS_BASE1_VIDEOCONVERTSCALE if WPEWEBKIT_VIDEO
        select GST_PLUGINS_BASE1_VIDEORATE      if WPEWEBKIT_WEBRTC
        select GST_PLUGINS_BASE1_VOLUME         if WPEWEBKIT_AUDIO
        select GST_PLUGINS_GOOD1                if (WPEWEBKIT_VIDEO || 
WPEWEBKIT_AUDIO) && RUNTIME
-- 
2.30.2