From: Michael Olbrich <m.olbr...@pengutronix.de>

also disable broken plugins revealed by this change.

Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de>
---
 rules/gst-plugins-bad.in   |   25 ++++++++++++++++++---
 rules/gst-plugins-bad.make |   50 +++++++++++++++++++++++++++++---------------
 2 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/rules/gst-plugins-bad.in b/rules/gst-plugins-bad.in
index 4c96607..94e4049 100644
--- a/rules/gst-plugins-bad.in
+++ b/rules/gst-plugins-bad.in
@@ -38,6 +38,10 @@ config GST_PLUGINS_BAD_ASFMUX
        bool
        prompt "asfmux"
 
+config GST_PLUGINS_BAD_AUDIOPARSERS
+       bool
+       prompt "audioparsers"
+
 config GST_PLUGINS_BAD_AUTOCONVERT
        bool
        prompt "autoconvert"
@@ -233,19 +237,19 @@ config GST_PLUGINS_BAD_VMNC
 
 config GST_PLUGINS_BAD_DIRECTSOUND
        bool
-       prompt "directsound"
+       # windows only
 
 config GST_PLUGINS_BAD_DIRECTDRAW
        bool
-       prompt "directdraw"
+       # windows only
 
 config GST_PLUGINS_BAD_OSX_VIDEO
        bool
-       prompt "osx_video"
+       # OSX only
 
 config GST_PLUGINS_BAD_QUICKTIME
        bool
-       prompt "quicktime"
+       # OSX only
 
 config GST_PLUGINS_BAD_VCD
        bool
@@ -315,6 +319,8 @@ config GST_PLUGINS_BAD_DIVX
 
 config GST_PLUGINS_BAD_RESINDVD
        bool
+       # needs dvdnav & dvdread
+       depends on BROKEN
        prompt "resindvd"
 
 config GST_PLUGINS_BAD_METADATA
@@ -373,10 +379,14 @@ config GST_PLUGINS_BAD_LV2
 
 config GST_PLUGINS_BAD_LIBMMS
        bool
+       # needs libmms
+       depends on BROKEN
        prompt "libmms"
 
 config GST_PLUGINS_BAD_MODPLUG
        bool
+       # needs libmodplug
+       depends on BROKEN
        prompt "modplug"
 
 config GST_PLUGINS_BAD_MIMIC
@@ -445,6 +455,8 @@ config GST_PLUGINS_BAD_SDL
 
 config GST_PLUGINS_BAD_SNDFILE
        bool
+       # needs sndfile
+       depends on BROKEN
        prompt "sndfile"
 
 config GST_PLUGINS_BAD_SOUNDTOUCH
@@ -469,6 +481,9 @@ config GST_PLUGINS_BAD_SWFDEC
 
 config GST_PLUGINS_BAD_THEORADEC
        bool
+       # this is disabled in the source code (0.10.19)
+       # recheck in later versions
+       depends on BROKEN
        prompt "theoradec"
 
 config GST_PLUGINS_BAD_XVID
@@ -497,6 +512,8 @@ config GST_PLUGINS_BAD_VDPAU
 
 config GST_PLUGINS_BAD_SCHRO
        bool
+       # needs schroedinger-1.0
+       depends on BROKEN
        prompt "schro"
 
 config GST_PLUGINS_BAD_ZBAR
diff --git a/rules/gst-plugins-bad.make b/rules/gst-plugins-bad.make
index de226d5..00554ff 100644
--- a/rules/gst-plugins-bad.make
+++ b/rules/gst-plugins-bad.make
@@ -41,6 +41,8 @@ GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_ADPCMDEC)    
+= adpcmdec
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_ADPCMENC)     += adpcmenc
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_AIFF)         += aiff
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_ASFMUX)       += asfmux
+GST_PLUGINS_BAD_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD_AUDIOPARSERS)        += 
audioparsers
+GST_PLUGINS_BAD_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD_AUDIOPARSERS)        += 
audioparsersbad
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_AUTOCONVERT)  += autoconvert
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_CAMERABIN)    += camerabin
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_LEGACYRESAMPLE) += 
legacyresample
@@ -48,7 +50,8 @@ GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_BAYER)       
        += bayer
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_CDXAPARSE)    += cdxaparse
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_DATAURISRC)   += dataurisrc
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_DCCP)         += dccp
-GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_DEBUGUTILS)   += debugutils
+GST_PLUGINS_BAD_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD_DEBUGUTILS)  += debugutils
+GST_PLUGINS_BAD_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD_DEBUGUTILS)  += debugutilsbad
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_DTMF)         += dtmf
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_DVDSPU)       += dvdspu
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_FESTIVAL)     += festival
@@ -59,7 +62,8 @@ GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_HDVPARSE)    
+= hdvparse
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_ID3TAG)       += id3tag
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_INVTELECINE)  += invtelecine
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_JPEGFORMAT)   += jpegformat
-GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_LIBRFB)       += librfb
+GST_PLUGINS_BAD_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD_LIBRFB)      += librfb
+GST_PLUGINS_BAD_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD_LIBRFB)      += rfbsrc
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_LIVEADDER)    += liveadder
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_MPEGDEMUX)    += mpegdemux
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_MPEGTSMUX)    += mpegtsmux
@@ -74,10 +78,15 @@ GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_PCAPPARSE) 
+= pcapparse
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_PNM)          += pnm
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_QTMUX)                += qtmux
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_RAWPARSE)     += rawparse
+# real plugin cannot be built on arch != x86
+ifdef PTXCONF_ARCH_X86
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_REAL)         += real
+endif
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_RTPMUX)       += rtpmux
-GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_SCALETEMPO)   += scaletempo
-GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_SDP)          += sdp
+GST_PLUGINS_BAD_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD_SCALETEMPO)  += scaletempo
+GST_PLUGINS_BAD_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD_SCALETEMPO)  += 
scaletempoplugin
+GST_PLUGINS_BAD_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD_SDP)         += sdp
+GST_PLUGINS_BAD_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD_SDP)         += sdpelem
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_SEGMENTCLIP)  += segmentclip
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_SELECTOR)     += selector
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_SIREN)                += siren
@@ -93,8 +102,10 @@ 
GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_DIRECTSOUND)       += 
directsound
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_DIRECTDRAW)   += directdraw
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_OSX_VIDEO)    += osx_video
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_QUICKTIME)    += quicktime
-GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_VCD)          += vcd
-GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_ALSA)         += alsa
+GST_PLUGINS_BAD_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD_VCD)         += vcd
+GST_PLUGINS_BAD_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD_VCD)         += vcdsrc
+GST_PLUGINS_BAD_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD_ALSA)                += alsa
+GST_PLUGINS_BAD_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD_ALSA)                += 
alsaspdif
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_ASSRENDER)    += assrender
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_AMRWB)                += amrwb
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_APEXSINK)     += apexsink
@@ -103,7 +114,8 @@ GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_CDAUDIO)   
+= cdaudio
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_CELT)         += celt
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_COG)          += cog
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_DC1394)       += dc1394
-GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_DIRECTFB)     += directfb
+GST_PLUGINS_BAD_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD_DIRECTFB)    += directfb
+GST_PLUGINS_BAD_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD_DIRECTFB)    += dfbvideosink
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_DIRAC)                += dirac
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_DTS)          += dts
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_DIVX)         += divx
@@ -111,7 +123,8 @@ GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_RESINDVD)  
+= resindvd
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_METADATA)     += metadata
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_FAAC)         += faac
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_FAAD)         += faad
-GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_FBDEV)                += fbdev
+GST_PLUGINS_BAD_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD_FBDEV)       += fbdev
+GST_PLUGINS_BAD_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD_FBDEV)       += fbdevsink
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_FLITE)                += flite
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_GSM)          += gsm
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_JACK)         += jack
@@ -149,6 +162,10 @@ GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_SCHRO)    
        += schro
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_ZBAR)         += zbar
 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_VP8)          += vp8
 
+GST_PLUGINS_BAD_ENABLEC-y      += $(GST_PLUGINS_BAD_ENABLE-y)
+GST_PLUGINS_BAD_ENABLEC-       += $(GST_PLUGINS_BAD_ENABLE-)
+GST_PLUGINS_BAD_ENABLEP-y      += $(GST_PLUGINS_BAD_ENABLE-y)
+
 #
 # autoconf
 #
@@ -170,12 +187,12 @@ GST_PLUGINS_BAD_CONF_OPT := \
        --disable-gtk-doc \
        --disable-sdltest
 
-ifneq ($(call remove_quotes,$(GST_PLUGINS_BAD_ENABLE-y)),)
-GST_PLUGINS_BAD_CONF_OPT +=  --enable-$(subst 
$(space),$(space)--enable-,$(strip $(GST_PLUGINS_BAD_ENABLE-y)))
+ifneq ($(call remove_quotes,$(GST_PLUGINS_BAD_ENABLEC-y)),)
+GST_PLUGINS_BAD_CONF_OPT +=  --enable-$(subst 
$(space),$(space)--enable-,$(strip $(GST_PLUGINS_BAD_ENABLEC-y)))
 endif
 
-ifneq ($(call remove_quotes,$(GST_PLUGINS_BAD_ENABLE-)),)
-GST_PLUGINS_BAD_CONF_OPT +=  --disable-$(subst 
$(space),$(space)--disable-,$(strip $(GST_PLUGINS_BAD_ENABLE-)))
+ifneq ($(call remove_quotes,$(GST_PLUGINS_BAD_ENABLEC-)),)
+GST_PLUGINS_BAD_CONF_OPT +=  --disable-$(subst 
$(space),$(space)--disable-,$(strip $(GST_PLUGINS_BAD_ENABLEC-)))
 endif
 
 #  --enable-gobject-cast-checks=[no/auto/yes] Enable GObject cast checks
@@ -207,11 +224,10 @@ $(STATEDIR)/gst-plugins-bad.targetinstall:
        fi
 
        # install all activated plugins
-       @if [ -d  $(GST_PLUGINS_BAD_PKGDIR)/usr/lib/gstreamer-0.10/ ]; then \
-               cd $(GST_PLUGINS_BAD_PKGDIR) && for plugin in `find 
./usr/lib/gstreamer-0.10/ -name "*.so"`; do \
-                       $(call install_copy, gst-plugins-bad, 0, 0, 0644, -, 
/$$plugin); \
-               done \
-       fi
+       @for plugin in $(GST_PLUGINS_BAD_ENABLEP-y); do \
+               $(call install_copy, gst-plugins-bad, 0, 0, 0644, -, \
+                       /usr/lib/gstreamer-0.10/libgst$${plugin}.so); \
+       done
 
        @$(call install_finish, gst-plugins-bad)
 
-- 
1.7.1


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Reply via email to