From: Michael Olbrich <[email protected]>
Signed-off-by: Michael Olbrich <[email protected]>
---
rules/gst-plugins-ugly.make | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/rules/gst-plugins-ugly.make b/rules/gst-plugins-ugly.make
index 3cfacf4..115d103 100644
--- a/rules/gst-plugins-ugly.make
+++ b/rules/gst-plugins-ugly.make
@@ -35,13 +35,15 @@ $(GST_PLUGINS_UGLY_SOURCE):
# Prepare
# ----------------------------------------------------------------------------
-GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_ASFDEMUX) +=
asfdemux
+GST_PLUGINS_UGLY_ENABLEC-$(PTXCONF_GST_PLUGINS_UGLY_ASFDEMUX) +=
asfdemux
+GST_PLUGINS_UGLY_ENABLEP-$(PTXCONF_GST_PLUGINS_UGLY_ASFDEMUX) += asf
GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_DVDLPCMDEC) +=
dvdlpcmdec
GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_DVDSUB) +=
dvdsub
GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_IEC958) +=
iec958
GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_MPEGAUDIOPARSE) +=
mpegaudioparse
GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_MPEGSTREAM) +=
mpegstream
-GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_REALMEDIA) +=
realmedia
+GST_PLUGINS_UGLY_ENABLEC-$(PTXCONF_GST_PLUGINS_UGLY_REALMEDIA) +=
realmedia
+GST_PLUGINS_UGLY_ENABLEP-$(PTXCONF_GST_PLUGINS_UGLY_REALMEDIA) +=
rmdemux
GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_SYNAESTHESIA) +=
synaesthesia
GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_A52DEC) +=
a52dec
GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_AMRNB) += amrnb
@@ -55,6 +57,10 @@ GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_SID)
+= sidplay
GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_TWOLAME) +=
twolame
GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_X264) += x264
+GST_PLUGINS_UGLY_ENABLEC-y += $(GST_PLUGINS_UGLY_ENABLE-y)
+GST_PLUGINS_UGLY_ENABLEC- += $(GST_PLUGINS_UGLY_ENABLE-)
+GST_PLUGINS_UGLY_ENABLEP-y += $(GST_PLUGINS_UGLY_ENABLE-y)
+
#
# autoconf
#
@@ -83,12 +89,12 @@ GST_PLUGINS_UGLY_CONF_OPT := \
# --with-plugins is useless, so we generate a --enable-*
# and --disable-* below
#
-ifneq ($(call remove_quotes,$(GST_PLUGINS_UGLY_ENABLE-y)),)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-$(subst
$(space),$(space)--enable-,$(strip $(GST_PLUGINS_UGLY_ENABLE-y)))
+ifneq ($(call remove_quotes,$(GST_PLUGINS_UGLY_ENABLEC-y)),)
+GST_PLUGINS_UGLY_CONF_OPT += --enable-$(subst
$(space),$(space)--enable-,$(strip $(GST_PLUGINS_UGLY_ENABLEC-y)))
endif
-ifneq ($(call remove_quotes,$(GST_PLUGINS_UGLY_ENABLE-)),)
-GST_PLUGINS_UGLY_CONF_OPT += --disable-$(subst
$(space),$(space)--disable-,$(strip $(GST_PLUGINS_UGLY_ENABLE-)))
+ifneq ($(call remove_quotes,$(GST_PLUGINS_UGLY_ENABLEC-)),)
+GST_PLUGINS_UGLY_CONF_OPT += --disable-$(subst
$(space),$(space)--disable-,$(strip $(GST_PLUGINS_UGLY_ENABLEC-)))
endif
# ----------------------------------------------------------------------------
@@ -108,11 +114,10 @@ $(STATEDIR)/gst-plugins-ugly.targetinstall:
@$(call install_fixup, gst-plugins-ugly,DESCRIPTION,missing)
# install all activated plugins
- @if [ -d $(GST_PLUGINS_UGLY_PKGDIR)/usr/lib/gstreamer-0.10/ ]; then \
- cd $(GST_PLUGINS_UGLY_PKGDIR) && for plugin in `find
./usr/lib/gstreamer-0.10/ -name "*.so"`; do \
- $(call install_copy, gst-plugins-ugly, 0, 0, 0644, -,
/$$plugin); \
- done \
- fi
+ @for plugin in $(GST_PLUGINS_UGLY_ENABLEP-y); do \
+ $(call install_copy, gst-plugins-ugly, 0, 0, 0644, -, \
+ /usr/lib/gstreamer-0.10/libgst$${plugin}.so); \
+ done
@$(call install_finish, gst-plugins-ugly)
--
1.7.1
--
ptxdist mailing list
[email protected]
