Signed-off-by: Michael Tretter <m.tret...@pengutronix.de> --- rules/gst-plugins-bad1.in | 116 ++++++++++++++++++-------------------------- rules/gst-plugins-bad1.make | 31 ++++++------ 2 files changed, 60 insertions(+), 87 deletions(-)
diff --git a/rules/gst-plugins-bad1.in b/rules/gst-plugins-bad1.in index 4c17517b9..5c9365c37 100644 --- a/rules/gst-plugins-bad1.in +++ b/rules/gst-plugins-bad1.in @@ -9,28 +9,17 @@ menuconfig GST_PLUGINS_BAD1 select BZIP2 if GST_PLUGINS_BAD1_BZ2 select BZIP2_LIBBZ2 if GST_PLUGINS_BAD1_BZ2 select BLUEZ if GST_PLUGINS_BAD1_BLUEZ + select LCMS if GST_PLUGINS_BAD1_LCMS2 select LIBCURL if GST_PLUGINS_BAD1_CURL 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 DIRECTFB if GST_PLUGINS_BAD1_DIRECTFB select OPENSSL if GST_PLUGINS_BAD1_DTLS - select GTK if GST_PLUGINS_BAD1_GTK3 select OPENSSL if GST_PLUGINS_BAD1_HLS select LIBMMS if GST_PLUGINS_BAD1_LIBMMS - select MESALIB if GST_PLUGINS_BAD1_OPENGL || GST_PLUGINS_BAD1_GLES2 || GST_PLUGINS_BAD1_EGL - select MESALIB_OPENGL if GST_PLUGINS_BAD1_OPENGL - select GLU if GST_PLUGINS_BAD1_OPENGL - select MESALIB_GLES2 if GST_PLUGINS_BAD1_GLES2 - select MESALIB_EGL if GST_PLUGINS_BAD1_EGL - select MESALIB_EGL_WAYLAND if GST_PLUGINS_BAD1_EGL_WAYLAND - select MESALIB_GLX if GST_PLUGINS_BAD1_GLX - select XORG_LIB_X11 if GST_PLUGINS_BAD1_EGL_X11 select LIBDRM if GST_PLUGINS_BAD1_KMS || GST_PLUGINS_BAD1_WAYLAND select LIBDRM_LIBKMS if GST_PLUGINS_BAD1_KMS select OPUS if GST_PLUGINS_BAD1_OPUS - select QT5 if GST_PLUGINS_BAD1_QT - select QT5_GUI if GST_PLUGINS_BAD1_QT - select QT5_MODULE_QTDECLARATIVE if GST_PLUGINS_BAD1_QT select RTMPDUMP if GST_PLUGINS_BAD1_RTMP select LIBSNDFILE if GST_PLUGINS_BAD1_SNDFILE select PANGO if GST_PLUGINS_BAD1_TTML @@ -84,9 +73,9 @@ config GST_PLUGINS_BAD1_AUDIOFXBAD bool prompt "audiofxbad" -config GST_PLUGINS_BAD1_AUDIOMIXER +config GST_PLUGINS_BAD1_AUDIOLATENCY bool - prompt "audiomixer" + prompt "audiolatency" config GST_PLUGINS_BAD1_AUDIOMIXMATRIX bool @@ -116,6 +105,12 @@ config GST_PLUGINS_BAD1_COLOREFFECTS bool prompt "coloreffects" +config GST_PLUGINS_BAD1_CUDA + bool + # needs cuda + depends on BROKEN + prompt "cuda" + config GST_PLUGINS_BAD1_DEBUGUTILS bool prompt "debugutils" @@ -160,6 +155,14 @@ config GST_PLUGINS_BAD1_GDP bool prompt "gdp" +config GST_PLUGINS_BAD1_GL + bool + prompt "gl" + +config GST_PLUGINS_BAD1_IPCPIPELINE + bool + prompt "ipcpipeline" + config GST_PLUGINS_BAD1_ID3TAG bool prompt "id3tag" @@ -194,6 +197,10 @@ config GST_PLUGINS_BAD1_JPEGFORMAT bool prompt "jpegformat" +config GST_PLUGINS_BAD1_LCMS2 + bool + prompt "lcms2" + config GST_PLUGINS_BAD1_LIBRFB bool prompt "librfb" @@ -238,6 +245,10 @@ config GST_PLUGINS_BAD1_PNM bool prompt "pnm" +config GST_PLUGINS_BAD1_PROXY + bool + prompt "proxy" + config GST_PLUGINS_BAD1_RAWPARSE bool prompt "rawparse" @@ -533,6 +544,12 @@ config GST_PLUGINS_BAD1_NEON prompt "neon" depends on BROKEN +config GST_PLUGINS_BAD1_NVDEC + bool + prompt "nvdec" + # Needs NVDEC + depends on BROKEN + config GST_PLUGINS_BAD1_OFA bool prompt "ofa" @@ -565,6 +582,12 @@ config GST_PLUGINS_BAD1_OPENJPEG prompt "openjpeg" depends on BROKEN +config GST_PLUGINS_BAD1_OPENMPT + bool + prompt "openmpt" + # Needs OpenMPT + depends on BROKEN + config GST_PLUGINS_BAD1_OPENNI2 bool prompt "openni2" @@ -580,64 +603,23 @@ config GST_PLUGINS_BAD1_RSVG prompt "rsvg" depends on BROKEN -config GST_PLUGINS_BAD1_GL - bool - prompt "gl" - -if GST_PLUGINS_BAD1_GL - -config GST_PLUGINS_BAD1_GLES2 - bool - depends on !GST_PLUGINS_BAD1_OPENGL - prompt "gles2" - -config GST_PLUGINS_BAD1_OPENGL +config GST_PLUGINS_BAD1_SRT bool - prompt "opengl" - -config GST_PLUGINS_BAD1_EGL - bool - prompt "egl" - -if GST_PLUGINS_BAD1_EGL - -config GST_PLUGINS_BAD1_EGL_X11 - bool - select GST_PLUGINS_BAD1_X11 - prompt "x11 egl" - -config GST_PLUGINS_BAD1_EGL_WAYLAND - bool - prompt "wayland egl" - -endif - -config GST_PLUGINS_BAD1_GLX - bool - select GST_PLUGINS_BAD1_OPENGL - select GST_PLUGINS_BAD1_X11 - prompt "glx" - -config GST_PLUGINS_BAD1_X11 - bool - -endif - -config GST_PLUGINS_BAD1_GTK3 - bool - prompt "gtk3" - -config GST_PLUGINS_BAD1_QT - bool - # Needs Qt 5.5.x + prompt "srt" + # Needs libsrt depends on BROKEN - prompt "qt" config GST_PLUGINS_BAD1_VULKAN bool prompt "vulkan" depends on BROKEN +config GST_PLUGINS_BAD1_WEBRTC + bool + prompt "webrtc" + # Needs libnice + depends on BROKEN + config GST_PLUGINS_BAD1_TELETEXTDEC bool prompt "teletextdec" @@ -691,12 +673,6 @@ config GST_PLUGINS_BAD1_SBC depends on BROKEN prompt "sbc" -config GST_PLUGINS_BAD1_SCHRO - bool - # needs schroedinger-1.0 - depends on BROKEN - prompt "schro" - config GST_PLUGINS_BAD1_ZBAR bool prompt "zbar" diff --git a/rules/gst-plugins-bad1.make b/rules/gst-plugins-bad1.make index fe3512c30..a0a3be166 100644 --- a/rules/gst-plugins-bad1.make +++ b/rules/gst-plugins-bad1.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_BAD1) += gst-plugins-bad1 # # Paths and names # -GST_PLUGINS_BAD1_VERSION := 1.12.4 -GST_PLUGINS_BAD1_MD5 := 64bf16cf15edaab1c0e02c8dee7170d0 +GST_PLUGINS_BAD1_VERSION := 1.14.0 +GST_PLUGINS_BAD1_MD5 := 555bbe7232fb4653c31b78e1f79068cf 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) @@ -35,10 +35,11 @@ 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_AOM) += aom GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_ASFMUX) += asfmux GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_AUDIOBUFFERSPLIT) += audiobuffersplit GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_AUDIOFXBAD) += audiofxbad -GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_AUDIOMIXER) += audiomixer +GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_AUDIOLATENCY) += audiolatency GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_AUDIOMIXMATRIX) += audiomixmatrix GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_COMPOSITOR) += compositor GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_AUDIOVISUALIZERS) += audiovisualizers @@ -59,6 +60,9 @@ GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_FREI0R) += frei0r GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_GAUDIEFFECTS) += gaudieffects GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_GEOMETRICTRANSFORM) += geometrictransform GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_GDP) += gdp +GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_GL) += gl +GST_PLUGINS_BAD1_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD1_GL) += openglmixers +GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_IPCPIPELINE) += ipcpipeline GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_ID3TAG) += id3tag GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_INTER) += inter GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_INTERLACE) += interlace @@ -69,6 +73,7 @@ GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_JP2KDECIMATOR) += jp2kdecimat GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_JPEGFORMAT) += jpegformat 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_LCMS2) += lcms2 GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_MIDI) += midi GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_MPEGDEMUX) += mpegdemux GST_PLUGINS_BAD1_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD1_MPEGDEMUX) += mpegpsdemux @@ -81,6 +86,7 @@ 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_PCAPPARSE) += pcapparse GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_PNM) += pnm +GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_PROXY) += proxy GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_RAWPARSE) += rawparse GST_PLUGINS_BAD1_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD1_RAWPARSE) += legacyrawparse GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_REMOVESILENCE) += removesilence @@ -120,6 +126,7 @@ GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_VOAACENC) += voaacenc GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_BS2B) += bs2b GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_BZ2) += bz2 GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_CHROMAPRINT) += chromaprint +GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_CUDA) += cuda GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_CURL) += curl GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_DASH) += dash GST_PLUGINS_BAD1_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD1_DASH) += dashdemux @@ -156,25 +163,18 @@ GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_MPLEX) += mplex GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_MSDK) += msdk GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_MUSEPACK) += musepack GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_NEON) += neon +GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_NVDEC) += nvdec GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_OFA) += ofa GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_OPENAL) += openal GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_OPENCV) += opencv GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_OPENEXR) += openexr GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_OPENH264) += openh264 GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_OPENJPEG) += openjpeg +GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_OPENMPT) += openmpt GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_OPENNI2) += openni2 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_RSVG) += rsvg -GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_OPENGL) += opengl -GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_GLES2) += gles2 -GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_EGL) += egl -GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_GLX) += glx -GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_X11) += x11 -GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_GL) += gl -GST_PLUGINS_BAD1_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD1_GL) += opengl -GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_GTK3) += gtk3 -GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_QT) += qt GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_VULKAN) += vulkan GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_TELETEXTDEC) += teletextdec GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_WILDMIDI) += wildmidi @@ -187,13 +187,14 @@ GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_DVB) += dvb GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_ACM) += acm GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_VDPAU) += vdpau GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_SBC) += sbc -GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_SCHRO) += schro GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_ZBAR) += zbar GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_RTMP) += rtmp GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_SPANDSP) += spandsp +GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_SRT) += srt GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_HLS) += hls GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_X265) += x265 GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_WEBRTCDSP) += webrtcdsp +GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_WEBRTC) += webrtc GST_PLUGINS_BAD1_ENABLEC-y += $(GST_PLUGINS_BAD1_ENABLE-y) GST_PLUGINS_BAD1_ENABLEC- += $(GST_PLUGINS_BAD1_ENABLE-) @@ -221,9 +222,6 @@ GST_PLUGINS_BAD1_CONF_OPT = \ \ --enable-orc \ \ - --disable-wgl \ - --disable-cocoa \ - --disable-dispmanx \ --disable-directsound \ --disable-wasapi \ --disable-direct3d \ @@ -231,7 +229,6 @@ GST_PLUGINS_BAD1_CONF_OPT = \ --disable-winks \ --disable-android_media \ --disable-apple_media \ - --without-jpeg-mmx \ --without-player-tests \ $(call ptx/ifdef,PTXCONF_GST_PLUGINS_BAD1_HLS,--with-hls-crypto=openssl) -- 2.16.1 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de