From 7fb0106d426c51edf65f19c4e47bd1ef8c179734 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Mon, 22 Apr 2019 20:51:47 +0200 Subject: gst-plugins-good1: version bump 1.14.4 -> 1.16.0 Signed-off-by: Michael Olbrich --- rules/gst-plugins-good1.make | 129 +++++++++++++++++++++++-------------------- 1 file changed, 68 insertions(+), 61 deletions(-) (limited to 'rules/gst-plugins-good1.make') diff --git a/rules/gst-plugins-good1.make b/rules/gst-plugins-good1.make index 008bc9a92..8409e3199 100644 --- a/rules/gst-plugins-good1.make +++ b/rules/gst-plugins-good1.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_GOOD1) += gst-plugins-good1 # # Paths and names # -GST_PLUGINS_GOOD1_VERSION := 1.14.4 -GST_PLUGINS_GOOD1_MD5 := 6e3b247097366cf2639f22abfece7113 +GST_PLUGINS_GOOD1_VERSION := 1.16.0 +GST_PLUGINS_GOOD1_MD5 := d1a7b442994d9522418de4af4330e034 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) @@ -29,6 +29,7 @@ GST_PLUGINS_GOOD1_LICENSE := LGPL-2.1-or-later # Prepare # ---------------------------------------------------------------------------- +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_AALIB) += aalib 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 @@ -37,100 +38,112 @@ GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_AUDIOPARSERS) += audioparse GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_AUPARSE) += auparse GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_AUTODETECT) += autodetect GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_AVI) += avi +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_CAIRO) += cairo GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_CUTTER) += cutter GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_DEBUGUTILS) += debugutils -GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_DEBUGUTILS) += debug navigationtest +GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_DEBUGUTILS) += navigationtest debug GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_DEINTERLACE) += deinterlace GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_DTMF) += dtmf +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_DV) += dv +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_DV1394) += dv1394 GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_EFFECTV) += effectv GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_EQUALIZER) += equalizer +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_FLAC) += flac GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_FLV) += flv GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_FLX) += flx GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_FLX) += flxdec +GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_GDK_PIXBUF) += gdk-pixbuf +GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_GDK_PIXBUF) += gdkpixbuf GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_GOOM) += goom GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_GOOM2K1) += goom2k1 +GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_GTK3) += gtk3 +GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_GTK3) += gtk GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_ICYDEMUX) += icydemux GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_ID3DEMUX) += id3demux GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_IMAGEFREEZE) += imagefreeze GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_INTERLEAVE) += interleave -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_QTDEMUX) += isomp4 +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_ISOMP4) += isomp4 +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_JACK) += jack +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_JPEG) += jpeg +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_LAME) += lame GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_LAW) += law GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_LAW) += alaw mulaw GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_LEVEL) += level +GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_LIBCACA) += libcaca +GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_LIBCACA) += cacasink GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_MATROSKA) += matroska GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_MONOSCOPE) += monoscope +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_MPG123) += mpg123 GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_MULTIFILE) += multifile GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_MULTIPART) += multipart +GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_OSS) += oss +GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_OSS) += ossaudio +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_OSS4) += oss4 +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_PNG) += png +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_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 GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_RTSP) += rtsp GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_SHAPEWIPE) += shapewipe +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_SHOUT2) += shout2 GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_SMPTE) += smpte +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_SOUP) += soup GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_SPECTRUM) += spectrum +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_SPEEX) += speex +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_TAGLIB) += taglib +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_TWOLAME) += twolame GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_UDP) += udp +GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_V4L2) += v4l2 +GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_V4L2) += video4linux2 +GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_V4L2_LIBV4L2) += v4l2-libv4l2 GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_VIDEOBOX) += videobox GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_VIDEOCROP) += videocrop GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_VIDEOFILTER) += videofilter GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_VIDEOMIXER) += videomixer +GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_VPX) += vpx 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_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_Y4M) += y4m GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_Y4M) += y4menc -GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_OSS) += oss -GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_OSS) += ossaudio -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_OSS4) += oss4 -GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_GST_V4L2) += gst_v4l2 v4l2-probe -GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_GST_V4L2) += video4linux2 -GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_X) += x -GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_X) += ximagesrc -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_AALIB) += aalib -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_CAIRO) += cairo -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_FLAC) += flac -GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_GDK_PIXBUF) += gdk_pixbuf -GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_GDK_PIXBUF) += gdkpixbuf -GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_GTK3) += gtk3 -GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_GTK3) += gtk -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_JACK) += jack -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_JPEG) += jpeg -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_LAME) += lame -GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_LIBCACA) += libcaca -GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_LIBCACA) += cacasink -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_LIBDV) += libdv -GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_LIBPNG) += libpng -GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_LIBPNG) += png -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_MPG123) += mpg123 -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_QT) += qt -GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_QT) += qmlgl -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_DV1394) += dv1394 -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_SHOUT2) += shout2 -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_SOUP) += soup -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_SPEEX) += speex -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_TAGLIB) += taglib -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_TWOLAME) += twolame -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_VPX) += vpx -GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_WAVPACK) += wavpack -GST_PLUGINS_GOOD1_ENABLEC-y += $(GST_PLUGINS_GOOD1_ENABLE-y) GST_PLUGINS_GOOD1_ENABLEC- += $(GST_PLUGINS_GOOD1_ENABLE-) +GST_PLUGINS_GOOD1_ENABLEC-y += $(GST_PLUGINS_GOOD1_ENABLE-y) GST_PLUGINS_GOOD1_ENABLEP-y += $(GST_PLUGINS_GOOD1_ENABLE-y) ifdef PTXCONF_KERNEL_HEADER # for new linux/videodev2.h from kernel headers -GST_PLUGINS_GOOD1_CONF_ENV := \ - $(CROSS_ENV) \ - CPPFLAGS="$(CROSS_CPPFLAGS) -isystem $(KERNEL_HEADERS_INCLUDE_DIR)" +GST_PLUGINS_GOOD1_CPPFLAGS := -isystem $(KERNEL_HEADERS_INCLUDE_DIR) +endif +ifdef PTXCONF_GST_PLUGINS_GOOD1_QT5 +GST_PLUGINS_GOOD1_PATH := PATH=$(PTXDIST_SYSROOT_CROSS)/bin/qt5:$(CROSS_PATH) endif # -# autoconf +# meson # -GST_PLUGINS_GOOD1_CONF_TOOL := autoconf +GST_PLUGINS_GOOD1_CONF_TOOL = meson GST_PLUGINS_GOOD1_CONF_OPT = \ - $(CROSS_AUTOCONF_USR) \ - $(GSTREAMER1_GENERIC_CONF_OPT) \ + $(CROSS_MESON_USR) \ + $(call GSTREAMER1_GENERIC_CONF_OPT,GStreamer Good Plug-ins) \ + -Dbz2=$(call ptx/endis,PTXCONF_GST_PLUGINS_GOOD1_BZ2)d \ + -Ddirectsound=disabled \ + -Dorc=enabled \ + -Dosxaudio=disabled \ + -Dosxvideo=disabled \ + -Dv4l2-gudev=$(call ptx/endis,PTXCONF_GST_PLUGINS_GOOD1_V4L2)d \ + -Dv4l2-probe=$(call ptx/truefalse,PTXCONF_GST_PLUGINS_GOOD1_V4L2) \ + -Dwaveform=disabled \ + -Dximagesrc-xdamage=$(call ptx/endis,PTXCONF_GST_PLUGINS_GOOD1_XIMAGESRC)d \ + -Dximagesrc-xfixes=$(call ptx/endis,PTXCONF_GST_PLUGINS_GOOD1_XIMAGESRC)d \ + -Dximagesrc-xshm=$(call ptx/endis,PTXCONF_GST_PLUGINS_GOOD1_XIMAGESRC)d \ + +foo = \ --enable-external \ --enable-experimental \ \ @@ -143,25 +156,19 @@ GST_PLUGINS_GOOD1_CONF_OPT = \ --disable-aalibtest \ --$(call ptx/endis,PTXCONF_GST_PLUGINS_GOOD1_ZLIB)-zlib \ --$(call ptx/endis,PTXCONF_GST_PLUGINS_GOOD1_BZ2)-bz2 \ - --$(call ptx/wwo,PTXCONF_GST_PLUGINS_GOOD1_GST_V4L2)-gudev \ + --$(call ptx/wwo,PTXCONF_GST_PLUGINS_GOOD1_V4L2)-gudev \ --without-jpeg-mmx \ - --$(call ptx/wwo,PTXCONF_GST_PLUGINS_GOOD1_GST_V4L2_LIBV4L2)-libv4l2 + --$(call ptx/wwo,PTXCONF_GST_PLUGINS_GOOD1_V4L2_LIBV4L2)-libv4l2 -# -# the --with-plugins sadly only applies to depencyless plugings -# and when no plugins are sellected it builds them all. So -# --with-plugins is useless, so we generate a --enable-* -# and --disable-* below -# ifneq ($(call remove_quotes,$(GST_PLUGINS_GOOD1_ENABLEC-y)),) -GST_PLUGINS_GOOD1_CONF_OPT += --enable-$(subst $(space),$(space)--enable-,$(strip $(GST_PLUGINS_GOOD1_ENABLEC-y))) +GST_PLUGINS_GOOD1_CONF_OPT += $(addsuffix =enabled, $(addprefix -D, $(GST_PLUGINS_GOOD1_ENABLEC-y))) endif ifneq ($(call remove_quotes,$(GST_PLUGINS_GOOD1_ENABLEC-)),) -GST_PLUGINS_GOOD1_CONF_OPT += --disable-$(subst $(space),$(space)--disable-,$(strip $(GST_PLUGINS_GOOD1_ENABLEC-))) +GST_PLUGINS_GOOD1_CONF_OPT += $(addsuffix =disabled, $(addprefix -D, $(GST_PLUGINS_GOOD1_ENABLEC-))) endif -ifdef PTXCONF_GST_PLUGINS_GOOD1_QT +ifdef PTXCONF_GST_PLUGINS_GOOD1_QT5 GST_PLUGINS_GOOD1_MAKE_ENV := \ ICECC_REMOTE_CPP=0 endif @@ -179,10 +186,10 @@ $(STATEDIR)/gst-plugins-good1.targetinstall: @$(call install_fixup, gst-plugins-good1,AUTHOR,"Robert Schwebel ") @$(call install_fixup, gst-plugins-good1,DESCRIPTION,missing) - @for plugin in $(GST_PLUGINS_GOOD1_ENABLEP-y); do \ +# # install all activated plugins + @$(foreach plugin,$(GST_PLUGINS_GOOD1_ENABLEP-y), \ $(call install_copy, gst-plugins-good1, 0, 0, 0644, -, \ - /usr/lib/gstreamer-1.0/libgst$${plugin}.so); \ - done + /usr/lib/gstreamer-1.0/libgst$(plugin).so)$(ptx/nl)) @$(call install_finish, gst-plugins-good1) -- cgit v1.2.3