diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-04-22 19:41:54 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-04-25 14:52:25 +0200 |
commit | efa65e630b27d99470f85565199f2c9f2ae8b1a1 (patch) | |
tree | 211485901a8a9b07aa57df1c58f76fb6222afa6c /rules/gst-plugins-base1.make | |
parent | 4ad71c60b016f66dae36049ad975784b05ceb88f (diff) | |
download | ptxdist-efa65e630b27d99470f85565199f2c9f2ae8b1a1.tar.gz ptxdist-efa65e630b27d99470f85565199f2c9f2ae8b1a1.tar.xz |
gst-plugins-base1: version bump 1.14.4 -> 1.16.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/gst-plugins-base1.make')
-rw-r--r-- | rules/gst-plugins-base1.make | 134 |
1 files changed, 72 insertions, 62 deletions
diff --git a/rules/gst-plugins-base1.make b/rules/gst-plugins-base1.make index 1bc7e746a..d601f5952 100644 --- a/rules/gst-plugins-base1.make +++ b/rules/gst-plugins-base1.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_BASE1) += gst-plugins-base1 # # Paths and names # -GST_PLUGINS_BASE1_VERSION := 1.14.4 -GST_PLUGINS_BASE1_MD5 := 4dbe20c1bf44191c2b8833234df5cb2a +GST_PLUGINS_BASE1_VERSION := 1.16.0 +GST_PLUGINS_BASE1_MD5 := 41dde92930710c75cdb49169c5cc6dfc GST_PLUGINS_BASE1 := gst-plugins-base-$(GST_PLUGINS_BASE1_VERSION) GST_PLUGINS_BASE1_SUFFIX := tar.xz GST_PLUGINS_BASE1_URL := http://gstreamer.freedesktop.org/src/gst-plugins-base/$(GST_PLUGINS_BASE1).$(GST_PLUGINS_BASE1_SUFFIX) @@ -30,89 +30,101 @@ GST_PLUGINS_BASE1_LICENSE := LGPL-2.0-or-later # ---------------------------------------------------------------------------- GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_ADDER) += adder +GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_ALSA) += alsa GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_APP) += app GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_AUDIOCONVERT) += audioconvert GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_AUDIOMIXER) += audiomixer GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_AUDIORATE) += audiorate +GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_AUDIORESAMPLE) += audioresample GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_AUDIOTESTSRC) += audiotestsrc +GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_CDPARANOIA) += cdparanoia +GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_COMPOSITOR) += compositor GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_ENCODING) += encoding -GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_VIDEOCONVERT) += videoconvert GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_GIO) += gio GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_GL) += gl GST_PLUGINS_BASE1_ENABLEP-$(PTXCONF_GST_PLUGINS_BASE1_GL) += opengl +GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_LIBVISUAL) += libvisual +GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_OGG) += ogg +GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_OPUS) += opus +GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_OVERLAYCOMPOSITION) += overlaycomposition +GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_PANGO) += pango +GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_PBTYPES) += pbtypes GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_PLAYBACK) += playback -GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_AUDIORESAMPLE) += audioresample +GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_RAWPARSE) += rawparse GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_SUBPARSE) += subparse GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_TCP) += tcp +GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_THEORA) += theora +GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_TREMOR) += tremor +GST_PLUGINS_BASE1_ENABLEP-$(PTXCONF_GST_PLUGINS_BASE1_TREMOR) += ivorbisdec GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_TYPEFIND) += typefind GST_PLUGINS_BASE1_ENABLEP-$(PTXCONF_GST_PLUGINS_BASE1_TYPEFIND) += typefindfunctions -GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_VIDEOTESTSRC) += videotestsrc +GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_VIDEOCONVERT) += videoconvert GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_VIDEORATE) += videorate GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_VIDEOSCALE) += videoscale +GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_VIDEOTESTSRC) += videotestsrc GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_VOLUME) += volume -GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_X) += x -GST_PLUGINS_BASE1_ENABLEP-$(PTXCONF_GST_PLUGINS_BASE1_X) += ximagesink -GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_XVIDEO) += xvideo -GST_PLUGINS_BASE1_ENABLEP-$(PTXCONF_GST_PLUGINS_BASE1_XVIDEO) += xvimagesink -GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_ALSA) += alsa -GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_CDPARANOIA) += cdparanoia -GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_IVORBIS) += ivorbis -GST_PLUGINS_BASE1_ENABLEP-$(PTXCONF_GST_PLUGINS_BASE1_IVORBIS) += ivorbisdec -GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_LIBVISUAL) += libvisual -GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_OGG) += ogg -GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_OPENGL) += opengl -GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_GLES2) += gles2 -GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_EGL) += egl -GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_EGL_WAYLAND) += wayland -GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_GLX) += glx -GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_OPUS) += opus -GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_PANGO) += pango -GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_RAWPARSE) += rawparse -GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_THEORA) += theora GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_VORBIS) += vorbis -GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_X11) += x11 +GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_X) += x11 xshm xvideo +GST_PLUGINS_BASE1_ENABLEP-$(PTXCONF_GST_PLUGINS_BASE1_X) += ximagesink xvimagesink -GST_PLUGINS_BASE1_ENABLEC-y += $(GST_PLUGINS_BASE1_ENABLE-y) -GST_PLUGINS_BASE1_ENABLEC- += $(GST_PLUGINS_BASE1_ENABLE-) -GST_PLUGINS_BASE1_ENABLEP-y += $(GST_PLUGINS_BASE1_ENABLE-y) +GST_PLUGINS_BASE1_ENABLEC- += $(GST_PLUGINS_BASE1_ENABLE-) +GST_PLUGINS_BASE1_ENABLEC-y += $(GST_PLUGINS_BASE1_ENABLE-y) +GST_PLUGINS_BASE1_ENABLEP-y += $(GST_PLUGINS_BASE1_ENABLE-y) + +GST_PLUGINS_BASE1_GL_API := +ifdef PTXCONF_GST_PLUGINS_BASE1_GLES2 +GST_PLUGINS_BASE1_GL_API += gles2 +endif +ifdef PTXCONF_GST_PLUGINS_BASE1_OPENGL +GST_PLUGINS_BASE1_GL_API += opengl +endif +GST_PLUGINS_BASE1_GL_API := $(subst $(space),$(comma),$(strip $(GST_PLUGINS_BASE1_GL_API))) + +GST_PLUGINS_BASE1_GL_PLATFORM := +ifdef PTXCONF_GST_PLUGINS_BASE1_EGL +GST_PLUGINS_BASE1_GL_PLATFORM += egl +endif +ifdef PTXCONF_GST_PLUGINS_BASE1_GLX +GST_PLUGINS_BASE1_GL_PLATFORM += glx +endif +GST_PLUGINS_BASE1_GL_PLATFORM := $(subst $(space),$(comma),$(strip $(GST_PLUGINS_BASE1_GL_PLATFORM))) + +GST_PLUGINS_BASE1_GL_WINSYS := gbm +ifdef PTXCONF_GST_PLUGINS_BASE1_EGL_WAYLAND +GST_PLUGINS_BASE1_GL_WINSYS += wayland +endif +ifdef PTXCONF_GST_PLUGINS_BASE1_X11 +GST_PLUGINS_BASE1_GL_WINSYS += x11 +endif +GST_PLUGINS_BASE1_GL_WINSYS := $(subst $(space),$(comma),$(strip $(GST_PLUGINS_BASE1_GL_WINSYS))) # -# autoconf +# meson # -GST_PLUGINS_BASE1_CONF_TOOL = autoconf +GST_PLUGINS_BASE1_CONF_TOOL = meson GST_PLUGINS_BASE1_CONF_OPT = \ - $(CROSS_AUTOCONF_USR) \ - $(GSTREAMER1_GENERIC_CONF_OPT) \ - \ - --enable-external \ - --disable-experimental \ - --$(call ptx/endis, PTXCONF_GSTREAMER1_INTROSPECTION)-introspection \ - \ - --enable-orc \ - \ - --disable-wgl \ - --disable-cocoa \ - --disable-dispmanx \ - --disable-iso-codes \ - --$(call ptx/endis,PTXCONF_GST_PLUGINS_BASE1_ZLIB)-zlib \ - --$(call ptx/endis,PTXCONF_GST_PLUGINS_BASE1_XSHM)-xshm - -# --with-plugins=foo,bar,baz only works for depencyless plugins and -# when no plugins are given it falls back to its default which is -# to enable all plugins, so --with-plugins is useless for us. + $(CROSS_MESON_USR) \ + $(call GSTREAMER1_GENERIC_CONF_OPT,GStreamer Base Plug-ins) \ + -Daudioresample_format=auto \ + -Degl_module_name=libEGL \ + -Dgl-graphene=disabled \ + -Dgl-jpeg=$(call ptx/endis, PTXCONF_GST_PLUGINS_BASE1_OPENGL)d \ + -Dgl-png=$(call ptx/endis, PTXCONF_GST_PLUGINS_BASE1_OPENGL)d \ + -Dgl_api=$(GST_PLUGINS_BASE1_GL_API) \ + -Dgl_platform=$(GST_PLUGINS_BASE1_GL_PLATFORM) \ + -Dgl_winsys=$(GST_PLUGINS_BASE1_GL_WINSYS) \ + -Dgtk_doc=disabled \ + -Dintrospection=$(call ptx/endis,PTXCONF_GSTREAMER1_INTROSPECTION)d \ + -Diso-codes=disabled \ + -Dorc=enabled \ + -Dtools=$(call ptx/endis, PTXCONF_GST_PLUGINS_BASE1_INSTALL_TOOLS)d ifneq ($(call remove_quotes,$(GST_PLUGINS_BASE1_ENABLEC-y)),) -GST_PLUGINS_BASE1_CONF_OPT += --enable-$(subst $(space),$(space)--enable-,$(strip $(GST_PLUGINS_BASE1_ENABLEC-y))) +GST_PLUGINS_BASE1_CONF_OPT += $(addsuffix =enabled, $(addprefix -D, $(GST_PLUGINS_BASE1_ENABLEC-y))) endif ifneq ($(call remove_quotes,$(GST_PLUGINS_BASE1_ENABLEC-)),) -GST_PLUGINS_BASE1_CONF_OPT += --disable-$(subst $(space),$(space)--disable-,$(strip $(GST_PLUGINS_BASE1_ENABLEC-))) -endif - -ifdef PTXCONF_GSTREAMER1_INTROSPECTION -GST_PLUGINS_BASE1_LDFLAGS := \ - -Wl,-rpath-link,$(GST_PLUGINS_BASE1_DIR)/gst-libs/gst/tag/.libs \ - -Wl,-rpath-link,$(GST_PLUGINS_BASE1_DIR)/gst-libs/gst/rtp/.libs +GST_PLUGINS_BASE1_CONF_OPT += $(addsuffix =disabled, $(addprefix -D, $(GST_PLUGINS_BASE1_ENABLEC-))) endif # ---------------------------------------------------------------------------- @@ -140,14 +152,12 @@ ifdef PTXCONF_GST_PLUGINS_BASE1_INSTALL_TOOLS endif # install all activated libs - @cd $(GST_PLUGINS_BASE1_PKGDIR)/usr/lib/ && \ - for libs in `find -name "*-1.0.so" -printf '%f\n'`; do \ - $(call install_lib, gst-plugins-base1, 0, 0, 0644, $${libs%.so}); \ - done + @$(foreach lib,$(basename $(notdir $(wildcard $(GST_PLUGINS_BASE1_PKGDIR)/usr/lib/*-1.0.so))), \ + $(call install_lib, gst-plugins-base1, 0, 0, 0644, $(lib))$(ptx/nl)) @$(foreach plugin, $(GST_PLUGINS_BASE1_ENABLEP-y), \ $(call install_copy, gst-plugins-base1, 0, 0, 0644, -, \ - /usr/lib/gstreamer-1.0/libgst$(plugin).so);) + /usr/lib/gstreamer-1.0/libgst$(plugin).so)$(ptx/nl)) ifdef PTXCONF_GSTREAMER1_INTROSPECTION @$(call install_tree, gst-plugins-base1, 0, 0, -, \ |