convert gstreamer1 package and plugins to meson
cover convert gstreamer1 package and plugins to meson
From: Adam Duskett <[email protected]>
This patch series converts gstreamer1 and the plugins
(base, good, bad, and ugly) to meson. The reason to do this is because 1.16.0 is the last version that will support autotools.
Hopefully this looks clean enough to merge. I will have a few other subsequent patches to submit after the initial meson conversion is complete, but so far I am happy with the results.
Adam Duskett (1):
package/gstreamer1/gstreamer1: Convert package to meson
package/gstreamer1/gstreamer1/gstreamer1.mk | 32 ++++++++++++--------- 1 file changed, 19 insertions(+), 13 deletions(-)
Signature · 1 line
2.21.0
PATCH 1/6 package/gstreamer1/gstreamer1: Convert package type to meson
From: Adam Duskett <[email protected]>
Gstreamer 1.16.0 is the last version to support autotools, and will be removed in the next version.
Other changes:
- Valgrind is no longer an option, and is checked via headers. So this option is removed and instead changed to a package check and a dependency.
- Add the following new meson-specific options:
- -DDgtk_doc=disabled
- -Dglib-asserts=disabled
- -Dglib-checks=disabled
--- package/gstreamer1/gstreamer1/gstreamer1.mk | 32 ++++++++++++--------- 1 file changed, 19 insertions(+), 13 deletions(-)
package/gstreamer1/gstreamer1/gstreamer1.mk +19 -13
@@ -12,18 +12,20 @@ GSTREAMER1_LICENSE_FILES = COPYING GSTREAMER1_LICENSE = LGPL-2.0+, LGPL-2.1+ GSTREAMER1_CONF_OPTS = \ - --disable-examples \ - --disable-tests \ - --disable-failing-tests \ - --disable-valgrind \ - --disable-benchmarks \ - --disable-introspection \ - $(if $(BR2_PACKAGE_GSTREAMER1_CHECK),,--disable-check) \ - $(if $(BR2_PACKAGE_GSTREAMER1_TRACE),,--disable-trace) \ - $(if $(BR2_PACKAGE_GSTREAMER1_PARSE),,--disable-parse) \ - $(if $(BR2_PACKAGE_GSTREAMER1_GST_DEBUG),,--disable-gst-debug) \ - $(if $(BR2_PACKAGE_GSTREAMER1_PLUGIN_REGISTRY),,--disable-registry) \ - $(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),,--disable-tools) + -Dexamples=disabled \ + -Dtests=disabled \ + -Dbenchmarks=disabled \ + -Dgtk_doc=disabled \ + -Dintrospection=disabled \ + -Dgobject-cast-checks=disabled \ + -Dglib-asserts=disabled \ + -Dglib-checks=disabled \ + -Dcheck=$(if $(BR2_PACKAGE_GSTREAMER1_CHECK),enabled,disabled) \ + -Dtracer_hooks=$(if $(BR2_PACKAGE_GSTREAMER1_TRACE),true,false) \ + -Doption-parsing=$(if $(BR2_PACKAGE_GSTREAMER1_PARSE),true,false) \ + -Dgst_debug=$(if $(BR2_PACKAGE_GSTREAMER1_GST_DEBUG),true,false) \ + -Dregistry=$(if $(BR2_PACKAGE_GSTREAMER1_PLUGIN_REGISTRY),true,false) \ + -Dtools=$(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),enabled,disabled) GSTREAMER1_DEPENDENCIES = \ host-bison \
@@ -32,4 +34,8 @@ GSTREAMER1_DEPENDENCIES = \ libglib2 \ $(if $(BR2_PACKAGE_LIBUNWIND),libunwind) -$(eval $(autotools-package)) +ifeq ($(BR2_PACKAGE_VALGRIND),y) +GSTREAMER1_DEPENDENCIES += valgrind +endif + +$(eval $(meson-package))
Signature · 1 line
2.21.0
PATCH 1/6 package/gstreamer1/gstreamer1: Convert package type to meson
Hello Adam,
Quoted 4 lines · aduskett at gmail.com
From: Adam Duskett <[email protected]>
Gstreamer 1.16.0 is the last version to support autotools, and will be removed in the next version.
This text is more one for a cover-letter?
Quoted 4 lines
Other changes:
- Valgrind is no longer an option, and is checked via headers. So this option is removed and instead changed to a package check and a dependency.
Or (better?):
The meson build provides no 'disable-valgrind' option but checks for the availability of valgrind/valgrind.h, so add an optional valgrind dependency instead.
Quoted 3 lines
- Add the following new meson-specific options:
- -DDgtk_doc=disabled
s/DDgtk_doc/Dgtk_doc/
Quoted 2 lines
- -Dglib-asserts=disabled
- -Dglib-checks=disabled
missing:
- -Dgobject-cast-checks=disabled
Quoted 25 lines
Signed-off-by Adam Duskett <[email protected]>--- package/gstreamer1/gstreamer1/gstreamer1.mk | 32 ++++++++++++--------- 1 file changed, 19 insertions(+), 13 deletions(-)package/gstreamer1/gstreamer1/gstreamer1.mk +0
-11@@ -12,18 +12,20 @@ GSTREAMER1_LICENSE_FILES = COPYING GSTREAMER1_LICENSE = LGPL-2.0+, LGPL-2.1+ GSTREAMER1_CONF_OPTS = \ - --disable-examples \ - --disable-tests \ - --disable-failing-tests \ - --disable-valgrind \ - --disable-benchmarks \ - --disable-introspection \ - $(if $(BR2_PACKAGE_GSTREAMER1_CHECK),,--disable-check) \ - $(if $(BR2_PACKAGE_GSTREAMER1_TRACE),,--disable-trace) \ - $(if $(BR2_PACKAGE_GSTREAMER1_PARSE),,--disable-parse) \ - $(if $(BR2_PACKAGE_GSTREAMER1_GST_DEBUG),,--disable-gst-debug) \ - $(if $(BR2_PACKAGE_GSTREAMER1_PLUGIN_REGISTRY),,--disable-registry) \
package/gstreamer1/gstreamer1/gstreamer1.mk GSTREAMER1_LICENSE_FILES = COPYING · line 23
Quoted 10 lines
package/gstreamer1/gstreamer1/gstreamer1.mk +8
-1- $(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),,--disable-tools) + -Dexamples=disabled \ + -Dtests=disabled \ + -Dbenchmarks=disabled \ + -Dgtk_doc=disabled \ + -Dintrospection=disabled \ + -Dgobject-cast-checks=disabled \ + -Dglib-asserts=disabled \ + -Dglib-checks=disabled \
Not sure if it is the best to disable these three checks above as default...the meson_options.txt files states 'auto = enabled for development, disabled for stable releases'...so maybe you are right with this decision...
Quoted 10 lines
package/gstreamer1/gstreamer1/gstreamer1.mk +6
-0+ -Dcheck=$(if $(BR2_PACKAGE_GSTREAMER1_CHECK),enabled,disabled) \ + -Dtracer_hooks=$(if $(BR2_PACKAGE_GSTREAMER1_TRACE),true,false) \ + -Doption-parsing=$(if $(BR2_PACKAGE_GSTREAMER1_PARSE),true,false) \ + -Dgst_debug=$(if $(BR2_PACKAGE_GSTREAMER1_GST_DEBUG),true,false) \ + -Dregistry=$(if $(BR2_PACKAGE_GSTREAMER1_PLUGIN_REGISTRY),true,false) \ + -Dtools=$(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),enabled,disabled) GSTREAMER1_DEPENDENCIES = \package/gstreamer1/gstreamer1/gstreamer1.mk +0
-0host-bison \
package/gstreamer1/gstreamer1/gstreamer1.mk GSTREAMER1_DEPENDENCIES = \ · line 39
Quoted 7 lines
package/gstreamer1/gstreamer1/gstreamer1.mk +3
-1@@ -32,4 +34,8 @@ GSTREAMER1_DEPENDENCIES = \ libglib2 \ $(if $(BR2_PACKAGE_LIBUNWIND),libunwind) -$(eval $(autotools-package)) +ifeq ($(BR2_PACKAGE_VALGRIND),y) +GSTREAMER1_DEPENDENCIES += valgrind +endif
Why not the short form as above for libunwind? e.g.
... \
$(if $(BR2_PACKAGE_VALGRIND),valgrind)package/gstreamer1/gstreamer1/gstreamer1.mk GSTREAMER1_DEPENDENCIES = \ · line 41
Quoted 2 lines
package/gstreamer1/gstreamer1/gstreamer1.mk +2
-0+ +$(eval $(meson-package))
Otherwise looks very similar to my draft from April, see [1]
Regards,
Peter
[1] http://lists.busybox.net/pipermail/buildroot/2019-April/249008.html
PATCH 2/6 package/gstreamer1/gst1-plugins-base: Convert package type to meson
In reply to aduskett at gmail.comFrom: Adam Duskett <[email protected]>
GStreamer 1.16.0 is the last version to support autotools, which is removed in the next version.
Other changes:
- Valgrind is no longer an option and is checked via headers, so the option has been removed entirely, because the Valgrind package check is now in the base gstreamer1 package.
- zlib no longer has an option and is also checked via headers.
- Add the following new meson-specific options:
- -Dgtk_doc=disabled
- -Dglib-asserts=disabled
- -Dglib-checks=disabled
- Three config options are comma separated strings. These options are:
- gl_api
- gl_platform
- gl_winsys
The lists can be passed empty without error. As such, the logic now creats a list such as:
-Dgl_api='opengl,gles2'
-Dgl_platform='glx,egl'
-Dgl_winsys='x11,wayland'
- Remove the egl BASE_CONF_ENV CPPFLAGS and LIBS options, as meson finds the include paths and libraries correctly during the configure stage.
--- .../gst1-plugins-base/gst1-plugins-base.mk | 183 +++++++++--------- 1 file changed, 89 insertions(+), 94 deletions(-)
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +89 -94
@@ -12,267 +12,262 @@ GST1_PLUGINS_BASE_LICENSE_FILES = COPYING GST1_PLUGINS_BASE_LICENSE = LGPL-2.0+, LGPL-2.1+ GST1_PLUGINS_BASE_CONF_OPTS = \ - --disable-examples \ - --disable-valgrind \ - --disable-introspection + -Dexamples=disabled \ + -Dtests=disabled \ + -Dgobject-cast-checks=disabled \ + -Dglib-asserts=disabled \ + -Dglib-checks=disabled \ + -Dgtk_doc=disabled \ + -Dintrospection=disabled # Options which require currently unpackaged libraries GST1_PLUGINS_BASE_CONF_OPTS += \ - --disable-cdparanoia \ - --disable-libvisual \ - --disable-iso-codes + -Dcdparanoia=disabled \ + -Dlibvisual=disabled \ + -Diso-codes=disabled GST1_PLUGINS_BASE_DEPENDENCIES = gstreamer1 # These plugins are listed in the order from ./configure --help ifeq ($(BR2_PACKAGE_ORC),y) GST1_PLUGINS_BASE_DEPENDENCIES += orc -GST1_PLUGINS_BASE_CONF_OPTS += --enable-orc +GST1_PLUGINS_BASE_CONF_OPTS += -Dorc=enabled +else +GST1_PLUGINS_BASE_CONF_OPTS += -Dorc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-opengl +GST1_PLUGINS_BASE_GL_API_LIST = opengl +GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=enabled GST1_PLUGINS_BASE_DEPENDENCIES += libgl libglu else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-opengl +GST1_PLUGINS_BASE_CONF_OPTS += -Dgl=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLES2),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-gles2 +GST1_PLUGINS_BASE_GL_API_LIST += gles2 GST1_PLUGINS_BASE_DEPENDENCIES += libgles -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-gles2 endif +GST1_PLUGINS_BASE_CONF_OPTS += -Dgl_api='$(subst $(space),$(comma),$(GST1_PLUGINS_BASE_GL_API_LIST))' ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLX),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-glx +GST1_PLUGINS_BASE_GL_PLATFORM_LIST += glx GST1_PLUGINS_BASE_DEPENDENCIES += xorgproto xlib_libXrender -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-glx endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-egl +GST1_PLUGINS_BASE_GL_PLATFORM_LIST += egl GST1_PLUGINS_BASE_DEPENDENCIES += libegl -GST1_PLUGINS_BASE_CONF_ENV += \ - CPPFLAGS="$(TARGET_CPPFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags egl`" \ - LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs egl`" -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-egl endif +GST1_PLUGINS_BASE_CONF_OPTS += -Dgl_platform='$(subst $(space),$(comma),$(GST1_PLUGINS_BASE_GL_PLATFORM_LIST))' ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_X11),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-x11 +GST1_PLUGINS_BASE_WINSYS_LIST += x11 GST1_PLUGINS_BASE_DEPENDENCIES += xlib_libX11 xlib_libXext -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-x11 endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_WAYLAND),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-wayland +GST1_PLUGINS_BASE_WINSYS_LIST += wayland GST1_PLUGINS_BASE_DEPENDENCIES += wayland wayland-protocols -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-wayland endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_DISPMANX),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-dispmanx +GST1_PLUGINS_BASE_WINSYS_LIST += dispmax GST1_PLUGINS_BASE_DEPENDENCIES += rpi-userland -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-dispmanx endif +GST1_PLUGINS_BASE_CONF_OPTS += -Dgl_winsys='$(subst $(space),$(comma),$(GST1_PLUGINS_BASE_WINSYS_LIST))' ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ADDER),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-adder +GST1_PLUGINS_BASE_CONF_OPTS += -Dadder=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-adder +GST1_PLUGINS_BASE_CONF_OPTS += -Dadder=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-app +GST1_PLUGINS_BASE_CONF_OPTS += -Dapp=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-app +GST1_PLUGINS_BASE_CONF_OPTS += -Dapp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-audioconvert +GST1_PLUGINS_BASE_CONF_OPTS += -Daudioconvert=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-audioconvert +GST1_PLUGINS_BASE_CONF_OPTS += -Daudioconvert=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-audiomixer +GST1_PLUGINS_BASE_CONF_OPTS += -Daudiomixer=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-audiomixer +GST1_PLUGINS_BASE_CONF_OPTS += -Daudiomixer=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORATE),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-audiorate +GST1_PLUGINS_BASE_CONF_OPTS += -Daudiorate=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-audiorate +GST1_PLUGINS_BASE_CONF_OPTS += -Daudiorate=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-audiotestsrc +GST1_PLUGINS_BASE_CONF_OPTS += -Daudiotestsrc=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-audiotestsrc +GST1_PLUGINS_BASE_CONF_OPTS += -Daudiotestsrc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_COMPOSITOR),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-compositor +GST1_PLUGINS_BASE_CONF_OPTS += -Dcompositor=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-compositor +GST1_PLUGINS_BASE_CONF_OPTS += -Dcompositor=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ENCODING),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-encoding +GST1_PLUGINS_BASE_CONF_OPTS += -Dencoding=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-encoding +GST1_PLUGINS_BASE_CONF_OPTS += -Dencoding=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-videoconvert +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvert=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-videoconvert +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvert=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-gio +GST1_PLUGINS_BASE_CONF_OPTS += -Dgio=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-gio +GST1_PLUGINS_BASE_CONF_OPTS += -Dgio=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OVERLAYCOMPOSITION),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-overlaycomposition +GST1_PLUGINS_BASE_CONF_OPTS += -Doverlaycomposition=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-overlaycomposition +GST1_PLUGINS_BASE_CONF_OPTS += -Doverlaycomposition=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-playback +GST1_PLUGINS_BASE_CONF_OPTS += -Dplayback=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-playback +GST1_PLUGINS_BASE_CONF_OPTS += -Dplayback=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-audioresample +GST1_PLUGINS_BASE_CONF_OPTS += -Daudioresample=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-audioresample +GST1_PLUGINS_BASE_CONF_OPTS += -Daudioresample=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_RAWPARSE),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-rawparse +GST1_PLUGINS_BASE_CONF_OPTS += -Drawparse=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-rawparse +GST1_PLUGINS_BASE_CONF_OPTS += -Drawparse=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_SUBPARSE),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-subparse +GST1_PLUGINS_BASE_CONF_OPTS += -Dsubparse=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-subparse +GST1_PLUGINS_BASE_CONF_OPTS += -Dsubparse=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TCP),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-tcp +GST1_PLUGINS_BASE_CONF_OPTS += -Dtcp=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-tcp +GST1_PLUGINS_BASE_CONF_OPTS += -Dtcp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TYPEFIND),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-typefind +GST1_PLUGINS_BASE_CONF_OPTS += -Dtypefind=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-typefind +GST1_PLUGINS_BASE_CONF_OPTS += -Dtypefind=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-videotestsrc +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideotestsrc=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-videotestsrc +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideotestsrc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-videorate +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideorate=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-videorate +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideorate=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-videoscale +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoscale=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-videoscale +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoscale=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-volume +GST1_PLUGINS_BASE_CONF_OPTS += -Dvolume=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-volume +GST1_PLUGINS_BASE_CONF_OPTS += -Dvolume=disabled endif +# Zlib is checked for headers and is not an option. ifeq ($(BR2_PACKAGE_ZLIB),y) GST1_PLUGINS_BASE_DEPENDENCIES += zlib -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-zlib endif ifeq ($(BR2_PACKAGE_XORG7),y) GST1_PLUGINS_BASE_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv GST1_PLUGINS_BASE_CONF_OPTS += \ - --enable-x \ - --enable-xshm \ - --enable-xvideo + -Dx11=enabled \ + -Dxshm=enabled \ + -Dxvideo=enabled else GST1_PLUGINS_BASE_CONF_OPTS += \ - --disable-x \ - --disable-xshm \ - --disable-xvideo + -Dx11=disabled \ + -Dxshm=disabled \ + -Dxvideo=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA),y) GST1_PLUGINS_BASE_DEPENDENCIES += alsa-lib +GST1_PLUGINS_BASE_CONF_OPTS += -Dalsa=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-alsa +GST1_PLUGINS_BASE_CONF_OPTS += -Dalsa=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TREMOR),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-ivorbis +GST1_PLUGINS_BASE_CONF_OPTS += -Dtremor=enabled GST1_PLUGINS_BASE_DEPENDENCIES += tremor else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-ivorbis +GST1_PLUGINS_BASE_CONF_OPTS += -Dtremor=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OPUS),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-opus +GST1_PLUGINS_BASE_CONF_OPTS += -Dopus=enabled GST1_PLUGINS_BASE_DEPENDENCIES += opus else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-opus +GST1_PLUGINS_BASE_CONF_OPTS += -Dopus=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OGG),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-ogg +GST1_PLUGINS_BASE_CONF_OPTS += -Dogg=enabled GST1_PLUGINS_BASE_DEPENDENCIES += libogg else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-ogg +GST1_PLUGINS_BASE_CONF_OPTS += -Dogg=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-pango +GST1_PLUGINS_BASE_CONF_OPTS += -Dpango=enabled GST1_PLUGINS_BASE_DEPENDENCIES += pango else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-pango +GST1_PLUGINS_BASE_CONF_OPTS += -Dpango=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_THEORA),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-theora +GST1_PLUGINS_BASE_CONF_OPTS += -Dtheora=enabled GST1_PLUGINS_BASE_DEPENDENCIES += libtheora else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-theora +GST1_PLUGINS_BASE_CONF_OPTS += -Dtheora=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VORBIS),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-vorbis +GST1_PLUGINS_BASE_CONF_OPTS += -Dvorbis=enabled GST1_PLUGINS_BASE_DEPENDENCIES += libvorbis else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-vorbis +GST1_PLUGINS_BASE_CONF_OPTS += -Dvorbis=disabled endif -$(eval $(autotools-package)) +$(eval $(meson-package))
Signature · 1 line
2.21.0
PATCH 3/6 package/gstreamer1/gst1-plugins-good: Convert package type to meson
In reply to aduskett at gmail.comFrom: Adam Duskett <[email protected]>
GStreamer 1.16.0 is the last version to support autotools, and will be removed in the next version.
Other changes:
- Valgrind is no longer an option and is checked via headers, so the option has been removed entirely, because the Valgrind package check is now in the base gstreamer1 package.
- zlib no longer has an option and is also checked via headers.
--- .../gst1-plugins-good/gst1-plugins-good.mk | 301 +++++++++--------- 1 file changed, 149 insertions(+), 152 deletions(-)
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +149 -152
@@ -11,457 +11,454 @@ GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING GST1_PLUGINS_GOOD_LICENSE = LGPL-2.1+ GST1_PLUGINS_GOOD_CONF_OPTS = \ - --disable-valgrind \ - --disable-examples \ - --disable-directsound \ - --disable-waveform \ - --disable-sunaudio \ - --disable-osx_audio \ - --disable-osx_video \ - --disable-aalib \ - --disable-aalibtest \ - --disable-libcaca + -Dexamples=disabled \ + -Dtests=disabled \ + -Ddirectsound=disabled \ + -Dwaveform=disabled \ + -Dosxaudio=disabled \ + -Dosxvideo=disabled \ + -Daalib=disabled \ + -Dlibcaca=disabled # Options which require currently unpackaged libraries GST1_PLUGINS_GOOD_CONF_OPTS += \ - --disable-libdv \ - --disable-dv1394 \ - --disable-shout2 + -Ddv=disabled \ + -Ddv1394=disabled \ + -Dshout2=disabled GST1_PLUGINS_GOOD_DEPENDENCIES = gstreamer1 gst1-plugins-base ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_JACK),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-jack +GST1_PLUGINS_GOOD_CONF_OPTS += -Djack=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += jack2 else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-jack +GST1_PLUGINS_GOOD_CONF_OPTS += -Djack=disabled endif ifeq ($(BR2_PACKAGE_LIBV4L),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --with-libv4l2 +GST1_PLUGINS_GOOD_CONF_OPTS += -Dv4l2-libv4l2=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += libv4l else -GST1_PLUGINS_GOOD_CONF_OPTS += --without-libv4l2 +GST1_PLUGINS_GOOD_CONF_OPTS += -Dv4l2-libv4l2=disabled endif ifeq ($(BR2_PACKAGE_ORC),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-orc +GST1_PLUGINS_GOOD_CONF_OPTS += -Dorc=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += orc endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ALPHA),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-alpha +GST1_PLUGINS_GOOD_CONF_OPTS += -Dalpha=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-alpha +GST1_PLUGINS_GOOD_CONF_OPTS += -Dalpha=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_APETAG),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-apetag +GST1_PLUGINS_GOOD_CONF_OPTS += -Dapetag=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-apetag +GST1_PLUGINS_GOOD_CONF_OPTS += -Dapetag=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-audiofx +GST1_PLUGINS_GOOD_CONF_OPTS += -Daudiofx=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-audiofx +GST1_PLUGINS_GOOD_CONF_OPTS += -Daudiofx=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-audioparsers +GST1_PLUGINS_GOOD_CONF_OPTS += -Daudioparsers=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-audioparsers +GST1_PLUGINS_GOOD_CONF_OPTS += -Daudioparsers=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUPARSE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-auparse +GST1_PLUGINS_GOOD_CONF_OPTS += -Dauparse=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-auparse +GST1_PLUGINS_GOOD_CONF_OPTS += -Dauparse=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-autodetect +GST1_PLUGINS_GOOD_CONF_OPTS += -Dautodetect=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-autodetect +GST1_PLUGINS_GOOD_CONF_OPTS += -Dautodetect=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AVI),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-avi +GST1_PLUGINS_GOOD_CONF_OPTS += -Davi=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-avi +GST1_PLUGINS_GOOD_CONF_OPTS += -Davi=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CUTTER),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-cutter +GST1_PLUGINS_GOOD_CONF_OPTS += -Dcutter=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-cutter +GST1_PLUGINS_GOOD_CONF_OPTS += -Dcutter=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEBUGUTILS),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-debugutils +GST1_PLUGINS_GOOD_CONF_OPTS += -Ddebugutils=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-debugutils +GST1_PLUGINS_GOOD_CONF_OPTS += -Ddebugutils=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-deinterlace +GST1_PLUGINS_GOOD_CONF_OPTS += -Ddeinterlace=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-deinterlace +GST1_PLUGINS_GOOD_CONF_OPTS += -Ddeinterlace=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DTMF),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-dtmf +GST1_PLUGINS_GOOD_CONF_OPTS += -Ddtmf=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-dtmf +GST1_PLUGINS_GOOD_CONF_OPTS += -Ddtmf=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EFFECTV),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-effectv +GST1_PLUGINS_GOOD_CONF_OPTS += -Deffectv=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-effectv +GST1_PLUGINS_GOOD_CONF_OPTS += -Deffectv=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EQUALIZER),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-equalizer +GST1_PLUGINS_GOOD_CONF_OPTS += -Dequalizer=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-equalizer +GST1_PLUGINS_GOOD_CONF_OPTS += -Dequalizer=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLV),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-flv +GST1_PLUGINS_GOOD_CONF_OPTS += -Dflv=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-flv +GST1_PLUGINS_GOOD_CONF_OPTS += -Dflv=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLX),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-flx +GST1_PLUGINS_GOOD_CONF_OPTS += -Dflx=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-flx +GST1_PLUGINS_GOOD_CONF_OPTS += -Dflx=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GOOM),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-goom +GST1_PLUGINS_GOOD_CONF_OPTS += -Dgoom=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-goom +GST1_PLUGINS_GOOD_CONF_OPTS += -Dgoom=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GOOM2K1),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-goom2k1 +GST1_PLUGINS_GOOD_CONF_OPTS += -Dgoom2k1=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-goom2k1 +GST1_PLUGINS_GOOD_CONF_OPTS += -Dgoom2k1=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ICYDEMUX),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-icydemux +GST1_PLUGINS_GOOD_CONF_OPTS += -Dicydemux=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-icydemux +GST1_PLUGINS_GOOD_CONF_OPTS += -Dicydemux=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ID3DEMUX),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-id3demux +GST1_PLUGINS_GOOD_CONF_OPTS += -Did3demux=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-id3demux +GST1_PLUGINS_GOOD_CONF_OPTS += -Did3demux=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-imagefreeze +GST1_PLUGINS_GOOD_CONF_OPTS += -Dimagefreeze=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-imagefreeze +GST1_PLUGINS_GOOD_CONF_OPTS += -Dimagefreeze=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_INTERLEAVE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-interleave +GST1_PLUGINS_GOOD_CONF_OPTS += -Dinterleave=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-interleave +GST1_PLUGINS_GOOD_CONF_OPTS += -Dinterleave=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-isomp4 +GST1_PLUGINS_GOOD_CONF_OPTS += -Disomp4=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-isomp4 +GST1_PLUGINS_GOOD_CONF_OPTS += -Disomp4=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAME),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-lame +GST1_PLUGINS_GOOD_CONF_OPTS += -Dlame=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += lame else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-lame +GST1_PLUGINS_GOOD_CONF_OPTS += -Dlame=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MPG123),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-mpg123 +GST1_PLUGINS_GOOD_CONF_OPTS += -Dmpg123=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += mpg123 else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-mpg123 +GST1_PLUGINS_GOOD_CONF_OPTS += -Dmpg123=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAW),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-law +GST1_PLUGINS_GOOD_CONF_OPTS += -Dlaw=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-law +GST1_PLUGINS_GOOD_CONF_OPTS += -Dlaw=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LEVEL),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-level +GST1_PLUGINS_GOOD_CONF_OPTS += -Dlevel=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-level +GST1_PLUGINS_GOOD_CONF_OPTS += -Dlevel=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-matroska +GST1_PLUGINS_GOOD_CONF_OPTS += -Dmatroska=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-matroska +GST1_PLUGINS_GOOD_CONF_OPTS += -Dmatroska=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MONOSCOPE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-monoscope +GST1_PLUGINS_GOOD_CONF_OPTS += -Dmonoscope=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-monoscope +GST1_PLUGINS_GOOD_CONF_OPTS += -Dmonoscope=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIFILE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-multifile +GST1_PLUGINS_GOOD_CONF_OPTS += -Dmultifile=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-multifile +GST1_PLUGINS_GOOD_CONF_OPTS += -Dmultifile=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIPART),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-multipart +GST1_PLUGINS_GOOD_CONF_OPTS += -Dmultipart=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-multipart +GST1_PLUGINS_GOOD_CONF_OPTS += -Dmultipart=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_REPLAYGAIN),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-replaygain +GST1_PLUGINS_GOOD_CONF_OPTS += -Dreplaygain=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-replaygain +GST1_PLUGINS_GOOD_CONF_OPTS += -Dreplaygain=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-rtp +GST1_PLUGINS_GOOD_CONF_OPTS += -Drtp=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-rtp +GST1_PLUGINS_GOOD_CONF_OPTS += -Drtp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTPMANAGER),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-rtpmanager +GST1_PLUGINS_GOOD_CONF_OPTS += -Drtpmanager=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-rtpmanager +GST1_PLUGINS_GOOD_CONF_OPTS += -Drtpmanager=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-rtsp +GST1_PLUGINS_GOOD_CONF_OPTS += -Drtsp=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-rtsp +GST1_PLUGINS_GOOD_CONF_OPTS += -Drtsp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SHAPEWIPE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-shapewipe +GST1_PLUGINS_GOOD_CONF_OPTS += -Dshapewipe=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-shapewipe +GST1_PLUGINS_GOOD_CONF_OPTS += -Dshapewipe=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SMPTE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-smpte +GST1_PLUGINS_GOOD_CONF_OPTS += -Dsmpte=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-smpte +GST1_PLUGINS_GOOD_CONF_OPTS += -Dsmpte=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPECTRUM),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-spectrum +GST1_PLUGINS_GOOD_CONF_OPTS += -Dspectrum=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-spectrum +GST1_PLUGINS_GOOD_CONF_OPTS += -Dspectrum=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_UDP),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-udp +GST1_PLUGINS_GOOD_CONF_OPTS += -Dudp=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-udp +GST1_PLUGINS_GOOD_CONF_OPTS += -Dudp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOBOX),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-videobox +GST1_PLUGINS_GOOD_CONF_OPTS += -Dvideobox=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-videobox +GST1_PLUGINS_GOOD_CONF_OPTS += -Dvideobox=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOCROP),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-videocrop +GST1_PLUGINS_GOOD_CONF_OPTS += -Dvideocrop=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-videocrop +GST1_PLUGINS_GOOD_CONF_OPTS += -Dvideocrop=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOFILTER),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-videofilter +GST1_PLUGINS_GOOD_CONF_OPTS += -Dvideofilter=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-videofilter +GST1_PLUGINS_GOOD_CONF_OPTS += -Dvideofilter=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOMIXER),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-videomixer +GST1_PLUGINS_GOOD_CONF_OPTS += -Dvideomixer=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-videomixer +GST1_PLUGINS_GOOD_CONF_OPTS += -Dvideomixer=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVENC),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-wavenc +GST1_PLUGINS_GOOD_CONF_OPTS += -Dwavenc=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-wavenc +GST1_PLUGINS_GOOD_CONF_OPTS += -Dwavenc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPARSE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-wavparse +GST1_PLUGINS_GOOD_CONF_OPTS += -Dwavparse=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-wavparse +GST1_PLUGINS_GOOD_CONF_OPTS += -Dwavparse=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-y4m +GST1_PLUGINS_GOOD_CONF_OPTS += -Dy4m=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-y4m +GST1_PLUGINS_GOOD_CONF_OPTS += -Dy4m=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-oss +GST1_PLUGINS_GOOD_CONF_OPTS += -Doss=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-oss +GST1_PLUGINS_GOOD_CONF_OPTS += -Doss=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS4),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-oss4 +GST1_PLUGINS_GOOD_CONF_OPTS += -Doss4=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-oss4 +GST1_PLUGINS_GOOD_CONF_OPTS += -Doss4=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_QMLGL),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-qt +GST1_PLUGINS_GOOD_CONF_OPTS += -Dqt5=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += qt5declarative ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) GST1_PLUGINS_GOOD_DEPENDENCIES += qt5x11extras endif else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-qt +GST1_PLUGINS_GOOD_CONF_OPTS += -Dqt5=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-gst_v4l2 +GST1_PLUGINS_GOOD_CONF_OPTS += -Dv4l2=enabled else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-gst_v4l2 +GST1_PLUGINS_GOOD_CONF_OPTS += -Dv4l2=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-v4l2-probe +GST1_PLUGINS_GOOD_CONF_OPTS += -Dv4l2-probe=true else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-v4l2-probe +GST1_PLUGINS_GOOD_CONF_OPTS += -Dv4l2-probe=false endif ifeq ($(BR2_PACKAGE_XORG7),y) GST1_PLUGINS_GOOD_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv GST1_PLUGINS_GOOD_CONF_OPTS += \ - --enable-x \ - $(if $(BR2_PACKAGE_XLIB_LIBXFIXES),xlib_libXfixes) \ - $(if $(BR2_PACKAGE_XLIB_LIBXDAMAGE),xlib_libXdamage) + -Dximagesrc=enabled \ + $(if $(BR2_PACKAGE_XLIB_LIBXFIXES),-Dximagesrc-xfixes=enabled) \ + $(if $(BR2_PACKAGE_XLIB_LIBXDAMAGE),-Dximagesrc-xdamage=enabled) else GST1_PLUGINS_GOOD_CONF_OPTS += \ - --disable-x + -Dximagesrc=disabled \ + -Dximagesrc-xfixes=disabled \ + -Dximagesrc-xdamage=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CAIRO),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-cairo +GST1_PLUGINS_GOOD_CONF_OPTS += -Dcairo=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += cairo else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-cairo +GST1_PLUGINS_GOOD_CONF_OPTS += -Dcairo=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLAC),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-flac +GST1_PLUGINS_GOOD_CONF_OPTS += -Dflac=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += flac else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-flac +GST1_PLUGINS_GOOD_CONF_OPTS += -Dflac=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-gdk_pixbuf +GST1_PLUGINS_GOOD_CONF_OPTS += -Dgdk-pixbuf=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += gdk-pixbuf else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-gdk_pixbuf +GST1_PLUGINS_GOOD_CONF_OPTS += -Dgdk-pixbuf=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_JPEG),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-jpeg +GST1_PLUGINS_GOOD_CONF_OPTS += -Djpeg=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += jpeg else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-jpeg +GST1_PLUGINS_GOOD_CONF_OPTS += -Djpeg=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PNG),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-libpng +GST1_PLUGINS_GOOD_CONF_OPTS += -Dpng=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += libpng else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-libpng +GST1_PLUGINS_GOOD_CONF_OPTS += -Dpng=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-pulse +GST1_PLUGINS_GOOD_CONF_OPTS += -Dpulse=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += pulseaudio else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-pulse +GST1_PLUGINS_GOOD_CONF_OPTS += -Dpulse=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-soup +GST1_PLUGINS_GOOD_CONF_OPTS += -Dsoup=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += libsoup else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-soup +GST1_PLUGINS_GOOD_CONF_OPTS += -Dsoup=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPEEX),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-speex +GST1_PLUGINS_GOOD_CONF_OPTS += -Dspeex=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += speex else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-speex +GST1_PLUGINS_GOOD_CONF_OPTS += -Dspeex=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TAGLIB),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-taglib +GST1_PLUGINS_GOOD_CONF_OPTS += -Dtaglib=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += taglib else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-taglib +GST1_PLUGINS_GOOD_CONF_OPTS += -Dtaglib=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TWOLAME),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-twolame +GST1_PLUGINS_GOOD_CONF_OPTS += -Dtwolame=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += twolame else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-twolame +GST1_PLUGINS_GOOD_CONF_OPTS += -Dtwolame=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-vpx +GST1_PLUGINS_GOOD_CONF_OPTS += -Dvpx=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += libvpx else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-vpx +GST1_PLUGINS_GOOD_CONF_OPTS += -Dvpx=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPACK),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-wavpack +GST1_PLUGINS_GOOD_CONF_OPTS += -Dwavpack=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += wavpack else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-wavpack +GST1_PLUGINS_GOOD_CONF_OPTS += -Dwavpack=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIB),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-zlib GST1_PLUGINS_GOOD_DEPENDENCIES += zlib -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-zlib endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_BZ2),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-bz2 +GST1_PLUGINS_GOOD_CONF_OPTS += -Dbz2=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += bzip2 else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-bz2 +GST1_PLUGINS_GOOD_CONF_OPTS += -Dbz2=disabled endif -$(eval $(autotools-package)) +$(eval $(meson-package))
Signature · 1 line
2.21.0
PATCH 4/6 package/gstreamer1/gst1-plugins-bad: Convert package type to meson
In reply to aduskett at gmail.comFrom: Adam Duskett <[email protected]>
GStreamer 1.16.0 is the last version to support autotools, and will be removed in the next version.
Other changes:
- Valgrind is no longer an option and is checked via headers, so the option has been removed entirely, because the Valgrind package check is now in the base gstreamer1 package.
- Add 0002-fix-hls-meson-logic.patch:
If one was to set -Dhls-crypto to either libgcrypt or openssl instead of auto, the following lines in ext/hls/meson.build would fail because hls_crypto_dep is not yet set:
if not hls_crypto_dep.found() and ['auto', 'libgcrypt'].contains(hls_crypto) if not hls_crypto_dep.found() and ['auto', 'openssl'].contains(hls_crypto)
Instead, change "if not hls_crypto_dep.found()" to "if not have_hls_crypto" which fixes the error.
This patch is upstream.
--- .../0002-fix-hls-meson-logic.patch | 48 ++ package/gstreamer1/gst1-plugins-bad/Config.in | 16 +- .../gst1-plugins-bad/gst1-plugins-bad.mk | 501 +++++++++--------- 3 files changed, 305 insertions(+), 260 deletions(-) create mode 100644 package/gstreamer1/gst1-plugins-bad/0002-fix-hls-meson-logic.patch
package/gstreamer1/gst1-plugins-bad/0002-fix-hls-meson-logic.patch new file +48 -0
@@ -0,0 +1,48 @@ +From 172e4bc2a694162c1a38a758874b647234081b4c Mon Sep 17 00:00:00 2001 +From: Adam Duskett <[email protected]> +Date: Wed, 29 May 2019 13:29:51 -0400 +Subject: [PATCH] ext/hls/meson.build: fix dependency logic + +Currently, if one was to set -Dhls-crypto to either libgcrypt or openssl +instead of auto, the following lines would fail because hls_crypto_dep is not +yet set: + +if not hls_crypto_dep.found() and ['auto', 'libgcrypt'].contains(hls_crypto) +if not hls_crypto_dep.found() and ['auto', 'openssl'].contains(hls_crypto) + +Instead, change "if not hls_crypto_dep.found()" to "if not have_hls_crypto" +which fixes the error. + +Upstream status: Accepted +https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/merge_requests/372 + +Signed-off-by: Adam Duskett <[email protected]> +--- + ext/hls/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ext/hls/meson.build b/ext/hls/meson.build +index fb5a7d4cc..0d33327ad 100644 +--- a/ext/hls/meson.build ++++ b/ext/hls/meson.build +@@ -23,7 +23,7 @@ if not hls_option.disabled() + endif + endif + +- if not hls_crypto_dep.found() and ['auto', 'libgcrypt'].contains(hls_crypto) ++ if not have_hls_crypto and ['auto', 'libgcrypt'].contains(hls_crypto) + hls_crypto_dep = cc.find_library('gcrypt', required : false) + if hls_crypto_dep.found() + have_hls_crypto = true +@@ -31,7 +31,7 @@ if not hls_option.disabled() + endif + endif + +- if not hls_crypto_dep.found() and ['auto', 'openssl'].contains(hls_crypto) ++ if not have_hls_crypto and ['auto', 'openssl'].contains(hls_crypto) + hls_crypto_dep = dependency('openssl', required : false) + if hls_crypto_dep.found() + have_hls_crypto = true +-- +2.21.0 +
package/gstreamer1/gst1-plugins-bad/Config.in +8 -8
@@ -310,13 +310,13 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ bool "bluez" - depends on BR2_USE_WCHAR # bluez5_utils -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # bluez5_utils -> dbus, libglib2 - depends on BR2_USE_MMU # bluez5_utils -> dbus - depends on !BR2_STATIC_LIBS # bluez5_utils -> uses dlfcn - depends on !BR2_PACKAGE_BLUEZ_UTILS # bluez5_utils -> conflicts with 4.x version - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 + depends on BR2_USE_MMU # dbus + depends on !BR2_STATIC_LIBS # uses dlfcn + depends on !BR2_PACKAGE_BLUEZ_UTILS # conflicts with 4.x version + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 select BR2_PACKAGE_BLUEZ5_UTILS help Bluetooth audio A2DP/AVDTP sink, AVDTP source plugin
@@ -351,7 +351,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DASH config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK bool "decklink" depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS # <dlfcn.h> + depends on !BR2_STATIC_LIBS # uses dlfcn help Blackmagic Decklink plugin
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +249 -252
963 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH 5/6 package/gstreamer1/gst1-plugins-ugly: Convert package type to meson
In reply to aduskett at gmail.comFrom: Adam Duskett <[email protected]>
GStreamer 1.16.0 is the last version to support autotools, and will be removed in the next version.
Other changes:
- Valgrind is no longer an option and is checked via headers, so the option has been removed entirely, because the Valgrind package check is now in the base gstreamer1 package.
--- .../gst1-plugins-ugly/gst1-plugins-ugly.mk | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-)
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +28 -26
@@ -11,79 +11,81 @@ GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING # GPL licensed plugins will append to GST1_PLUGINS_UGLY_LICENSE if enabled. GST1_PLUGINS_UGLY_LICENSE = LGPL-2.1+ -GST1_PLUGINS_UGLY_CONF_OPTS = --disable-examples --disable-valgrind +GST1_PLUGINS_UGLY_CONF_OPTS += \ + -Dtests=disabled GST1_PLUGINS_UGLY_CONF_OPTS += \ - --disable-a52dec \ - --disable-amrnb \ - --disable-amrwb \ - --disable-cdio \ - --disable-sidplay \ - --disable-twolame + -Da52dec=disabled \ + -Damrnb=disabled \ + -Damrwbdec=disabled \ + -Dcdio=disabled \ + -Dsidplay=disabled GST1_PLUGINS_UGLY_DEPENDENCIES = gstreamer1 gst1-plugins-base ifeq ($(BR2_PACKAGE_ORC),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-orc +GST1_PLUGINS_UGLY_CONF_OPTS += -Dorc=enabled GST1_PLUGINS_UGLY_DEPENDENCIES += orc +else +GST1_PLUGINS_UGLY_CONF_OPTS += -Dorc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_ASFDEMUX),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-asfdemux +GST1_PLUGINS_UGLY_CONF_OPTS += -Dasfdemux=enabled else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-asfdemux +GST1_PLUGINS_UGLY_CONF_OPTS += -Dasfdemux=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-dvdlpcmdec +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdlpcmdec=enabled else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdlpcmdec +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdlpcmdec=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-dvdsub +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdsub=enabled else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdsub +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdsub=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-xingmux +GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=enabled else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-xingmux +GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-realmedia +GST1_PLUGINS_UGLY_CONF_OPTS += -Drealmedia=enabled else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-realmedia +GST1_PLUGINS_UGLY_CONF_OPTS += -Drealmedia=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD),y) # configure does not use pkg-config to detect libdvdread ifeq ($(BR2_PACKAGE_LIBDVDCSS)$(BR2_STATIC_LIBS),yy) -GST1_PLUGINS_UGLY_CONF_ENV += LIBS="-ldvdcss" +GST1_PLUGINS_UGLY_LDFLAGS +="-ldvdcss" endif -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-dvdread +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdread=enabled GST1_PLUGINS_UGLY_DEPENDENCIES += libdvdread GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdread +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdread=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPEG2DEC),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-mpeg2dec +GST1_PLUGINS_UGLY_CONF_OPTS += -Dmpeg2dec=enabled GST1_PLUGINS_UGLY_DEPENDENCIES += libmpeg2 GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-mpeg2dec +GST1_PLUGINS_UGLY_CONF_OPTS += -Dmpeg2dec=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_X264),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-x264 +GST1_PLUGINS_UGLY_CONF_OPTS += -Dx264=enabled GST1_PLUGINS_UGLY_DEPENDENCIES += x264 GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-x264 +GST1_PLUGINS_UGLY_CONF_OPTS += -Dx264=disabled endif # Add GPL license if GPL plugins enabled.
@@ -94,4 +96,4 @@ endif # Use the following command to extract license info for plugins. # # find . -name 'plugin-*.xml' | xargs grep license -$(eval $(autotools-package)) +$(eval $(meson-package))
Signature · 1 line
2.21.0
PATCH 5/6 package/gstreamer1/gst1-plugins-ugly: Convert package type to meson
Hello Adam,
Quoted 20 lines · aduskett at gmail.com
From: Adam Duskett <[email protected]>
GStreamer 1.16.0 is the last version to support autotools, and will be removed in the next version.
Other changes:
- Valgrind is no longer an option and is checked via headers, so the option has been removed entirely, because the Valgrind package check is now in the base gstreamer1 package.Signed-off-by Adam Duskett <[email protected]>--- .../gst1-plugins-ugly/gst1-plugins-ugly.mk | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-)package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +0
-0
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING · line 15
Quoted 6 lines
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +2
-1@@ -11,79 +11,81 @@ GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING # GPL licensed plugins will append to GST1_PLUGINS_UGLY_LICENSE if enabled. GST1_PLUGINS_UGLY_LICENSE = LGPL-2.1+ -GST1_PLUGINS_UGLY_CONF_OPTS = --disable-examples --disable-valgrind +GST1_PLUGINS_UGLY_CONF_OPTS += \ + -Dtests=disabled
-Dexamples=disabled missing?
Regards,
Peter
Quoted 106 lines
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +26
-25GST1_PLUGINS_UGLY_CONF_OPTS += \ - --disable-a52dec \ - --disable-amrnb \ - --disable-amrwb \ - --disable-cdio \ - --disable-sidplay \ - --disable-twolame + -Da52dec=disabled \ + -Damrnb=disabled \ + -Damrwbdec=disabled \ + -Dcdio=disabled \ + -Dsidplay=disabled GST1_PLUGINS_UGLY_DEPENDENCIES = gstreamer1 gst1-plugins-base ifeq ($(BR2_PACKAGE_ORC),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-orc +GST1_PLUGINS_UGLY_CONF_OPTS += -Dorc=enabled GST1_PLUGINS_UGLY_DEPENDENCIES += orc +else +GST1_PLUGINS_UGLY_CONF_OPTS += -Dorc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_ASFDEMUX),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-asfdemux +GST1_PLUGINS_UGLY_CONF_OPTS += -Dasfdemux=enabled else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-asfdemux +GST1_PLUGINS_UGLY_CONF_OPTS += -Dasfdemux=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-dvdlpcmdec +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdlpcmdec=enabled else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdlpcmdec +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdlpcmdec=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-dvdsub +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdsub=enabled else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdsub +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdsub=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-xingmux +GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=enabled else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-xingmux +GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-realmedia +GST1_PLUGINS_UGLY_CONF_OPTS += -Drealmedia=enabled else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-realmedia +GST1_PLUGINS_UGLY_CONF_OPTS += -Drealmedia=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD),y) # configure does not use pkg-config to detect libdvdread ifeq ($(BR2_PACKAGE_LIBDVDCSS)$(BR2_STATIC_LIBS),yy) -GST1_PLUGINS_UGLY_CONF_ENV += LIBS="-ldvdcss" +GST1_PLUGINS_UGLY_LDFLAGS +="-ldvdcss" endif -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-dvdread +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdread=enabled GST1_PLUGINS_UGLY_DEPENDENCIES += libdvdread GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdread +GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdread=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPEG2DEC),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-mpeg2dec +GST1_PLUGINS_UGLY_CONF_OPTS += -Dmpeg2dec=enabled GST1_PLUGINS_UGLY_DEPENDENCIES += libmpeg2 GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-mpeg2dec +GST1_PLUGINS_UGLY_CONF_OPTS += -Dmpeg2dec=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_X264),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-x264 +GST1_PLUGINS_UGLY_CONF_OPTS += -Dx264=enabled GST1_PLUGINS_UGLY_DEPENDENCIES += x264 GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-x264 +GST1_PLUGINS_UGLY_CONF_OPTS += -Dx264=disabled endif # Add GPL license if GPL plugins enabled.@@ -94,4 +96,4 @@ endif # Use the following command to extract license info for plugins. # # find . -name 'plugin-*.xml' | xargs grep license -$(eval $(autotools-package)) +$(eval $(meson-package))
PATCH 6/6 package/gstreamer1/gst1-rtsp-server: Convert package type to meson
In reply to aduskett at gmail.comFrom: Adam Duskett <[email protected]>
GStreamer 1.16.0 is the last version to support autotools, and will be removed in the next version.
--- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +6 -1
@@ -16,6 +16,11 @@ GST1_RTSP_SERVER_DEPENDENCIES = \ gst1-plugins-base \ gst1-plugins-good +GST1_RTSP_SERVER_CONF_OPTS += \ + -Dexamples=disabled \ + -Dtests=disabled \ + -Dintrospection=disabled + ifeq ($(BR2_PACKAGE_LIBCGROUP),y) GST1_RTSP_SERVER_DEPENDENCIES += libcgroup endif
@@ -24,4 +29,4 @@ ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD),y) GST1_RTSP_SERVER_DEPENDENCIES += gst1-plugins-bad endif -$(eval $(autotools-package)) +$(eval $(meson-package))
Signature · 1 line
2.21.0