Thanks, applied as da38bca0e3d959c3cfb7602a3b65ad3e92e84cc2. Michael
[sent from post-receive hook] On Mon, 28 Feb 2022 13:09:27 +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 c19cc2252d5d..578746df33a9 100644 > --- a/rules/gst-plugins-bad1.in > +++ b/rules/gst-plugins-bad1.in > @@ -19,11 +19,13 @@ menuconfig GST_PLUGINS_BAD1 > select LIBCURL_LIBSSH2 if GST_PLUGINS_BAD1_CURL_SSH2 > select LIBXML2 if GST_PLUGINS_BAD1_DASH || > GST_PLUGINS_BAD1_SMOOTHSTREAMING || GST_PLUGINS_BAD1_TTML > select LIBXML2_DOM if GST_PLUGINS_BAD1_DASH || > GST_PLUGINS_BAD1_SMOOTHSTREAMING > + select OPENSSL if GST_PLUGINS_BAD1_AES > select OPENSSL if GST_PLUGINS_BAD1_DTLS > select OPENSSL if GST_PLUGINS_BAD1_HLS > - select LIBMMS if GST_PLUGINS_BAD1_LIBMMS > select LIBDRM if GST_PLUGINS_BAD1_KMS || > GST_PLUGINS_BAD1_WAYLAND > select OPUS if GST_PLUGINS_BAD1_OPUS > + select JSON_GLIB if GST_PLUGINS_BAD1_QROVERLAY > + select QRENCODE if GST_PLUGINS_BAD1_QROVERLAY > select RTMPDUMP if GST_PLUGINS_BAD1_RTMP > select LIBSNDFILE if GST_PLUGINS_BAD1_SNDFILE > select LIBSRTP if GST_PLUGINS_BAD1_SRTP > @@ -104,6 +106,10 @@ config GST_PLUGINS_BAD1_CAMERABIN2 > bool > prompt "camerabin2" > > +config GST_PLUGINS_BAD1_CODECALPHA > + bool > + prompt "codecalpha" > + > config GST_PLUGINS_BAD1_COLOREFFECTS > bool > prompt "coloreffects" > @@ -318,6 +324,12 @@ config GST_PLUGINS_BAD1_Y4M > > comment "plugins with dependencies" > > +config GST_PLUGINS_BAD1_AES > + bool > + prompt "aes" > + help > + AES encryption/decryption plugin > + > config GST_PLUGINS_BAD1_AOM > bool > # needs libaom > @@ -555,12 +567,6 @@ config GST_PLUGINS_BAD1_LIBDE265 > help > HEVC/H.265 video decoder plugin > > -config GST_PLUGINS_BAD1_LIBMMS > - bool > - prompt "libmms" > - help > - Microsoft multimedia server network source plugin > - > config GST_PLUGINS_BAD1_LV2 > bool > # needs liblilv > @@ -633,14 +639,6 @@ config GST_PLUGINS_BAD1_NVCODEC > help > NVIDIA GPU codec plugin > > -config GST_PLUGINS_BAD1_OFA > - bool > - # needs libofa > - depends on BROKEN > - prompt "ofa" > - help > - Open Fingerprint Architecture library plugin > - > config GST_PLUGINS_BAD1_OPENAL > bool > # needs OpenAL > @@ -709,6 +707,12 @@ config GST_PLUGINS_BAD1_OPUS > help > OPUS audio parser plugin > > +config GST_PLUGINS_BAD1_QROVERLAY > + bool > + prompt "qroverlay" > + help > + QR code overlay 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 edc192ddfb8d..2f54cc317a4a 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.18.5 > -GST_PLUGINS_BAD1_MD5 := 4ab1c19c3cf1ba79c20c65f6be78e7fd > +GST_PLUGINS_BAD1_VERSION := 1.20.0 > +GST_PLUGINS_BAD1_MD5 := 00dade0bc7b2b54643db92c8f4bdd4ab > 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) > @@ -33,6 +33,7 @@ GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_ACCURIP) > += accurip > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_ADPCMDEC) += > adpcmdec > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_ADPCMENC) += > adpcmenc > 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_ASFMUX) += > asfmux > @@ -49,6 +50,7 @@ GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_BS2B) > += bs2b > 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_CHROMAPRINT) > += chromaprint > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_CLOSEDCAPTION) += > closedcaption > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_COLOREFFECTS) += > coloreffects > @@ -99,8 +101,6 @@ GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_KATE) > += kate > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_KMS) > += kms > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_LADSPA) += > ladspa > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_LIBDE265) += > libde265 > -GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_LIBMMS) += > libmms > -GST_PLUGINS_BAD1_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD1_LIBMMS) += mms > GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_LIBRFB) += > librfb > GST_PLUGINS_BAD1_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD1_LIBRFB) += > rfbsrc > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_LV2) > += lv2 > @@ -120,7 +120,6 @@ GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_MXF) > += mxf > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_NEON) += neon > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_NETSIM) += > netsim > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_NVCODEC) += > nvcodec > -GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_OFA) > += ofa > GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_ONVIF) += onvif > GST_PLUGINS_BAD1_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD1_ONVIF) += > rtponvif > GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_OPENAL) += > openal > @@ -135,6 +134,7 @@ GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_OPUS) > += opus > 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 > 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 > @@ -210,18 +210,28 @@ GST_PLUGINS_BAD1_CONF_OPT = \ > $(call GSTREAMER1_GENERIC_CONF_OPT,GStreamer Bad Plug-ins) \ > -Dandroidmedia=disabled \ > -Dapplemedia=disabled \ > + -Dasio=disabled \ > + -Dasio-sdk-path= \ > -Dd3dvideosink=disabled \ > -Dd3d11=disabled \ > -Ddirectsound=disabled \ > -Dexamples=disabled \ > -Dextra-checks=disabled \ > - -Dgst_player_tests=false \ > + -Dgs=disabled \ > + -Dgpl=disabled \ > + -Dgst_play_tests=false \ > -Dhls-crypto=openssl \ > -Dintrospection=$(call ptx/endis,PTXCONF_GSTREAMER1_INTROSPECTION)d \ > + -Disac=disabled \ > + -Dldac=disabled \ > -Dmagicleap=disabled \ > -Dmediafoundation=disabled \ > + -Dmfx_api=auto \ > + -Donnx=disabled \ > + -Dopenaptx=disabled \ > -Dnls=disabled \ > -Dorc=enabled \ > + -Dsctp-internal-usrsctp=enabled \ > -Dwasapi=disabled \ > -Dwasapi2=disabled \ > -Dwinks=disabled \ _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
