diff --git a/Config.in.legacy b/Config.in.legacy index 41c5fdefb3..3fff2b1ddd 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,20 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + bool "videoscale removed" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE + help + The videoscale option has been combined with videoconvert. + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT + bool "videoconvert removed" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE + help + The videoconvert option has been combined with videoscale. + config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 bool "imx-gpu-viv X11 output has been removed" select BR2_LEGACY diff --git a/package/gstreamer1/gst1-plugins-base/Config.in b/package/gstreamer1/gst1-plugins-base/Config.in index bd4ee0b994..df10774ac7 100644 --- a/package/gstreamer1/gst1-plugins-base/Config.in +++ b/package/gstreamer1/gst1-plugins-base/Config.in @@ -59,10 +59,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ENCODING help various encoding-related elements -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT - bool "videoconvert" +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE + bool "videoconvertscale (mandatory for video playback)" + default y help - Colorspace conversion + Colorspace conversion, resizes video config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO bool "gio" @@ -123,12 +124,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE help Adjusts video frames -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE - bool "videoscale (mandatory for video playback)" - default y - help - Resizes video - config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME bool "volume (mandatory for audio playback)" default y diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 5c729d832f..bac4f8398a 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.4.tar.xz.sha256sum -sha256 8d181b7abe4caf23ee9f9ec5b4d3e232640452464e39495bfffb6d776fc97225 gst-plugins-base-1.20.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.0.tar.xz.sha256sum +sha256 f53672294f3985d56355c8b1df8f6b49c8c8721106563e19f53be3507ff2229d gst-plugins-base-1.22.0.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index d225cdf910..7d509331fe 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.20.4 +GST1_PLUGINS_BASE_VERSION = 1.22.0 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES @@ -147,10 +147,10 @@ else GST1_PLUGINS_BASE_CONF_OPTS += -Dencoding=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT),y) -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvert=enabled +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE),y) +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvertscale=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvert=disabled +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvertscale=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO),y) @@ -219,12 +219,6 @@ else GST1_PLUGINS_BASE_CONF_OPTS += -Dvideorate=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE),y) -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoscale=enabled -else -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoscale=disabled -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME),y) GST1_PLUGINS_BASE_CONF_OPTS += -Dvolume=enabled else diff --git a/package/gstreamer1/gstreamer1-editing-services/Config.in b/package/gstreamer1/gstreamer1-editing-services/Config.in index 9c41e8142b..e824781d47 100644 --- a/package/gstreamer1/gstreamer1-editing-services/Config.in +++ b/package/gstreamer1/gstreamer1-editing-services/Config.in @@ -6,9 +6,8 @@ config BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE # runtime - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT # runtime + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC # runtime - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME # runtime select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE # runtime help diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index cafe497491..dc5d738dae 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -104,8 +104,7 @@ config BR2_PACKAGE_WEBKITGTK_MULTIMEDIA select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME select BR2_PACKAGE_GST1_PLUGINS_GOOD select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index 04ed40bd92..7a8dc557c3 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -97,8 +97,7 @@ config BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME select BR2_PACKAGE_GST1_PLUGINS_GOOD select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX