Thanks, applied as 81786ad731102fdbe648b564fb410dac02aa4947. Michael
[sent from post-receive hook] On Fri, 17 Feb 2023 18:20:42 +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-bad1.in b/rules/gst-plugins-bad1.in > index 578746df33a9..6a2b19f458ff 100644 > --- a/rules/gst-plugins-bad1.in > +++ b/rules/gst-plugins-bad1.in > @@ -14,6 +14,7 @@ menuconfig GST_PLUGINS_BAD1 > select BZIP2_LIBBZ2 if GST_PLUGINS_BAD1_BZ2 > select BLUEZ if GST_PLUGINS_BAD1_BLUEZ > select BLUEZ_LIBBLUETOOTH if GST_PLUGINS_BAD1_BLUEZ > + select GTK if GST_PLUGINS_BAD1_GTK3 > select LCMS if GST_PLUGINS_BAD1_COLORMANAGEMENT > select LIBCURL if GST_PLUGINS_BAD1_CURL > select LIBCURL_LIBSSH2 if GST_PLUGINS_BAD1_CURL_SSH2 > @@ -110,6 +111,10 @@ config GST_PLUGINS_BAD1_CODECALPHA > bool > prompt "codecalpha" > > +config GST_PLUGINS_BAD1_CODECTIMESTAMPER > + bool > + prompt "codectimestamper" > + > config GST_PLUGINS_BAD1_COLOREFFECTS > bool > prompt "coloreffects" > @@ -338,6 +343,14 @@ config GST_PLUGINS_BAD1_AOM > help > AOM AV1 video codec plugin > > +config GST_PLUGINS_BAD1_AMFCODEC > + bool > + # needs amf > + depends on BROKEN > + prompt "amfcodec" > + help > + AMD AMF codec plugin > + > config GST_PLUGINS_BAD1_AVTP > bool > # needs avtp > @@ -517,6 +530,12 @@ config GST_PLUGINS_BAD1_GSM > help > GSM encoder/decoder plugin > > +config GST_PLUGINS_BAD1_GTK3 > + bool > + prompt "gtk3" > + help > + GTK+ video sink plugin > + > config GST_PLUGINS_BAD1_HLS > bool > prompt "hls" > @@ -713,6 +732,12 @@ config GST_PLUGINS_BAD1_QROVERLAY > help > QR code overlay plugin > > +config GST_PLUGINS_BAD1_QSV > + bool > + prompt "qsv" > + help > + Intel Quick Sync Video plugin > + > config GST_PLUGINS_BAD1_RESINDVD > bool > # needs dvdnav & dvdread > diff --git a/rules/gst-plugins-bad1.make b/rules/gst-plugins-bad1.make > index cd8509669bd3..002abd059783 100644 > --- a/rules/gst-plugins-bad1.make > +++ b/rules/gst-plugins-bad1.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_BAD1) += gst-plugins-bad1 > # > # Paths and names > # > -GST_PLUGINS_BAD1_VERSION := 1.20.5 > -GST_PLUGINS_BAD1_MD5 := 142bd94df6f9c3705054c7cd71a59987 > +GST_PLUGINS_BAD1_VERSION := 1.22.0 > +GST_PLUGINS_BAD1_MD5 := 6c4df68e7d32e2ae6a682b7dbc22e35a > GST_PLUGINS_BAD1 := gst-plugins-bad-$(GST_PLUGINS_BAD1_VERSION) > GST_PLUGINS_BAD1_SUFFIX := tar.xz > GST_PLUGINS_BAD1_URL := > http://gstreamer.freedesktop.org/src/gst-plugins-bad/$(GST_PLUGINS_BAD1).$(GST_PLUGINS_BAD1_SUFFIX) > @@ -36,6 +36,7 @@ GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_AIFF) > += aiff > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_AES) > += aes > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_AOM) > += aom > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_AVTP) += avtp > +GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_AMFCODEC) += > amfcodec > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_ASFMUX) += > asfmux > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_ASSRENDER) > += assrender > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_AUDIOBUFFERSPLIT) += > audiobuffersplit > @@ -51,6 +52,7 @@ GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_BZ2) > += bz2 > GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_CAMERABIN2) > += camerabin2 > GST_PLUGINS_BAD1_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD1_CAMERABIN2) > += camerabin > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_CODECALPHA) > += codecalpha > +GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_CODECTIMESTAMPER) += > codectimestamper > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_CHROMAPRINT) > += chromaprint > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_CLOSEDCAPTION) += > closedcaption > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_COLOREFFECTS) += > coloreffects > @@ -87,6 +89,8 @@ > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_GEOMETRICTRANSFORM) > += geomet > GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_GL) > += gl > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_GME) > += gme > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_GSM) > += gsm > +GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_GTK3) += gtk3 > +GST_PLUGINS_BAD1_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD1_GTK3) += > gtkwayland > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_HLS) > += hls > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_ID3TAG) += > id3tag > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_INTER) += inter > @@ -135,6 +139,9 @@ GST_PLUGINS_BAD1_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD1_OPUS) > += opusparse > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_PCAPPARSE) > += pcapparse > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_PNM) > += pnm > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_QROVERLAY) > += qroverlay > +ifdef PTXCONF_ARCH_X86_64 > +GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_QSV) > += qsv > +endif > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_PROXY) += proxy > GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_RAWPARSE) > += rawparse > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_SWITCHBIN) > += switchbin > @@ -215,6 +222,7 @@ GST_PLUGINS_BAD1_CONF_OPT = \ > -Dd3dvideosink=disabled \ > -Dd3d11=disabled \ > -Ddirectsound=disabled \ > + -Ddirectshow=disabled \ > -Dexamples=disabled \ > -Dextra-checks=disabled \ > -Dgs=disabled \ > @@ -227,6 +235,7 @@ GST_PLUGINS_BAD1_CONF_OPT = \ > -Dmagicleap=disabled \ > -Dmediafoundation=disabled \ > -Dmfx_api=auto \ > + -Dmfx-modules-dir= \ > -Donnx=disabled \ > -Dopenaptx=disabled \ > -Dnls=disabled \ > @@ -234,6 +243,7 @@ GST_PLUGINS_BAD1_CONF_OPT = \ > -Dsctp-internal-usrsctp=enabled \ > -Dwasapi=disabled \ > -Dwasapi2=disabled \ > + -Dwic=disabled \ > -Dwinks=disabled \ > -Dwinscreencap=disabled \ > -Dx11=disabled
