[gst-plugins-good] Version update to 0.10.17

Signed-off-by: Erwin Rol <erwin@erwinrol.com>

2 files changed, 226 insertions, 507 deletions

diff --git a/rules/gst-plugins-good.in b/rules/gst-plugins-good.in
index fbc8e21e3..9e0b98bc7 100644
--- a/rules/gst-plugins-good.in
+++ b/rules/gst-plugins-good.in
@@ -6,16 +6,29 @@ menuconfig GST_PLUGINS_GOOD
 	select LIBOIL
 	select GSTREAMER
 	select GST_PLUGINS_BASE
-	select LIBPNG		if GST_PLUGINS_GOOD__LIBPNG
-	select LIBJPEG		if GST_PLUGINS_GOOD__JPEG
-	select ZLIB		if GST_PLUGINS_GOOD__ZLIB
+	select LIBPNG		if GST_PLUGINS_GOOD_LIBPNG
+	select LIBJPEG		if GST_PLUGINS_GOOD_JPEG
+	select ZLIB		if GST_PLUGINS_GOOD_ZLIB
+	select BZIP2		if GST_PLUGINS_GOOD_BZ2
+	select LIBCACA		if GST_PLUGINS_GOOD_LIBCACA
+	select XORG_LIB_X11	if GST_PLUGINS_GOOD_X
+	select XORG_LIB_X11	if GST_PLUGINS_GOOD_XVIDEO
+	select GTK		if GST_PLUGINS_GOOD_GDK_PIXBUF
+	select SPEEX		if GST_PLUGINS_GOOD_SPEEX
+	select FLAC		if GST_PLUGINS_GOOD_FLAC
+	select CAIRO		if GST_PLUGINS_GOOD_CAIRO
+
 	prompt "gst-plugins-good              "
 	help
-	  A set of good-quality plug-ins for gstreamer
+	  GStreamer Good Plug-ins is a set of plug-ins that
+	  we consider to have good quality code, correct
+	  functionality, our preferred license (LGPL for the
+	  plug-in code, LGPL or LGPL-compatible for the
+	  supporting library).
 
 if GST_PLUGINS_GOOD
 
-	config GST_PLUGINS_GOOD__BROKEN
+	config GST_PLUGINS_GOOD_BROKEN
 		bool
 		prompt "show also broken plugins"
 		help
@@ -30,313 +43,322 @@ if GST_PLUGINS_GOOD
 	comment "dependencyless plugins"
 	# ------------------------------
 
-	config GST_PLUGINS_GOOD__VIDEOFILTER
+	config GST_PLUGINS_GOOD_VIDEOFILTER
 		bool
 		prompt "videofilter"
 
-	config GST_PLUGINS_GOOD__ALPHA
+	config GST_PLUGINS_GOOD_ALPHA
 		bool
 		prompt "alpha"
 
-	config GST_PLUGINS_GOOD__APETAG
+	config GST_PLUGINS_GOOD_APETAG
 		bool
 		prompt "apetag"
 
-	config GST_PLUGINS_GOOD__AUDIOFX
+	config GST_PLUGINS_GOOD_AUDIOFX
 		bool
 		prompt "audiofx"
 
-	config GST_PLUGINS_GOOD__AUPARSE
+	config GST_PLUGINS_GOOD_AUPARSE
 		bool
 		prompt "auparse"
 
-	config GST_PLUGINS_GOOD__AUTODETECT
+	config GST_PLUGINS_GOOD_AUTODETECT
 		bool
 		prompt "autodetect"
 
-	config GST_PLUGINS_GOOD__AVI
+	config GST_PLUGINS_GOOD_AVI
 		bool
 		prompt "avi"
 
-	config GST_PLUGINS_GOOD__CUTTER
+	config GST_PLUGINS_GOOD_CUTTER
 		bool
 		prompt "cutter"
 
-	config GST_PLUGINS_GOOD__DEBUG
+	config GST_PLUGINS_GOOD_DEBUG
 		bool
 		prompt "debug"
 
-	config GST_PLUGINS_GOOD__EFFECTV
+	config GST_PLUGINS_GOOD_EFFECTV
 		bool
 		prompt "effectv"
 
-	config GST_PLUGINS_GOOD__EQUALIZER
+	config GST_PLUGINS_GOOD_EQUALIZER
 		bool
 		prompt "equalizer"
 
-	config GST_PLUGINS_GOOD__ID3DEMUX
+	config GST_PLUGINS_GOOD_ID3DEMUX
 		bool
 		prompt "id3demux"
 
-	config GST_PLUGINS_GOOD__ICYDEMUX
+	config GST_PLUGINS_GOOD_ICYDEMUX
 		bool
 		prompt "icydemux"
 
-	config GST_PLUGINS_GOOD__INTERLEAVE
+	config GST_PLUGINS_GOOD_INTERLEAVE
 		bool
 		prompt "interleave"
 
-	config GST_PLUGINS_GOOD__FLX
+	config GST_PLUGINS_GOOD_FLX
 		bool
 		prompt "flx"
 
-	config GST_PLUGINS_GOOD__GOOM
+	config GST_PLUGINS_GOOD_GOOM
 		bool
 		prompt "goom"
 
-	config GST_PLUGINS_GOOD__GOOM2K1
+	config GST_PLUGINS_GOOD_GOOM2K1
 		bool
 		prompt "goom2k1"
 
-	config GST_PLUGINS_GOOD__LAW
+	config GST_PLUGINS_GOOD_LAW
 		bool
 		prompt "law"
 
-	config GST_PLUGINS_GOOD__LEVEL
+	config GST_PLUGINS_GOOD_LEVEL
 		bool
 		prompt "level"
 
-	config GST_PLUGINS_GOOD__MATROSKA
+	config GST_PLUGINS_GOOD_MATROSKA
 		bool
 		prompt "matroska"
 
-	config GST_PLUGINS_GOOD__MONOSCOPE
+	config GST_PLUGINS_GOOD_MONOSCOPE
 		bool
 		prompt "monoscope"
 
-	config GST_PLUGINS_GOOD__MULTIFILE
+	config GST_PLUGINS_GOOD_MULTIFILE
 		bool
 		prompt "multifile"
 
-	config GST_PLUGINS_GOOD__MULTIPART
+	config GST_PLUGINS_GOOD_MULTIPART
 		bool
 		prompt "multipart"
 
-	config GST_PLUGINS_GOOD__QTDEMUX
+	config GST_PLUGINS_GOOD_QTDEMUX
 		bool
 		prompt "qtdemux"
 
-	config GST_PLUGINS_GOOD__REPLAYGAIN
+	config GST_PLUGINS_GOOD_REPLAYGAIN
 		bool
 		prompt "replaygain"
 
-	config GST_PLUGINS_GOOD__RTP
+	config GST_PLUGINS_GOOD_RTP
 		bool
 		prompt "rtp"
 
-	config GST_PLUGINS_GOOD__RTSP
+	config GST_PLUGINS_GOOD_RTSP
 		bool
 		prompt "rtsp"
 
-	config GST_PLUGINS_GOOD__SMPTE
+	config GST_PLUGINS_GOOD_SMPTE
 		bool
 		prompt "smpte"
 
-	config GST_PLUGINS_GOOD__SPECTRUM
+	config GST_PLUGINS_GOOD_SPECTRUM
 		bool
 		prompt "spectrum"
 
-	config GST_PLUGINS_GOOD__UDP
+	config GST_PLUGINS_GOOD_UDP
 		bool
 		prompt "udp"
 
-	config GST_PLUGINS_GOOD__VIDEOBOX
+	config GST_PLUGINS_GOOD_VIDEOBOX
 		bool
 		prompt "videobox"
 
-	config GST_PLUGINS_GOOD__VIDEOCROP
+	config GST_PLUGINS_GOOD_VIDEOCROP
 		bool
 		prompt "videocrop"
 
-	config GST_PLUGINS_GOOD__VIDEOMIXER
+	config GST_PLUGINS_GOOD_VIDEOMIXER
 		bool
 		prompt "videomixer"
 
-	config GST_PLUGINS_GOOD__WAVENC
+	config GST_PLUGINS_GOOD_WAVENC
 		bool
 		prompt "wavenc"
 
-	config GST_PLUGINS_GOOD__WAVPARSE
+	config GST_PLUGINS_GOOD_WAVPARSE
 		bool
 		prompt "wavparse"
 
+	config GST_PLUGINS_GOOD_DEBUGUTILS
+		bool
+		prompt "debugutils"
+
+	config GST_PLUGINS_GOOD_DEINTERLACE
+		bool
+		prompt "deinterlace"
+
+	config GST_PLUGINS_GOOD_FLV
+		bool
+		prompt "flv"
+
+	config GST_PLUGINS_GOOD_RTPMANAGER
+		bool
+		prompt "rtpmanager"
+
+	config GST_PLUGINS_GOOD_Y4M
+		bool
+		prompt "y4m"
+
 	# ---------------------------------
 	comment "plugins with dependencies"
 	# ---------------------------------
 
-	config GST_PLUGINS_GOOD__DIRECTDRAW
+	config GST_PLUGINS_GOOD_DIRECTDRAW
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
+		depends on GST_PLUGINS_GOOD_BROKEN
 		prompt "directdraw"
 
-	config GST_PLUGINS_GOOD__DIRECTSOUND
+	config GST_PLUGINS_GOOD_DIRECTSOUND
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
+		depends on GST_PLUGINS_GOOD_BROKEN
 		prompt "directsound"
 
-	config GST_PLUGINS_GOOD__OSS
+	config GST_PLUGINS_GOOD_OSS
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
+		depends on GST_PLUGINS_GOOD_BROKEN
 		prompt "oss"
 
-	config GST_PLUGINS_GOOD__SUNAUDIO
+	config GST_PLUGINS_GOOD_SUNAUDIO
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
+		depends on GST_PLUGINS_GOOD_BROKEN
 		prompt "sunaudio"
 
-	config GST_PLUGINS_GOOD__OSX_AUDIO
+	config GST_PLUGINS_GOOD_OSX_AUDIO
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
+		depends on GST_PLUGINS_GOOD_BROKEN
 		prompt "osx_audio"
 
-	config GST_PLUGINS_GOOD__OSX_VIDEO
+	config GST_PLUGINS_GOOD_OSX_VIDEO
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
+		depends on GST_PLUGINS_GOOD_BROKEN
 		prompt "osx_video"
 
-	config GST_PLUGINS_GOOD__V4L2
+	config GST_PLUGINS_GOOD_V4L2
 		bool
 		prompt "v4l2"
 
-	config GST_PLUGINS_GOOD__X
+	config GST_PLUGINS_GOOD_X
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
 		prompt "x"
 
-	config GST_PLUGINS_GOOD__XSHM
+	config GST_PLUGINS_GOOD_XSHM
 		bool
 		prompt "xshm"
 
-	config GST_PLUGINS_GOOD__XVIDEO
+	config GST_PLUGINS_GOOD_XVIDEO
 		bool
 		prompt "xvideo"
 
-	config GST_PLUGINS_GOOD__AALIB
+	config GST_PLUGINS_GOOD_AALIB
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
+		depends on GST_PLUGINS_GOOD_BROKEN
 		prompt "aalib"
 
-	config GST_PLUGINS_GOOD__AALIBTEST
+	config GST_PLUGINS_GOOD_ANNODEX
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
-		prompt "aalibtest"
-
-	config GST_PLUGINS_GOOD__ANNODEX
-		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
+		depends on GST_PLUGINS_GOOD_BROKEN
 		prompt "annodex"
 
-	config GST_PLUGINS_GOOD__CAIRO
+	config GST_PLUGINS_GOOD_CAIRO
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
 		prompt "cairo"
 
-	config GST_PLUGINS_GOOD__CDIO
+	config GST_PLUGINS_GOOD_CDIO
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
+		depends on GST_PLUGINS_GOOD_BROKEN
 		prompt "cdio"
 
-	config GST_PLUGINS_GOOD__ESD
+	config GST_PLUGINS_GOOD_ESD
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
+		depends on GST_PLUGINS_GOOD_BROKEN
 		prompt "esd"
 
-	config GST_PLUGINS_GOOD__ESDTEST
-		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
-		prompt "esdtest"
-
-	config GST_PLUGINS_GOOD__FLAC
+	config GST_PLUGINS_GOOD_FLAC
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
 		prompt "flac"
 
-	config GST_PLUGINS_GOOD__GCONF
+	config GST_PLUGINS_GOOD_GCONF
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
+		depends on GST_PLUGINS_GOOD_BROKEN
 		prompt "gconf"
 
-	config GST_PLUGINS_GOOD__GDK_PIXBUF
+	config GST_PLUGINS_GOOD_GDK_PIXBUF
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
 		prompt "gdk_pixbuf"
 
-	config GST_PLUGINS_GOOD__HAL
+	config GST_PLUGINS_GOOD_HAL
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
+		depends on GST_PLUGINS_GOOD_BROKEN
 		prompt "hal"
 
-	config GST_PLUGINS_GOOD__JPEG
+	config GST_PLUGINS_GOOD_JPEG
 		bool
 		prompt "jpeg"
 
-	config GST_PLUGINS_GOOD__LIBCACA
+	config GST_PLUGINS_GOOD_LIBCACA
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
 		prompt "libcaca"
 
-	config GST_PLUGINS_GOOD__LIBDV
+	config GST_PLUGINS_GOOD_LIBDV
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
+		depends on GST_PLUGINS_GOOD_BROKEN
 		prompt "libdv"
 
-	config GST_PLUGINS_GOOD__LIBPNG
+	config GST_PLUGINS_GOOD_LIBPNG
 		bool
 		prompt "libpng"
 
-	config GST_PLUGINS_GOOD__PULSE
+	config GST_PLUGINS_GOOD_PULSE
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
+		depends on GST_PLUGINS_GOOD_BROKEN
 		prompt "pulse"
 
-	config GST_PLUGINS_GOOD__DV1394
+	config GST_PLUGINS_GOOD_DV1394
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
-		#prompt "dv1394"
+		depends on GST_PLUGINS_GOOD_BROKEN
+		prompt "dv1394"
 
-	config GST_PLUGINS_GOOD__SHOUT2
+	config GST_PLUGINS_GOOD_SHOUT2
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
+		depends on GST_PLUGINS_GOOD_BROKEN
 		prompt "shout2"
 
-	config GST_PLUGINS_GOOD__SHOUT2TEST
-		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
-		prompt "shout2test"
-
-	config GST_PLUGINS_GOOD__SOUP
+	config GST_PLUGINS_GOOD_SOUP
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
+		depends on GST_PLUGINS_GOOD_BROKEN
 		prompt "soup"
 
-	config GST_PLUGINS_GOOD__SPEEX
+	config GST_PLUGINS_GOOD_SPEEX
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
 		prompt "speex"
 
-	config GST_PLUGINS_GOOD__TAGLIB
+	config GST_PLUGINS_GOOD_TAGLIB
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
+		depends on GST_PLUGINS_GOOD_BROKEN
 		prompt "taglib"
 
-	config GST_PLUGINS_GOOD__WAVPACK
+	config GST_PLUGINS_GOOD_WAVPACK
 		bool
-		depends on GST_PLUGINS_GOOD__BROKEN
+		depends on GST_PLUGINS_GOOD_BROKEN
 		prompt "wavpack"
 
-	config GST_PLUGINS_GOOD__ZLIB
+	comment "Support options"
+
+	config GST_PLUGINS_GOOD_ZLIB
 		bool
 		prompt "zlib"
+		help
+		  zlib support for id3demux/qtdemux/matroska
+
+	config GST_PLUGINS_GOOD_BZ2
+		bool
+		prompt "bz2"
+		help
+		  bz2 support for matroska
 
 endif
 
diff --git a/rules/gst-plugins-good.make b/rules/gst-plugins-good.make
index f5d76d679..508258afd 100644
--- a/rules/gst-plugins-good.make
+++ b/rules/gst-plugins-good.make
@@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_GOOD) += gst-plugins-good
 #
 # Paths and names
 #
-GST_PLUGINS_GOOD_VERSION	:= 0.10.14
+GST_PLUGINS_GOOD_VERSION	:= 0.10.17
 GST_PLUGINS_GOOD		:= gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION)
 GST_PLUGINS_GOOD_SUFFIX		:= tar.bz2
 GST_PLUGINS_GOOD_URL		:= http://gstreamer.freedesktop.org/src/gst-plugins-good/$(GST_PLUGINS_GOOD).$(GST_PLUGINS_GOOD_SUFFIX)
@@ -35,15 +35,83 @@ $(GST_PLUGINS_GOOD_SOURCE):
 # Prepare
 # ----------------------------------------------------------------------------
 
-GST_PLUGINS_GOOD_PATH	:= PATH=$(CROSS_PATH)
-GST_PLUGINS_GOOD_ENV 	:= $(CROSS_ENV)
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_VIDEOFILTER)	+= videofilter
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_ALPHA)	+= alpha
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_APETAG)	+= apetag
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_AUDIOFX)	+= audiofx
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_AUPARSE)	+= auparse
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_AUTODETECT)	+= autodetect
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_AVI)		+= avi
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_CUTTER)	+= cutter
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_DEBUGUTILS)	+= debugutils
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_DEINTERLACE)	+= deinterlace
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_EFFECTV)	+= effectv
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_EQUALIZER)	+= equalizer
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_FLV)		+= flv
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_ID3DEMUX)	+= id3demux
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_ICYDEMUX)	+= icydemux
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_INTERLEAVE)	+= interleave
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_FLX)		+= flx
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_GOOM)	+= goom
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_GOOM2K1)	+= goom2k1
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_LAW)		+= law
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_LEVEL)	+= level
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_MATROSKA)	+= matroska
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_MONOSCOPE)	+= monoscope
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_MULTIFILE)	+= multifile
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_MULTIPART)	+= multipart
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_QTDEMUX)	+= qtdemux
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_REPLAYGAIN)	+= replaygain
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_RTP)		+= rtp
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_RTPMANAGER)	+= rtpmanager
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_RTSP)	+= rtsp
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_SMPTE)	+= smpte
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_SPECTRUM)	+= spectrum
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_UDP)		+= udp
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_VIDEOBOX)	+= videobox
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_VIDEOCROP)	+= videocrop
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_VIDEOMIXER)	+= videomixer
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_WAVENC)	+= wavenc
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_WAVPARSE)	+= wavparse
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_Y4M)		+= y4m
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_DIRECTSOUND)	+= directsound
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_OSS)		+= oss
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_SUNAUDIO)	+= sunaudio
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_OSX_AUDIO)	+= osx_audio
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_OSX_VIDEO)	+= osx_video
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_GST_V4L2)	+= gst_v4l2
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_X)		+= x
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_XSHM)	+= xshm
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_XVIDEO)	+= xvideo
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_AALIB)	+= aalib
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_ANNODEX)	+= annodex
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_CAIRO)	+= cairo
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_ESD)		+= esd
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_FLAC)	+= flac
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_GCONF)	+= gconf
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_GDK_PIXBUF)	+= gdk_pixbuf
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_HAL)		+= hal
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_JPEG)	+= jpeg
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_LIBCACA)	+= libcaca
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_LIBDV)	+= libdv
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_LIBPNG)	+= libpng
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_PULSE)	+= pulse
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_DV1394)	+= dv1394
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_SHOUT2)	+= shout2
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_SOUP)	+= soup
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_SPEEX)	+= speex
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_TAGLIB)	+= taglib
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_WAVPACK)	+= wavpack
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_ZLIB)	+= zlib
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_BZ2)		+= bz2
 
 #
 # autoconf
 #
 # --without-libiconv-prefix -> we use libc iconv
 #
-GST_PLUGINS_GOOD_AUTOCONF := \
+GST_PLUGINS_GOOD_CONF_TOOL	:= autoconf
+GST_PLUGINS_GOOD_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	--disable-rpath \
 	--disable-nls \
@@ -57,397 +125,25 @@ GST_PLUGINS_GOOD_AUTOCONF := \
 	--disable-schemas-install \
 	--disable-gtk-doc \
 	--disable-gconftool \
-	--without-libiconv-prefix
+	--without-libiconv-prefix \
+	--enable-shave \
+	--disable-esdtest \
+	--disable-aalibtest \
+	--disable-shout2test
+
 
 #
-# FIXME: what about these? They are built but I don't know which option
-# they belong to.
+# 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
 #
-#/usr/lib/gstreamer-0.10/libgstnavigationtest.so
-#/usr/lib/gstreamer-0.10/libgstmulaw.so
-#/usr/lib/gstreamer-0.10/libgstgamma.so
-
-ifdef PTXCONF_GST_PLUGINS_GOOD__VIDEOFILTER
-GST_PLUGINS_GOOD_AUTOCONF += --enable-videofilter
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstvideoflip.so \
-                             /usr/lib/gstreamer-0.10/libgstgamma.so \
-                             /usr/lib/gstreamer-0.10/libgstvideobalance.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-videofilter
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__ALPHA
-GST_PLUGINS_GOOD_AUTOCONF += --enable-alpha
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstalphacolor.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-alpha
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__APETAG
-GST_PLUGINS_GOOD_AUTOCONF += --enable-apetag
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-apetag
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__AUDIOFX
-GST_PLUGINS_GOOD_AUTOCONF += --enable-audiofx
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstaudiofx.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-audiofx
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__AUPARSE
-GST_PLUGINS_GOOD_AUTOCONF += --enable-auparse
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstauparse.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-auparse
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__AUTODETECT
-GST_PLUGINS_GOOD_AUTOCONF += --enable-autodetect
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-autodetect
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__AVI
-GST_PLUGINS_GOOD_AUTOCONF += --enable-avi
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstavi.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-avi
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__CUTTER
-GST_PLUGINS_GOOD_AUTOCONF += --enable-cutter
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstcutter.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-cutter
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__DEBUG
-GST_PLUGINS_GOOD_AUTOCONF += --enable-debug
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstdebug.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-debug
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__EFFECTV
-GST_PLUGINS_GOOD_AUTOCONF += --enable-effectv
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgsteffectv.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-effectv
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__EQUALIZER
-GST_PLUGINS_GOOD_AUTOCONF += --enable-equalizer
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstequalizer.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-equalizer
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__ID3DEMUX
-GST_PLUGINS_GOOD_AUTOCONF += --enable-id3demux
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-id3demux
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__ICYDEMUX
-GST_PLUGINS_GOOD_AUTOCONF += --enable-icydemux
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgsticydemux.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-icydemux
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__INTERLEAVE
-GST_PLUGINS_GOOD_AUTOCONF += --enable-interleave
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstinterleave.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-interleave
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__FLX
-GST_PLUGINS_GOOD_AUTOCONF += --enable-flx
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstflxdec.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-flx
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__GOOM
-GST_PLUGINS_GOOD_AUTOCONF += --enable-goom
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstgoom.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-goom
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__GOOM2K1
-GST_PLUGINS_GOOD_AUTOCONF += --enable-goom2k1
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstgoom2k1.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-goom2k1
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__LAW
-GST_PLUGINS_GOOD_AUTOCONF += --enable-law
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-law
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__LEVEL
-GST_PLUGINS_GOOD_AUTOCONF += --enable-level
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstlevel.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-level
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__MATROSKA
-GST_PLUGINS_GOOD_AUTOCONF += --enable-matroska
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstmatroska.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-matroska
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__MONOSCOPE
-GST_PLUGINS_GOOD_AUTOCONF += --enable-monoscope
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstmonoscope.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-monoscope
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__MULTIFILE
-GST_PLUGINS_GOOD_AUTOCONF += --enable-multifile
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstmultifile.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-multifile
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__MULTIPART
-GST_PLUGINS_GOOD_AUTOCONF += --enable-multipart
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstmultipart.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-multipart
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__QTDEMUX
-GST_PLUGINS_GOOD_AUTOCONF += --enable-qtdemux
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstqtdemux.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-qtdemux
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__REPLAYGAIN
-GST_PLUGINS_GOOD_AUTOCONF += --enable-replaygain
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstreplaygain.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-replaygain
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__RTP
-GST_PLUGINS_GOOD_AUTOCONF += --enable-rtp
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstrtp.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-rtp
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__RTSP
-GST_PLUGINS_GOOD_AUTOCONF += --enable-rtsp
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstrtsp.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-rtsp
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__SMPTE
-GST_PLUGINS_GOOD_AUTOCONF += --enable-smpte
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstsmpte.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-smpte
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__SPECTRUM
-GST_PLUGINS_GOOD_AUTOCONF += --enable-spectrum
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstspectrum.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-spectrum
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__UDP
-GST_PLUGINS_GOOD_AUTOCONF += --enable-udp
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstudp.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-udp
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__VIDEOBOX
-GST_PLUGINS_GOOD_AUTOCONF += --enable-videobox
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstvideobox.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-videobox
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__VIDEOCROP
-GST_PLUGINS_GOOD_AUTOCONF += --enable-videocrop
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstvideocrop.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-videocrop
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__VIDEOMIXER
-GST_PLUGINS_GOOD_AUTOCONF += --enable-videomixer
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstvideomixer.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-videomixer
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__WAVENC
-GST_PLUGINS_GOOD_AUTOCONF += --enable-wavenc
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-wavenc
+ifneq ($(call remove_quotes,$(GST_PLUGINS_GOOD_ENABLE-y)),)
+GST_PLUGINS_GOOD_CONF_OPT +=  --enable-$(subst $(space),$(space)--enable-,$(strip $(GST_PLUGINS_GOOD_ENABLE-y)))
 endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__WAVPARSE
-GST_PLUGINS_GOOD_AUTOCONF += --enable-wavparse
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstwavparse.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-wavparse
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__DIRECTDRAW
-GST_PLUGINS_GOOD_AUTOCONF += --enable-directdraw
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-directdraw
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__DIRECTSOUND
-GST_PLUGINS_GOOD_AUTOCONF += --enable-directsound
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-directsound
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__OSS
-GST_PLUGINS_GOOD_AUTOCONF += --enable-oss
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-oss
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__SUNAUDIO
-GST_PLUGINS_GOOD_AUTOCONF += --enable-sunaudio
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-sunaudio
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__OSX_AUDIO
-GST_PLUGINS_GOOD_AUTOCONF += --enable-osx_audio
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-osx_audio
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__OSX_VIDEO
-GST_PLUGINS_GOOD_AUTOCONF += --enable-osx_video
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-osx_video
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__V4L2
-GST_PLUGINS_GOOD_AUTOCONF += --enable-gst_v4l2
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstvideo4linux2.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-gst_v4l2
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__X
-GST_PLUGINS_GOOD_AUTOCONF += --enable-x
-#  --x-includes=DIR    X include files are in DIR
-#  --x-libraries=DIR   X library files are in DIR
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-x
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__XSHM
-GST_PLUGINS_GOOD_AUTOCONF += --enable-xshm
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-xshm
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__XVIDEO
-GST_PLUGINS_GOOD_AUTOCONF += --enable-xvideo
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-xvideo
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__AALIB
-GST_PLUGINS_GOOD_AUTOCONF += --enable-aalib
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-aalib
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__AALIBTEST
-GST_PLUGINS_GOOD_AUTOCONF += --enable-aalibtest
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-aalibtest
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__ANNODEX
-GST_PLUGINS_GOOD_AUTOCONF += --enable-annodex
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-annodex
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__CAIRO
-GST_PLUGINS_GOOD_AUTOCONF += --enable-cairo
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-cairo
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__CDIO
-GST_PLUGINS_GOOD_AUTOCONF += --enable-cdio
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-cdio
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__ESD
-GST_PLUGINS_GOOD_AUTOCONF += --enable-esd
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-esd
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__ESDTEST
-GST_PLUGINS_GOOD_AUTOCONF += --enable-esdtest
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-esdtest
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__FLAC
-GST_PLUGINS_GOOD_AUTOCONF += --enable-flac
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-flac
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__GCONF
-GST_PLUGINS_GOOD_AUTOCONF += --enable-gconf
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-gconf
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__GDK_PIXBUF
-GST_PLUGINS_GOOD_AUTOCONF += --enable-gdk_pixbuf
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-gdk_pixbuf
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__HAL
-GST_PLUGINS_GOOD_AUTOCONF += --enable-hal
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-hal
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__JPEG
-GST_PLUGINS_GOOD_AUTOCONF += --enable-jpeg
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstjpeg.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-jpeg
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__LIBCACA
-GST_PLUGINS_GOOD_AUTOCONF += --enable-libcaca
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-libcaca
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__LIBDV
-GST_PLUGINS_GOOD_AUTOCONF += --enable-libdv
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-libdv
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__LIBPNG
-GST_PLUGINS_GOOD_AUTOCONF += --enable-libpng
-GST_PLUGINS_GOOD_INSTALL  += /usr/lib/gstreamer-0.10/libgstpng.so
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-libpng
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__PULSE
-GST_PLUGINS_GOOD_AUTOCONF += --enable-pulse
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-pulse
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__DV1394
-GST_PLUGINS_GOOD_AUTOCONF += --enable-dv1394
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-dv1394
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__SHOUT2
-GST_PLUGINS_GOOD_AUTOCONF += --enable-shout2
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-shout2
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__SHOUT2TEST
-GST_PLUGINS_GOOD_AUTOCONF += --enable-shout2test
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-shout2test
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__SOUP
-GST_PLUGINS_GOOD_AUTOCONF += --enable-soup
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-soup
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__SPEEX
-GST_PLUGINS_GOOD_AUTOCONF += --enable-speex
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-speex
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__TAGLIB
-GST_PLUGINS_GOOD_AUTOCONF += --enable-taglib
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-taglib
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__WAVPACK
-GST_PLUGINS_GOOD_AUTOCONF += --enable-wavpack
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-wavpack
-endif
-ifdef PTXCONF_GST_PLUGINS_GOOD__ZLIB
-GST_PLUGINS_GOOD_AUTOCONF += --enable-zlib
-else
-GST_PLUGINS_GOOD_AUTOCONF += --disable-zlib
+
+ifneq ($(call remove_quotes,$(GST_PLUGINS_GOOD_ENABLE-)),)
+GST_PLUGINS_GOOD_CONF_OPT +=  --disable-$(subst $(space),$(space)--disable-,$(strip $(GST_PLUGINS_GOOD_ENABLE-)))
 endif
 
 # ----------------------------------------------------------------------------
@@ -467,10 +163,11 @@ $(STATEDIR)/gst-plugins-good.targetinstall:
 	@$(call install_fixup, gst-plugins-good,DESCRIPTION,missing)
 
 	# install all activated plugins
-	@for i in $(GST_PLUGINS_GOOD_INSTALL); do \
-		$(call install_copy, gst-plugins-good, 0, 0, 644, \
-			$(PKGDIR)/$(GST_PLUGINS_GOOD)$$i, $$i) \
-	done
+	@if [ -d  $(GST_PLUGINS_GOOD_PKGDIR)/usr/lib/gstreamer-0.10/ ]; then \
+		cd $(GST_PLUGINS_GOOD_PKGDIR) && for plugin in `find ./usr/lib/gstreamer-0.10/ -name "*.so"`; do \
+			$(call install_copy, gst-plugins-good, 0, 0, 0644, -, /$$plugin); \
+		done \
+	fi
 
 	@$(call install_finish, gst-plugins-good)