gst-plugins-ugly1: version bump 1.14.4 -> 1.16.0

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

2 files changed, 57 insertions, 37 deletions

diff --git a/rules/gst-plugins-ugly1.in b/rules/gst-plugins-ugly1.in
index 54566099c..583fe2bc6 100644
--- a/rules/gst-plugins-ugly1.in
+++ b/rules/gst-plugins-ugly1.in
@@ -2,11 +2,13 @@
 
 menuconfig GST_PLUGINS_UGLY1
 	tristate
+	select HOST_MESON
+
 	select GLIB
 	select GSTREAMER1
 	select GST_PLUGINS_BASE1
 	select ORC
-	select LIBMPEG2		if GST_PLUGINS_UGLY1_MPEG2DEC
+	select LIBMPEG2			if GST_PLUGINS_UGLY1_MPEG2DEC
 	prompt "gst-plugins-ugly              "
 	help
 	  GStreamer Ugly Plug-ins is a set of plug-ins that
@@ -18,6 +20,8 @@ menuconfig GST_PLUGINS_UGLY1
 
 if GST_PLUGINS_UGLY1
 
+comment "dependency-less plugins"
+
 config GST_PLUGINS_UGLY1_ASFDEMUX
 	bool
 	prompt "asfdemux"
@@ -30,52 +34,77 @@ config GST_PLUGINS_UGLY1_DVDSUB
 	bool
 	prompt "dvdsub"
 
+config GST_PLUGINS_UGLY1_REALMEDIA
+	bool
+	prompt "realmedia"
+
 config GST_PLUGINS_UGLY1_XINGMUX
 	bool
 	prompt "xingmux"
 
-config GST_PLUGINS_UGLY1_REALMEDIA
-	bool
-	prompt "realmedia"
+comment "plugins with dependencies"
 
 config GST_PLUGINS_UGLY1_A52DEC
 	bool
+	# needs liba52
 	depends on BROKEN
 	prompt "a52dec"
+	help
+	  Dolby Digital (AC-3) audio decoder plugin
 
 config GST_PLUGINS_UGLY1_AMRNB
 	bool
+	# needs opencore-amrnb
 	depends on BROKEN
 	prompt "amrnb"
+	help
+	  Adaptive Multi-Rate Narrow-Band audio codec plugin
 
 config GST_PLUGINS_UGLY1_AMRWBDEC
 	bool
+	# needs opencore-amrwb
 	depends on BROKEN
 	prompt "amrwbdec"
+	help
+	  Adaptive Multi-Rate Wide-Band audio decoder plugin
 
 config GST_PLUGINS_UGLY1_CDIO
 	bool
+	# needs libcdio
 	depends on BROKEN
 	prompt "cdio"
+	help
+	  CD audio source plugin
 
-config GST_PLUGINS_UGLY1_DVDREADSRC
+config GST_PLUGINS_UGLY1_DVDREAD
 	bool
+	# needs glib & dvdread
 	depends on BROKEN
-	prompt "dvdreadsrc"
+	prompt "dvdread"
+	help
+	  DVD video source plugin
 
 config GST_PLUGINS_UGLY1_MPEG2DEC
 	bool
 	prompt "mpeg2dec"
+	help
+	  MPEG 2 video decoder plugin
 
-config GST_PLUGINS_UGLY1_SID
+config GST_PLUGINS_UGLY1_SIDPLAY
 	bool
+	# needs sidplay
 	depends on BROKEN
-	prompt "sid"
+	prompt "sidplay"
+	help
+	  Commodore 64 audio decoder plugin
 
 config GST_PLUGINS_UGLY1_X264
 	bool
+	# needs x264
 	depends on BROKEN
 	prompt "x264"
+	help
+	  H.264 video encoder plugin
 
 endif
 
diff --git a/rules/gst-plugins-ugly1.make b/rules/gst-plugins-ugly1.make
index ce1a8d866..6b409437f 100644
--- a/rules/gst-plugins-ugly1.make
+++ b/rules/gst-plugins-ugly1.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_UGLY1) += gst-plugins-ugly1
 #
 # Paths and names
 #
-GST_PLUGINS_UGLY1_VERSION	:= 1.14.4
-GST_PLUGINS_UGLY1_MD5		:= 90768a0074db071175ce980064d9a1ac
+GST_PLUGINS_UGLY1_VERSION	:= 1.16.0
+GST_PLUGINS_UGLY1_MD5		:= 1ec343c58d4b17d682f7befa8453c11c
 GST_PLUGINS_UGLY1		:= gst-plugins-ugly-$(GST_PLUGINS_UGLY1_VERSION)
 GST_PLUGINS_UGLY1_SUFFIX	:= tar.xz
 GST_PLUGINS_UGLY1_URL		:= http://gstreamer.freedesktop.org/src/gst-plugins-ugly/$(GST_PLUGINS_UGLY1).$(GST_PLUGINS_UGLY1_SUFFIX)
@@ -29,50 +29,42 @@ GST_PLUGINS_UGLY1_LICENSE	:= LGPL-2.1-or-later
 # Prepare
 # ----------------------------------------------------------------------------
 
+GST_PLUGINS_UGLY1_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY1_A52DEC)		+= a52dec
+GST_PLUGINS_UGLY1_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY1_AMRNB)		+= amrnb
+GST_PLUGINS_UGLY1_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY1_AMRWBDEC)		+= amrwbdec
 GST_PLUGINS_UGLY1_ENABLEC-$(PTXCONF_GST_PLUGINS_UGLY1_ASFDEMUX)		+= asfdemux
 GST_PLUGINS_UGLY1_ENABLEP-$(PTXCONF_GST_PLUGINS_UGLY1_ASFDEMUX)		+= asf
+GST_PLUGINS_UGLY1_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY1_CDIO)		+= cdio
 GST_PLUGINS_UGLY1_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY1_DVDLPCMDEC)	+= dvdlpcmdec
+GST_PLUGINS_UGLY1_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY1_DVDREAD)		+= dvdread
 GST_PLUGINS_UGLY1_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY1_DVDSUB)		+= dvdsub
-GST_PLUGINS_UGLY1_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY1_XINGMUX)		+= xingmux
-GST_PLUGINS_UGLY1_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY1_REALMEDIA)		+= realmedia
-GST_PLUGINS_UGLY1_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY1_A52DEC)		+= a52dec
-GST_PLUGINS_UGLY1_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY1_AMRNB)		+= amrnb
-GST_PLUGINS_UGLY1_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY1_AMRWBDEC)		+= amrwb
-GST_PLUGINS_UGLY1_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY1_CDIO)		+= cdio
-GST_PLUGINS_UGLY1_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY1_DVDREADSRC)	+= dvdread
 GST_PLUGINS_UGLY1_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY1_MPEG2DEC)		+= mpeg2dec
-GST_PLUGINS_UGLY1_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY1_SID)		+= sidplay
+GST_PLUGINS_UGLY1_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY1_REALMEDIA)		+= realmedia
+GST_PLUGINS_UGLY1_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY1_SIDPLAY)		+= sidplay
 GST_PLUGINS_UGLY1_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY1_X264)		+= x264
+GST_PLUGINS_UGLY1_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY1_XINGMUX)		+= xingmux
 
-GST_PLUGINS_UGLY1_ENABLEC-y	+= $(GST_PLUGINS_UGLY1_ENABLE-y)
 GST_PLUGINS_UGLY1_ENABLEC-	+= $(GST_PLUGINS_UGLY1_ENABLE-)
+GST_PLUGINS_UGLY1_ENABLEC-y	+= $(GST_PLUGINS_UGLY1_ENABLE-y)
 GST_PLUGINS_UGLY1_ENABLEP-y	+= $(GST_PLUGINS_UGLY1_ENABLE-y)
 
 #
-# autoconf
+# meson
 #
-GST_PLUGINS_UGLY1_CONF_TOOL	:= autoconf
+GST_PLUGINS_UGLY1_CONF_TOOL	:= meson
 GST_PLUGINS_UGLY1_CONF_OPT	= \
-	$(CROSS_AUTOCONF_USR) \
-	$(GSTREAMER1_GENERIC_CONF_OPT) \
-	--enable-external \
-	--enable-experimental \
-	--enable-orc
+	$(CROSS_MESON_USR) \
+	$(call GSTREAMER1_GENERIC_CONF_OPT,GStreamer Ugly Plug-ins) \
 
-#
-# the --with-plugins sadly only applies to depencyless plugings
-# and when no plugins are sellected it builds them all. So
-# --with-plugins is useless, so we generate a --enable-*
-# and --disable-* below
-#
 ifneq ($(call remove_quotes,$(GST_PLUGINS_UGLY1_ENABLEC-y)),)
-GST_PLUGINS_UGLY1_CONF_OPT +=  --enable-$(subst $(space),$(space)--enable-,$(strip $(GST_PLUGINS_UGLY1_ENABLEC-y)))
+GST_PLUGINS_UGLY1_CONF_OPT +=  $(addsuffix =enabled, $(addprefix -D, $(GST_PLUGINS_UGLY1_ENABLEC-y)))
 endif
 
 ifneq ($(call remove_quotes,$(GST_PLUGINS_UGLY1_ENABLEC-)),)
-GST_PLUGINS_UGLY1_CONF_OPT +=  --disable-$(subst $(space),$(space)--disable-,$(strip $(GST_PLUGINS_UGLY1_ENABLEC-)))
+GST_PLUGINS_UGLY1_CONF_OPT +=  $(addsuffix =disabled, $(addprefix -D, $(GST_PLUGINS_UGLY1_ENABLEC-)))
 endif
 
+
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
@@ -87,10 +79,9 @@ $(STATEDIR)/gst-plugins-ugly1.targetinstall:
 	@$(call install_fixup, gst-plugins-ugly1,DESCRIPTION,missing)
 
 	# install all activated plugins
-	@for plugin in $(GST_PLUGINS_UGLY1_ENABLEP-y); do \
+	@$(foreach plugin,$(GST_PLUGINS_UGLY1_ENABLEP-y), \
 		$(call install_copy, gst-plugins-ugly1, 0, 0, 0644, -, \
-			/usr/lib/gstreamer-1.0/libgst$${plugin}.so); \
-	done
+			/usr/lib/gstreamer-1.0/libgst$(plugin).so)$(ptx/nl))
 
 	@$(call install_finish, gst-plugins-ugly1)