gstreamer1: convert packages to meson
v2 cover gstreamer1: convert packages 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.
V2 has some small fixes that were suggested by Peter, but otherwise remains much the same.
Adam Duskett (6):
package/gstreamer1/gstreamer1: Convert package type to meson package/gstreamer1/gst1-plugins-base: Convert package type to meson package/gstreamer1/gst1-plugins-good: Convert package type to meson package/gstreamer1/gst1-plugins-bad: Convert package type to meson package/gstreamer1/gst1-plugins-ugly: Convert package type to meson package/gstreamer1/gst1-rtsp-server: Convert package type to meson
.../0002-fix-hls-meson-logic.patch | 48 ++ package/gstreamer1/gst1-plugins-bad/Config.in | 16 +- .../gst1-plugins-bad/gst1-plugins-bad.mk | 501 +++++++++--------- .../gst1-plugins-base/gst1-plugins-base.mk | 183 ++++--- .../gst1-plugins-good/gst1-plugins-good.mk | 301 ++++++----- .../gst1-plugins-ugly/gst1-plugins-ugly.mk | 55 +- .../gst1-rtsp-server/gst1-rtsp-server.mk | 7 +- package/gstreamer1/gstreamer1/gstreamer1.mk | 31 +- 8 files changed, 595 insertions(+), 547 deletions(-) create mode 100644 package/gstreamer1/gst1-plugins-bad/0002-fix-hls-meson-logic.patch
Signature · 1 line
2.21.0
PATCH v2 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:
- The meson build provides no 'disable-valgrind' option but checks for the availability of valgrind/valgrind.h, so add an optional valgrind dependency instead.
- Add the following new meson-specific options:
- -Dgtk_doc=disabled
- -Dglib-asserts=disabled
- -Dglib-checks=disabled
- -Dgobject-cast-checks=disabled
---
Changes v1 -> v2:
- Change valgrind check from an ifeq to the short form like libunwind. (Peter)
- Update commit message to be more clear about valgrind. (Peter)
- Fix s/DDgtk_doc/Dgtk_doc/ in the commit message. (Peter)
- Add -Dgobject-cast-checks=disabled to the commit message. (Peter)
package/gstreamer1/gstreamer1/gstreamer1.mk | 31 +++++++++++---------- 1 file changed, 17 insertions(+), 14 deletions(-)
package/gstreamer1/gstreamer1/gstreamer1.mk +17 -14
@@ -12,24 +12,27 @@ 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 \ + -Dglib-asserts=disabled \ + -Dglib-checks=disabled \ + -Dgobject-cast-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 \ host-flex \ host-pkgconf \ libglib2 \ - $(if $(BR2_PACKAGE_LIBUNWIND),libunwind) + $(if $(BR2_PACKAGE_LIBUNWIND),libunwind) \ + $(if $(BR2_PACKAGE_VALGRIND),valgrind) -$(eval $(autotools-package)) +$(eval $(meson-package))
Signature · 1 line
2.21.0
PATCH v2 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.
Still some text more for an cover-letter...
Otherwise looks good...
Regards,
Peter
Quoted 69 lines
Other changes:
- The meson build provides no 'disable-valgrind' option but checks for the availability ofvalgrind/valgrind.h, so add an optional valgrind dependency instead.- Add the following new meson-specific options:
- -Dgtk_doc=disabled
- -Dglib-asserts=disabled
- -Dglib-checks=disabled
- -Dgobject-cast-checks=disabledSigned-off-by Adam Duskett <[email protected]>---
Changes v1 -> v2:
- Change valgrind check from an ifeq to the short form like libunwind. (Peter)
- Update commit message to be more clear about valgrind. (Peter)
- Fix s/DDgtk_doc/Dgtk_doc/ in the commit message. (Peter)
- Add -Dgobject-cast-checks=disabled to the commit message. (Peter)package/gstreamer1/gstreamer1/gstreamer1.mk | 31 +++++++++++---------- 1 file changed, 17 insertions(+), 14 deletions(-)package/gstreamer1/gstreamer1/gstreamer1.mk +17
-14@@ -12,24 +12,27 @@ 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 \ + -Dglib-asserts=disabled \ + -Dglib-checks=disabled \ + -Dgobject-cast-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 \ host-flex \ host-pkgconf \ libglib2 \ - $(if $(BR2_PACKAGE_LIBUNWIND),libunwind) + $(if $(BR2_PACKAGE_LIBUNWIND),libunwind) \ + $(if $(BR2_PACKAGE_VALGRIND),valgrind) -$(eval $(autotools-package)) +$(eval $(meson-package))
PATCH v2 1/6 package/gstreamer1/gstreamer1: convert package type to meson
In reply to aduskett at gmail.comHello Adam,
and one more nitpick (or something a matter of taste, others will differ), I would prefer a shorter subject line:
package/gstreamer1: convert package type to meson package/gst1-plugins-base: convert package type to meson
...
Regards,
Peter
Quoted 73 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:
- The meson build provides no 'disable-valgrind' option but checks for the availability ofvalgrind/valgrind.h, so add an optional valgrind dependency instead.- Add the following new meson-specific options:
- -Dgtk_doc=disabled
- -Dglib-asserts=disabled
- -Dglib-checks=disabled
- -Dgobject-cast-checks=disabledSigned-off-by Adam Duskett <[email protected]>---
Changes v1 -> v2:
- Change valgrind check from an ifeq to the short form like libunwind. (Peter)
- Update commit message to be more clear about valgrind. (Peter)
- Fix s/DDgtk_doc/Dgtk_doc/ in the commit message. (Peter)
- Add -Dgobject-cast-checks=disabled to the commit message. (Peter)package/gstreamer1/gstreamer1/gstreamer1.mk | 31 +++++++++++---------- 1 file changed, 17 insertions(+), 14 deletions(-)package/gstreamer1/gstreamer1/gstreamer1.mk renamed from package/gstreamer1/gstreamer1/gstreamer1.mk8c0d910ae6441f611ade55494089230d00ae86ff +17
-14@@ -12,24 +12,27 @@ 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 \ + -Dglib-asserts=disabled \ + -Dglib-checks=disabled \ + -Dgobject-cast-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 \ host-flex \ host-pkgconf \ libglib2 \ - $(if $(BR2_PACKAGE_LIBUNWIND),libunwind) + $(if $(BR2_PACKAGE_LIBUNWIND),libunwind) \ + $(if $(BR2_PACKAGE_VALGRIND),valgrind) -$(eval $(autotools-package)) +$(eval $(meson-package))
PATCH v2 1/6 package/gstreamer1/gstreamer1: convert package type to meson
Quoted 8 lines · Peter Seiderer
Hello Adam,
and one more nitpick (or something a matter of taste, others will differ), I would prefer a shorter subject line:
package/gstreamer1: convert package type to meson package/gst1-plugins-base: convert package type to meson
...
I would also prefer that - even without package/ - but we adopted an as-of-yet
unwritten rule to use the directory as the subject prefix.
Regards,
Arnout
Quoted 3 lines
Regards,
Peter
PATCH v2 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 v2 2/6 package/gstreamer1/gst1-plugins-base: convert package type to meson
Hello Adam,
Quoted 5 lines · aduskett at gmail.com
From: Adam Duskett <[email protected]>
GStreamer 1.16.0 is the last version to support autotools, which is removed in the next version.
Still some text more for an cover-letter...
Quoted 4 lines
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.
Or:
The meson build provides no 'disable-valgrind' option in the plugin packages (valgrind availability checking is done in the base gstreamer package already).
Quoted 7 lines
- 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
Missing:
- -Dgobject-cast-checks=disabled
Quoted 283 lines
- Three config options are comma separated strings. These options are:
-gl_api
-gl_platform
-gl_winsysThe 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_ENVCPPFLAGS and LIBS options, as meson finds the include paths and libraries correctly during the configure stage.Signed-off-by Adam Duskett <[email protected]>--- .../gst1-plugins-base/gst1-plugins-base.mk | 183 +++++++++--------- 1 file changed, 89 insertions(+), 94 deletions(-)package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +65
-70@@ -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
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk GST1_PLUGINS_BASE_LICENSE_FILES = COPYING · line 206
Quoted 10 lines
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +3
-2ifeq ($(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.
Better comment:
# checked for by gst-libs/gst/tag/meson.build
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk GST1_PLUGINS_BASE_LICENSE_FILES = COPYING · line 209
Quoted 5 lines
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +0
-2ifeq ($(BR2_PACKAGE_ZLIB),y) GST1_PLUGINS_BASE_DEPENDENCIES += zlib -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-zlib endif
Otherwise looks good...
Regards,
Peter
Quoted 84 lines
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +21
-20ifeq ($(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))
PATCH v2 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 v2 3/6 package/gstreamer1/gst1-plugins-good: 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.
See previous patch...
Quoted 5 lines
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.
See previous patch...
Quoted 13 lines
- zlib no longer has an option and is also checked via headers.
Signed-off-by Adam Duskett <[email protected]>--- .../gst1-plugins-good/gst1-plugins-good.mk | 301 +++++++++--------- 1 file changed, 149 insertions(+), 152 deletions(-)package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +0
-0
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING · line 18
Quoted 8 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +0
-5@@ -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 \
Add commit log entry for the lost sunaudio option (removed since 2017-06-23, did not determine the gstreamer version)....
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING · line 15
Quoted 7 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +2
-5- --disable-osx_audio \ - --disable-osx_video \ - --disable-aalib \ - --disable-aalibtest \ - --disable-libcaca + -Dexamples=disabled \ + -Dtests=disabled \
While your are at it , the following options should move to the 'Options which require currently unpackaged libraries' section some lines below:
Quoted 447 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +114
-108+ -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
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING · line 361
Quoted 10 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +3
-3ifeq ($(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)
Maybe better with an Dximagesrc-xfixes=disabled, Dximagesrc-xdamage=disabled else path?
Quoted 112 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +26
-24else 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
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING · line 455
Quoted 10 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +1
-4-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
Should be:
# checked for by meson.build, gst/isomp4/meson.build, gst/matroska/meson.build # and gst/icydemux/meson.build ifeq ($(BR2_PACKAGE_ZLIB),y) GST1_PLUGINS_GOOD_DEPENDENCIES += zlib endif
And option BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIB removed from Config.in (and moved to Config.in.legacy)...
Regards,
Peter
Quoted 12 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +3
-3ifeq ($(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))
PATCH v2 3/6 package/gstreamer1/gst1-plugins-good: convert package type to meson
Quoted 3 lines · Peter Seiderer
Hello Adam,
On Wed, 10 Jul 2019 11:36:31 -0400, aduskett at gmail.com wrote:
[snip]
Quoted 11 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING · line 15
Quoted 7 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +2
-5- --disable-osx_audio \ - --disable-osx_video \ - --disable-aalib \ - --disable-aalibtest \ - --disable-libcaca + -Dexamples=disabled \ + -Dtests=disabled \While your are at it , the following options should move to the 'Options which require currently unpackaged libraries' section some lines below:
No, that should be done as a separate patch.
It would also be nice BTW if all the options would be ordered alphabetically.
Now they're a bit of a hodgepodge.
[snip]
Quoted 11 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING · line 455
Quoted 6 lines
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIB),y)
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +0
-3-GST1_PLUGINS_GOOD_CONF_OPTS += --enable-zlib GST1_PLUGINS_GOOD_DEPENDENCIES += zlib -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-zlib endifShould be:
# checked for by meson.build, gst/isomp4/meson.build, gst/matroska/meson.build # and gst/icydemux/meson.build
We don't add such a comment for any other package, so not needed.
Quoted 6 lines
ifeq ($(BR2_PACKAGE_ZLIB),y) GST1_PLUGINS_GOOD_DEPENDENCIES += zlib endifAnd option
BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIBremoved from Config.in (and moved to Config.in.legacy)...
This, however, is true. Legacy handling is not needed though: existing .configs
will just work unmodified, the option will disappear automatically when you do 'make olddefconfig' and zlib will still be selected.
Regards,
Arnout
[snip]
PATCH v2 3/6 package/gstreamer1/gst1-plugins-good: convert package type to meson
Hello Arnout,
Quoted 18 lines · Arnout Vandecappelle
Quoted 3 lines · Peter Seiderer
Hello Adam,
On Wed, 10 Jul 2019 11:36:31 -0400, aduskett at gmail.com wrote:
[snip]
Quoted 11 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING · line 15
Quoted 7 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +2
-5- --disable-osx_audio \ - --disable-osx_video \ - --disable-aalib \ - --disable-aalibtest \ - --disable-libcaca + -Dexamples=disabled \ + -Dtests=disabled \While your are at it , the following options should move to the 'Options which require currently unpackaged libraries' section some lines below:
Quoted 4 lines
No, that should be done as a separate patch.
It would also be nice BTW if all the options would be ordered alphabetically.
Now they're a bit of a hodgepodge.
O.k. stuff for an follow up patch, I would prefer option ordering according to meson_options.txt (to enable easy check for added/removed/changed options)...
Quoted 11 lines
[snip]
Quoted 9 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING · line 455
Quoted 6 lines
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIB),y)
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +0
-3-GST1_PLUGINS_GOOD_CONF_OPTS += --enable-zlib GST1_PLUGINS_GOOD_DEPENDENCIES += zlib -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-zlib endifShould be:
Quoted 4 lines
Quoted 2 lines
# checked for by meson.build, gst/isomp4/meson.build, gst/matroska/meson.build # and gst/icydemux/meson.buildWe don't add such a comment for any other package, so not needed.
Would like to keep it, because:
- as prove of correctness of the removed BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIB Config.in entry
- as a reminder/blueprint for identifying zlib-like minor feature dependencies not expressed in the root meson_options.txt file
Regards,
Peter
Quoted 17 lines
Quoted 7 lines
ifeq ($(BR2_PACKAGE_ZLIB),y) GST1_PLUGINS_GOOD_DEPENDENCIES += zlib endifAnd option
BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIBremoved from Config.in (and moved to Config.in.legacy)...This, however, is true. Legacy handling is not needed though: existing .configs
will just work unmodified, the option will disappear automatically when you do 'make olddefconfig' and zlib will still be selected.Regards,
Arnout[snip]
PATCH v2 3/6 package/gstreamer1/gst1-plugins-good: convert package type to meson
Quoted 22 lines · Peter Seiderer
Hello Arnout,
Quoted 18 lines · Arnout Vandecappelle
Quoted 3 lines · Peter Seiderer
Hello Adam,
On Wed, 10 Jul 2019 11:36:31 -0400, aduskett at gmail.com wrote:
[snip]
Quoted 11 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING · line 15
Quoted 7 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +2
-5- --disable-osx_audio \ - --disable-osx_video \ - --disable-aalib \ - --disable-aalibtest \ - --disable-libcaca + -Dexamples=disabled \ + -Dtests=disabled \While your are at it , the following options should move to the 'Options which require currently unpackaged libraries' section some lines below:
Quoted 7 lines
Quoted 4 lines
No, that should be done as a separate patch.
It would also be nice BTW if all the options would be ordered alphabetically.
Now they're a bit of a hodgepodge.O.k. stuff for an follow up patch, I would prefer option ordering according to meson_options.txt (to enable easy check for added/removed/changed options)...
OK. then indeed it can be done at the same time as the conversion to meson.
The ordering choice should be mentioned in the commit message then.
Quoted 13 lines
Quoted 13 lines
[snip]
Quoted 11 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING · line 455
Quoted 6 lines
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIB),y)
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +0
-3-GST1_PLUGINS_GOOD_CONF_OPTS += --enable-zlib GST1_PLUGINS_GOOD_DEPENDENCIES += zlib -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-zlib endifShould be:
# checked for by meson.build, gst/isomp4/meson.build, gst/matroska/meson.build # and gst/icydemux/meson.build
Quoted 7 lines
Quoted 1 line
We don't add such a comment for any other package, so not needed.
Would like to keep it, because:
- as prove of correctness of the removed
BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIBConfig.in entry
- as a reminder/blueprint for identifying zlib-like minor feature dependencies not expressed in the root meson_options.txt file
Good point, but IMHO it fits more as a commit message paragaph than as a
comment in the source file.
Regards,
Arnout
[snip]
PATCH v2 3/6 package/gstreamer1/gst1-plugins-good: convert package type to meson
Hello Arnout,
Quoted 25 lines · Arnout Vandecappelle
Quoted 24 lines · Peter Seiderer
Hello Arnout,
Quoted 20 lines · Arnout Vandecappelle
Quoted 3 lines · Peter Seiderer
Hello Adam,
On Wed, 10 Jul 2019 11:36:31 -0400, aduskett at gmail.com wrote:
[snip]
Quoted 11 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING · line 15
Quoted 7 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +2
-5- --disable-osx_audio \ - --disable-osx_video \ - --disable-aalib \ - --disable-aalibtest \ - --disable-libcaca + -Dexamples=disabled \ + -Dtests=disabled \While your are at it , the following options should move to the 'Options which require currently unpackaged libraries' section some lines below:
No, that should be done as a separate patch.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
It would also be nice BTW if all the options would be ordered alphabetically.
Now they're a bit of a hodgepodge.O.k. stuff for an follow up patch, I would prefer option ordering according to meson_options.txt (to enable easy check for added/removed/changed options)...
OK. then indeed it can be done at the same time as the conversion to meson.
Tried it already, but doing the re-ordering in one patch with the conversion makes patch review very hard, therefore prefer the re-ordering via an extra patch...
Quoted 2 lines
The ordering choice should be mentioned in the commit message then.
Or in the .mk Files, some plugin .mk files state now
# These plugins are listed in the order from ./configure --help
should be change to
# These plugins are listed in the order from meson_options.txt
Quoted 16 lines
Quoted 16 lines
Quoted 15 lines
[snip]
Quoted 11 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING · line 455
Quoted 6 lines
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIB),y)
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +0
-3-GST1_PLUGINS_GOOD_CONF_OPTS += --enable-zlib GST1_PLUGINS_GOOD_DEPENDENCIES += zlib -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-zlib endifShould be:
# checked for by meson.build, gst/isomp4/meson.build, gst/matroska/meson.build # and gst/icydemux/meson.buildWe don't add such a comment for any other package, so not needed.
Quoted 8 lines
Quoted 5 lines
Would like to keep it, because:
- as prove of correctness of the removed
BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIBConfig.in entry
- as a reminder/blueprint for identifying zlib-like minor feature dependencies not expressed in the root meson_options.txt fileGood point, but IMHO it fits more as a commit message paragaph than as a
comment in the source file.
Thats fine with me...
Regards,
Peter
Quoted 5 lines
Regards,
Arnout[snip]
PATCH v2 3/6 package/gstreamer1/gst1-plugins-good: convert package type to meson
In reply to aduskett at gmail.comHello Adam,
Quoted 33 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.- zlib no longer has an option and is also checked via headers.
Signed-off-by Adam Duskett <[email protected]>--- .../gst1-plugins-good/gst1-plugins-good.mk | 301 +++++++++--------- 1 file changed, 149 insertions(+), 152 deletions(-)package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +0
-8@@ -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 \
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING · line 21
Quoted 10 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +8
-2- --disable-aalibtest \ - --disable-libcaca + -Dexamples=disabled \ + -Dtests=disabled \ + -Ddirectsound=disabled \ + -Dwaveform=disabled \ + -Dosxaudio=disabled \ + -Dosxvideo=disabled \ + -Daalib=disabled \ + -Dlibcaca=disabled
Missing:
+ -Dgobject-cast-checks=disabled \
+ -Dglib-asserts=disabled \
+ -Dglib-checks=disabled \
Quoted 431 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +105
-106# 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
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING · line 354
Quoted 10 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +3
-2+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
Missing entry for:
option('v4l2-libv4l2', type : 'feature', value : 'auto', description : 'Use libv4l2 for some obscure format conversions')
ifeq ($(BR2_PACKAGE_LIBV4L),y) GST1_PLUGINS_GOOD_CONF_OPTS += -Dv4l2-libv4l2=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += libv4l
elseGST1_PLUGINS_GOOD_CONF_OPTS += -Dv4l2-libv4l2=disabled endif
Maybe missing entry for:
option('v4l2-gudev', type : 'feature', value : 'auto', description : 'Use libgudev for probing v4l2 devices')
Regards,
Peter
Quoted 144 lines
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +33
-34ifeq ($(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))
PATCH v2 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 v2 4/6 package/gstreamer1/gst1-plugins-bad: convert package type to meson
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.
See previous patch...
Quoted 5 lines
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.
See previous patch...
Quoted 86 lines
- 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 becausehls_crypto_depis not yet set:if not
hls_crypto_dep.found()and ['auto', 'libgcrypt'].contains(hls_crypto) if nothls_crypto_dep.found()and ['auto', 'openssl'].contains(hls_crypto)Instead, change "if not
hls_crypto_dep.found()" to "if nothave_hls_crypto" which fixes the error. This patch is upstream.Signed-off-by Adam Duskett <[email protected]>--- .../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.patchpackage/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 +0
-4@@ -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
package/gstreamer1/gst1-plugins-bad/Config.in config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER · line 319
Quoted 10 lines
package/gstreamer1/gst1-plugins-bad/Config.in +7
-3- 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
Why all this comment changes? I believe the bluez5_utils comment makes it more clear where the dependencies come from...
Quoted 20 lines
package/gstreamer1/gst1-plugins-bad/Config.in +1
-1select 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 pluginpackage/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +0
-0@@ -14,710 +14,707 @@ GST1_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB GST1_PLUGINS_BAD_LICENSE := LGPL-2.0+, LGPL-2.1+ GST1_PLUGINS_BAD_CONF_OPTS = \
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk GST1_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB · line 18
Quoted 10 lines
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +2
-8- --disable-examples \ - --disable-valgrind \ - --disable-directsound \ - --disable-direct3d \ - --disable-winks \ - --disable-android_media \ - --disable-apple_media \ - --disable-introspection + -Dexamples=disabled \ + -Dtests=disabled \
While your are at it , the following options should move to the 'Options which require currently unpackaged libraries' section some lines below:
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk GST1_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB
Quoted 7 lines
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +6
-0+ -Ddirectsound=disabled \ + -Dd3dvideosink=disabled \ + -Dwinks=disabled \ + -Dandroidmedia=disabled \ + -Dapplemedia=disabled \ + -Dintrospection=disabled
Missing:
+ -Dgobject-cast-checks=disabled \
+ -Dglib-asserts=disabled \
+ -Dglib-checks=disabled \
Quoted 27 lines
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +0
-24# Options which require currently unpackaged libraries GST1_PLUGINS_BAD_CONF_OPTS += \ - --disable-avc \ - --disable-opensles \ - --disable-uvch264 \ - --disable-msdk \ - --disable-voamrwbenc \ - --disable-bs2b \ - --disable-chromaprint \ - --disable-dc1394 \ - --disable-dts \ - --disable-resindvd \ - --disable-faac \ - --disable-flite \ - --disable-gsm \ - --disable-fluidsynth \ - --disable-kate \ - --disable-ladspa \ - --disable-lv2 \ - --disable-libde265 \ - --disable-modplug \ - --disable-mplex \ - --disable-ofa \ - --disable-openexr \ - --disable-openni2 \ - --disable-teletextdec \
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk GST1_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB · line 61
Quoted 10 lines
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +0
-10- --disable-wildmidi \ - --disable-smoothstreaming \ - --disable-soundtouch \ - --disable-gme \ - --disable-vdpau \ - --disable-schro \ - --disable-spandsp \ - --disable-gtk3 \ - --disable-iqa \ - --disable-opencv
What happend to '--disable-avc'?
Regards,
Peter
Quoted 908 lines
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +241
-210+ -Dopensles=disabled \ + -Duvch264=disabled \ + -Dmsdk=disabled \ + -Dvoamrwbenc=disabled \ + -Dbs2b=disabled \ + -Dchromaprint=disabled \ + -Ddc1394=disabled \ + -Ddts=disabled \ + -Dresindvd=disabled \ + -Dfaac=disabled \ + -Dflite=disabled \ + -Dgsm=disabled \ + -Dfluidsynth=disabled \ + -Dkate=disabled \ + -Dladspa=disabled \ + -Dlv2=disabled \ + -Dlibde265=disabled \ + -Dmodplug=disabled \ + -Dmplex=disabled \ + -Dofa=disabled \ + -Dopenexr=disabled \ + -Dopenni2=disabled \ + -Dteletextdec=disabled \ + -Dwildmidi=disabled \ + -Dsmoothstreaming=disabled \ + -Dsoundtouch=disabled \ + -Dgme=disabled \ + -Dvdpau=disabled \ + -Dspandsp=disabled \ + -Diqa=disabled \ + -Dopencv=disabled GST1_PLUGINS_BAD_DEPENDENCIES = gst1-plugins-base gstreamer1 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) # RPI has odd locations for several required headers. -GST1_PLUGINS_BAD_CONF_ENV += \ - CPPFLAGS="$(TARGET_CPPFLAGS) \ - -I$(STAGING_DIR)/usr/include/IL \ - -I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \ - -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" +GST1_PLUGINS_BAD_CFLAGS=$(TARGET_CPPFLAGS) \ + $(STAGING_DIR)/usr/include/IL \ + $(STAGING_DIR)/usr/include/interface/vcos/pthreads \ + $(STAGING_DIR)/usr/include/interface/vmcs_host/linux endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-wayland +GST1_PLUGINS_BAD_CONF_OPTS += -Dwayland=enabled GST1_PLUGINS_BAD_DEPENDENCIES += wayland wayland-protocols else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-wayland +GST1_PLUGINS_BAD_CONF_OPTS += -Dwayland=disabled endif ifeq ($(BR2_PACKAGE_ORC),y) GST1_PLUGINS_BAD_DEPENDENCIES += orc -GST1_PLUGINS_BAD_CONF_OPTS += --enable-orc +GST1_PLUGINS_BAD_CONF_OPTS += -Dorc=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dorc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ),y) GST1_PLUGINS_BAD_DEPENDENCIES += bluez5_utils -GST1_PLUGINS_BAD_CONF_OPTS += --enable-bluez +GST1_PLUGINS_BAD_CONF_OPTS += -Dbluez=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-bluez +GST1_PLUGINS_BAD_CONF_OPTS += -Dbluez=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ACCURIP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-accurip +GST1_PLUGINS_BAD_CONF_OPTS += -Daccurip=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-accurip +GST1_PLUGINS_BAD_CONF_OPTS += -Daccurip=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMDEC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-adpcmdec +GST1_PLUGINS_BAD_CONF_OPTS += -Dadpcmdec=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-adpcmdec +GST1_PLUGINS_BAD_CONF_OPTS += -Dadpcmdec=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMENC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-adpcmenc +GST1_PLUGINS_BAD_CONF_OPTS += -Dadpcmenc=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-adpcmenc +GST1_PLUGINS_BAD_CONF_OPTS += -Dadpcmenc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AIFF),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-aiff +GST1_PLUGINS_BAD_CONF_OPTS += -Daiff=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-aiff +GST1_PLUGINS_BAD_CONF_OPTS += -Daiff=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASFMUX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-asfmux +GST1_PLUGINS_BAD_CONF_OPTS += -Dasfmux=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-asfmux +GST1_PLUGINS_BAD_CONF_OPTS += -Dasfmux=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOBUFFERSPLIT),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiobuffersplit +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiobuffersplit=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiobuffersplit +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiobuffersplit=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOFXBAD),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiofxbad +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiofxbad=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiofxbad +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiofxbad=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOLATENCY),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiolatency +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiolatency=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiolatency +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiolatency=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXMATRIX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiomixmatrix +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiomixmatrix=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiomixmatrix +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiomixmatrix=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiovisualizers +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiovisualizers=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiovisualizers +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiovisualizers=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUTOCONVERT),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-autoconvert +GST1_PLUGINS_BAD_CONF_OPTS += -Dautoconvert=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-autoconvert +GST1_PLUGINS_BAD_CONF_OPTS += -Dautoconvert=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BAYER),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-bayer +GST1_PLUGINS_BAD_CONF_OPTS += -Dbayer=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-bayer +GST1_PLUGINS_BAD_CONF_OPTS += -Dbayer=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-camerabin2 +GST1_PLUGINS_BAD_CONF_OPTS += -Dcamerabin2=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-camerabin2 +GST1_PLUGINS_BAD_CONF_OPTS += -Dcamerabin2=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-coloreffects +GST1_PLUGINS_BAD_CONF_OPTS += -Dcoloreffects=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-coloreffects +GST1_PLUGINS_BAD_CONF_OPTS += -Dcoloreffects=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-debugutils +GST1_PLUGINS_BAD_CONF_OPTS += -Ddebugutils=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-debugutils +GST1_PLUGINS_BAD_CONF_OPTS += -Ddebugutils=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dvbsuboverlay +GST1_PLUGINS_BAD_CONF_OPTS += -Ddvbsuboverlay=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dvbsuboverlay +GST1_PLUGINS_BAD_CONF_OPTS += -Ddvbsuboverlay=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVDSPU),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dvdspu +GST1_PLUGINS_BAD_CONF_OPTS += -Ddvdspu=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dvdspu +GST1_PLUGINS_BAD_CONF_OPTS += -Ddvdspu=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FACEOVERLAY),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-faceoverlay +GST1_PLUGINS_BAD_CONF_OPTS += -Dfaceoverlay=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-faceoverlay +GST1_PLUGINS_BAD_CONF_OPTS += -Dfaceoverlay=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FESTIVAL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-festival +GST1_PLUGINS_BAD_CONF_OPTS += -Dfestival=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-festival +GST1_PLUGINS_BAD_CONF_OPTS += -Dfestival=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FIELDANALYSIS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-fieldanalysis +GST1_PLUGINS_BAD_CONF_OPTS += -Dfieldanalysis=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-fieldanalysis +GST1_PLUGINS_BAD_CONF_OPTS += -Dfieldanalysis=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FREEVERB),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-freeverb +GST1_PLUGINS_BAD_CONF_OPTS += -Dfreeverb=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-freeverb +GST1_PLUGINS_BAD_CONF_OPTS += -Dfreeverb=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FREI0R),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-frei0r +GST1_PLUGINS_BAD_CONF_OPTS += -Dfrei0r=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-frei0r +GST1_PLUGINS_BAD_CONF_OPTS += -Dfrei0r=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-gaudieffects +GST1_PLUGINS_BAD_CONF_OPTS += -Dgaudieffects=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-gaudieffects +GST1_PLUGINS_BAD_CONF_OPTS += -Dgaudieffects=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GEOMETRICTRANSFORM),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-geometrictransform +GST1_PLUGINS_BAD_CONF_OPTS += -Dgeometrictransform=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-geometrictransform +GST1_PLUGINS_BAD_CONF_OPTS += -Dgeometrictransform=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GDP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-gdp +GST1_PLUGINS_BAD_CONF_OPTS += -Dgdp=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-gdp +GST1_PLUGINS_BAD_CONF_OPTS += -Dgdp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ID3TAG),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-id3tag +GST1_PLUGINS_BAD_CONF_OPTS += -Did3tag=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-id3tag +GST1_PLUGINS_BAD_CONF_OPTS += -Did3tag=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTER),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-inter +GST1_PLUGINS_BAD_CONF_OPTS += -Dinter=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-inter +GST1_PLUGINS_BAD_CONF_OPTS += -Dinter=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTERLACE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-interlace +GST1_PLUGINS_BAD_CONF_OPTS += -Dinterlace=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-interlace +GST1_PLUGINS_BAD_CONF_OPTS += -Dinterlace=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IVFPARSE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-ivfparse +GST1_PLUGINS_BAD_CONF_OPTS += -Divfparse=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-ivfparse +GST1_PLUGINS_BAD_CONF_OPTS += -Divfparse=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IVTC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-ivtc +GST1_PLUGINS_BAD_CONF_OPTS += -Divtc=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-ivtc +GST1_PLUGINS_BAD_CONF_OPTS += -Divtc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-jp2kdecimator +GST1_PLUGINS_BAD_CONF_OPTS += -Djp2kdecimator=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-jp2kdecimator +GST1_PLUGINS_BAD_CONF_OPTS += -Djp2kdecimator=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JPEGFORMAT),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-jpegformat +GST1_PLUGINS_BAD_CONF_OPTS += -Djpegformat=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-jpegformat +GST1_PLUGINS_BAD_CONF_OPTS += -Djpegformat=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBRFB),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-librfb +GST1_PLUGINS_BAD_CONF_OPTS += -Dlibrfb=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-librfb +GST1_PLUGINS_BAD_CONF_OPTS += -Dlibrfb=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MIDI),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-midi +GST1_PLUGINS_BAD_CONF_OPTS += -Dmidi=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-midi +GST1_PLUGINS_BAD_CONF_OPTS += -Dmidi=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGDEMUX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpegdemux +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegdemux=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpegdemux +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegdemux=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpegtsdemux +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGPSMUX),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegpsmux=enabled GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpegtsdemux +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegpsmux=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSMUX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpegtsmux +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegtsmux=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpegtsmux +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegtsmux=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGPSMUX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpegpsmux +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegtsdemux=enabled GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpegpsmux +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegtsdemux=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MXF),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mxf +GST1_PLUGINS_BAD_CONF_OPTS += -Dmxf=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mxf +GST1_PLUGINS_BAD_CONF_OPTS += -Dmxf=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NETSIM),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-netsim +GST1_PLUGINS_BAD_CONF_OPTS += -Dnetsim=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-netsim +GST1_PLUGINS_BAD_CONF_OPTS += -Dnetsim=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ONVIF),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-onvif +GST1_PLUGINS_BAD_CONF_OPTS += -Donvif=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-onvif +GST1_PLUGINS_BAD_CONF_OPTS += -Donvif=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PCAPPARSE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-pcapparse +GST1_PLUGINS_BAD_CONF_OPTS += -Dpcapparse=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-pcapparse +GST1_PLUGINS_BAD_CONF_OPTS += -Dpcapparse=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PNM),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-pnm +GST1_PLUGINS_BAD_CONF_OPTS += -Dpnm=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-pnm +GST1_PLUGINS_BAD_CONF_OPTS += -Dpnm=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PROXY),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-proxy +GST1_PLUGINS_BAD_CONF_OPTS += -Dproxy=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-proxy +GST1_PLUGINS_BAD_CONF_OPTS += -Dproxy=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RAWPARSE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-rawparse +GST1_PLUGINS_BAD_CONF_OPTS += -Drawparse=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-rawparse +GST1_PLUGINS_BAD_CONF_OPTS += -Drawparse=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REMOVESILENCE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-removesilence +GST1_PLUGINS_BAD_CONF_OPTS += -Dremovesilence=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-removesilence +GST1_PLUGINS_BAD_CONF_OPTS += -Dremovesilence=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-rtmp +GST1_PLUGINS_BAD_CONF_OPTS += -Drtmp=enabled GST1_PLUGINS_BAD_DEPENDENCIES += rtmpdump else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-rtmp +GST1_PLUGINS_BAD_CONF_OPTS += -Drtmp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-sdp +GST1_PLUGINS_BAD_CONF_OPTS += -Dsdp=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-sdp +GST1_PLUGINS_BAD_CONF_OPTS += -Dsdp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SEGMENTCLIP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-segmentclip +GST1_PLUGINS_BAD_CONF_OPTS += -Dsegmentclip=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-segmentclip +GST1_PLUGINS_BAD_CONF_OPTS += -Dsegmentclip=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SIREN),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-siren +GST1_PLUGINS_BAD_CONF_OPTS += -Dsiren=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-siren +GST1_PLUGINS_BAD_CONF_OPTS += -Dsiren=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SMOOTH),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-smooth +GST1_PLUGINS_BAD_CONF_OPTS += -Dsmooth=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-smooth +GST1_PLUGINS_BAD_CONF_OPTS += -Dsmooth=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SPEED),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-speed +GST1_PLUGINS_BAD_CONF_OPTS += -Dspeed=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-speed +GST1_PLUGINS_BAD_CONF_OPTS += -Dspeed=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SUBENC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-subenc +GST1_PLUGINS_BAD_CONF_OPTS += -Dsubenc=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-subenc +GST1_PLUGINS_BAD_CONF_OPTS += -Dsubenc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TIMECODE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-timecode +GST1_PLUGINS_BAD_CONF_OPTS += -Dtimecode=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-timecode +GST1_PLUGINS_BAD_CONF_OPTS += -Dtimecode=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFILTERS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-videofilters +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideofilters=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-videofilters +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideofilters=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFRAME_AUDIOLEVEL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-videoframe_audiolevel +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideoframe_audiolevel=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-videoframe_audiolevel +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideoframe_audiolevel=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-videoparsers +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideoparsers=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-videoparsers +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideoparsers=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-videosignal +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideosignal=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-videosignal +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideosignal=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VMNC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-vmnc +GST1_PLUGINS_BAD_CONF_OPTS += -Dvmnc=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-vmnc +GST1_PLUGINS_BAD_CONF_OPTS += -Dvmnc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_Y4M),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-y4m +GST1_PLUGINS_BAD_CONF_OPTS += -Dy4m=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-y4m +GST1_PLUGINS_BAD_CONF_OPTS += -Dy4m=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-yadif +GST1_PLUGINS_BAD_CONF_OPTS += -Dyadif=enabled GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-yadif +GST1_PLUGINS_BAD_CONF_OPTS += -Dyadif=disabled endif # Plugins with dependencies ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-assrender +GST1_PLUGINS_BAD_CONF_OPTS += -Dassrender=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libass else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-assrender +GST1_PLUGINS_BAD_CONF_OPTS += -Dassrender=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BZ2),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-bz2 +GST1_PLUGINS_BAD_CONF_OPTS += -Dbz2=enabled GST1_PLUGINS_BAD_DEPENDENCIES += bzip2 else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-bz2 +GST1_PLUGINS_BAD_CONF_OPTS += -Dbz2=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CURL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-curl +GST1_PLUGINS_BAD_CONF_OPTS += -Dcurl=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libcurl else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-curl +GST1_PLUGINS_BAD_CONF_OPTS += -Dcurl=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DASH),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dash +GST1_PLUGINS_BAD_CONF_OPTS += -Ddash=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libxml2 else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dash +GST1_PLUGINS_BAD_CONF_OPTS += -Ddash=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-decklink +GST1_PLUGINS_BAD_CONF_OPTS += -Ddecklink=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-decklink +GST1_PLUGINS_BAD_CONF_OPTS += -Ddecklink=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-directfb +GST1_PLUGINS_BAD_CONF_OPTS += -Ddirectfb=enabled GST1_PLUGINS_BAD_DEPENDENCIES += directfb else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-directfb +GST1_PLUGINS_BAD_CONF_OPTS += -Ddirectfb=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dvb +GST1_PLUGINS_BAD_CONF_OPTS += -Ddvb=enabled GST1_PLUGINS_BAD_DEPENDENCIES += dtv-scan-tables else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dvb +GST1_PLUGINS_BAD_CONF_OPTS += -Ddvb=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FAAD),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-faad +GST1_PLUGINS_BAD_CONF_OPTS += -Dfaad=enabled GST1_PLUGINS_BAD_DEPENDENCIES += faad2 GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-faad +GST1_PLUGINS_BAD_CONF_OPTS += -Dfaad=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-fbdev +GST1_PLUGINS_BAD_CONF_OPTS += -Dfbdev=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-fbdev +GST1_PLUGINS_BAD_CONF_OPTS += -Dfbdev=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-fdk_aac +GST1_PLUGINS_BAD_CONF_OPTS += -Dfdkaac=enabled GST1_PLUGINS_BAD_DEPENDENCIES += fdk-aac else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-fdk_aac +GST1_PLUGINS_BAD_CONF_OPTS += -Dfdkaac=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-gl +GST1_PLUGINS_BAD_CONF_OPTS += -Dgl=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-gl +GST1_PLUGINS_BAD_CONF_OPTS += -Dgl=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-hls +GST1_PLUGINS_BAD_CONF_OPTS += -Dhls=enabled ifeq ($(BR2_PACKAGE_NETTLE),y) GST1_PLUGINS_BAD_DEPENDENCIES += nettle -GST1_PLUGINS_BAD_CONF_OPTS += --with-hls-crypto=nettle +GST1_PLUGINS_BAD_CONF_OPTS += -Dhls-crypto='nettle' else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) GST1_PLUGINS_BAD_DEPENDENCIES += libgcrypt -GST1_PLUGINS_BAD_CONF_OPTS += --with-hls-crypto=libgcrypt \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr +GST1_PLUGINS_BAD_CONF_OPTS += -Dhls-crypto='libgcrypt' else GST1_PLUGINS_BAD_DEPENDENCIES += openssl -GST1_PLUGINS_BAD_CONF_OPTS += --with-hls-crypto=openssl +GST1_PLUGINS_BAD_CONF_OPTS += -Dhls-crypto='openssl' endif else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-hls +GST1_PLUGINS_BAD_CONF_OPTS += -Dhls=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-kms +GST1_PLUGINS_BAD_CONF_OPTS += -Dkms=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libdrm else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-kms +GST1_PLUGINS_BAD_CONF_OPTS += -Dkms=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-libmms +GST1_PLUGINS_BAD_CONF_OPTS += -Dlibmms=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libmms else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-libmms +GST1_PLUGINS_BAD_CONF_OPTS += -Dlibmms=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dtls +GST1_PLUGINS_BAD_CONF_OPTS += -Ddtls=enabled GST1_PLUGINS_BAD_DEPENDENCIES += openssl GST1_PLUGINS_BAD_HAS_BSD2C_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dtls +GST1_PLUGINS_BAD_CONF_OPTS += -Ddtls=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTML),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-ttml +GST1_PLUGINS_BAD_CONF_OPTS += -Dttml=enabled GST1_PLUGINS_BAD_DEPENDENCIES += cairo libxml2 pango else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-ttml +GST1_PLUGINS_BAD_CONF_OPTS += -Dttml=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEG2ENC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpeg2enc +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpeg2enc=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libmpeg2 mjpegtools GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpeg2enc +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpeg2enc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MUSEPACK),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-musepack +GST1_PLUGINS_BAD_CONF_OPTS += -Dmusepack=enabled GST1_PLUGINS_BAD_DEPENDENCIES += musepack else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-musepack +GST1_PLUGINS_BAD_CONF_OPTS += -Dmusepack=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NEON),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-neon +GST1_PLUGINS_BAD_CONF_OPTS += -Dneon=enabled GST1_PLUGINS_BAD_DEPENDENCIES += neon else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-neon +GST1_PLUGINS_BAD_CONF_OPTS += -Dneon=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENAL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-openal +GST1_PLUGINS_BAD_CONF_OPTS += -Dopenal=enabled GST1_PLUGINS_BAD_DEPENDENCIES += openal else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-openal +GST1_PLUGINS_BAD_CONF_OPTS += -Dopenal=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-openh264 +GST1_PLUGINS_BAD_CONF_OPTS += -Dopenh264=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libopenh264 GST1_PLUGINS_BAD_HAS_BSD2C_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-openh264 +GST1_PLUGINS_BAD_CONF_OPTS += -Dopenh264=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENJPEG),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-openjpeg +GST1_PLUGINS_BAD_CONF_OPTS += -Dopenjpeg=enabled GST1_PLUGINS_BAD_DEPENDENCIES += openjpeg else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-openjpeg +GST1_PLUGINS_BAD_CONF_OPTS += -Dopenjpeg=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-opus +GST1_PLUGINS_BAD_CONF_OPTS += -Dopus=enabled GST1_PLUGINS_BAD_DEPENDENCIES += opus else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-opus +GST1_PLUGINS_BAD_CONF_OPTS += -Dopus=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-rsvg +GST1_PLUGINS_BAD_CONF_OPTS += -Drsvg=enabled GST1_PLUGINS_BAD_DEPENDENCIES += librsvg else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-rsvg +GST1_PLUGINS_BAD_CONF_OPTS += -Drsvg=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SBC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-sbc +GST1_PLUGINS_BAD_CONF_OPTS += -Dsbc=enabled GST1_PLUGINS_BAD_DEPENDENCIES += sbc else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-sbc +GST1_PLUGINS_BAD_CONF_OPTS += -Dsbc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SHM),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-shm +GST1_PLUGINS_BAD_CONF_OPTS += -Dshm=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-shm +GST1_PLUGINS_BAD_CONF_OPTS += -Dshm=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SNDFILE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-sndfile +GST1_PLUGINS_BAD_CONF_OPTS += -Dsndfile=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libsndfile else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-sndfile +GST1_PLUGINS_BAD_CONF_OPTS += -Dsndfile=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SRTP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-srtp +GST1_PLUGINS_BAD_CONF_OPTS += -Dsrtp=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libsrtp else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-srtp +GST1_PLUGINS_BAD_CONF_OPTS += -Dsrtp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-voaacenc +GST1_PLUGINS_BAD_CONF_OPTS += -Dvoaacenc=enabled GST1_PLUGINS_BAD_DEPENDENCIES += vo-aacenc else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-voaacenc +GST1_PLUGINS_BAD_CONF_OPTS += -Dvoaacenc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-webp +GST1_PLUGINS_BAD_CONF_OPTS += -Dwebp=enabled GST1_PLUGINS_BAD_DEPENDENCIES += webp else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-webp +GST1_PLUGINS_BAD_CONF_OPTS += -Dwebp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-webrtc +GST1_PLUGINS_BAD_CONF_OPTS += -Dwebrtc=enabled GST1_PLUGINS_BAD_DEPENDENCIES += gst1-plugins-base libnice else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-webrtc +GST1_PLUGINS_BAD_CONF_OPTS += -Dwebrtc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTCDSP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-webrtcdsp +GST1_PLUGINS_BAD_CONF_OPTS += -Dwebrtcdsp=enabled GST1_PLUGINS_BAD_DEPENDENCIES += webrtc-audio-processing else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-webrtcdsp +GST1_PLUGINS_BAD_CONF_OPTS += -Dwebrtcdsp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WPE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-wpe -GST1_PLUGINS_BAD_DEPENDENCIES += wpewebkit +GST1_PLUGINS_BAD_CONF_OPTS += -Dwpe=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += libwpe wpewebkit wpebackend-fdo else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-wpe +GST1_PLUGINS_BAD_CONF_OPTS += -Dwpe=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-x265 +GST1_PLUGINS_BAD_CONF_OPTS += -Dx265=enabled GST1_PLUGINS_BAD_DEPENDENCIES += x265 GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-x265 +GST1_PLUGINS_BAD_CONF_OPTS += -Dx265=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_ZBAR),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-zbar +GST1_PLUGINS_BAD_CONF_OPTS += -Dzbar=enabled GST1_PLUGINS_BAD_DEPENDENCIES += zbar else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-zbar +GST1_PLUGINS_BAD_CONF_OPTS += -Dzbar=disabled endif # Add GPL license if GPL licensed plugins enabled.@@ -739,4 +736,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 v2 4/6 package/gstreamer1/gst1-plugins-bad: convert package type to meson
Quoted 3 lines · Peter Seiderer
Quoted 1 line · aduskett at gmail.com
From: Adam Duskett <[email protected]>
[snip]
Quoted 11 lines
Quoted 11 lines
config
BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZpackage/gstreamer1/gst1-plugins-bad/Config.in +2
-7bool "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
Quoted 8 lines
package/gstreamer1/gst1-plugins-bad/Config.in config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER · line 319
Quoted 5 lines
package/gstreamer1/gst1-plugins-bad/Config.in +5
-0+ 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_4Why all this comment changes? I believe the
bluez5_utilscomment makes it more clear where the dependencies come from...
+1
And anyway, it is not something related to conversion to meson.
Regards,
Arnout
[snip]
PATCH v2 4/6 package/gstreamer1/gst1-plugins-bad: convert package type to meson
In reply to Peter SeidererQuoted 109 lines · Peter Seiderer
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.
See previous patch...
Quoted 5 lines
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.See previous patch...
Quoted 91 lines
- 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 becausehls_crypto_depis not yet set:if not
hls_crypto_dep.found()and ['auto', 'libgcrypt'].contains(hls_crypto) if nothls_crypto_dep.found()and ['auto', 'openssl'].contains(hls_crypto)Instead, change "if not
hls_crypto_dep.found()" to "if nothave_hls_crypto" which fixes the error. This patch is upstream.Signed-off-by Adam Duskett <[email protected]>--- .../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.patchpackage/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 +2
-7@@ -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
Quoted 8 lines
package/gstreamer1/gst1-plugins-bad/Config.in config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER · line 319
Quoted 5 lines
package/gstreamer1/gst1-plugins-bad/Config.in +5
-0+ 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_4Why all this comment changes? I believe the
bluez5_utilscomment makes it more clear where the dependencies come from...
Simple mistake. This branch is several months old and these changes were part of a previous
patch series that was never updated.
Quoted 88 lines
Quoted 21 lines
package/gstreamer1/gst1-plugins-bad/Config.in +1
-1select 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 pluginpackage/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +0
-0@@ -14,710 +14,707 @@ GST1_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB GST1_PLUGINS_BAD_LICENSE := LGPL-2.0+, LGPL-2.1+ GST1_PLUGINS_BAD_CONF_OPTS = \package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk GST1_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB · line 18
Quoted 10 lines
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +2
-8- --disable-examples \ - --disable-valgrind \ - --disable-directsound \ - --disable-direct3d \ - --disable-winks \ - --disable-android_media \ - --disable-apple_media \ - --disable-introspection + -Dexamples=disabled \ + -Dtests=disabled \While your are at it , the following options should move to the 'Options which require currently unpackaged libraries' section some lines below:
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk GST1_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB
Quoted 7 lines
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +6
-0+ -Ddirectsound=disabled \ + -Dd3dvideosink=disabled \ + -Dwinks=disabled \ + -Dandroidmedia=disabled \ + -Dapplemedia=disabled \ + -Dintrospection=disabledMissing:
(quoted diff) +3
-0+ -Dgobject-cast-checks=disabled \ + -Dglib-asserts=disabled \ + -Dglib-checks=disabled \Quoted 28 lines
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +0
-24# Options which require currently unpackaged libraries GST1_PLUGINS_BAD_CONF_OPTS += \ - --disable-avc \ - --disable-opensles \ - --disable-uvch264 \ - --disable-msdk \ - --disable-voamrwbenc \ - --disable-bs2b \ - --disable-chromaprint \ - --disable-dc1394 \ - --disable-dts \ - --disable-resindvd \ - --disable-faac \ - --disable-flite \ - --disable-gsm \ - --disable-fluidsynth \ - --disable-kate \ - --disable-ladspa \ - --disable-lv2 \ - --disable-libde265 \ - --disable-modplug \ - --disable-mplex \ - --disable-ofa \ - --disable-openexr \ - --disable-openni2 \ - --disable-teletextdec \package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk GST1_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB · line 61
Quoted 10 lines
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +0
-10- --disable-wildmidi \ - --disable-smoothstreaming \ - --disable-soundtouch \ - --disable-gme \ - --disable-vdpau \ - --disable-schro \ - --disable-spandsp \ - --disable-gtk3 \ - --disable-iqa \ - --disable-opencv
Quoted 1 line
What happend to '--disable-avc'?
It dissapeared and isn't in meson_options anymore. Nor is it anywhere in any of the other plugin packages that I can find.
Quoted 913 lines
Regards,
PeterQuoted 908 lines
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +241
-210+ -Dopensles=disabled \ + -Duvch264=disabled \ + -Dmsdk=disabled \ + -Dvoamrwbenc=disabled \ + -Dbs2b=disabled \ + -Dchromaprint=disabled \ + -Ddc1394=disabled \ + -Ddts=disabled \ + -Dresindvd=disabled \ + -Dfaac=disabled \ + -Dflite=disabled \ + -Dgsm=disabled \ + -Dfluidsynth=disabled \ + -Dkate=disabled \ + -Dladspa=disabled \ + -Dlv2=disabled \ + -Dlibde265=disabled \ + -Dmodplug=disabled \ + -Dmplex=disabled \ + -Dofa=disabled \ + -Dopenexr=disabled \ + -Dopenni2=disabled \ + -Dteletextdec=disabled \ + -Dwildmidi=disabled \ + -Dsmoothstreaming=disabled \ + -Dsoundtouch=disabled \ + -Dgme=disabled \ + -Dvdpau=disabled \ + -Dspandsp=disabled \ + -Diqa=disabled \ + -Dopencv=disabled GST1_PLUGINS_BAD_DEPENDENCIES = gst1-plugins-base gstreamer1 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) # RPI has odd locations for several required headers. -GST1_PLUGINS_BAD_CONF_ENV += \ - CPPFLAGS="$(TARGET_CPPFLAGS) \ - -I$(STAGING_DIR)/usr/include/IL \ - -I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \ - -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" +GST1_PLUGINS_BAD_CFLAGS=$(TARGET_CPPFLAGS) \ + $(STAGING_DIR)/usr/include/IL \ + $(STAGING_DIR)/usr/include/interface/vcos/pthreads \ + $(STAGING_DIR)/usr/include/interface/vmcs_host/linux endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-wayland +GST1_PLUGINS_BAD_CONF_OPTS += -Dwayland=enabled GST1_PLUGINS_BAD_DEPENDENCIES += wayland wayland-protocols else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-wayland +GST1_PLUGINS_BAD_CONF_OPTS += -Dwayland=disabled endif ifeq ($(BR2_PACKAGE_ORC),y) GST1_PLUGINS_BAD_DEPENDENCIES += orc -GST1_PLUGINS_BAD_CONF_OPTS += --enable-orc +GST1_PLUGINS_BAD_CONF_OPTS += -Dorc=enabled +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dorc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ),y) GST1_PLUGINS_BAD_DEPENDENCIES += bluez5_utils -GST1_PLUGINS_BAD_CONF_OPTS += --enable-bluez +GST1_PLUGINS_BAD_CONF_OPTS += -Dbluez=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-bluez +GST1_PLUGINS_BAD_CONF_OPTS += -Dbluez=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ACCURIP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-accurip +GST1_PLUGINS_BAD_CONF_OPTS += -Daccurip=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-accurip +GST1_PLUGINS_BAD_CONF_OPTS += -Daccurip=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMDEC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-adpcmdec +GST1_PLUGINS_BAD_CONF_OPTS += -Dadpcmdec=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-adpcmdec +GST1_PLUGINS_BAD_CONF_OPTS += -Dadpcmdec=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMENC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-adpcmenc +GST1_PLUGINS_BAD_CONF_OPTS += -Dadpcmenc=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-adpcmenc +GST1_PLUGINS_BAD_CONF_OPTS += -Dadpcmenc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AIFF),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-aiff +GST1_PLUGINS_BAD_CONF_OPTS += -Daiff=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-aiff +GST1_PLUGINS_BAD_CONF_OPTS += -Daiff=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASFMUX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-asfmux +GST1_PLUGINS_BAD_CONF_OPTS += -Dasfmux=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-asfmux +GST1_PLUGINS_BAD_CONF_OPTS += -Dasfmux=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOBUFFERSPLIT),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiobuffersplit +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiobuffersplit=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiobuffersplit +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiobuffersplit=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOFXBAD),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiofxbad +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiofxbad=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiofxbad +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiofxbad=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOLATENCY),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiolatency +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiolatency=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiolatency +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiolatency=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXMATRIX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiomixmatrix +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiomixmatrix=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiomixmatrix +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiomixmatrix=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiovisualizers +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiovisualizers=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiovisualizers +GST1_PLUGINS_BAD_CONF_OPTS += -Daudiovisualizers=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUTOCONVERT),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-autoconvert +GST1_PLUGINS_BAD_CONF_OPTS += -Dautoconvert=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-autoconvert +GST1_PLUGINS_BAD_CONF_OPTS += -Dautoconvert=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BAYER),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-bayer +GST1_PLUGINS_BAD_CONF_OPTS += -Dbayer=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-bayer +GST1_PLUGINS_BAD_CONF_OPTS += -Dbayer=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-camerabin2 +GST1_PLUGINS_BAD_CONF_OPTS += -Dcamerabin2=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-camerabin2 +GST1_PLUGINS_BAD_CONF_OPTS += -Dcamerabin2=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-coloreffects +GST1_PLUGINS_BAD_CONF_OPTS += -Dcoloreffects=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-coloreffects +GST1_PLUGINS_BAD_CONF_OPTS += -Dcoloreffects=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-debugutils +GST1_PLUGINS_BAD_CONF_OPTS += -Ddebugutils=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-debugutils +GST1_PLUGINS_BAD_CONF_OPTS += -Ddebugutils=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dvbsuboverlay +GST1_PLUGINS_BAD_CONF_OPTS += -Ddvbsuboverlay=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dvbsuboverlay +GST1_PLUGINS_BAD_CONF_OPTS += -Ddvbsuboverlay=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVDSPU),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dvdspu +GST1_PLUGINS_BAD_CONF_OPTS += -Ddvdspu=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dvdspu +GST1_PLUGINS_BAD_CONF_OPTS += -Ddvdspu=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FACEOVERLAY),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-faceoverlay +GST1_PLUGINS_BAD_CONF_OPTS += -Dfaceoverlay=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-faceoverlay +GST1_PLUGINS_BAD_CONF_OPTS += -Dfaceoverlay=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FESTIVAL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-festival +GST1_PLUGINS_BAD_CONF_OPTS += -Dfestival=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-festival +GST1_PLUGINS_BAD_CONF_OPTS += -Dfestival=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FIELDANALYSIS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-fieldanalysis +GST1_PLUGINS_BAD_CONF_OPTS += -Dfieldanalysis=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-fieldanalysis +GST1_PLUGINS_BAD_CONF_OPTS += -Dfieldanalysis=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FREEVERB),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-freeverb +GST1_PLUGINS_BAD_CONF_OPTS += -Dfreeverb=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-freeverb +GST1_PLUGINS_BAD_CONF_OPTS += -Dfreeverb=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FREI0R),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-frei0r +GST1_PLUGINS_BAD_CONF_OPTS += -Dfrei0r=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-frei0r +GST1_PLUGINS_BAD_CONF_OPTS += -Dfrei0r=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-gaudieffects +GST1_PLUGINS_BAD_CONF_OPTS += -Dgaudieffects=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-gaudieffects +GST1_PLUGINS_BAD_CONF_OPTS += -Dgaudieffects=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GEOMETRICTRANSFORM),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-geometrictransform +GST1_PLUGINS_BAD_CONF_OPTS += -Dgeometrictransform=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-geometrictransform +GST1_PLUGINS_BAD_CONF_OPTS += -Dgeometrictransform=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GDP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-gdp +GST1_PLUGINS_BAD_CONF_OPTS += -Dgdp=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-gdp +GST1_PLUGINS_BAD_CONF_OPTS += -Dgdp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ID3TAG),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-id3tag +GST1_PLUGINS_BAD_CONF_OPTS += -Did3tag=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-id3tag +GST1_PLUGINS_BAD_CONF_OPTS += -Did3tag=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTER),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-inter +GST1_PLUGINS_BAD_CONF_OPTS += -Dinter=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-inter +GST1_PLUGINS_BAD_CONF_OPTS += -Dinter=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTERLACE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-interlace +GST1_PLUGINS_BAD_CONF_OPTS += -Dinterlace=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-interlace +GST1_PLUGINS_BAD_CONF_OPTS += -Dinterlace=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IVFPARSE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-ivfparse +GST1_PLUGINS_BAD_CONF_OPTS += -Divfparse=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-ivfparse +GST1_PLUGINS_BAD_CONF_OPTS += -Divfparse=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IVTC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-ivtc +GST1_PLUGINS_BAD_CONF_OPTS += -Divtc=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-ivtc +GST1_PLUGINS_BAD_CONF_OPTS += -Divtc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-jp2kdecimator +GST1_PLUGINS_BAD_CONF_OPTS += -Djp2kdecimator=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-jp2kdecimator +GST1_PLUGINS_BAD_CONF_OPTS += -Djp2kdecimator=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JPEGFORMAT),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-jpegformat +GST1_PLUGINS_BAD_CONF_OPTS += -Djpegformat=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-jpegformat +GST1_PLUGINS_BAD_CONF_OPTS += -Djpegformat=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBRFB),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-librfb +GST1_PLUGINS_BAD_CONF_OPTS += -Dlibrfb=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-librfb +GST1_PLUGINS_BAD_CONF_OPTS += -Dlibrfb=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MIDI),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-midi +GST1_PLUGINS_BAD_CONF_OPTS += -Dmidi=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-midi +GST1_PLUGINS_BAD_CONF_OPTS += -Dmidi=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGDEMUX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpegdemux +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegdemux=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpegdemux +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegdemux=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpegtsdemux +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGPSMUX),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegpsmux=enabled GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpegtsdemux +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegpsmux=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSMUX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpegtsmux +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegtsmux=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpegtsmux +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegtsmux=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGPSMUX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpegpsmux +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegtsdemux=enabled GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpegpsmux +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpegtsdemux=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MXF),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mxf +GST1_PLUGINS_BAD_CONF_OPTS += -Dmxf=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mxf +GST1_PLUGINS_BAD_CONF_OPTS += -Dmxf=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NETSIM),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-netsim +GST1_PLUGINS_BAD_CONF_OPTS += -Dnetsim=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-netsim +GST1_PLUGINS_BAD_CONF_OPTS += -Dnetsim=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ONVIF),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-onvif +GST1_PLUGINS_BAD_CONF_OPTS += -Donvif=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-onvif +GST1_PLUGINS_BAD_CONF_OPTS += -Donvif=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PCAPPARSE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-pcapparse +GST1_PLUGINS_BAD_CONF_OPTS += -Dpcapparse=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-pcapparse +GST1_PLUGINS_BAD_CONF_OPTS += -Dpcapparse=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PNM),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-pnm +GST1_PLUGINS_BAD_CONF_OPTS += -Dpnm=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-pnm +GST1_PLUGINS_BAD_CONF_OPTS += -Dpnm=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PROXY),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-proxy +GST1_PLUGINS_BAD_CONF_OPTS += -Dproxy=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-proxy +GST1_PLUGINS_BAD_CONF_OPTS += -Dproxy=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RAWPARSE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-rawparse +GST1_PLUGINS_BAD_CONF_OPTS += -Drawparse=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-rawparse +GST1_PLUGINS_BAD_CONF_OPTS += -Drawparse=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REMOVESILENCE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-removesilence +GST1_PLUGINS_BAD_CONF_OPTS += -Dremovesilence=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-removesilence +GST1_PLUGINS_BAD_CONF_OPTS += -Dremovesilence=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-rtmp +GST1_PLUGINS_BAD_CONF_OPTS += -Drtmp=enabled GST1_PLUGINS_BAD_DEPENDENCIES += rtmpdump else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-rtmp +GST1_PLUGINS_BAD_CONF_OPTS += -Drtmp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-sdp +GST1_PLUGINS_BAD_CONF_OPTS += -Dsdp=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-sdp +GST1_PLUGINS_BAD_CONF_OPTS += -Dsdp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SEGMENTCLIP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-segmentclip +GST1_PLUGINS_BAD_CONF_OPTS += -Dsegmentclip=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-segmentclip +GST1_PLUGINS_BAD_CONF_OPTS += -Dsegmentclip=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SIREN),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-siren +GST1_PLUGINS_BAD_CONF_OPTS += -Dsiren=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-siren +GST1_PLUGINS_BAD_CONF_OPTS += -Dsiren=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SMOOTH),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-smooth +GST1_PLUGINS_BAD_CONF_OPTS += -Dsmooth=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-smooth +GST1_PLUGINS_BAD_CONF_OPTS += -Dsmooth=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SPEED),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-speed +GST1_PLUGINS_BAD_CONF_OPTS += -Dspeed=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-speed +GST1_PLUGINS_BAD_CONF_OPTS += -Dspeed=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SUBENC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-subenc +GST1_PLUGINS_BAD_CONF_OPTS += -Dsubenc=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-subenc +GST1_PLUGINS_BAD_CONF_OPTS += -Dsubenc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TIMECODE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-timecode +GST1_PLUGINS_BAD_CONF_OPTS += -Dtimecode=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-timecode +GST1_PLUGINS_BAD_CONF_OPTS += -Dtimecode=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFILTERS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-videofilters +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideofilters=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-videofilters +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideofilters=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFRAME_AUDIOLEVEL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-videoframe_audiolevel +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideoframe_audiolevel=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-videoframe_audiolevel +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideoframe_audiolevel=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-videoparsers +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideoparsers=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-videoparsers +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideoparsers=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-videosignal +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideosignal=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-videosignal +GST1_PLUGINS_BAD_CONF_OPTS += -Dvideosignal=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VMNC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-vmnc +GST1_PLUGINS_BAD_CONF_OPTS += -Dvmnc=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-vmnc +GST1_PLUGINS_BAD_CONF_OPTS += -Dvmnc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_Y4M),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-y4m +GST1_PLUGINS_BAD_CONF_OPTS += -Dy4m=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-y4m +GST1_PLUGINS_BAD_CONF_OPTS += -Dy4m=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-yadif +GST1_PLUGINS_BAD_CONF_OPTS += -Dyadif=enabled GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-yadif +GST1_PLUGINS_BAD_CONF_OPTS += -Dyadif=disabled endif # Plugins with dependencies ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-assrender +GST1_PLUGINS_BAD_CONF_OPTS += -Dassrender=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libass else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-assrender +GST1_PLUGINS_BAD_CONF_OPTS += -Dassrender=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BZ2),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-bz2 +GST1_PLUGINS_BAD_CONF_OPTS += -Dbz2=enabled GST1_PLUGINS_BAD_DEPENDENCIES += bzip2 else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-bz2 +GST1_PLUGINS_BAD_CONF_OPTS += -Dbz2=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CURL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-curl +GST1_PLUGINS_BAD_CONF_OPTS += -Dcurl=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libcurl else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-curl +GST1_PLUGINS_BAD_CONF_OPTS += -Dcurl=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DASH),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dash +GST1_PLUGINS_BAD_CONF_OPTS += -Ddash=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libxml2 else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dash +GST1_PLUGINS_BAD_CONF_OPTS += -Ddash=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-decklink +GST1_PLUGINS_BAD_CONF_OPTS += -Ddecklink=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-decklink +GST1_PLUGINS_BAD_CONF_OPTS += -Ddecklink=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-directfb +GST1_PLUGINS_BAD_CONF_OPTS += -Ddirectfb=enabled GST1_PLUGINS_BAD_DEPENDENCIES += directfb else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-directfb +GST1_PLUGINS_BAD_CONF_OPTS += -Ddirectfb=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dvb +GST1_PLUGINS_BAD_CONF_OPTS += -Ddvb=enabled GST1_PLUGINS_BAD_DEPENDENCIES += dtv-scan-tables else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dvb +GST1_PLUGINS_BAD_CONF_OPTS += -Ddvb=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FAAD),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-faad +GST1_PLUGINS_BAD_CONF_OPTS += -Dfaad=enabled GST1_PLUGINS_BAD_DEPENDENCIES += faad2 GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-faad +GST1_PLUGINS_BAD_CONF_OPTS += -Dfaad=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-fbdev +GST1_PLUGINS_BAD_CONF_OPTS += -Dfbdev=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-fbdev +GST1_PLUGINS_BAD_CONF_OPTS += -Dfbdev=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-fdk_aac +GST1_PLUGINS_BAD_CONF_OPTS += -Dfdkaac=enabled GST1_PLUGINS_BAD_DEPENDENCIES += fdk-aac else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-fdk_aac +GST1_PLUGINS_BAD_CONF_OPTS += -Dfdkaac=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-gl +GST1_PLUGINS_BAD_CONF_OPTS += -Dgl=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-gl +GST1_PLUGINS_BAD_CONF_OPTS += -Dgl=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-hls +GST1_PLUGINS_BAD_CONF_OPTS += -Dhls=enabled ifeq ($(BR2_PACKAGE_NETTLE),y) GST1_PLUGINS_BAD_DEPENDENCIES += nettle -GST1_PLUGINS_BAD_CONF_OPTS += --with-hls-crypto=nettle +GST1_PLUGINS_BAD_CONF_OPTS += -Dhls-crypto='nettle' else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) GST1_PLUGINS_BAD_DEPENDENCIES += libgcrypt -GST1_PLUGINS_BAD_CONF_OPTS += --with-hls-crypto=libgcrypt \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr +GST1_PLUGINS_BAD_CONF_OPTS += -Dhls-crypto='libgcrypt' else GST1_PLUGINS_BAD_DEPENDENCIES += openssl -GST1_PLUGINS_BAD_CONF_OPTS += --with-hls-crypto=openssl +GST1_PLUGINS_BAD_CONF_OPTS += -Dhls-crypto='openssl' endif else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-hls +GST1_PLUGINS_BAD_CONF_OPTS += -Dhls=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-kms +GST1_PLUGINS_BAD_CONF_OPTS += -Dkms=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libdrm else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-kms +GST1_PLUGINS_BAD_CONF_OPTS += -Dkms=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-libmms +GST1_PLUGINS_BAD_CONF_OPTS += -Dlibmms=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libmms else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-libmms +GST1_PLUGINS_BAD_CONF_OPTS += -Dlibmms=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dtls +GST1_PLUGINS_BAD_CONF_OPTS += -Ddtls=enabled GST1_PLUGINS_BAD_DEPENDENCIES += openssl GST1_PLUGINS_BAD_HAS_BSD2C_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dtls +GST1_PLUGINS_BAD_CONF_OPTS += -Ddtls=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTML),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-ttml +GST1_PLUGINS_BAD_CONF_OPTS += -Dttml=enabled GST1_PLUGINS_BAD_DEPENDENCIES += cairo libxml2 pango else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-ttml +GST1_PLUGINS_BAD_CONF_OPTS += -Dttml=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEG2ENC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpeg2enc +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpeg2enc=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libmpeg2 mjpegtools GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpeg2enc +GST1_PLUGINS_BAD_CONF_OPTS += -Dmpeg2enc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MUSEPACK),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-musepack +GST1_PLUGINS_BAD_CONF_OPTS += -Dmusepack=enabled GST1_PLUGINS_BAD_DEPENDENCIES += musepack else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-musepack +GST1_PLUGINS_BAD_CONF_OPTS += -Dmusepack=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NEON),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-neon +GST1_PLUGINS_BAD_CONF_OPTS += -Dneon=enabled GST1_PLUGINS_BAD_DEPENDENCIES += neon else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-neon +GST1_PLUGINS_BAD_CONF_OPTS += -Dneon=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENAL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-openal +GST1_PLUGINS_BAD_CONF_OPTS += -Dopenal=enabled GST1_PLUGINS_BAD_DEPENDENCIES += openal else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-openal +GST1_PLUGINS_BAD_CONF_OPTS += -Dopenal=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-openh264 +GST1_PLUGINS_BAD_CONF_OPTS += -Dopenh264=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libopenh264 GST1_PLUGINS_BAD_HAS_BSD2C_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-openh264 +GST1_PLUGINS_BAD_CONF_OPTS += -Dopenh264=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENJPEG),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-openjpeg +GST1_PLUGINS_BAD_CONF_OPTS += -Dopenjpeg=enabled GST1_PLUGINS_BAD_DEPENDENCIES += openjpeg else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-openjpeg +GST1_PLUGINS_BAD_CONF_OPTS += -Dopenjpeg=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-opus +GST1_PLUGINS_BAD_CONF_OPTS += -Dopus=enabled GST1_PLUGINS_BAD_DEPENDENCIES += opus else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-opus +GST1_PLUGINS_BAD_CONF_OPTS += -Dopus=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-rsvg +GST1_PLUGINS_BAD_CONF_OPTS += -Drsvg=enabled GST1_PLUGINS_BAD_DEPENDENCIES += librsvg else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-rsvg +GST1_PLUGINS_BAD_CONF_OPTS += -Drsvg=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SBC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-sbc +GST1_PLUGINS_BAD_CONF_OPTS += -Dsbc=enabled GST1_PLUGINS_BAD_DEPENDENCIES += sbc else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-sbc +GST1_PLUGINS_BAD_CONF_OPTS += -Dsbc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SHM),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-shm +GST1_PLUGINS_BAD_CONF_OPTS += -Dshm=enabled else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-shm +GST1_PLUGINS_BAD_CONF_OPTS += -Dshm=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SNDFILE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-sndfile +GST1_PLUGINS_BAD_CONF_OPTS += -Dsndfile=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libsndfile else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-sndfile +GST1_PLUGINS_BAD_CONF_OPTS += -Dsndfile=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SRTP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-srtp +GST1_PLUGINS_BAD_CONF_OPTS += -Dsrtp=enabled GST1_PLUGINS_BAD_DEPENDENCIES += libsrtp else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-srtp +GST1_PLUGINS_BAD_CONF_OPTS += -Dsrtp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-voaacenc +GST1_PLUGINS_BAD_CONF_OPTS += -Dvoaacenc=enabled GST1_PLUGINS_BAD_DEPENDENCIES += vo-aacenc else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-voaacenc +GST1_PLUGINS_BAD_CONF_OPTS += -Dvoaacenc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-webp +GST1_PLUGINS_BAD_CONF_OPTS += -Dwebp=enabled GST1_PLUGINS_BAD_DEPENDENCIES += webp else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-webp +GST1_PLUGINS_BAD_CONF_OPTS += -Dwebp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-webrtc +GST1_PLUGINS_BAD_CONF_OPTS += -Dwebrtc=enabled GST1_PLUGINS_BAD_DEPENDENCIES += gst1-plugins-base libnice else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-webrtc +GST1_PLUGINS_BAD_CONF_OPTS += -Dwebrtc=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTCDSP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-webrtcdsp +GST1_PLUGINS_BAD_CONF_OPTS += -Dwebrtcdsp=enabled GST1_PLUGINS_BAD_DEPENDENCIES += webrtc-audio-processing else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-webrtcdsp +GST1_PLUGINS_BAD_CONF_OPTS += -Dwebrtcdsp=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WPE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-wpe -GST1_PLUGINS_BAD_DEPENDENCIES += wpewebkit +GST1_PLUGINS_BAD_CONF_OPTS += -Dwpe=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += libwpe wpewebkit wpebackend-fdo else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-wpe +GST1_PLUGINS_BAD_CONF_OPTS += -Dwpe=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-x265 +GST1_PLUGINS_BAD_CONF_OPTS += -Dx265=enabled GST1_PLUGINS_BAD_DEPENDENCIES += x265 GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-x265 +GST1_PLUGINS_BAD_CONF_OPTS += -Dx265=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_ZBAR),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-zbar +GST1_PLUGINS_BAD_CONF_OPTS += -Dzbar=enabled GST1_PLUGINS_BAD_DEPENDENCIES += zbar else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-zbar +GST1_PLUGINS_BAD_CONF_OPTS += -Dzbar=disabled endif # Add GPL license if GPL licensed plugins enabled.@@ -739,4 +736,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 v2 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.
---
Changes v1 -> v2:
- Add -Dexamples=disabled as a default config value. (Peter)
.../gst1-plugins-ugly/gst1-plugins-ugly.mk | 55 ++++++++++--------- 1 file changed, 29 insertions(+), 26 deletions(-)
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +29 -26
@@ -11,79 +11,82 @@ 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 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 +97,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 v2 5/6 package/gstreamer1/gst1-plugins-ugly: 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.
See previous patch...
Quoted 5 lines
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.
See previous patch...
Quoted 14 lines
Signed-off-by Adam Duskett <[email protected]>---
Changes v1 -> v2:
- Add -Dexamples=disabled as a default config value. (Peter).../gst1-plugins-ugly/gst1-plugins-ugly.mk | 55 ++++++++++--------- 1 file changed, 29 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 16
Quoted 7 lines
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +3
-1@@ -11,79 +11,82 @@ 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
Keep the order:
-Dexamples=disabled \ -Dtests=disabled
Missing:
+ -Dgobject-cast-checks=disabled \
+ -Dglib-asserts=disabled \
+ -Dglib-checks=disabled \
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING · line 22
Quoted 8 lines
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +0
-6GST1_PLUGINS_UGLY_CONF_OPTS += \ - --disable-a52dec \ - --disable-amrnb \ - --disable-amrwb \ - --disable-cdio \ - --disable-sidplay \ - --disable-twolame
What happend to --disable-twolame?
Quoted 51 lines
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +17
-10+ -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
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING · line 67
Quoted 10 lines
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +2
-2else -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"
Missing space (GST1_PLUGINS_UGLY_LDFLAGS += "-ldvdcss")?
Regards,
Peter
Quoted 37 lines
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +7
-7endif -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 +97,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 v2 5/6 package/gstreamer1/gst1-plugins-ugly: convert package type to meson
Hey Peter
Quoted 62 lines · Peter Seiderer
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.
See previous patch...
Quoted 5 lines
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.See previous patch...
Quoted 14 lines
Signed-off-by Adam Duskett <[email protected]>---
Changes v1 -> v2:
- Add -Dexamples=disabled as a default config value. (Peter).../gst1-plugins-ugly/gst1-plugins-ugly.mk | 55 ++++++++++--------- 1 file changed, 29 insertions(+), 26 deletions(-)package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +0
-0package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING · line 16
Quoted 7 lines
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +3
-1@@ -11,79 +11,82 @@ 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=disabledKeep the order:
-Dexamples=disabled \ -Dtests=disabledMissing:
(quoted diff) +3
-0+ -Dgobject-cast-checks=disabled \ + -Dglib-asserts=disabled \ + -Dglib-checks=disabled \package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING · line 22
Quoted 9 lines
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +0
-6GST1_PLUGINS_UGLY_CONF_OPTS += \ - --disable-a52dec \ - --disable-amrnb \ - --disable-amrwb \ - --disable-cdio \ - --disable-sidplay \ - --disable-twolame
Quoted 1 line
What happend to --disable-twolame?
twolame is in good :)
Quoted 106 lines
Quoted 52 lines
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +17
-10+ -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=enabledpackage/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING · line 67
Quoted 10 lines
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +2
-2else -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"Missing space (
GST1_PLUGINS_UGLY_LDFLAGS+= "-ldvdcss")?Regards,
PeterQuoted 37 lines
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +7
-7endif -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 +97,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 v2 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
PATCH v2 6/6 package/gstreamer1/gst1-rtsp-server: 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.
See previous patch...
Quoted 11 lines
Signed-off-by Adam Duskett <[email protected]>--- 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 +0
-0
package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk GST1_RTSP_SERVER_DEPENDENCIES = \ · line 22
Quoted 7 lines
package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +4
-0@@ -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
Missing:
+ -Dgobject-cast-checks=disabled \
+ -Dglib-asserts=disabled \
+ -Dglib-checks=disabled \
package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD),y) · line 30
Quoted 7 lines
package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +1
-0+ 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
Please add:
# These plugins are listed in the order from meson_options.txt GST1_RTSP_SERVER_CONF_OPTS = \
-Drtspclientsink=enabled
Regards,
Peter
Quoted 3 lines
package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +1
-1-$(eval $(autotools-package)) +$(eval $(meson-package))
v2 cover gstreamer1: convert packages to meson
In reply to aduskett at gmail.comQuoted 11 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.
V2 has some small fixes that were suggested by Peter, but otherwise remains much the same.
Adam Duskett (6):
package/gstreamer1/gstreamer1: Convert package type to meson package/gstreamer1/gst1-plugins-base: Convert package type to meson
I've (mostly) taken into account Peter's comments and applied these two to
master, thanks. And thank you Peter for reviewing.
Quoted 1 line
package/gstreamer1/gst1-plugins-good: Convert package type to meson
These comments were a bit bigger, so I stopped.
Regards,
Arnout
Quoted 15 lines
package/gstreamer1/gst1-plugins-bad: Convert package type to meson package/gstreamer1/gst1-plugins-ugly: Convert package type to meson package/gstreamer1/gst1-rtsp-server: Convert package type to meson
.../0002-fix-hls-meson-logic.patch | 48 ++ package/gstreamer1/gst1-plugins-bad/Config.in | 16 +- .../gst1-plugins-bad/gst1-plugins-bad.mk | 501 +++++++++--------- .../gst1-plugins-base/gst1-plugins-base.mk | 183 ++++--- .../gst1-plugins-good/gst1-plugins-good.mk | 301 ++++++----- .../gst1-plugins-ugly/gst1-plugins-ugly.mk | 55 +- .../gst1-rtsp-server/gst1-rtsp-server.mk | 7 +- package/gstreamer1/gstreamer1/gstreamer1.mk | 31 +- 8 files changed, 595 insertions(+), 547 deletions(-) create mode 100644 package/gstreamer1/gst1-plugins-bad/0002-fix-hls-meson-logic.patch