Skip to contentSkip to conversation

package/gstreamer1/gst1-plugins-good: convert package type to meson

PATCH Superseded aduskett at gmail.com 1 participant 4 messages Jul 10, 2019 Arm/Amlogic Meson SoC support

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/4 package/gstreamer1/gst1-plugins-good: convert package type to meson

From: Adam Duskett <[email protected]>

Other changes:
- Remove BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIB
Existing configs will already have BR2_PACKAGE_ZLIB selected, so no legacy entry is needed for BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIB

---
Changes v1 -> v3:
- Remove BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIB option (Arnout)

 .../gstreamer1/gst1-plugins-good/Config.in    |   8 -
 .../gst1-plugins-good/gst1-plugins-good.mk    | 301 +++++++++---------
 2 files changed, 149 insertions(+), 160 deletions(-)
package/gstreamer1/gst1-plugins-good/Config.in +0 -8
index 433084fd6b..6e595b80b4 100644
@@ -32,14 +32,6 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_BZ2
 	  Enable bz2 support for the following plugins:
 	  matroska
 
-config BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIB
-	bool "zlib support"
-	depends on BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4 || BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ID3DEMUX || BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA
-	select BR2_PACKAGE_ZLIB
-	help
-	  Enable zlib support for the following plugins:
-	  id3demux, isomp4, matroska
-
 comment "dependency-less plugins"
 
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ALPHA
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +149 -152

606 lines not on this page · raw message

Signature · 1 line
2.21.0
#1 lore raw

PATCH v3 2/4 package/gstreamer1/gst1-plugins-bad: convert package type to meson

From: Adam Duskett <[email protected]>

Other changes:
- 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.

- Remove --disable-avc, this option is no longer in any of the plugin packages.

---
Changes v1 -> v3:
- revert changes to BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ as this was a mistake on my part, which stemmed from my gstreamer meson branch being several months old. (Arnout, Peter)

- Add missing gobject-cast-checks, glib-asserts, and glib-checks in gst1-plugins-bad.mk (Peter)

- Add a line in the commit message explaining the removal of disable-avc.

 .../0002-fix-hls-meson-logic.patch            |  48 ++
 .../gst1-plugins-bad/gst1-plugins-bad.mk      | 504 +++++++++---------
 2 files changed, 300 insertions(+), 252 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
new file mode 100644
index 0000000000..84b0739110
@@ -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/gst1-plugins-bad.mk +252 -252

966 lines not on this page · raw message

Signature · 1 line
2.21.0
#2 lore raw

PATCH v3 3/4 package/gstreamer1/gst1-plugins-ugly: convert package type to meson

In reply to aduskett at gmail.com

From: Adam Duskett <[email protected]>

Other changes:
- Remove --disable-twolame as this plugin is now in gst1-plugins-good.

---
Changes v1 -> v3:
- revert the flipped order of tests and examples. (Peter)

- Add missing gobject-cast-checks, glib-asserts, and glib-checks in gst1-plugins-bad.mk (Peter)

- Add a line in the commit message explaining the removal of disable-twolame.

 .../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
index f3ac2f79d3..e428444400 100644
@@ -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 += \
+	-Dexamples=disabled \
+	-Dtests=disabled
 
 GST1_PLUGINS_UGLY_CONF_OPTS += \
-	--disable-a52dec \
-	--disable-amrnb \
-	--disable-amrwb \
-	--disable-cdio \
-	--disable-sidplay \
-	--disable-twolame
+	-Da52dec=disabled \
+	-Damrnb=disabled \
+	-Damrwbdec=disabled \
+	-Dcdio=disabled \
+	-Dsidplay=disabled
 
 GST1_PLUGINS_UGLY_DEPENDENCIES = gstreamer1 gst1-plugins-base
 
 ifeq ($(BR2_PACKAGE_ORC),y)
-GST1_PLUGINS_UGLY_CONF_OPTS += --enable-orc
+GST1_PLUGINS_UGLY_CONF_OPTS += -Dorc=enabled
 GST1_PLUGINS_UGLY_DEPENDENCIES += orc
+else
+GST1_PLUGINS_UGLY_CONF_OPTS += -Dorc=disabled
 endif
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_ASFDEMUX),y)
-GST1_PLUGINS_UGLY_CONF_OPTS += --enable-asfdemux
+GST1_PLUGINS_UGLY_CONF_OPTS += -Dasfdemux=enabled
 else
-GST1_PLUGINS_UGLY_CONF_OPTS += --disable-asfdemux
+GST1_PLUGINS_UGLY_CONF_OPTS += -Dasfdemux=disabled
 endif
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC),y)
-GST1_PLUGINS_UGLY_CONF_OPTS += --enable-dvdlpcmdec
+GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdlpcmdec=enabled
 else
-GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdlpcmdec
+GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdlpcmdec=disabled
 endif
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB),y)
-GST1_PLUGINS_UGLY_CONF_OPTS += --enable-dvdsub
+GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdsub=enabled
 else
-GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdsub
+GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdsub=disabled
 endif
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX),y)
-GST1_PLUGINS_UGLY_CONF_OPTS += --enable-xingmux
+GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=enabled
 else
-GST1_PLUGINS_UGLY_CONF_OPTS += --disable-xingmux
+GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=disabled
 endif
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA),y)
-GST1_PLUGINS_UGLY_CONF_OPTS += --enable-realmedia
+GST1_PLUGINS_UGLY_CONF_OPTS += -Drealmedia=enabled
 else
-GST1_PLUGINS_UGLY_CONF_OPTS += --disable-realmedia
+GST1_PLUGINS_UGLY_CONF_OPTS += -Drealmedia=disabled
 endif
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD),y)
 # configure does not use pkg-config to detect libdvdread
 ifeq ($(BR2_PACKAGE_LIBDVDCSS)$(BR2_STATIC_LIBS),yy)
-GST1_PLUGINS_UGLY_CONF_ENV += LIBS="-ldvdcss"
+GST1_PLUGINS_UGLY_LDFLAGS += "-ldvdcss"
 endif
-GST1_PLUGINS_UGLY_CONF_OPTS += --enable-dvdread
+GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdread=enabled
 GST1_PLUGINS_UGLY_DEPENDENCIES += libdvdread
 GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y
 else
-GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdread
+GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdread=disabled
 endif
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPEG2DEC),y)
-GST1_PLUGINS_UGLY_CONF_OPTS += --enable-mpeg2dec
+GST1_PLUGINS_UGLY_CONF_OPTS += -Dmpeg2dec=enabled
 GST1_PLUGINS_UGLY_DEPENDENCIES += libmpeg2
 GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y
 else
-GST1_PLUGINS_UGLY_CONF_OPTS += --disable-mpeg2dec
+GST1_PLUGINS_UGLY_CONF_OPTS += -Dmpeg2dec=disabled
 endif
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_X264),y)
-GST1_PLUGINS_UGLY_CONF_OPTS += --enable-x264
+GST1_PLUGINS_UGLY_CONF_OPTS += -Dx264=enabled
 GST1_PLUGINS_UGLY_DEPENDENCIES += x264
 GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y
 else
-GST1_PLUGINS_UGLY_CONF_OPTS += --disable-x264
+GST1_PLUGINS_UGLY_CONF_OPTS += -Dx264=disabled
 endif
 
 # Add GPL license if GPL plugins enabled.
@@ -94,4 +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
#3 lore raw

PATCH v3 4/4 package/gstreamer1/gst1-rtsp-server: convert package type to meson

In reply to aduskett at gmail.com

From: Adam Duskett <[email protected]>

---
Changes v1 -> v3:
- Add missing gobject-cast-checks, glib-asserts, and glib-checks in gst1-plugins-bad.mk (Peter)

 .../gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +9 -1
index 34869863d9..b3b132d07e 100644
@@ -16,6 +16,14 @@ GST1_RTSP_SERVER_DEPENDENCIES = \
 	gst1-plugins-base \
 	gst1-plugins-good
 
+GST1_RTSP_SERVER_CONF_OPTS += \
+	-Dexamples=disabled \
+	-Dtests=disabled \
+	-Dintrospection=disabled \
+	-Dgobject-cast-checks=disabled \
+	-Dglib-asserts=disabled \
+	-Dglib-checks=disabled
+
 ifeq ($(BR2_PACKAGE_LIBCGROUP),y)
 GST1_RTSP_SERVER_DEPENDENCIES += libcgroup
 endif
@@ -24,4 +32,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