On Sat, Sep 19, 2009 at 04:50:02PM +0200, Antoine Jacoutot wrote:
> Hi.
>
> I've been willing (with agreement from some other porters) to merge some
> gstreamer-plugins-* subpackages into their -main counterpart.
> This for several reasons.
>
> For the most used plugins, like jpeg, vorbis, ogg, png... I don't really
> see any point in having a subpackage for each as their dependency is
> quite small and are already probably installed on desktop systems using
> gstreamer plugins.
> Also, this will greatly simplify maintainance and upgrade.
> But the most important thing imho, it that basic functionnality shoud be
> there when you install a gstreamer-plugins package, we've seen several
> reports on ports@ already about either missing dependencies or missing
> functionnality from packages because the user was missing one of the
> "obvious" plugins (like he already had gstreamer-plugins-base but was
> missing gstreamer-plugins-vorbis which imho should have been part of
> gstreamer-plugins-base in the first place).
>
> Here's a primilarely diff that only does the merging so that you guys
> can check what would go into -main and what would stay as a subpackage.
> Don't look to deep at the diff, I only made sure it would build but
> that's all. I didn't want to put too much work on this if the general
> consensus was against it.
>
> If most people are ok with this change, then I will cook up a complete
> diff with necessary modifications to ports depending on
> gstreamer-plugins-*.
>
> I hope that makes sense...
>
> Cheers!
i think this is something we really want(/need ?). i'm all for finishing
this move.
cheers,
jasper
> --
> Antoine
> Index: plugins-bad/Makefile
> ===================================================================
> RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-bad/Makefile,v
> retrieving revision 1.18
> diff -u -r1.18 Makefile
> --- plugins-bad/Makefile 10 Aug 2009 06:33:02 -0000 1.18
> +++ plugins-bad/Makefile 19 Sep 2009 14:38:12 -0000
> @@ -1,45 +1,20 @@
> # $OpenBSD: Makefile,v 1.18 2009/08/10 06:33:02 kili Exp $
>
> COMMENT-main = multimedia framework - plugins bad
> -COMMENT-tremor = multimedia framework - tremor plugin
> -COMMENT-musepack = multimedia framework - musepack plugin
> -COMMENT-faac = multimedia framework - faac plugin
> -COMMENT-faad = multimedia framework - faad plugin
> -COMMENT-xvid = multimedia framework - xvid plugin
> -COMMENT-sdl = multimedia framework - sdl plugin
> -COMMENT-bz2 = multimedia framework - bz2 plugin
> COMMENT-gsm = multimedia framework - gsm plugin
> -COMMENT-ladspa = multimedia framework - ladspa plugin
> COMMENT-neon = multimedia framework - neon plugin
> -COMMENT-swf = multimedia framework - flash plugin
> -COMMENT-meta = multimedia framework - metadata plugin
> -COMMENT-sndfile = multimedia framework - sndfile plugin
> COMMENT-real = multimedia framework - real plugin
> -COMMENT-x264 = multimedia framework - x264 plugin
> COMMENT-mplex = multimedia framework - mplex plugin
>
> V = 0.10.7
> DISTNAME = gst-plugins-bad-$V
> -PKGNAME-main = gstreamer-plugins-bad-${V}p6
> -PKGNAME-tremor = gstreamer-tremor-$Vp3
> -PKGNAME-musepack = gstreamer-musepack-$Vp3
> -PKGNAME-faac = gstreamer-faac-$Vp3
> -PKGNAME-faad = gstreamer-faad-$Vp3
> -PKGNAME-xvid = gstreamer-xvid-$Vp4
> -PKGNAME-sdl = gstreamer-sdl-$Vp6
> -PKGNAME-bz2 = gstreamer-bz2-$Vp3
> +PKGNAME-main = gstreamer-plugins-bad-${V}p7
> PKGNAME-gsm = gstreamer-gsm-$Vp3
> -PKGNAME-ladspa = gstreamer-ladspa-$Vp3
> PKGNAME-neon = gstreamer-neon-$Vp4
> -PKGNAME-swf = gstreamer-flash-$Vp2
> -PKGNAME-meta = gstreamer-meta-$Vp3
> -PKGNAME-sndfile = gstreamer-sndfile-$Vp3
> PKGNAME-real = gstreamer-real-$Vp3
> -PKGNAME-x264 = gstreamer-x264-$Vp2
> PKGNAME-mplex = gstreamer-mplex-$Vp1
>
> -MULTI_PACKAGES = -main -tremor -musepack -faac -faad -xvid -sdl -bz2 \
> - -gsm -ladspa -meta -neon -sndfile -x264 -mplex
> +MULTI_PACKAGES = -main -gsm -neon -mplex
>
> SHARED_LIBS += gstapp-0.10 0.0 # .0.0
>
> @@ -52,57 +27,23 @@
> RUN_DEPENDS = ::${BUILD_PKGPATH}
>
> WANTLIB-main = ${WANTLIB} \
> - stdc++ \
> - gstbase-0.10 gstcontroller-0.10
> + stdc++ X11 Xau Xdmcp Xext Xrandr Xrender bz2
> pthread-stubs \
> + sndio usbhid xcb gstbase-0.10 gstcontroller-0.10
>
> LIB_DEPENDS-main = ${LIB_DEPENDS} \
> -
> gstaudio-0.10,gstinterfaces-0.10,gstvideo-0.10,gstriff-0.10,gstnetbuffer-0.10,gstpbutils-0.10,gstrtp-0.10,gstsdp-0.10,gsttag-0.10::$P/plugins-base
> +
> gstaudio-0.10,gstinterfaces-0.10,gstvideo-0.10,gstriff-0.10,gstnetbuffer-0.10,gstpbutils-0.10,gstrtp-0.10,gstsdp-0.10,gsttag-0.10::$P/plugins-base
> \
> + vorbisidec.>=2::audio/tremor \
> + x264.>=3::multimedia/x264 \
> + sndfile.>=3::audio/libsndfile \
> + mpcdec.>=3::audio/libmpcdec \
> + faac.>=1::audio/faac \
> + faad.>=2::audio/faad \
> + exif.>=12::graphics/libexif \
> + xvidcore.>=4::multimedia/xvidcore \
> + SDL.>=8::devel/sdl
>
> RUN_DEPENDS-main =
>
> -WANTLIB-tremor = ${WANTLIB} \
> - gstbase-0.10
> -
> -LIB_DEPENDS-tremor = ${LIB_DEPENDS} \
> - gstaudio-0.10,gstinterfaces-0.10::$P/plugins-base \
> - vorbisidec::audio/tremor
> -
> -WANTLIB-musepack = ${WANTLIB}
> -
> -LIB_DEPENDS-musepack = ${LIB_DEPENDS} \
> - mpcdec::audio/libmpcdec
> -
> -WANTLIB-faac = ${WANTLIB} \
> - gstbase-0.10
> -
> -LIB_DEPENDS-faac = ${LIB_DEPENDS} \
> - gstaudio-0.10,gstinterfaces-0.10::$P/plugins-base \
> - faac::audio/faac
> -
> -WANTLIB-faad = ${WANTLIB} \
> - gstbase-0.10
> -
> -LIB_DEPENDS-faad = ${LIB_DEPENDS} \
> - gstaudio-0.10,gstinterfaces-0.10::$P/plugins-base \
> - faad::audio/faad
> -
> -WANTLIB-xvid = ${WANTLIB}
> -
> -LIB_DEPENDS-xvid = ${LIB_DEPENDS} \
> - xvidcore::multimedia/xvidcore
> -
> -WANTLIB-sdl = ${WANTLIB} \
> - X11 Xext gstbase-0.10 usbhid Xau Xdmcp Xrandr \
> - Xrender pthread-stubs sndio xcb
> -LIB_DEPENDS-sdl = ${LIB_DEPENDS} \
> -
> gstaudio-0.10,gstinterfaces-0.10,gstvideo-0.10::$P/plugins-base \
> - SDL::devel/sdl
> -
> -WANTLIB-bz2 = ${WANTLIB} \
> - gstbase-0.10
> -LIB_DEPENDS-bz2 = ${LIB_DEPENDS} \
> - bz2::archivers/bzip2
> -
> WANTLIB-gsm = ${WANTLIB} \
> gstbase-0.10
> LIB_DEPENDS-gsm = ${LIB_DEPENDS} \
> @@ -111,11 +52,6 @@
>
> BUILD_DEPENDS += ::audio/ladspa
>
> -WANTLIB-ladspa = ${WANTLIB} \
> - gstbase-0.10
> -LIB_DEPENDS-ladspa = ${LIB_DEPENDS} \
> - gstaudio-0.10,gstinterfaces-0.10::$P/plugins-base
> -
> WANTLIB-neon = ${WANTLIB} \
> gstbase-0.10 \
> crypto expat ssl asn1 gssapi krb5
> @@ -123,20 +59,6 @@
> LIB_DEPENDS-neon = ${LIB_DEPENDS} \
> neon::net/neon
>
> -WANTLIB-swf = ${WANTLIB}
> -LIB_DEPENDS-swf = ${LIB_DEPENDS}
> -
> -WANTLIB-meta = ${WANTLIB} \
> - gstbase-0.10
> -LIB_DEPENDS-meta = ${LIB_DEPENDS} \
> - exif::graphics/libexif \
> - gsttag-0.10::$P/plugins-base
> -
> -WANTLIB-sndfile = ${WANTLIB} \
> - gstbase-0.10
> -LIB_DEPENDS-sndfile = ${LIB_DEPENDS} \
> - sndfile::audio/libsndfile
> -
> .if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == amd64
> MULTI_PACKAGES += -real
>
> @@ -145,10 +67,6 @@
> LIB_DEPENDS-real = ${LIB_DEPENDS} \
> gstaudio-0.10,gstinterfaces-0.10::$P/plugins-base
> .endif
> -
> -WANTLIB-x264 = ${WANTLIB}
> -LIB_DEPENDS-x264 = ${LIB_DEPENDS} \
> - x264.>=1::multimedia/x264
>
> WANTLIB-mplex = ${WANTLIB} \
> gstbase-0.10
> Index: plugins-bad/pkg/DESCR-bz2
> ===================================================================
> RCS file: plugins-bad/pkg/DESCR-bz2
> diff -N plugins-bad/pkg/DESCR-bz2
> --- plugins-bad/pkg/DESCR-bz2 13 Jan 2007 11:23:38 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,4 +0,0 @@
> -This is a "bad" plugin for gstreamer-${VERSION}. It might be buggy or
> -unfinished.
> -
> -* bz2 compress/decompress streams
> Index: plugins-bad/pkg/DESCR-faac
> ===================================================================
> RCS file: plugins-bad/pkg/DESCR-faac
> diff -N plugins-bad/pkg/DESCR-faac
> --- plugins-bad/pkg/DESCR-faac 13 Jan 2007 11:23:38 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,4 +0,0 @@
> -This is a "bad" plugin for gstreamer-${VERSION}. It might be buggy or
> -unfinished.
> -
> -* faac AAC encoder
> Index: plugins-bad/pkg/DESCR-faad
> ===================================================================
> RCS file: plugins-bad/pkg/DESCR-faad
> diff -N plugins-bad/pkg/DESCR-faad
> --- plugins-bad/pkg/DESCR-faad 13 Jan 2007 11:23:38 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,4 +0,0 @@
> -This is a "bad" plugin for gstreamer-${VERSION}. It might be buggy or
> -unfinished.
> -
> -* faad AAC decoder
> Index: plugins-bad/pkg/DESCR-ladspa
> ===================================================================
> RCS file: plugins-bad/pkg/DESCR-ladspa
> diff -N plugins-bad/pkg/DESCR-ladspa
> --- plugins-bad/pkg/DESCR-ladspa 13 Jan 2007 11:23:38 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,4 +0,0 @@
> -This is a "bad" plugin for gstreamer-${VERSION}. It might be buggy or
> -unfinished.
> -
> -* ladspa connection to the ladspa framework (audio effects)
> Index: plugins-bad/pkg/DESCR-main
> ===================================================================
> RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-bad/pkg/DESCR-main,v
> retrieving revision 1.5
> diff -u -r1.5 DESCR-main
> --- plugins-bad/pkg/DESCR-main 30 Jan 2009 01:11:03 -0000 1.5
> +++ plugins-bad/pkg/DESCR-main 19 Sep 2009 14:38:12 -0000
> @@ -15,19 +15,10 @@
>
> The following plugins are in specific packages because of dependencies:
>
> -* bz2
> -* faac
> -* faad
> * gsm
> -* ladspa
> * mplex
> -* musepack
> * neon
> * real
> -* sdl
> -* x264
> -* xvid
> -
>
> The following plugins are not built:
>
> @@ -38,7 +29,6 @@
> * mms (no libmms library)
> * mpeg2enc (depends on internals of mjpegtools)
> * musicbrainz (not ported yet)
> -* neon (library needs an update)
> * soundtouch (no libsoundtouch)
> * spcdec (no library)
> * swfdec (library is out-of-date)
> Index: plugins-bad/pkg/DESCR-meta
> ===================================================================
> RCS file: plugins-bad/pkg/DESCR-meta
> diff -N plugins-bad/pkg/DESCR-meta
> --- plugins-bad/pkg/DESCR-meta 13 May 2008 15:11:51 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,4 +0,0 @@
> -This is a "bad" plugin for gstreamer-${VERSION}. It might be buggy or
> -unfinished.
> -
> -* meta metadata mux/demux, mostly exif-based
> Index: plugins-bad/pkg/DESCR-musepack
> ===================================================================
> RCS file: plugins-bad/pkg/DESCR-musepack
> diff -N plugins-bad/pkg/DESCR-musepack
> --- plugins-bad/pkg/DESCR-musepack 13 Jan 2007 11:23:38 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,4 +0,0 @@
> -This is a "bad" plugin for gstreamer-${VERSION}. It might be buggy or
> -unfinished.
> -
> -* musepack Musepack decoder
> Index: plugins-bad/pkg/DESCR-sdl
> ===================================================================
> RCS file: plugins-bad/pkg/DESCR-sdl
> diff -N plugins-bad/pkg/DESCR-sdl
> --- plugins-bad/pkg/DESCR-sdl 13 Jan 2007 11:23:38 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,4 +0,0 @@
> -This is a "bad" plugin for gstreamer-${VERSION}. It might be buggy or
> -unfinished.
> -
> -* sdl SDL (Simple DirectMedia Layer) support
> Index: plugins-bad/pkg/DESCR-sndfile
> ===================================================================
> RCS file: plugins-bad/pkg/DESCR-sndfile
> diff -N plugins-bad/pkg/DESCR-sndfile
> --- plugins-bad/pkg/DESCR-sndfile 13 May 2008 15:11:51 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,4 +0,0 @@
> -This is a "bad" plugin for gstreamer-${VERSION}. It might be buggy or
> -unfinished.
> -
> -* sndfile sndfile source/sink
> Index: plugins-bad/pkg/DESCR-swf
> ===================================================================
> RCS file: plugins-bad/pkg/DESCR-swf
> diff -N plugins-bad/pkg/DESCR-swf
> --- plugins-bad/pkg/DESCR-swf 13 Jan 2007 11:23:38 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,4 +0,0 @@
> -This is a "bad" plugin for gstreamer-${VERSION}. It might be buggy or
> -unfinished.
> -
> -* swfdec decode Flash video streams
> Index: plugins-bad/pkg/DESCR-tremor
> ===================================================================
> RCS file: plugins-bad/pkg/DESCR-tremor
> diff -N plugins-bad/pkg/DESCR-tremor
> --- plugins-bad/pkg/DESCR-tremor 13 Jan 2007 11:23:38 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,4 +0,0 @@
> -This is a "bad" plugin for gstreamer-${VERSION}. It might be buggy or
> -unfinished.
> -
> -* ivorbis vorbis decoding using integer operations
> Index: plugins-bad/pkg/DESCR-x264
> ===================================================================
> RCS file: plugins-bad/pkg/DESCR-x264
> diff -N plugins-bad/pkg/DESCR-x264
> --- plugins-bad/pkg/DESCR-x264 1 Oct 2008 08:02:59 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,4 +0,0 @@
> -This is a "bad" plugin for gstreamer-${VERSION}. It might be buggy or
> -unfinished.
> -
> -* x264 H.264 encoder
> Index: plugins-bad/pkg/DESCR-xvid
> ===================================================================
> RCS file: plugins-bad/pkg/DESCR-xvid
> diff -N plugins-bad/pkg/DESCR-xvid
> --- plugins-bad/pkg/DESCR-xvid 13 Jan 2007 11:23:38 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,4 +0,0 @@
> -This is a "bad" plugin for gstreamer-${VERSION}. It might be buggy or
> -unfinished.
> -
> -* xvid XviD decoder/encoder
> Index: plugins-bad/pkg/PLIST-bz2
> ===================================================================
> RCS file: plugins-bad/pkg/PLIST-bz2
> diff -N plugins-bad/pkg/PLIST-bz2
> --- plugins-bad/pkg/PLIST-bz2 13 Jan 2007 11:23:38 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,3 +0,0 @@
> -...@comment $OpenBSD: PLIST-bz2,v 1.1 2007/01/13 11:23:38 espie Exp $
> -lib/gstreamer-${VERSION}/libgstbz2.la
> -lib/gstreamer-${VERSION}/libgstbz2.so
> Index: plugins-bad/pkg/PLIST-faac
> ===================================================================
> RCS file: plugins-bad/pkg/PLIST-faac
> diff -N plugins-bad/pkg/PLIST-faac
> --- plugins-bad/pkg/PLIST-faac 11 Jan 2007 18:12:36 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,3 +0,0 @@
> -...@comment $OpenBSD: PLIST-faac,v 1.1.1.1 2007/01/11 18:12:36 espie Exp $
> -lib/gstreamer-${VERSION}/libgstfaac.la
> -lib/gstreamer-${VERSION}/libgstfaac.so
> Index: plugins-bad/pkg/PLIST-faad
> ===================================================================
> RCS file: plugins-bad/pkg/PLIST-faad
> diff -N plugins-bad/pkg/PLIST-faad
> --- plugins-bad/pkg/PLIST-faad 11 Jan 2007 18:12:36 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,5 +0,0 @@
> -...@comment $OpenBSD: PLIST-faad,v 1.1.1.1 2007/01/11 18:12:36 espie Exp $
> -...@option no-default-conflict
> -...@conflict gstreamer-faad->=0.10
> -lib/gstreamer-${VERSION}/libgstfaad.la
> -lib/gstreamer-${VERSION}/libgstfaad.so
> Index: plugins-bad/pkg/PLIST-ladspa
> ===================================================================
> RCS file: plugins-bad/pkg/PLIST-ladspa
> diff -N plugins-bad/pkg/PLIST-ladspa
> --- plugins-bad/pkg/PLIST-ladspa 13 Jan 2007 11:23:38 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,3 +0,0 @@
> -...@comment $OpenBSD: PLIST-ladspa,v 1.1 2007/01/13 11:23:38 espie Exp $
> -lib/gstreamer-${VERSION}/libgstladspa.la
> -lib/gstreamer-${VERSION}/libgstladspa.so
> Index: plugins-bad/pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-main,v
> retrieving revision 1.3
> diff -u -r1.3 PLIST-main
> --- plugins-bad/pkg/PLIST-main 1 Jun 2008 07:19:05 -0000 1.3
> +++ plugins-bad/pkg/PLIST-main 19 Sep 2009 14:38:12 -0000
> @@ -1,4 +1,16 @@
> @comment $OpenBSD: PLIST-main,v 1.3 2008/06/01 07:19:05 sturm Exp $
> +...@conflict gstreamer-bz2-*
> +...@conflict gstreamer-faac-*
> +...@conflict gstreamer-faad-*
> +...@conflict gstreamer-ladspa-*
> +...@conflict gstreamer-meta-*
> +...@conflict gstreamer-musepack-*
> +...@conflict gstreamer-sdl-*
> +...@conflict gstreamer-sndfile-*
> +...@conflict gstreamer-swf-*
> +...@conflict gstreamer-tremor-*
> +...@conflict gstreamer-x264-*
> +...@conflict gstreamer-xvid-*
> include/gstreamer-${VERSION}/gst/app/
> include/gstreamer-${VERSION}/gst/app/gstappbuffer.h
> include/gstreamer-${VERSION}/gst/app/gstappsink.h
> @@ -7,12 +19,18 @@
> lib/gstreamer-${VERSION}/libgstapp.so
> lib/gstreamer-${VERSION}/libgstbayer.la
> lib/gstreamer-${VERSION}/libgstbayer.so
> +lib/gstreamer-${VERSION}/libgstbz2.la
> +lib/gstreamer-${VERSION}/libgstbz2.so
> lib/gstreamer-${VERSION}/libgstcdxaparse.la
> lib/gstreamer-${VERSION}/libgstcdxaparse.so
> lib/gstreamer-${VERSION}/libgstdeinterlace.la
> lib/gstreamer-${VERSION}/libgstdeinterlace.so
> lib/gstreamer-${VERSION}/libgstdvdspu.la
> lib/gstreamer-${VERSION}/libgstdvdspu.so
> +lib/gstreamer-${VERSION}/libgstfaac.la
> +lib/gstreamer-${VERSION}/libgstfaac.so
> +lib/gstreamer-${VERSION}/libgstfaad.la
> +lib/gstreamer-${VERSION}/libgstfaad.so
> lib/gstreamer-${VERSION}/libgstfestival.la
> lib/gstreamer-${VERSION}/libgstfestival.so
> lib/gstreamer-${VERSION}/libgstfilter.la
> @@ -25,6 +43,12 @@
> lib/gstreamer-${VERSION}/libgsth264parse.so
> lib/gstreamer-${VERSION}/libgstinterleave.la
> lib/gstreamer-${VERSION}/libgstinterleave.so
> +lib/gstreamer-${VERSION}/libgstivorbis.la
> +lib/gstreamer-${VERSION}/libgstivorbis.so
> +lib/gstreamer-${VERSION}/libgstladspa.la
> +lib/gstreamer-${VERSION}/libgstladspa.so
> +lib/gstreamer-${VERSION}/libgstmetadata.la
> +lib/gstreamer-${VERSION}/libgstmetadata.so
> lib/gstreamer-${VERSION}/libgstmodplug.la
> lib/gstreamer-${VERSION}/libgstmodplug.so
> lib/gstreamer-${VERSION}/libgstmpeg4videoparse.la
> @@ -33,6 +57,8 @@
> lib/gstreamer-${VERSION}/libgstmpegtsparse.so
> lib/gstreamer-${VERSION}/libgstmpegvideoparse.la
> lib/gstreamer-${VERSION}/libgstmpegvideoparse.so
> +lib/gstreamer-${VERSION}/libgstmusepack.la
> +lib/gstreamer-${VERSION}/libgstmusepack.so
> lib/gstreamer-${VERSION}/libgstmve.la
> lib/gstreamer-${VERSION}/libgstmve.so
> lib/gstreamer-${VERSION}/libgstnsf.la
> @@ -47,10 +73,14 @@
> lib/gstreamer-${VERSION}/libgstrfbsrc.so
> lib/gstreamer-${VERSION}/libgstrtpmanager.la
> lib/gstreamer-${VERSION}/libgstrtpmanager.so
> +lib/gstreamer-${VERSION}/libgstsdl.la
> +lib/gstreamer-${VERSION}/libgstsdl.so
> lib/gstreamer-${VERSION}/libgstsdpelem.la
> lib/gstreamer-${VERSION}/libgstsdpelem.so
> lib/gstreamer-${VERSION}/libgstselector.la
> lib/gstreamer-${VERSION}/libgstselector.so
> +lib/gstreamer-${VERSION}/libgstsndfile.la
> +lib/gstreamer-${VERSION}/libgstsndfile.so
> lib/gstreamer-${VERSION}/libgstspeed.la
> lib/gstreamer-${VERSION}/libgstspeed.so
> lib/gstreamer-${VERSION}/libgstspeexresample.la
> @@ -65,6 +95,10 @@
> lib/gstreamer-${VERSION}/libgstvideosignal.so
> lib/gstreamer-${VERSION}/libgstvmnc.la
> lib/gstreamer-${VERSION}/libgstvmnc.so
> +lib/gstreamer-${VERSION}/libgstx264.la
> +lib/gstreamer-${VERSION}/libgstx264.so
> +lib/gstreamer-${VERSION}/libgstxvid.la
> +lib/gstreamer-${VERSION}/libgstxvid.so
> lib/gstreamer-${VERSION}/libgsty4menc.la
> lib/gstreamer-${VERSION}/libgsty4menc.so
> lib/libgstapp-${VERSION}.la
> Index: plugins-bad/pkg/PLIST-meta
> ===================================================================
> RCS file: plugins-bad/pkg/PLIST-meta
> diff -N plugins-bad/pkg/PLIST-meta
> --- plugins-bad/pkg/PLIST-meta 13 May 2008 15:11:51 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,3 +0,0 @@
> -...@comment $OpenBSD: PLIST-meta,v 1.1 2008/05/13 15:11:51 espie Exp $
> -lib/gstreamer-${VERSION}/libgstmetadata.la
> -lib/gstreamer-${VERSION}/libgstmetadata.so
> Index: plugins-bad/pkg/PLIST-musepack
> ===================================================================
> RCS file: plugins-bad/pkg/PLIST-musepack
> diff -N plugins-bad/pkg/PLIST-musepack
> --- plugins-bad/pkg/PLIST-musepack 11 Jan 2007 18:12:36 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,5 +0,0 @@
> -...@comment $OpenBSD: PLIST-musepack,v 1.1.1.1 2007/01/11 18:12:36 espie Exp
> $
> -...@option no-default-conflict
> -...@conflict gstreamer-musepack->=0.10
> -lib/gstreamer-${VERSION}/libgstmusepack.la
> -lib/gstreamer-${VERSION}/libgstmusepack.so
> Index: plugins-bad/pkg/PLIST-sdl
> ===================================================================
> RCS file: plugins-bad/pkg/PLIST-sdl
> diff -N plugins-bad/pkg/PLIST-sdl
> --- plugins-bad/pkg/PLIST-sdl 13 May 2008 15:11:51 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,5 +0,0 @@
> -...@comment $OpenBSD: PLIST-sdl,v 1.2 2008/05/13 15:11:51 espie Exp $
> -...@option no-default-conflict
> -...@conflict gstreamer-sdl->=0.10
> -lib/gstreamer-${VERSION}/libgstsdl.la
> -lib/gstreamer-${VERSION}/libgstsdl.so
> Index: plugins-bad/pkg/PLIST-sndfile
> ===================================================================
> RCS file: plugins-bad/pkg/PLIST-sndfile
> diff -N plugins-bad/pkg/PLIST-sndfile
> --- plugins-bad/pkg/PLIST-sndfile 13 May 2008 15:11:51 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,3 +0,0 @@
> -...@comment $OpenBSD: PLIST-sndfile,v 1.1 2008/05/13 15:11:51 espie Exp $
> -lib/gstreamer-${VERSION}/libgstsndfile.la
> -lib/gstreamer-${VERSION}/libgstsndfile.so
> Index: plugins-bad/pkg/PLIST-tremor
> ===================================================================
> RCS file: plugins-bad/pkg/PLIST-tremor
> diff -N plugins-bad/pkg/PLIST-tremor
> --- plugins-bad/pkg/PLIST-tremor 11 Jan 2007 18:12:36 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,5 +0,0 @@
> -...@comment $OpenBSD: PLIST-tremor,v 1.1.1.1 2007/01/11 18:12:36 espie Exp $
> -...@option no-default-conflict
> -...@conflict gstreamer-tremor->=0.10
> -lib/gstreamer-${VERSION}/libgstivorbis.la
> -lib/gstreamer-${VERSION}/libgstivorbis.so
> Index: plugins-bad/pkg/PLIST-x264
> ===================================================================
> RCS file: plugins-bad/pkg/PLIST-x264
> diff -N plugins-bad/pkg/PLIST-x264
> --- plugins-bad/pkg/PLIST-x264 1 Oct 2008 08:02:59 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,3 +0,0 @@
> -...@comment $OpenBSD: PLIST-x264,v 1.1 2008/10/01 08:02:59 ajacoutot Exp $
> -lib/gstreamer-${VERSION}/libgstx264.la
> -lib/gstreamer-${VERSION}/libgstx264.so
> Index: plugins-bad/pkg/PLIST-xvid
> ===================================================================
> RCS file: plugins-bad/pkg/PLIST-xvid
> diff -N plugins-bad/pkg/PLIST-xvid
> --- plugins-bad/pkg/PLIST-xvid 11 Jan 2007 18:12:36 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,3 +0,0 @@
> -...@comment $OpenBSD: PLIST-xvid,v 1.1.1.1 2007/01/11 18:12:36 espie Exp $
> -lib/gstreamer-${VERSION}/libgstxvid.la
> -lib/gstreamer-${VERSION}/libgstxvid.so
> Index: plugins-base/Makefile
> ===================================================================
> RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-base/Makefile,v
> retrieving revision 1.17
> diff -u -r1.17 Makefile
> --- plugins-base/Makefile 10 Aug 2009 06:33:02 -0000 1.17
> +++ plugins-base/Makefile 19 Sep 2009 14:38:12 -0000
> @@ -3,21 +3,13 @@
> COMMENT-main = multimedia framework - plugins base
> COMMENT-gnome = multimedia framework - gnome vfs plugin
> COMMENT-cdda = multimedia framework - cd paranoia plugin
> -COMMENT-ogg = multimedia framework - ogg plugin
> -COMMENT-vorbis = multimedia framework - vorbis plugin
> -COMMENT-theora = multimedia framework - theora plugin
> -COMMENT-pango = multimedia framework - pango renderer
>
> V = 0.10.19
> DISTNAME = gst-plugins-base-$V
> -PKGNAME-main = gstreamer-plugins-base-$Vp2
> +PKGNAME-main = gstreamer-plugins-base-$Vp3
> PKGNAME-gnome = gstreamer-gnome-$Vp4
> PKGNAME-cdda = gstreamer-cdda-$Vp2
> -PKGNAME-ogg = gstreamer-ogg-$Vp2
> -PKGNAME-theora = gstreamer-theora-$Vp2
> -PKGNAME-vorbis = gstreamer-vorbis-$Vp2
> -PKGNAME-pango = gstreamer-pango-$Vp3
> -MULTI_PACKAGES = -main -gnome -cdda -ogg -theora -vorbis -pango
> +MULTI_PACKAGES = -main -gnome -cdda
>
> SHARED_LIBS += gstinterfaces-0.10 0.2 # .8.0
> SHARED_LIBS += gsttag-0.10 0.2 # .8.0
> @@ -38,14 +30,18 @@
> RUN_DEPENDS = ::${BUILD_PKGPATH}
> WANTLIB = glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 xml2 \
> z m pcre
> -LIB_DEPENDS = gstreamer-0.10:gstreamer->=0.10:$P/core \
> +LIB_DEPENDS = gstreamer-0.10:gstreamer->=0.10:$P/core
>
> WANTLIB-main = ${WANTLIB} \
> Xv X11 ICE SM Xext Xau Xdmcp \
> gstdataprotocol-0.10 gstcontroller-0.10 gstbase-0.10 \
> - pthread-stubs xcb
> + pthread-stubs xcb expat fontconfig freetype ogg
> LIB_DEPENDS-main = ${LIB_DEPENDS} \
> - oil-0.3::devel/liboil
> + oil-0.3::devel/liboil \
> + vorbis.>=7,vorbisenc::audio/libvorbis \
> + pango-1.0.>=1801,pangoft2-1.0::devel/pango \
> + theora.>=3::multimedia/libtheora
> +
> RUN_DEPENDS-main =
>
> WANTLIB-gnome = ${WANTLIB} \
> @@ -61,30 +57,6 @@
> LIB_DEPENDS-cdda = ${LIB_DEPENDS} \
> gsttag-0.10::${BUILD_PKGPATH} \
> cdda_interface,cdda_paranoia::audio/cdparanoia
> -
> -WANTLIB-ogg = ${WANTLIB} \
> - gstbase-0.10
> -LIB_DEPENDS-ogg = ${LIB_DEPENDS} \
> -
> gstaudio-0.10,gstinterfaces-0.10,gstriff-0.10,gsttag-0.10::${BUILD_PKGPATH} \
> - ogg::audio/libogg
> -
> -WANTLIB-theora = ${WANTLIB} \
> - ogg gstbase-0.10
> -LIB_DEPENDS-theora = ${LIB_DEPENDS} \
> - gsttag-0.10::${BUILD_PKGPATH} \
> - theora::multimedia/libtheora
> -
> -WANTLIB-vorbis = ${WANTLIB} \
> - ogg gstbase-0.10
> -LIB_DEPENDS-vorbis = ${LIB_DEPENDS} \
> -
> gstaudio-0.10,gstinterfaces-0.10,gsttag-0.10::${BUILD_PKGPATH} \
> - vorbis,vorbisenc::audio/libvorbis
> -
> -WANTLIB-pango = ${WANTLIB} \
> - X11 Xau Xdmcp expat fontconfig freetype \
> - gstbase-0.10 pthread-stubs xcb
> -LIB_DEPENDS-pango = ${LIB_DEPENDS} \
> - pango-1.0,pangoft2-1.0::devel/pango
>
> CONFIGURE_ARGS += --disable-libvisual \
> --disable-alsa \
> Index: plugins-base/pkg/DESCR-main
> ===================================================================
> RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-base/pkg/DESCR-main,v
> retrieving revision 1.2
> diff -u -r1.2 DESCR-main
> --- plugins-base/pkg/DESCR-main 11 Jan 2007 23:37:56 -0000 1.2
> +++ plugins-base/pkg/DESCR-main 19 Sep 2009 14:38:12 -0000
> @@ -23,10 +23,6 @@
> The following plugins are in specific packages because of dependencies:
> * cdparanoia
> * gnomevfs
> -* ogg
> -* pango
> -* theora
> -* vorbis
>
> The following plugins are not built:
> * alsa (linux specific)
> Index: plugins-base/pkg/DESCR-ogg
> ===================================================================
> RCS file: plugins-base/pkg/DESCR-ogg
> diff -N plugins-base/pkg/DESCR-ogg
> --- plugins-base/pkg/DESCR-ogg 11 Jan 2007 23:37:56 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,2 +0,0 @@
> -This package is part of the base plugins for gstreamer-${VERSION}.
> -* ogg ogg stream manipulation (info about ogg: http://xiph.org/)
> Index: plugins-base/pkg/DESCR-pango
> ===================================================================
> RCS file: plugins-base/pkg/DESCR-pango
> diff -N plugins-base/pkg/DESCR-pango
> --- plugins-base/pkg/DESCR-pango 11 Jan 2007 23:37:56 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,2 +0,0 @@
> -This package is part of the base plugins for gstreamer-${VERSION}.
> -* pango Pango-based text rendering and overlay
> Index: plugins-base/pkg/DESCR-theora
> ===================================================================
> RCS file: plugins-base/pkg/DESCR-theora
> diff -N plugins-base/pkg/DESCR-theora
> --- plugins-base/pkg/DESCR-theora 11 Jan 2007 23:37:56 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,2 +0,0 @@
> -This package is part of the base plugins for gstreamer-${VERSION}.
> -* theora theora plugin library: encoder, decoder, parser
> Index: plugins-base/pkg/DESCR-vorbis
> ===================================================================
> RCS file: plugins-base/pkg/DESCR-vorbis
> diff -N plugins-base/pkg/DESCR-vorbis
> --- plugins-base/pkg/DESCR-vorbis 11 Jan 2007 23:37:56 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,2 +0,0 @@
> -This package is part of the base plugins for gstreamer-${VERSION}.
> -* vorbis vorbis plugin library (encoder, decoder, parser)
> Index: plugins-base/pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-base/pkg/PLIST-main,v
> retrieving revision 1.5
> diff -u -r1.5 PLIST-main
> --- plugins-base/pkg/PLIST-main 13 May 2008 15:11:51 -0000 1.5
> +++ plugins-base/pkg/PLIST-main 19 Sep 2009 14:38:12 -0000
> @@ -1,4 +1,8 @@
> @comment $OpenBSD: PLIST-main,v 1.5 2008/05/13 15:11:51 espie Exp $
> +...@conflict gstreamer-ogg-*
> +...@conflict gstreamer-theora-*
> +...@conflict gstreamer-vorbis-*
> +...@conflict gstreamer-pango-*
> bin/gst-visualise-${VERSION}
> include/gstreamer-${VERSION}/gst/audio/
> include/gstreamer-${VERSION}/gst/audio/audio.h
> @@ -91,6 +95,10 @@
> lib/gstreamer-${VERSION}/libgstffmpegcolorspace.so
> lib/gstreamer-${VERSION}/libgstgdp.la
> lib/gstreamer-${VERSION}/libgstgdp.so
> +lib/gstreamer-${VERSION}/libgstogg.la
> +lib/gstreamer-${VERSION}/libgstogg.so
> +lib/gstreamer-${VERSION}/libgstpango.la
> +lib/gstreamer-${VERSION}/libgstpango.so
> lib/gstreamer-${VERSION}/libgstplaybin.la
> lib/gstreamer-${VERSION}/libgstplaybin.so
> lib/gstreamer-${VERSION}/libgstqueue2.la
> @@ -99,6 +107,8 @@
> lib/gstreamer-${VERSION}/libgstsubparse.so
> lib/gstreamer-${VERSION}/libgsttcp.la
> lib/gstreamer-${VERSION}/libgsttcp.so
> +lib/gstreamer-${VERSION}/libgsttheora.la
> +lib/gstreamer-${VERSION}/libgsttheora.so
> lib/gstreamer-${VERSION}/libgsttypefindfunctions.la
> lib/gstreamer-${VERSION}/libgsttypefindfunctions.so
> lib/gstreamer-${VERSION}/libgstvideorate.la
> @@ -109,6 +119,8 @@
> lib/gstreamer-${VERSION}/libgstvideotestsrc.so
> lib/gstreamer-${VERSION}/libgstvolume.la
> lib/gstreamer-${VERSION}/libgstvolume.so
> +lib/gstreamer-${VERSION}/libgstvorbis.la
> +lib/gstreamer-${VERSION}/libgstvorbis.so
> lib/gstreamer-${VERSION}/libgstximagesink.la
> lib/gstreamer-${VERSION}/libgstximagesink.so
> lib/gstreamer-${VERSION}/libgstxvimagesink.la
> Index: plugins-base/pkg/PLIST-ogg
> ===================================================================
> RCS file: plugins-base/pkg/PLIST-ogg
> diff -N plugins-base/pkg/PLIST-ogg
> --- plugins-base/pkg/PLIST-ogg 9 Jan 2007 20:00:23 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,5 +0,0 @@
> -...@comment $OpenBSD: PLIST-ogg,v 1.2 2007/01/09 20:00:23 espie Exp $
> -...@option no-default-conflict
> -...@conflict gstreamer-ogg->=0.10
> -lib/gstreamer-${VERSION}/libgstogg.la
> -lib/gstreamer-${VERSION}/libgstogg.so
> Index: plugins-base/pkg/PLIST-pango
> ===================================================================
> RCS file: plugins-base/pkg/PLIST-pango
> diff -N plugins-base/pkg/PLIST-pango
> --- plugins-base/pkg/PLIST-pango 9 Jan 2007 20:00:23 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,3 +0,0 @@
> -...@comment $OpenBSD: PLIST-pango,v 1.2 2007/01/09 20:00:23 espie Exp $
> -lib/gstreamer-${VERSION}/libgstpango.la
> -lib/gstreamer-${VERSION}/libgstpango.so
> Index: plugins-base/pkg/PLIST-theora
> ===================================================================
> RCS file: plugins-base/pkg/PLIST-theora
> diff -N plugins-base/pkg/PLIST-theora
> --- plugins-base/pkg/PLIST-theora 9 Jan 2007 20:00:23 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,5 +0,0 @@
> -...@comment $OpenBSD: PLIST-theora,v 1.2 2007/01/09 20:00:23 espie Exp $
> -...@option no-default-conflict
> -...@conflict gstreamer-theora->=0.10
> -lib/gstreamer-${VERSION}/libgsttheora.la
> -lib/gstreamer-${VERSION}/libgsttheora.so
> Index: plugins-base/pkg/PLIST-vorbis
> ===================================================================
> RCS file: plugins-base/pkg/PLIST-vorbis
> diff -N plugins-base/pkg/PLIST-vorbis
> --- plugins-base/pkg/PLIST-vorbis 9 Jan 2007 20:00:23 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,5 +0,0 @@
> -...@comment $OpenBSD: PLIST-vorbis,v 1.2 2007/01/09 20:00:23 espie Exp $
> -...@option no-default-conflict
> -...@conflict gstreamer-vorbis->=0.10
> -lib/gstreamer-${VERSION}/libgstvorbis.la
> -lib/gstreamer-${VERSION}/libgstvorbis.so
> Index: plugins-good/Makefile
> ===================================================================
> RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-good/Makefile,v
> retrieving revision 1.45
> diff -u -r1.45 Makefile
> --- plugins-good/Makefile 8 Sep 2009 08:00:18 -0000 1.45
> +++ plugins-good/Makefile 19 Sep 2009 14:38:12 -0000
> @@ -2,43 +2,30 @@
>
> COMMENT-main = multimedia framework - good plugins
> COMMENT-aalib = multimedia framework - aalib plugin
> -COMMENT-cairo = multimedia framework - cairo plugin
> COMMENT-gconf = multimedia framework - conf elements
> COMMENT-esd = multimedia framework - esound plugin
> -COMMENT-flac = multimedia framework - flac plugin
> COMMENT-speex = multimedia framework - speex plugin
> -COMMENT-taglib = multimedia framework - taglib plugin
> COMMENT-dv = multimedia framework - dv plugin
> -COMMENT-jpeg = multimedia framework - jpeg plugin
> -COMMENT-png = multimedia framework - png plugin
> COMMENT-gdk = multimedia framework - gdk pixbuf plugin
> COMMENT-caca = multimedia framework - libcaca plugin
> COMMENT-shout = multimedia framework - shoutcast plugin
> COMMENT-soup = multimedia framework - libsoup plugin
> -COMMENT-wavpack = multimedia framework - wavpack plugin
>
> V = 0.10.8
> DISTNAME = gst-plugins-good-$V
> -PKGNAME-main = gstreamer-plugins-good-$Vp15v0
> +PKGNAME-main = gstreamer-plugins-good-$Vp16v0
> PKGNAME-aalib = gstreamer-aalib-$Vp5
> -PKGNAME-cairo = gstreamer-cairo-$Vp6
> PKGNAME-gconf = gstreamer-confelements-$Vp8
> PKGNAME-esd = gstreamer-esd-$Vp5
> -PKGNAME-flac = gstreamer-flac-$Vp4
> PKGNAME-speex = gstreamer-speex-$Vp4
> -PKGNAME-taglib = gstreamer-taglib-$Vp4
> PKGNAME-dv = gstreamer-dv-$Vp4
> -PKGNAME-jpeg = gstreamer-jpeg-$Vp4
> -PKGNAME-png = gstreamer-png-$Vp5
> PKGNAME-gdk = gstreamer-gdk-pixbuf-$Vp7
> PKGNAME-caca = gstreamer-libcaca-$Vp5
> PKGNAME-shout = gstreamer-shoutcast-$Vp4
> PKGNAME-soup = gstreamer-libsoup-$Vp5
> -PKGNAME-wavpack = gstreamer-wavpack-$Vp3
>
> -MULTI_PACKAGES = -main -aalib -cairo -gconf -esd -flac -speex \
> - -taglib -dv -jpeg -png -gdk -caca -shout -soup \
> - -wavpack
> +MULTI_PACKAGES = -main -aalib -gconf -esd -speex \
> + -dv -gdk -caca -shout -soup
> SHARED_LIBS =
>
> MASTER_SITES = ${MASTER_SITE_GST:=gst-plugins-good/}
> @@ -58,10 +45,16 @@
> WANTLIB-main = ${WANTLIB} \
> ICE SM X11 Xdamage Xext Xfixes sndio \
> gstcontroller-0.10 gstbase-0.10 Xau Xdmcp \
> - pthread-stubs xcb
> + pthread-stubs xcb Xrender cairo expat \
> + fontconfig freetype glitz ogg pixman-1 png \
> + stdc++
> LIB_DEPENDS-main = ${LIB_DEPENDS} \
> oil-0.3::devel/liboil \
> -
> gstaudio-0.10,gstinterfaces-0.10,gstnetbuffer-0.10,gstriff-0.10,gstrtp-0.10,gsttag-0.10,gstvideo-0.10,gstfft-0.10,gstrtsp-0.10,gstsdp-0.10::$P/plugins-base
> +
> gstaudio-0.10,gstinterfaces-0.10,gstnetbuffer-0.10,gstriff-0.10,gstrtp-0.10,gsttag-0.10,gstvideo-0.10,gstfft-0.10,gstrtsp-0.10,gstsdp-0.10::$P/plugins-base
> \
> + FLAC.>=9::audio/flac \
> + jpeg.>=62::graphics/jpeg \
> + tag.>=7::audio/taglib \
> + wavpack::audio/wavpack
> RUN_DEPENDS-main =
>
> WANTLIB-aalib= ${WANTLIB} \
> @@ -69,12 +62,6 @@
> LIB_DEPENDS-aalib = ${LIB_DEPENDS} \
> aa::graphics/aalib
>
> -WANTLIB-cairo = ${WANTLIB} \
> - X11 Xau Xdmcp Xrender fontconfig freetype \
> - pixman-1 glitz png gstbase-0.10 expat pthread-stubs xcb
> -LIB_DEPENDS-cairo = ${LIB_DEPENDS} \
> - cairo::graphics/cairo
> -
> WANTLIB-gconf = ${WANTLIB} \
> ORBit-2 dbus-1 dbus-glib-1
> LIB_DEPENDS-gconf = ${LIB_DEPENDS} \
> @@ -89,13 +76,6 @@
> esd::audio/esound \
> gstaudio-0.10,gstinterfaces-0.10::$P/plugins-base
>
> -WANTLIB-flac = ${WANTLIB} \
> - ogg gstbase-0.10
> -
> -LIB_DEPENDS-flac = ${LIB_DEPENDS} \
> - FLAC::audio/flac \
> - gsttag-0.10::$P/plugins-base
> -
> WANTLIB-speex = ${WANTLIB} \
> gstbase-0.10
>
> @@ -103,13 +83,6 @@
> speex::audio/speex \
> gsttag-0.10::$P/plugins-base
>
> -WANTLIB-taglib = ${WANTLIB} \
> - stdc++ gstbase-0.10
> -
> -LIB_DEPENDS-taglib = ${LIB_DEPENDS} \
> - gsttag-0.10::$P/plugins-base \
> - tag::audio/taglib
> -
> WANTLIB-dv = ${WANTLIB} \
> gstbase-0.10
>
> @@ -117,16 +90,6 @@
> dv::multimedia/libdv \
> gstaudio-0.10,gstinterfaces-0.10::$P/plugins-base
>
> -WANTLIB-jpeg = ${WANTLIB} \
> -
> -LIB_DEPENDS-jpeg = ${LIB_DEPENDS} \
> - jpeg::graphics/jpeg
> -
> -WANTLIB-png = ${WANTLIB} \
> -
> -LIB_DEPENDS-png = ${LIB_DEPENDS} \
> - png::graphics/png
> -
> WANTLIB-gdk = ${WANTLIB} \
> X11 Xcomposite Xdamage Xext Xrender atk-1.0 \
> cairo fontconfig freetype gio-2.0 glitz pango-1.0 \
> @@ -158,12 +121,6 @@
>
> LIB_DEPENDS-soup = ${LIB_DEPENDS} \
> soup-2.4::devel/libsoup
> -
> -WANTLIB-wavpack = ${WANTLIB}
> -
> -LIB_DEPENDS-wavpack = ${LIB_DEPENDS} \
> - wavpack::audio/wavpack \
> -
> gstaudio-0.10,gstbase-0.10,gstinterfaces-0.10::$P/plugins-base
>
> BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS} \
> ${MODGNU_AUTOMAKE_DEPENDS}
> Index: plugins-good/pkg/DESCR-cairo
> ===================================================================
> RCS file: plugins-good/pkg/DESCR-cairo
> diff -N plugins-good/pkg/DESCR-cairo
> --- plugins-good/pkg/DESCR-cairo 12 Jan 2007 00:29:35 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,2 +0,0 @@
> -good plugin for gstreamer-${VERSION}
> -* cairo Cairo-based text and time overlays on videos
> Index: plugins-good/pkg/DESCR-flac
> ===================================================================
> RCS file: plugins-good/pkg/DESCR-flac
> diff -N plugins-good/pkg/DESCR-flac
> --- plugins-good/pkg/DESCR-flac 12 Jan 2007 00:29:35 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,2 +0,0 @@
> -good plugin for gstreamer-${VERSION}
> -* flac FLAC Lossless compressor encoder/decoder
> Index: plugins-good/pkg/DESCR-jpeg
> ===================================================================
> RCS file: plugins-good/pkg/DESCR-jpeg
> diff -N plugins-good/pkg/DESCR-jpeg
> --- plugins-good/pkg/DESCR-jpeg 12 Jan 2007 00:29:35 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,2 +0,0 @@
> -good plugin for gstreamer-${VERSION}
> -* jpeg JPeg plugin library (decoder/encoder). smoke format too.
> Index: plugins-good/pkg/DESCR-main
> ===================================================================
> RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-good/pkg/DESCR-main,v
> retrieving revision 1.6
> diff -u -r1.6 DESCR-main
> --- plugins-good/pkg/DESCR-main 30 Jan 2009 02:18:53 -0000 1.6
> +++ plugins-good/pkg/DESCR-main 19 Sep 2009 14:38:12 -0000
> @@ -53,19 +53,13 @@
> The following plugins are in specific packages because of dependencies:
> * aasink
> * cacasink
> -* cairo
> * dv
> * esdsink
> -* flac
> * autodetect & gconfelements
> * gdkpixbuf
> -* jpeg
> -* png
> * shout2send
> * soup
> * speex
> -* taglib
> -* wavpack
>
> The following plugins are not built:
> * 1394 (no firewire support yet)
> Index: plugins-good/pkg/DESCR-png
> ===================================================================
> RCS file: plugins-good/pkg/DESCR-png
> diff -N plugins-good/pkg/DESCR-png
> --- plugins-good/pkg/DESCR-png 12 Jan 2007 00:29:35 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,2 +0,0 @@
> -good plugin for gstreamer-${VERSION}
> -* png PNG plugin library
> Index: plugins-good/pkg/DESCR-taglib
> ===================================================================
> RCS file: plugins-good/pkg/DESCR-taglib
> diff -N plugins-good/pkg/DESCR-taglib
> --- plugins-good/pkg/DESCR-taglib 12 Jan 2007 00:29:35 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,2 +0,0 @@
> -good plugin for gstreamer-${VERSION}
> -* taglib write AP2/ID3v2 tags
> Index: plugins-good/pkg/DESCR-wavpack
> ===================================================================
> RCS file: plugins-good/pkg/DESCR-wavpack
> diff -N plugins-good/pkg/DESCR-wavpack
> --- plugins-good/pkg/DESCR-wavpack 30 Jan 2009 02:18:53 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,2 +0,0 @@
> -good plugin for gstreamer-${VERSION}
> -* wavpack wavpack decoder
> Index: plugins-good/pkg/PLIST-cairo
> ===================================================================
> RCS file: plugins-good/pkg/PLIST-cairo
> diff -N plugins-good/pkg/PLIST-cairo
> --- plugins-good/pkg/PLIST-cairo 9 Jan 2007 21:33:25 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,3 +0,0 @@
> -...@comment $OpenBSD: PLIST-cairo,v 1.1 2007/01/09 21:33:25 espie Exp $
> -lib/gstreamer-${VERSION}/libgstcairo.la
> -lib/gstreamer-${VERSION}/libgstcairo.so
> Index: plugins-good/pkg/PLIST-flac
> ===================================================================
> RCS file: plugins-good/pkg/PLIST-flac
> diff -N plugins-good/pkg/PLIST-flac
> --- plugins-good/pkg/PLIST-flac 10 Jan 2007 12:58:31 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,5 +0,0 @@
> -...@comment $OpenBSD: PLIST-flac,v 1.2 2007/01/10 12:58:31 espie Exp $
> -...@option no-default-conflict
> -...@conflict gstreamer-flac->=0.10
> -lib/gstreamer-${VERSION}/libgstflac.la
> -lib/gstreamer-${VERSION}/libgstflac.so
> Index: plugins-good/pkg/PLIST-jpeg
> ===================================================================
> RCS file: plugins-good/pkg/PLIST-jpeg
> diff -N plugins-good/pkg/PLIST-jpeg
> --- plugins-good/pkg/PLIST-jpeg 10 Jan 2007 12:58:31 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,5 +0,0 @@
> -...@comment $OpenBSD: PLIST-jpeg,v 1.2 2007/01/10 12:58:31 espie Exp $
> -...@option no-default-conflict
> -...@conflict gstreamer-jpeg->=0.10
> -lib/gstreamer-${VERSION}/libgstjpeg.la
> -lib/gstreamer-${VERSION}/libgstjpeg.so
> Index: plugins-good/pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main,v
> retrieving revision 1.14
> diff -u -r1.14 PLIST-main
> --- plugins-good/pkg/PLIST-main 11 Apr 2009 14:37:21 -0000 1.14
> +++ plugins-good/pkg/PLIST-main 19 Sep 2009 14:38:12 -0000
> @@ -1,5 +1,11 @@
> @comment $OpenBSD: PLIST-main,v 1.14 2009/04/11 14:37:21 ajacoutot Exp $
> @conflict gstreamer-plugins-bad-<0.10.7
> +...@conflict gstreamer-jpeg-*
> +...@conflict gstreamer-png-*
> +...@conflict gstreamer-cairo-*
> +...@conflict gstreamer-flac-*
> +...@conflict gstreamer-taglib-*
> +...@conflict gstreamer-wavpack-*
> lib/gstreamer-${VERSION}/libgstalaw.la
> lib/gstreamer-${VERSION}/libgstalaw.so
> lib/gstreamer-${VERSION}/libgstalpha.la
> @@ -16,6 +22,8 @@
> lib/gstreamer-${VERSION}/libgstauparse.so
> lib/gstreamer-${VERSION}/libgstavi.la
> lib/gstreamer-${VERSION}/libgstavi.so
> +lib/gstreamer-${VERSION}/libgstcairo.la
> +lib/gstreamer-${VERSION}/libgstcairo.so
> lib/gstreamer-${VERSION}/libgstcutter.la
> lib/gstreamer-${VERSION}/libgstcutter.so
> lib/gstreamer-${VERSION}/libgstdebug.la
> @@ -26,6 +34,8 @@
> lib/gstreamer-${VERSION}/libgsteffectv.so
> lib/gstreamer-${VERSION}/libgstequalizer.la
> lib/gstreamer-${VERSION}/libgstequalizer.so
> +lib/gstreamer-${VERSION}/libgstflac.la
> +lib/gstreamer-${VERSION}/libgstflac.so
> lib/gstreamer-${VERSION}/libgstflxdec.la
> lib/gstreamer-${VERSION}/libgstflxdec.so
> lib/gstreamer-${VERSION}/libgstgamma.la
> @@ -38,6 +48,8 @@
> lib/gstreamer-${VERSION}/libgsticydemux.so
> lib/gstreamer-${VERSION}/libgstid3demux.la
> lib/gstreamer-${VERSION}/libgstid3demux.so
> +lib/gstreamer-${VERSION}/libgstjpeg.la
> +lib/gstreamer-${VERSION}/libgstjpeg.so
> lib/gstreamer-${VERSION}/libgstlevel.la
> lib/gstreamer-${VERSION}/libgstlevel.so
> lib/gstreamer-${VERSION}/libgstlibsndio.la
> @@ -56,6 +68,8 @@
> lib/gstreamer-${VERSION}/libgstnavigationtest.so
> @comment lib/gstreamer-${VERSION}/libgstossaudio.la
> @comment lib/gstreamer-${VERSION}/libgstossaudio.so
> +lib/gstreamer-${VERSION}/libgstpng.la
> +lib/gstreamer-${VERSION}/libgstpng.so
> lib/gstreamer-${VERSION}/libgstqtdemux.la
> lib/gstreamer-${VERSION}/libgstqtdemux.so
> lib/gstreamer-${VERSION}/libgstrtp.la
> @@ -68,6 +82,8 @@
> lib/gstreamer-${VERSION}/libgstspectrum.so
> lib/gstreamer-${VERSION}/libgstsunaudio.la
> lib/gstreamer-${VERSION}/libgstsunaudio.so
> +lib/gstreamer-${VERSION}/libgsttaglib.la
> +lib/gstreamer-${VERSION}/libgsttaglib.so
> lib/gstreamer-${VERSION}/libgstudp.la
> lib/gstreamer-${VERSION}/libgstudp.so
> lib/gstreamer-${VERSION}/libgstvideo4linux2.la
> @@ -84,6 +100,8 @@
> lib/gstreamer-${VERSION}/libgstvideomixer.so
> lib/gstreamer-${VERSION}/libgstwavenc.la
> lib/gstreamer-${VERSION}/libgstwavenc.so
> +lib/gstreamer-${VERSION}/libgstwavpack.la
> +lib/gstreamer-${VERSION}/libgstwavpack.so
> lib/gstreamer-${VERSION}/libgstwavparse.la
> lib/gstreamer-${VERSION}/libgstwavparse.so
> lib/gstreamer-${VERSION}/libgstximagesrc.la
> Index: plugins-good/pkg/PLIST-png
> ===================================================================
> RCS file: plugins-good/pkg/PLIST-png
> diff -N plugins-good/pkg/PLIST-png
> --- plugins-good/pkg/PLIST-png 10 Jan 2007 00:34:49 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,3 +0,0 @@
> -...@comment $OpenBSD: PLIST-png,v 1.1 2007/01/10 00:34:49 espie Exp $
> -lib/gstreamer-${VERSION}/libgstpng.la
> -lib/gstreamer-${VERSION}/libgstpng.so
> Index: plugins-good/pkg/PLIST-taglib
> ===================================================================
> RCS file: plugins-good/pkg/PLIST-taglib
> diff -N plugins-good/pkg/PLIST-taglib
> --- plugins-good/pkg/PLIST-taglib 10 Jan 2007 00:34:49 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,3 +0,0 @@
> -...@comment $OpenBSD: PLIST-taglib,v 1.1 2007/01/10 00:34:49 espie Exp $
> -lib/gstreamer-${VERSION}/libgsttaglib.la
> -lib/gstreamer-${VERSION}/libgsttaglib.so
> Index: plugins-good/pkg/PLIST-wavpack
> ===================================================================
> RCS file: plugins-good/pkg/PLIST-wavpack
> diff -N plugins-good/pkg/PLIST-wavpack
> --- plugins-good/pkg/PLIST-wavpack 30 Jan 2009 02:18:53 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,3 +0,0 @@
> -...@comment $OpenBSD: PLIST-wavpack,v 1.1 2009/01/30 02:18:53 sthen Exp $
> -lib/gstreamer-${VERSION}/libgstwavpack.la
> -lib/gstreamer-${VERSION}/libgstwavpack.so
> Index: plugins-ugly/Makefile
> ===================================================================
> RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-ugly/Makefile,v
> retrieving revision 1.10
> diff -u -r1.10 Makefile
> --- plugins-ugly/Makefile 11 Apr 2009 14:37:21 -0000 1.10
> +++ plugins-ugly/Makefile 19 Sep 2009 14:38:12 -0000
> @@ -2,22 +2,15 @@
>
> COMMENT-main = multimedia framework - plugins ugly
> COMMENT-sidplay = multimedia framework - sidplay plugin
> -COMMENT-a52 = multimedia framework - a52 plugin
> -COMMENT-mad = multimedia framework - mad plugin
> COMMENT-lame = multimedia framework - lame plugin
> -COMMENT-mpeg2 = multimedia framework - mpeg2 plugin
> -COMMENT-dvdread = multimedia framework - dvdread plugin
>
> V = 0.10.7
> DISTNAME = gst-plugins-ugly-$V
> PKGNAME-main = gstreamer-plugins-ugly-$Vp1
> PKGNAME-sidplay = gstreamer-sidplay-$Vp2
> -PKGNAME-a52 = gstreamer-a52-$Vp2
> -PKGNAME-mad = gstreamer-mad-$Vp2
> PKGNAME-lame = gstreamer-lame-$Vp2
> -PKGNAME-mpeg2 = gstreamer-mpeg2-$Vp2
> -PKGNAME-dvdread = gstreamer-dvdread-$Vp2
> -MULTI_PACKAGES = -main -sidplay -lame -mad -a52 -mpeg2 -dvdread
> +
> +MULTI_PACKAGES = -main -sidplay -lame
>
> PERMIT_PACKAGE_CDROM = Patent issues
> PERMIT_DISTFILES_CDROM =Patent issues
> @@ -35,7 +28,13 @@
> WANTLIB-main = ${WANTLIB}
> LIB_DEPENDS-main = ${LIB_DEPENDS} \
>
> gstriff-0.10,gstrtsp-0.10,gstsdp-0.10,gsttag-0.10::$P/plugins-base \
> -
> gstbase-0.10,gstaudio-0.10,gstinterfaces-0.10:gstreamer->=0.10:$P/core
> +
> gstbase-0.10,gstaudio-0.10,gstinterfaces-0.10:gstreamer->=0.10:$P/core \
> + oil-0.3::devel/liboil \
> + a52::audio/liba52 \
> + id3tag::audio/libid3tag \
> + mad::audio/libmad \
> + mpeg2::graphics/libmpeg2 \
> + dvdread::devel/libdvdread
> RUN_DEPENDS-main =
>
>
> @@ -43,36 +42,10 @@
> LIB_DEPENDS-sidplay = ${LIB_DEPENDS} \
> sidplay::audio/libsidplay
>
> -WANTLIB-a52 = ${WANTLIB}
> -LIB_DEPENDS-a52 = ${LIB_DEPENDS} \
> - oil-0.3::devel/liboil \
> - gstaudio-0.10,gstinterfaces-0.10::$P/plugins-base \
> - gstbase-0.10:gstreamer->=0.10:$P/core \
> - a52::audio/liba52
> -
> -WANTLIB-mad = ${WANTLIB}
> -LIB_DEPENDS-mad = ${LIB_DEPENDS} \
> - gsttag-0.10,gstbase-0.10:gstreamer->=0.10:$P/core \
> - gstaudio-0.10,gstinterfaces-0.10::$P/plugins-base \
> - id3tag::audio/libid3tag \
> - mad::audio/libmad
> -
> WANTLIB-lame = ${WANTLIB}
> LIB_DEPENDS-lame = ${LIB_DEPENDS} \
> mp3lame::audio/lame
>
> -WANTLIB-mpeg2 = ${WANTLIB}
> -
> -LIB_DEPENDS-mpeg2 = ${LIB_DEPENDS} \
> - mpeg2::graphics/libmpeg2
> -
> -WANTLIB-dvdread = ${WANTLIB} \
> - gstbase-0.10
> -
> -LIB_DEPENDS-dvdread = ${LIB_DEPENDS} \
> - dvdread::devel/libdvdread
> -
> CONFIGURE_ARGS = --disable-amrnb
> -
>
> .include <bsd.port.mk>
> Index: plugins-ugly/pkg/DESCR-a52
> ===================================================================
> RCS file: plugins-ugly/pkg/DESCR-a52
> diff -N plugins-ugly/pkg/DESCR-a52
> --- plugins-ugly/pkg/DESCR-a52 12 Jan 2007 00:51:46 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,2 +0,0 @@
> -plugin for gstreamer-${VERSION} with controversial licence
> -* a52dec decodes ATSC A/52 encoded audio streams
> Index: plugins-ugly/pkg/DESCR-dvdread
> ===================================================================
> RCS file: plugins-ugly/pkg/DESCR-dvdread
> diff -N plugins-ugly/pkg/DESCR-dvdread
> --- plugins-ugly/pkg/DESCR-dvdread 12 Jan 2007 00:51:46 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,2 +0,0 @@
> -plugin for gstreamer-${VERSION} with controversial licence
> -* dvdread Access a DVD title/chapter/angle using libdvdread
> Index: plugins-ugly/pkg/DESCR-mad
> ===================================================================
> RCS file: plugins-ugly/pkg/DESCR-mad
> diff -N plugins-ugly/pkg/DESCR-mad
> --- plugins-ugly/pkg/DESCR-mad 12 Jan 2007 00:51:46 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,2 +0,0 @@
> -plugin for gstreamer-${VERSION} with controversial licence
> -* mad id3 tag manipulation and mp3 decoding based on the mad library
>
> Index: plugins-ugly/pkg/DESCR-main
> ===================================================================
> RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-ugly/pkg/DESCR-main,v
> retrieving revision 1.2
> diff -u -r1.2 DESCR-main
> --- plugins-ugly/pkg/DESCR-main 12 Jan 2007 00:51:46 -0000 1.2
> +++ plugins-ugly/pkg/DESCR-main 19 Sep 2009 14:38:12 -0000
> @@ -10,11 +10,7 @@
> * rmdemux Realmedia stream demuxer
>
> The following plugins are in specific packages because of dependencies:
> -* a52dec
> -* dvdread
> * lame
> -* mad
> -* mpeg2dec
> * siddec
>
> The following plugins are not built:
> Index: plugins-ugly/pkg/DESCR-mpeg2
> ===================================================================
> RCS file: plugins-ugly/pkg/DESCR-mpeg2
> diff -N plugins-ugly/pkg/DESCR-mpeg2
> --- plugins-ugly/pkg/DESCR-mpeg2 12 Jan 2007 00:51:46 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,2 +0,0 @@
> -plugin for gstreamer-${VERSION} with controversial licence
> -* mpeg2dec LibMpeg2 decoder
> Index: plugins-ugly/pkg/PLIST-a52
> ===================================================================
> RCS file: plugins-ugly/pkg/PLIST-a52
> diff -N plugins-ugly/pkg/PLIST-a52
> --- plugins-ugly/pkg/PLIST-a52 10 Jan 2007 02:14:04 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,5 +0,0 @@
> -...@comment $OpenBSD: PLIST-a52,v 1.1 2007/01/10 02:14:04 espie Exp $
> -...@option no-default-conflict
> -...@conflict gstreamer-a52->=0.10
> -lib/gstreamer-${VERSION}/libgsta52dec.la
> -lib/gstreamer-${VERSION}/libgsta52dec.so
> Index: plugins-ugly/pkg/PLIST-dvdread
> ===================================================================
> RCS file: plugins-ugly/pkg/PLIST-dvdread
> diff -N plugins-ugly/pkg/PLIST-dvdread
> --- plugins-ugly/pkg/PLIST-dvdread 10 Jan 2007 12:58:31 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,5 +0,0 @@
> -...@comment $OpenBSD: PLIST-dvdread,v 1.1 2007/01/10 12:58:31 espie Exp $
> -...@option no-default-conflict
> -...@conflict gstreamer-dvdread->=0.10
> -lib/gstreamer-${VERSION}/libgstdvdread.la
> -lib/gstreamer-${VERSION}/libgstdvdread.so
> Index: plugins-ugly/pkg/PLIST-mad
> ===================================================================
> RCS file: plugins-ugly/pkg/PLIST-mad
> diff -N plugins-ugly/pkg/PLIST-mad
> --- plugins-ugly/pkg/PLIST-mad 10 Jan 2007 02:14:04 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,5 +0,0 @@
> -...@comment $OpenBSD: PLIST-mad,v 1.1 2007/01/10 02:14:04 espie Exp $
> -...@option no-default-conflict
> -...@conflict gstreamer-mad->=0.10
> -lib/gstreamer-${VERSION}/libgstmad.la
> -lib/gstreamer-${VERSION}/libgstmad.so
> Index: plugins-ugly/pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-ugly/pkg/PLIST-main,v
> retrieving revision 1.4
> diff -u -r1.4 PLIST-main
> --- plugins-ugly/pkg/PLIST-main 13 May 2008 15:11:51 -0000 1.4
> +++ plugins-ugly/pkg/PLIST-main 19 Sep 2009 14:38:12 -0000
> @@ -1,12 +1,24 @@
> @comment $OpenBSD: PLIST-main,v 1.4 2008/05/13 15:11:51 espie Exp $
> +...@conflict gstreamer-a52-*
> +...@conflict gstreamer-mad-*
> +...@conflict gstreamer-mpeg2-*
> +...@conflict gstreamer-dvdread-*
> +lib/gstreamer-${VERSION}/libgsta52dec.la
> +lib/gstreamer-${VERSION}/libgsta52dec.so
> lib/gstreamer-${VERSION}/libgstasf.la
> lib/gstreamer-${VERSION}/libgstasf.so
> lib/gstreamer-${VERSION}/libgstdvdlpcmdec.la
> lib/gstreamer-${VERSION}/libgstdvdlpcmdec.so
> +lib/gstreamer-${VERSION}/libgstdvdread.la
> +lib/gstreamer-${VERSION}/libgstdvdread.so
> lib/gstreamer-${VERSION}/libgstdvdsub.la
> lib/gstreamer-${VERSION}/libgstdvdsub.so
> lib/gstreamer-${VERSION}/libgstiec958.la
> lib/gstreamer-${VERSION}/libgstiec958.so
> +lib/gstreamer-${VERSION}/libgstmad.la
> +lib/gstreamer-${VERSION}/libgstmad.so
> +lib/gstreamer-${VERSION}/libgstmpeg2dec.la
> +lib/gstreamer-${VERSION}/libgstmpeg2dec.so
> lib/gstreamer-${VERSION}/libgstmpegaudioparse.la
> lib/gstreamer-${VERSION}/libgstmpegaudioparse.so
> lib/gstreamer-${VERSION}/libgstmpegstream.la
> Index: plugins-ugly/pkg/PLIST-mpeg2
> ===================================================================
> RCS file: plugins-ugly/pkg/PLIST-mpeg2
> diff -N plugins-ugly/pkg/PLIST-mpeg2
> --- plugins-ugly/pkg/PLIST-mpeg2 10 Jan 2007 12:58:31 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,5 +0,0 @@
> -...@comment $OpenBSD: PLIST-mpeg2,v 1.1 2007/01/10 12:58:31 espie Exp $
> -...@option no-default-conflict
> -...@conflict gstreamer-mpeg2->=0.10
> -lib/gstreamer-${VERSION}/libgstmpeg2dec.la
> -lib/gstreamer-${VERSION}/libgstmpeg2dec.so
--
"Intelligence should guide our actions, but in harmony with the
texture of the situation at hand"
-- Francisco Varela
