Thanks, applied as 1ce88d89f8b4acd5d1c87cfa7d3dbf34713b69cb. Michael
[sent from post-receive hook] On Wed, 08 Feb 2023 12:49:35 +0100, Philipp Zabel <[email protected]> wrote: > Signed-off-by: Philipp Zabel <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/gst-plugins-good1.in b/rules/gst-plugins-good1.in > index ab1d382ac53d..849168e8d788 100644 > --- a/rules/gst-plugins-good1.in > +++ b/rules/gst-plugins-good1.in > @@ -27,6 +27,11 @@ menuconfig GST_PLUGINS_GOOD1 > select QT5_MODULE_QTDECLARATIVE if GST_PLUGINS_GOOD1_QT5 > select LIBSHOUT if GST_PLUGINS_GOOD1_SHOUT2 > select LIBSOUP if GST_PLUGINS_GOOD1_SOUP > + select LIBSOUP if GST_PLUGINS_GOOD1_ADAPTIVEDEMUX2 && > RUNTIME > + select LIBXML2 if GST_PLUGINS_GOOD1_ADAPTIVEDEMUX2 > + select LIBGCRYPT if GST_PLUGINS_GOOD1_HLS_CRYPTO_GCRYPT > + select NETTLE if GST_PLUGINS_GOOD1_HLS_CRYPTO_NETTLE > + select OPENSSL if GST_PLUGINS_GOOD1_HLS_CRYPTO_OPENSSL > select SYSTEMD if GST_PLUGINS_GOOD1_V4L2 && > GST_PLUGINS_GOOD1_SYSTEMD && RUNTIME > select SYSTEMD_UDEV_PERSISTENT_V4L if GST_PLUGINS_GOOD1_V4L2 && > GST_PLUGINS_GOOD1_SYSTEMD && RUNTIME > select SPEEX if GST_PLUGINS_GOOD1_SPEEX > @@ -224,12 +229,46 @@ config GST_PLUGINS_GOOD1_WAVPARSE > bool > prompt "wavparse" > > +config GST_PLUGINS_GOOD1_XINGMUX > + bool > + prompt "xingmux" > + > config GST_PLUGINS_GOOD1_Y4M > bool > prompt "y4m" > > comment "plugins with dependencies" > > +config GST_PLUGINS_GOOD1_ADAPTIVEDEMUX2 > + bool > + prompt "adaptivedemux2" > + help > + 2nd generation adaptive demuxer plugin > + > +if GST_PLUGINS_GOOD1_ADAPTIVEDEMUX2 > + > +choice > + prompt "Crypto library to use for HLS plugin" > + > + config GST_PLUGINS_GOOD1_HLS_CRYPTO_NETTLE > + bool "nettle" > + > + config GST_PLUGINS_GOOD1_HLS_CRYPTO_GCRYPT > + bool "gcrypt" > + > + config GST_PLUGINS_GOOD1_HLS_CRYPTO_OPENSSL > + bool "openssl" > +endchoice > + > +endif > + > +config GST_PLUGINS_GOOD1_HLS_CRYPTO > + string > + default "nettle" if GST_PLUGINS_GOOD1_HLS_CRYPTO_NETTLE > + default "gcrypt" if GST_PLUGINS_GOOD1_HLS_CRYPTO_GCRYPT > + default "openssl" if GST_PLUGINS_GOOD1_HLS_CRYPTO_OPENSSL > + default "auto" > + > config GST_PLUGINS_GOOD1_AALIB > bool > # needs libaa > @@ -340,6 +379,14 @@ config GST_PLUGINS_GOOD1_QT5 > help > Qt5 QML video sink plugin > > +config GST_PLUGINS_GOOD1_QT6 > + bool > + # needs qt6 > + depends on BROKEN > + prompt "qt6" > + help > + Qt6 QML video sink plugin > + > config GST_PLUGINS_GOOD1_SHOUT2 > bool > prompt "shout2" > diff --git a/rules/gst-plugins-good1.make b/rules/gst-plugins-good1.make > index 591e587d6f33..faa4657ecbca 100644 > --- a/rules/gst-plugins-good1.make > +++ b/rules/gst-plugins-good1.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_GOOD1) += gst-plugins-good1 > # > # Paths and names > # > -GST_PLUGINS_GOOD1_VERSION := 1.20.5 > -GST_PLUGINS_GOOD1_MD5 := 63e55373d026497a486dabb1f5bf5abb > +GST_PLUGINS_GOOD1_VERSION := 1.22.0 > +GST_PLUGINS_GOOD1_MD5 := 4034320097501bccb2272a52874caaea > GST_PLUGINS_GOOD1 := gst-plugins-good-$(GST_PLUGINS_GOOD1_VERSION) > GST_PLUGINS_GOOD1_SUFFIX := tar.xz > GST_PLUGINS_GOOD1_URL := > http://gstreamer.freedesktop.org/src/gst-plugins-good/$(GST_PLUGINS_GOOD1).$(GST_PLUGINS_GOOD1_SUFFIX) > @@ -28,6 +28,7 @@ GST_PLUGINS_GOOD1_LICENSE := LGPL-2.1-or-later > # > ---------------------------------------------------------------------------- > > GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_AALIB) += aalib > +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_ADAPTIVEDEMUX2) += > adaptivedemux2 > GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_ALPHA) += alpha > GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_ALPHA) += > alpha alphacolor > GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_APETAG) += > apetag > @@ -82,6 +83,8 @@ > GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_PULSE) > += pulse > GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_PULSE) += > pulseaudio > GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_QT5) += qt5 > GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_QT5) += qmlgl > +GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_QT6) += qt6 > +GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_QT6) += qml6 > GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_REPLAYGAIN) += > replaygain > GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_RTP) += rtp > GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_RTPMANAGER) += > rtpmanager > @@ -107,6 +110,7 @@ > GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_WAVENC) += > wavenc > GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_WAVPACK) > += wavpack > GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_WAVPARSE) > += wavparse > GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_XIMAGESRC) > += ximagesrc > +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_XINGMUX) > += xingmux > GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_Y4M) += y4m > GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_Y4M) += > y4menc > > @@ -139,10 +143,12 @@ GST_PLUGINS_GOOD1_CONF_OPT = \ > -Dbz2=$(call ptx/endis,PTXCONF_GST_PLUGINS_GOOD1_BZ2)d \ > -Ddirectsound=disabled \ > -Dexamples=disabled \ > + -Dhls-crypto=$(call remove_quotes, > $(PTXCONF_GST_PLUGINS_GOOD1_HLS_CRYPTO)) \ > -Dnls=disabled \ > -Dorc=$(call ptx/endis,PTXCONF_GST_PLUGINS_GOOD1_ORC)d \ > -Dosxaudio=disabled \ > -Dosxvideo=disabled \ > + -Dqt-method=pkg-config \ > -Drpi-header-dir= \ > -Drpi-lib-dir= \ > -Drpicamsrc=disabled \
