aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.gstreamer.mk106
-rw-r--r--audio/Makefile29
-rw-r--r--audio/goobox/Makefile5
-rw-r--r--audio/gstreamer-monkeysaudio/Makefile6
-rw-r--r--audio/gstreamer-monkeysaudio/distinfo1
-rw-r--r--audio/gstreamer-monkeysaudio/pkg-plist2
-rw-r--r--audio/gstreamer-plugins-a52dec80/Makefile5
-rw-r--r--audio/gstreamer-plugins-artsd80/Makefile5
-rw-r--r--audio/gstreamer-plugins-audiofile80/Makefile5
-rw-r--r--audio/gstreamer-plugins-cdaudio80/Makefile5
-rw-r--r--audio/gstreamer-plugins-cdparanoia80/Makefile5
-rw-r--r--audio/gstreamer-plugins-esound80/Makefile5
-rw-r--r--audio/gstreamer-plugins-faac80/Makefile5
-rw-r--r--audio/gstreamer-plugins-faad80/Makefile5
-rw-r--r--audio/gstreamer-plugins-flac80/Makefile5
-rw-r--r--audio/gstreamer-plugins-gsm80/Makefile5
-rw-r--r--audio/gstreamer-plugins-ivorbis80/Makefile5
-rw-r--r--audio/gstreamer-plugins-jack80/Makefile5
-rw-r--r--audio/gstreamer-plugins-ladspa80/Makefile5
-rw-r--r--audio/gstreamer-plugins-lame80/Makefile5
-rw-r--r--audio/gstreamer-plugins-mad80/Makefile5
-rw-r--r--audio/gstreamer-plugins-mikmod80/Makefile5
-rw-r--r--audio/gstreamer-plugins-musepack80/Makefile5
-rw-r--r--audio/gstreamer-plugins-musicbrainz80/Makefile5
-rw-r--r--audio/gstreamer-plugins-nas80/Makefile5
-rw-r--r--audio/gstreamer-plugins-ogg80/Makefile5
-rw-r--r--audio/gstreamer-plugins-polyp80/Makefile5
-rw-r--r--audio/gstreamer-plugins-shout280/Makefile3
-rw-r--r--audio/gstreamer-plugins-shout80/Makefile5
-rw-r--r--audio/gstreamer-plugins-sidplay80/Makefile5
-rw-r--r--audio/gstreamer-plugins-smoothwave80/Makefile5
-rw-r--r--audio/gstreamer-plugins-sndfile80/Makefile5
-rw-r--r--audio/gstreamer-plugins-speex80/Makefile5
-rw-r--r--audio/gstreamer-plugins-vorbis80/Makefile5
-rw-r--r--audio/gstreamer-plugins-wavpack80/Makefile5
-rw-r--r--audio/jamboree/Makefile8
-rw-r--r--audio/jamboree/distinfo1
-rw-r--r--audio/jamboree/files/patch-src_Makefile.in12
-rw-r--r--audio/klira/Makefile3
-rw-r--r--audio/lindele/Makefile3
-rw-r--r--audio/lindele/distinfo1
-rw-r--r--audio/marlin/Makefile4
-rw-r--r--audio/rhythmbox-devel/Makefile15
-rw-r--r--audio/rhythmbox/Makefile15
-rw-r--r--audio/tunesbrowser/Makefile6
-rw-r--r--devel/Makefile3
-rw-r--r--devel/gstreamer-plugins-gconf/Makefile2
-rw-r--r--devel/gstreamer-plugins-gconf80/Makefile5
-rw-r--r--devel/gstreamer-plugins-gnomevfs80/Makefile5
-rw-r--r--devel/gstreamer-plugins-sdl80/Makefile5
-rw-r--r--games/gnome-music-quiz/Makefile2
-rw-r--r--games/monkeybubble/Makefile5
-rw-r--r--games/monkeybubble/pkg-plist3
-rw-r--r--graphics/Makefile11
-rw-r--r--graphics/gstreamer-plugins-aalib80/Makefile5
-rw-r--r--graphics/gstreamer-plugins-cairo80/Makefile7
-rw-r--r--graphics/gstreamer-plugins-gdkpixbuf80/Makefile5
-rw-r--r--graphics/gstreamer-plugins-hermes80/Makefile5
-rw-r--r--graphics/gstreamer-plugins-jpeg-mmx80/Makefile5
-rw-r--r--graphics/gstreamer-plugins-jpeg80/Makefile5
-rw-r--r--graphics/gstreamer-plugins-libcaca80/Makefile5
-rw-r--r--graphics/gstreamer-plugins-libmng80/Makefile5
-rw-r--r--graphics/gstreamer-plugins-libpng80/Makefile5
-rw-r--r--graphics/gstreamer-plugins-libvisual80/Makefile5
-rw-r--r--graphics/gstreamer-plugins-swfdec80/Makefile5
-rw-r--r--graphics/swfdec/Makefile3
-rw-r--r--multimedia/Makefile23
-rw-r--r--multimedia/gnonlin/Makefile2
-rw-r--r--multimedia/gnonlin/distinfo1
-rw-r--r--multimedia/gnonlin/pkg-plist6
-rw-r--r--multimedia/gstreamer-editor/Makefile9
-rw-r--r--multimedia/gstreamer-editor/distinfo1
-rw-r--r--multimedia/gstreamer-editor/pkg-plist6
-rw-r--r--multimedia/gstreamer-ffmpeg/Makefile9
-rw-r--r--multimedia/gstreamer-ffmpeg/distinfo6
-rw-r--r--multimedia/gstreamer-ffmpeg/pkg-plist4
-rw-r--r--multimedia/gstreamer-ffmpeg80/Makefile14
-rw-r--r--multimedia/gstreamer-ffmpeg80/distinfo1
-rw-r--r--multimedia/gstreamer-ffmpeg80/pkg-plist4
-rw-r--r--multimedia/gstreamer-pitfdll/Makefile3
-rw-r--r--multimedia/gstreamer-plugins-all/Makefile18
-rw-r--r--multimedia/gstreamer-plugins-all80/Makefile12
-rw-r--r--multimedia/gstreamer-plugins-bad/Makefile41
-rw-r--r--multimedia/gstreamer-plugins-bad/pkg-plist9
-rw-r--r--multimedia/gstreamer-plugins-core/Makefile22
-rw-r--r--multimedia/gstreamer-plugins-core80/Makefile25
-rw-r--r--multimedia/gstreamer-plugins-dirac80/Makefile3
-rw-r--r--multimedia/gstreamer-plugins-dts80/Makefile18
-rw-r--r--multimedia/gstreamer-plugins-dv80/Makefile5
-rw-r--r--multimedia/gstreamer-plugins-dvd80/Makefile3
-rw-r--r--multimedia/gstreamer-plugins-good/Makefile43
-rw-r--r--multimedia/gstreamer-plugins-good/files/patch-sys_oss_gstosshelper.c20
-rw-r--r--multimedia/gstreamer-plugins-good/pkg-plist84
-rw-r--r--multimedia/gstreamer-plugins-libfame80/Makefile3
-rw-r--r--multimedia/gstreamer-plugins-mpeg2dec80/Makefile3
-rw-r--r--multimedia/gstreamer-plugins-mpeg2enc80/Makefile3
-rw-r--r--multimedia/gstreamer-plugins-mplex80/Makefile3
-rw-r--r--multimedia/gstreamer-plugins-theora80/Makefile3
-rw-r--r--multimedia/gstreamer-plugins-ugly/Makefile41
-rw-r--r--multimedia/gstreamer-plugins-ugly/pkg-plist21
-rw-r--r--multimedia/gstreamer-plugins-x26480/Makefile3
-rw-r--r--multimedia/gstreamer-plugins-xvid80/Makefile3
-rw-r--r--multimedia/gstreamer-plugins/Makefile141
-rw-r--r--multimedia/gstreamer-plugins/Makefile.common484
-rw-r--r--multimedia/gstreamer-plugins/distinfo15
-rw-r--r--multimedia/gstreamer-plugins/files/bsdi_dvd.h340
-rw-r--r--multimedia/gstreamer-plugins/files/patch-configure12
-rw-r--r--multimedia/gstreamer-plugins/files/patch-ext::ivorbis::vorbisenc.h103
-rw-r--r--multimedia/gstreamer-plugins/files/patch-ext_cdparanoia_gstcdparanoia.c34
-rw-r--r--multimedia/gstreamer-plugins/files/patch-ext_libcaca_Makefile.in23
-rw-r--r--multimedia/gstreamer-plugins/files/patch-ext_mpeg2enc_gstmpeg2encoptions.cc26
-rw-r--r--multimedia/gstreamer-plugins/files/patch-ext_sdl_Makefile.in23
-rw-r--r--multimedia/gstreamer-plugins/files/patch-gcc29577
-rw-r--r--multimedia/gstreamer-plugins/files/patch-gst_ffmpegcolorspace_Makefile.in11
-rw-r--r--multimedia/gstreamer-plugins/files/patch-gst_librfb_gstrfbsrc.c10
-rw-r--r--multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h72
-rw-r--r--multimedia/gstreamer-plugins/files/patch-sys_oss_gstosselement.h10
-rw-r--r--multimedia/gstreamer-plugins/pkg-plist417
-rw-r--r--multimedia/gstreamer-plugins80/Makefile11
-rw-r--r--multimedia/gstreamer-plugins80/Makefile.common101
-rw-r--r--multimedia/gstreamer-plugins80/distinfo6
-rw-r--r--multimedia/gstreamer-plugins80/pkg-plist10
-rw-r--r--multimedia/gstreamer/Makefile48
-rw-r--r--multimedia/gstreamer/distinfo6
-rw-r--r--multimedia/gstreamer/files/patch-configure29
-rw-r--r--multimedia/gstreamer/files/patch-gst::cothreads.c13
-rw-r--r--multimedia/gstreamer/files/patch-gst__gstbin.c11
-rw-r--r--multimedia/gstreamer/files/patch-gst_gstmemchunk.c10
-rw-r--r--multimedia/gstreamer/pkg-plist149
-rw-r--r--multimedia/gstreamer80/Makefile7
-rw-r--r--multimedia/gstreamer80/distinfo6
-rw-r--r--multimedia/gstreamer80/files/patch-tools_Makefile.in20
-rw-r--r--multimedia/gstreamer80/pkg-plist12
-rw-r--r--multimedia/istanbul/Makefile11
-rw-r--r--multimedia/kaffeine/Makefile2
-rw-r--r--multimedia/pitivi/Makefile14
-rw-r--r--multimedia/pitivi/distinfo6
-rw-r--r--multimedia/pitivi/pkg-plist180
-rw-r--r--multimedia/py-gstreamer/Makefile9
-rw-r--r--multimedia/py-gstreamer/distinfo6
-rw-r--r--multimedia/py-gstreamer/pkg-plist77
-rw-r--r--multimedia/py-gstreamer80/Makefile4
-rw-r--r--multimedia/py-gstreamer80/distinfo1
-rw-r--r--multimedia/py-gstreamer80/pkg-plist2
-rw-r--r--multimedia/quodlibet/Makefile17
-rw-r--r--multimedia/ruby-gst/Makefile5
-rw-r--r--multimedia/totem-gstreamer/Makefile5
-rw-r--r--multimedia/totem/Makefile17
-rw-r--r--multimedia/totem/distinfo6
-rw-r--r--multimedia/totem/files/patch-src_totem-disk.c26
-rw-r--r--multimedia/totem/pkg-plist14
-rw-r--r--net/Makefile1
-rw-r--r--net/gstreamer-plugins-libmms80/Makefile5
-rw-r--r--sysutils/Makefile1
-rw-r--r--sysutils/gnomebaker/Makefile2
-rw-r--r--sysutils/gstreamer-plugins-cdio80/Makefile5
-rw-r--r--sysutils/serpentine/Makefile10
-rw-r--r--www/swfdec-plugin/Makefile7
-rw-r--r--x11-toolkits/Makefile1
-rw-r--r--x11-toolkits/gstreamer-plugins-pango80/Makefile5
-rw-r--r--x11-toolkits/wxgtk26/Makefile4
-rw-r--r--x11-toolkits/wxgtk28/Makefile4
-rw-r--r--x11-toolkits/wxgtk29/Makefile4
163 files changed, 1400 insertions, 2224 deletions
diff --git a/Mk/bsd.gstreamer.mk b/Mk/bsd.gstreamer.mk
index b8a37aca8de8..ed4928c6fbc6 100644
--- a/Mk/bsd.gstreamer.mk
+++ b/Mk/bsd.gstreamer.mk
@@ -7,7 +7,7 @@
# Date: 4 Oct 2004
#
# $FreeBSD$
-#
+# $MCom: ports/Mk/bsd.gstreamer.mk,v 1.24 2006/04/25 14:45:31 ahze Exp $
.if !defined(_POSTMKINCLUDED) && !defined(Gstreamer_Pre_Include)
@@ -18,7 +18,10 @@ Gstreamer_Pre_Include= bsd.gstreamer.mk
# Ports can use the following:
#
-# USE_GSTREAMER= dvd lame flac
+# For Gstreamer 0.10:
+# USE_GSTREAMER= lame faac ffmpeg
+# For Gstreamer 0.8:
+# USE_GSTREAMER80= dvd lame flac
#
# If you want to use USE_GSTREAMER after <bsd.port.pre.mk>
# you must follow one of the examples listed below
@@ -45,14 +48,25 @@ Gstreamer_Pre_Include= bsd.gstreamer.mk
#
GSTREAMER_PORT= ${PORTSDIR}/multimedia/gstreamer-plugins
+GSTREAMER80_PORT= ${GSTREAMER_PORT}80
_GST_LIB_BASE= ${X11BASE}/lib/gstreamer-${GST_VERSION}
-GST_VERSION= 0.8
+_GST80_LIB_BASE= ${X11BASE}/lib/gstreamer-${GST80_VERSION}
+GST_VERSION= 0.10
+GST_MINOR_VERSION= .0
+GST80_VERSION= 0.8
+GST80_MINOR_VERSION= .10
GST_SHLIB_VERSION= 1
-
+GST80_SHLIB_VERSION= 1
#
# These are the current supported gstreamer-plugins modules
#
-_USE_GSTREAMER_ALL= a52dec aalib artsd audiofile cairo cdaudio cdio cdparanoia \
+_USE_GSTREAMER_ALL= a52dec aalib bad cairo cdparanoia \
+ dv esound faac faad ffmpeg flac gconf gnomevfs \
+ gnonlin good gsm ivorbis jpeg ladspa lame libcaca \
+ libmms libpng libvisual mad mpeg2dec \
+ musepack ogg pango sdl shout2 sidplay \
+ speex theora ugly vorbis wavpack
+_USE_GSTREAMER80_ALL= a52dec aalib artsd audiofile cairo cdaudio cdio cdparanoia \
dirac dts dv dvd esound faac faad ffmpeg flac \
gconf gdkpixbuf gnomevfs gsm hermes ivorbis jack jpeg \
jpeg-mmx ladspa lame libcaca libfame libmms libmng \
@@ -60,29 +74,28 @@ _USE_GSTREAMER_ALL= a52dec aalib artsd audiofile cairo cdaudio cdio cdparanoia \
musepack musicbrainz nas sdl shout shout2 sidplay \
smoothwave sndfile speex theora ogg pango polyp \
swfdec vorbis wavpack x264 xvid
-
# other plugins
OTHER_GSTREAMER_PLUGINS+= core yes
+OTHER_GSTREAMER80_PLUGINS+= ${OTHER_GSTREAMER_PLUGINS}
+
_USE_GSTREAMER_ALL+= ${OTHER_GSTREAMER_PLUGINS}
+_USE_GSTREAMER80_ALL+= ${OTHER_GSTREAMER80_PLUGINS}
core_DEPENDS= multimedia/gstreamer-plugins-core
-core_PLIST= .gstreamer-plugins-core
-core_GST_EXT= .keep
yes_DEPENDS= multimedia/gstreamer-plugins
-yes_PLIST= libgstac3parse
+yes_NAME= gstreamer-plugins
+yes_GST80_PREFIX= # empty
+yes_GST_PREFIX= # empty
cdio_DEPENDS= sysutils/gstreamer-plugins-cdio
-cdio_PLIST= libgstcddasrc
gconf_DEPENDS= devel/gstreamer-plugins-gconf
-gconf_PLIST= libgstgconfelements
# Audio Plugins Section
a52dec_DEPENDS= audio/gstreamer-plugins-a52dec
artsd_DEPENDS= audio/gstreamer-plugins-artsd
-artsd_PLIST= libgstartsdsink
audiofile_DEPENDS= audio/gstreamer-plugins-audiofile
@@ -91,7 +104,6 @@ cdaudio_DEPENDS= audio/gstreamer-plugins-cdaudio
cdparanoia_DEPENDS= audio/gstreamer-plugins-cdparanoia
esound_DEPENDS= audio/gstreamer-plugins-esound
-esound_PLIST= libgstesd
faac_DEPENDS= audio/gstreamer-plugins-faac
@@ -116,22 +128,18 @@ mikmod_DEPENDS= audio/gstreamer-plugins-mikmod
musepack_DEPENDS= audio/gstreamer-plugins-musepack
musicbrainz_DEPENDS= audio/gstreamer-plugins-musicbrainz
-musicbrainz_PLIST= libgsttrm
nas_DEPENDS= audio/gstreamer-plugins-nas
-nas_PLIST= libgstnassink
ogg_DEPENDS= audio/gstreamer-plugins-ogg
polyp_DEPENDS= audio/gstreamer-plugins-polyp
-polyp_PLIST= libpolypaudio
shout_DEPENDS= audio/gstreamer-plugins-shout
shout2_DEPENDS= audio/gstreamer-plugins-shout2
sidplay_DEPENDS= audio/gstreamer-plugins-sidplay
-sidplay_PLIST= libgstsid
smoothwave_DEPENDS= audio/gstreamer-plugins-smoothwave
@@ -147,52 +155,52 @@ wavpack_DEPENDS= audio/gstreamer-plugins-wavpack
gnomevfs_DEPENDS= devel/gstreamer-plugins-gnomevfs
sdl_DEPENDS= devel/gstreamer-plugins-sdl
-sdl_PLIST= libgstsdlvideosink
# Graphics Plugins Section
aalib_DEPENDS= graphics/gstreamer-plugins-aalib
-aalib_PLIST= libgstaasink
cairo_DEPENDS= graphics/gstreamer-plugins-cairo
gdkpixbuf_DEPENDS= graphics/gstreamer-plugins-gdkpixbuf
hermes_DEPENDS= graphics/gstreamer-plugins-hermes
-hermes_PLIST= libgsthermescolorspace
jpeg_DEPENDS= graphics/gstreamer-plugins-jpeg
jpeg-mmx_DEPENDS= graphics/gstreamer-plugins-jpeg-mmx
-jpeg-mmx_PLIST= libgstjpeg
libcaca_DEPENDS= graphics/gstreamer-plugins-libcaca
-libcaca_PLIST= libgstcacasink
libmng_DEPENDS= graphics/gstreamer-plugins-libmng
-libmng_PLIST= libgstmng
libpng_DEPENDS= graphics/gstreamer-plugins-libpng
-libpng_PLIST= libgstpng
libvisual_DEPENDS= graphics/gstreamer-plugins-libvisual
swfdec_DEPENDS= graphics/gstreamer-plugins-swfdec
# Multimedia Plugins Section
+bad_DEPENDS= multimedia/gstreamer-plugins-bad
+
dirac_DEPENDS= multimedia/gstreamer-plugins-dirac
dts_DEPENDS= multimedia/gstreamer-plugins-dts
-dts_PLIST= libgstdtsdec
ffmpeg_DEPENDS= multimedia/gstreamer-ffmpeg
-
-libcaca_PLIST= libgstcacasink
+ffmpeg_GST80_SUFX= 80
+ffmpeg_GST80_PREFIX= gstreamer-
+ffmpeg_GST_PREFIX= gstreamer-
+ffmpeg_GST_SUFX= # empty
+ffmpeg_GST80_VERSION= 0.8.7
+ffmpeg_GST_VERSION= 0.10.0
dv_DEPENDS= multimedia/gstreamer-plugins-dv
-dv_PLIST= libgstdvdec
dvd_DEPENDS= multimedia/gstreamer-plugins-dvd
-dvd_PLIST= libgstdvdnavsrc
+
+good_DEPENDS= multimedia/gstreamer-plugins-good
+
+gnonlin_DEPENDS= multimedia/gstreamer-plugins-gnonlin
libfame_DEPENDS= multimedia/gstreamer-plugins-libfame
@@ -204,42 +212,54 @@ mplex_DEPENDS= multimedia/gstreamer-plugins-mplex
theora_DEPENDS= multimedia/gstreamer-plugins-theora
+ugly_DEPENDS= multimedia/gstreamer-plugins-ugly
+
x264_DEPENDS= multimedia/gstreamer-plugins-x264
-x264_PLIST= libx264
xvid_DEPENDS= multimedia/gstreamer-plugins-xvid
# Net Plugins Section
libmms_DEPENDS= net/gstreamer-plugins-libmms
-libmms_PLIST= libgstmms
# X11-Toolkits Plugins Section
pango_DEPENDS= x11-toolkits/gstreamer-plugins-pango
-pango_PLIST= libgsttextoverlay
.if defined(_POSTMKINCLUDED) && !defined(Gstreamer_Post_Include)
Gstreamer_Post_Include= bsd.gstreamer.mk
-# defined ext_PLIST="" for each port that uses auto plist
+.for ext in ${USE_GSTREAMER80}
+${ext}_GST80_SUFX?= 80
+${ext}_GST80_PREFIX?= gstreamer-plugins-
+${ext}_GST80_VERSION?= ${GST80_VERSION}${GST80_MINOR_VERSION}
+${ext}_NAME?= ${ext}
+.endfor
.for ext in ${USE_GSTREAMER}
-${ext}_PLIST?=
-${ext}_GST_EXT?= .so
+${ext}_GST_PREFIX?= gstreamer-plugins-
+${ext}_GST_VERSION?= ${GST_VERSION}${GST_MINOR_VERSION}
+${ext}_NAME?= ${ext}
.endfor
+.if defined(USE_GSTREAMER80)
+.for ext in ${USE_GSTREAMER80}
+. if ${_USE_GSTREAMER80_ALL:M${ext}}!= "" && exists(${PORTSDIR}/${${ext}_DEPENDS}${${ext}_GST80_SUFX})
+BUILD_DEPENDS+= ${${ext}_GST80_PREFIX}${${ext}_NAME}${${ext}_GST80_SUFX}>=${${ext}_GST80_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}${${ext}_GST80_SUFX}
+RUN_DEPENDS+= ${${ext}_GST80_PREFIX}${${ext}_NAME}${${ext}_GST80_SUFX}>=${${ext}_GST80_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}${${ext}_GST80_SUFX}
+. else
+BROKEN= "Unknown gstreamer-plugin -- ${ext}"
+. endif
+.endfor
+.endif
+.if defined(USE_GSTREAMER)
.for ext in ${USE_GSTREAMER}
. if ${_USE_GSTREAMER_ALL:M${ext}}!= "" && exists(${PORTSDIR}/${${ext}_DEPENDS})
-. if ${${ext}_PLIST} != ""
-BUILD_DEPENDS+= ${_GST_LIB_BASE}/${${ext}_PLIST}${${ext}_GST_EXT}:${PORTSDIR}/${${ext}_DEPENDS}
-RUN_DEPENDS+= ${_GST_LIB_BASE}/${${ext}_PLIST}${${ext}_GST_EXT}:${PORTSDIR}/${${ext}_DEPENDS}
-. else
-BUILD_DEPENDS+= ${_GST_LIB_BASE}/libgst${ext}.so:${PORTSDIR}/${${ext}_DEPENDS}
-RUN_DEPENDS+= ${_GST_LIB_BASE}/libgst${ext}.so:${PORTSDIR}/${${ext}_DEPENDS}
-. endif
+BUILD_DEPENDS+= ${${ext}_GST_PREFIX}${${ext}_NAME}>=${${ext}_GST_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
+RUN_DEPENDS+= ${${ext}_GST_PREFIX}${${ext}_NAME}>=${${ext}_GST_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
. else
-BROKEN= Unknown gstreamer-plugin -- ${ext}
+BROKEN= "Unknown gstreamer-plugin -- ${ext}"
. endif
.endfor
+.endif
# The End
.endif
diff --git a/audio/Makefile b/audio/Makefile
index 0b76450aa060..bafc9f5fbe8a 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -191,34 +191,63 @@
SUBDIR += gspeakers
SUBDIR += gstreamer-monkeysaudio
SUBDIR += gstreamer-plugins-a52dec
+ SUBDIR += gstreamer-plugins-a52dec80
SUBDIR += gstreamer-plugins-artsd
+ SUBDIR += gstreamer-plugins-artsd80
SUBDIR += gstreamer-plugins-audiofile
+ SUBDIR += gstreamer-plugins-audiofile80
SUBDIR += gstreamer-plugins-cdaudio
+ SUBDIR += gstreamer-plugins-cdaudio80
SUBDIR += gstreamer-plugins-cdparanoia
+ SUBDIR += gstreamer-plugins-cdparanoia80
SUBDIR += gstreamer-plugins-esound
+ SUBDIR += gstreamer-plugins-esound80
SUBDIR += gstreamer-plugins-faac
+ SUBDIR += gstreamer-plugins-faac80
SUBDIR += gstreamer-plugins-faad
+ SUBDIR += gstreamer-plugins-faad80
SUBDIR += gstreamer-plugins-flac
+ SUBDIR += gstreamer-plugins-flac80
SUBDIR += gstreamer-plugins-gsm
+ SUBDIR += gstreamer-plugins-gsm80
SUBDIR += gstreamer-plugins-ivorbis
+ SUBDIR += gstreamer-plugins-ivorbis80
SUBDIR += gstreamer-plugins-jack
+ SUBDIR += gstreamer-plugins-jack80
SUBDIR += gstreamer-plugins-ladspa
+ SUBDIR += gstreamer-plugins-ladspa80
SUBDIR += gstreamer-plugins-lame
+ SUBDIR += gstreamer-plugins-lame80
SUBDIR += gstreamer-plugins-mad
+ SUBDIR += gstreamer-plugins-mad80
SUBDIR += gstreamer-plugins-mikmod
+ SUBDIR += gstreamer-plugins-mikmod80
SUBDIR += gstreamer-plugins-musepack
+ SUBDIR += gstreamer-plugins-musepack80
SUBDIR += gstreamer-plugins-musicbrainz
+ SUBDIR += gstreamer-plugins-musicbrainz80
SUBDIR += gstreamer-plugins-nas
+ SUBDIR += gstreamer-plugins-nas80
SUBDIR += gstreamer-plugins-ogg
+ SUBDIR += gstreamer-plugins-ogg80
SUBDIR += gstreamer-plugins-polyp
+ SUBDIR += gstreamer-plugins-polyp80
SUBDIR += gstreamer-plugins-shout
SUBDIR += gstreamer-plugins-shout2
+ SUBDIR += gstreamer-plugins-shout280
+ SUBDIR += gstreamer-plugins-shout80
SUBDIR += gstreamer-plugins-sidplay
+ SUBDIR += gstreamer-plugins-sidplay80
SUBDIR += gstreamer-plugins-smoothwave
+ SUBDIR += gstreamer-plugins-smoothwave80
SUBDIR += gstreamer-plugins-sndfile
+ SUBDIR += gstreamer-plugins-sndfile80
SUBDIR += gstreamer-plugins-speex
+ SUBDIR += gstreamer-plugins-speex80
SUBDIR += gstreamer-plugins-vorbis
+ SUBDIR += gstreamer-plugins-vorbis80
SUBDIR += gstreamer-plugins-wavpack
+ SUBDIR += gstreamer-plugins-wavpack80
SUBDIR += gtick
SUBDIR += gtkgep
SUBDIR += gtkguitune
diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile
index 6074dfd50a04..0aaa6c27b973 100644
--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@@ -3,6 +3,7 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/goobox/Makefile,v 1.15 2006/04/13 07:52:30 bland Exp $
#
PORTNAME= goobox
@@ -10,7 +11,7 @@ PORTVERSION= 0.9.93
PORTREVISION= 2
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -24,7 +25,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libglade2 libbonobo \
gnomedocutils
-USE_GSTREAMER= cdparanoia gconf
+USE_GSTREAMER80= cdparanoia gconf
GNU_CONFIGURE= yes
INSTALLS_OMF= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/audio/gstreamer-monkeysaudio/Makefile b/audio/gstreamer-monkeysaudio/Makefile
index 7db3667c159f..de7431682c43 100644
--- a/audio/gstreamer-monkeysaudio/Makefile
+++ b/audio/gstreamer-monkeysaudio/Makefile
@@ -7,13 +7,13 @@
PORTNAME= gstreamer
PORTVERSION= 0.8.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= audio
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst${PKGNAMESUFFIX}/
PKGNAMESUFFIX= -monkeysaudio
DISTNAME= gst${PKGNAMESUFFIX}-${PORTVERSION}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= gnome@FreeBSD.org
COMMENT= GStreamer plugin for monkeysaudio files
USE_X_PREFIX= yes
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= lthack gnomehack gnomeprefix
-USE_GSTREAMER= yes
+USE_GSTREAMER80= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
PLIST_SUB= VERSION="${GST_VERSION}"
diff --git a/audio/gstreamer-monkeysaudio/distinfo b/audio/gstreamer-monkeysaudio/distinfo
index e1657c4f5546..9b86060bb366 100644
--- a/audio/gstreamer-monkeysaudio/distinfo
+++ b/audio/gstreamer-monkeysaudio/distinfo
@@ -1,3 +1,2 @@
MD5 (gst-monkeysaudio-0.8.0.tar.bz2) = cda60097072e9f48316a76ef2e4d9925
-SHA256 (gst-monkeysaudio-0.8.0.tar.bz2) = 4fb12f1d2e845c9028e547aa7945aacd217e3f1602cf6ccae383ddb04de895b3
SIZE (gst-monkeysaudio-0.8.0.tar.bz2) = 249562
diff --git a/audio/gstreamer-monkeysaudio/pkg-plist b/audio/gstreamer-monkeysaudio/pkg-plist
index ca496033f788..ff4e18f86e63 100644
--- a/audio/gstreamer-monkeysaudio/pkg-plist
+++ b/audio/gstreamer-monkeysaudio/pkg-plist
@@ -3,5 +3,5 @@ lib/gstreamer-%%VERSION%%/libgstmonkeysaudio.la
lib/gstreamer-%%VERSION%%/libgstmonkeysaudio.so
%%PORTDOCS%%%%DOCSDIR%%/GStreamer-monkeysaudio-permit
@exec %%X11BASE%%/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
-%%PORTDOCS%%@unexec /bin/rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
@unexec %%X11BASE%%/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
diff --git a/audio/gstreamer-plugins-a52dec80/Makefile b/audio/gstreamer-plugins-a52dec80/Makefile
index ccd726bbfef8..6b120f102e17 100644
--- a/audio/gstreamer-plugins-a52dec80/Makefile
+++ b/audio/gstreamer-plugins-a52dec80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-a52dec80/Makefile,v 1.2 2006/02/23 18:05:29 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer ATSC A/52 stream aka AC-3 (dvd audio) plugin
GST_PLUGIN= a52dec
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-artsd80/Makefile b/audio/gstreamer-plugins-artsd80/Makefile
index 253c9b2b155c..abd05910e787 100644
--- a/audio/gstreamer-plugins-artsd80/Makefile
+++ b/audio/gstreamer-plugins-artsd80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-artsd80/Makefile,v 1.2 2006/02/23 18:05:30 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer kde audio system plugin
GST_PLUGIN= artsd
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-audiofile80/Makefile b/audio/gstreamer-plugins-audiofile80/Makefile
index c0b205a6b78f..586ab04d2702 100644
--- a/audio/gstreamer-plugins-audiofile80/Makefile
+++ b/audio/gstreamer-plugins-audiofile80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-audiofile80/Makefile,v 1.2 2006/02/23 18:05:30 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer SGI audio file plugin
GST_PLUGIN= audiofile
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-cdaudio80/Makefile b/audio/gstreamer-plugins-cdaudio80/Makefile
index bed8a12956c3..6a1b5b45dad3 100644
--- a/audio/gstreamer-plugins-cdaudio80/Makefile
+++ b/audio/gstreamer-plugins-cdaudio80/Makefile
@@ -3,15 +3,16 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-cdaudio80/Makefile,v 1.2 2006/02/23 18:05:30 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer audio cd playing plugin
GST_PLUGIN= cdaudio
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-cdparanoia80/Makefile b/audio/gstreamer-plugins-cdparanoia80/Makefile
index b7b9beef3624..48ddd76337a0 100644
--- a/audio/gstreamer-plugins-cdparanoia80/Makefile
+++ b/audio/gstreamer-plugins-cdparanoia80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-cdparanoia80/Makefile,v 1.2 2006/02/23 18:05:30 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 2
+PORTREVISION= 3
COMMENT= Gstreamer CDDA extraction (aka audio ripping) plugin
GST_PLUGIN= cdparanoia
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-esound80/Makefile b/audio/gstreamer-plugins-esound80/Makefile
index 591c6e0250d7..f8667471add0 100644
--- a/audio/gstreamer-plugins-esound80/Makefile
+++ b/audio/gstreamer-plugins-esound80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-esound80/Makefile,v 1.2 2006/02/23 18:05:30 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer enlightenment sound library plugin
GST_PLUGIN= esound
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-faac80/Makefile b/audio/gstreamer-plugins-faac80/Makefile
index 1cd3027acf2b..4345bfe033c4 100644
--- a/audio/gstreamer-plugins-faac80/Makefile
+++ b/audio/gstreamer-plugins-faac80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-faac80/Makefile,v 1.2 2006/02/23 18:05:31 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer MPEG-2 and MPEG-4 AAC encoder plugin
GST_PLUGIN= faac
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-faad80/Makefile b/audio/gstreamer-plugins-faad80/Makefile
index cf29a1d52fde..99c7e5b1a8aa 100644
--- a/audio/gstreamer-plugins-faad80/Makefile
+++ b/audio/gstreamer-plugins-faad80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-faad80/Makefile,v 1.2 2006/02/23 18:05:31 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer MPEG-2 and MPEG-4 ACC decoder plugin
GST_PLUGIN= faad
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-flac80/Makefile b/audio/gstreamer-plugins-flac80/Makefile
index f7e86b3f19d8..bc63673717d1 100644
--- a/audio/gstreamer-plugins-flac80/Makefile
+++ b/audio/gstreamer-plugins-flac80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-flac80/Makefile,v 1.2 2006/02/23 18:05:31 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer free lossless audio encoder/decoder plugin
GST_PLUGIN= flac
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-gsm80/Makefile b/audio/gstreamer-plugins-gsm80/Makefile
index 9e830feb1dc9..7e8816d5d98c 100644
--- a/audio/gstreamer-plugins-gsm80/Makefile
+++ b/audio/gstreamer-plugins-gsm80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-gsm80/Makefile,v 1.2 2006/02/23 18:05:31 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer gsm encoding/decoding plugin
GST_PLUGIN= gsm
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-ivorbis80/Makefile b/audio/gstreamer-plugins-ivorbis80/Makefile
index 06dc5c879cfd..6eaf94b8d249 100644
--- a/audio/gstreamer-plugins-ivorbis80/Makefile
+++ b/audio/gstreamer-plugins-ivorbis80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-ivorbis80/Makefile,v 1.2 2006/02/23 18:05:31 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer integer only Ogg Vorbis decoder plugin
GST_PLUGIN= ivorbis
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-jack80/Makefile b/audio/gstreamer-plugins-jack80/Makefile
index 959ac287a1bb..7fa4079bd846 100644
--- a/audio/gstreamer-plugins-jack80/Makefile
+++ b/audio/gstreamer-plugins-jack80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-jack80/Makefile,v 1.2 2006/02/23 18:05:32 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer low-latency audio server plugin
GST_PLUGIN= jack
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-ladspa80/Makefile b/audio/gstreamer-plugins-ladspa80/Makefile
index be29246a0db1..54229141307a 100644
--- a/audio/gstreamer-plugins-ladspa80/Makefile
+++ b/audio/gstreamer-plugins-ladspa80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-ladspa80/Makefile,v 1.2 2006/02/23 18:05:32 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer ladspa (Linux Audio Developer's Simple Plugin API) plugin
GST_PLUGIN= ladspa
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-lame80/Makefile b/audio/gstreamer-plugins-lame80/Makefile
index db266a62a352..a690653dcd2d 100644
--- a/audio/gstreamer-plugins-lame80/Makefile
+++ b/audio/gstreamer-plugins-lame80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-lame80/Makefile,v 1.2 2006/02/23 18:05:32 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer mp3 encode plugin
GST_PLUGIN= lame
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-mad80/Makefile b/audio/gstreamer-plugins-mad80/Makefile
index e95837582370..87a42f92306f 100644
--- a/audio/gstreamer-plugins-mad80/Makefile
+++ b/audio/gstreamer-plugins-mad80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-mad80/Makefile,v 1.2 2006/02/23 18:05:32 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 2
+PORTREVISION= 3
COMMENT= Gstreamer mp3 decoder plugin
GST_PLUGIN= mad
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-mikmod80/Makefile b/audio/gstreamer-plugins-mikmod80/Makefile
index 59669433aad1..749b23a3e662 100644
--- a/audio/gstreamer-plugins-mikmod80/Makefile
+++ b/audio/gstreamer-plugins-mikmod80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-mikmod80/Makefile,v 1.2 2006/02/23 18:05:33 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer mikmod sound plugin
GST_PLUGIN= mikmod
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-musepack80/Makefile b/audio/gstreamer-plugins-musepack80/Makefile
index e3f0c687c3d0..8d77e5fb0cc2 100644
--- a/audio/gstreamer-plugins-musepack80/Makefile
+++ b/audio/gstreamer-plugins-musepack80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-musepack80/Makefile,v 1.1 2006/01/20 02:55:53 ahze Exp $
#
CATEGORIES= audio
-PORTREVISION= 3
+PORTREVISION= 2
COMMENT= Gstreamer musepack mpc encoder/decoder plugin
GST_PLUGIN= musepack
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-musicbrainz80/Makefile b/audio/gstreamer-plugins-musicbrainz80/Makefile
index 5e5e50d4145e..ed6ade7f44cb 100644
--- a/audio/gstreamer-plugins-musicbrainz80/Makefile
+++ b/audio/gstreamer-plugins-musicbrainz80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-musicbrainz80/Makefile,v 1.2 2006/02/23 18:05:33 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer CD index/audio metadata plugin
GST_PLUGIN= musicbrainz
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-nas80/Makefile b/audio/gstreamer-plugins-nas80/Makefile
index cd1f2e6d7829..d70318a7f9c8 100644
--- a/audio/gstreamer-plugins-nas80/Makefile
+++ b/audio/gstreamer-plugins-nas80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-nas80/Makefile,v 1.2 2006/02/23 18:05:33 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= GStreamer NAS (Network Audio System) plugin
GST_PLUGIN= nas
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-ogg80/Makefile b/audio/gstreamer-plugins-ogg80/Makefile
index 743ac2781296..6dda5292e0cd 100644
--- a/audio/gstreamer-plugins-ogg80/Makefile
+++ b/audio/gstreamer-plugins-ogg80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-ogg80/Makefile,v 1.2 2006/02/23 18:05:33 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer Ogg bitstream plugin
GST_PLUGIN= ogg
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-polyp80/Makefile b/audio/gstreamer-plugins-polyp80/Makefile
index 5c61725e6c68..37f6121797f7 100644
--- a/audio/gstreamer-plugins-polyp80/Makefile
+++ b/audio/gstreamer-plugins-polyp80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-polyp80/Makefile,v 1.3 2006/04/22 03:46:50 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 2
+PORTREVISION= 3
COMMENT= Gstreamer polypaudio sound server plugin
GST_PLUGIN= polyp
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-shout280/Makefile b/audio/gstreamer-plugins-shout280/Makefile
index 64f3f51162ed..48b78523be63 100644
--- a/audio/gstreamer-plugins-shout280/Makefile
+++ b/audio/gstreamer-plugins-shout280/Makefile
@@ -3,6 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-shout280/Makefile,v 1.1 2006/01/20 02:55:54 ahze Exp $
#
CATEGORIES= audio
@@ -12,6 +13,6 @@ COMMENT= Gstreamer icecast plugin
GST_PLUGIN= shout2
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-shout80/Makefile b/audio/gstreamer-plugins-shout80/Makefile
index 8c9aa2f40190..61d77594fe64 100644
--- a/audio/gstreamer-plugins-shout80/Makefile
+++ b/audio/gstreamer-plugins-shout80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-shout80/Makefile,v 1.2 2006/02/23 18:05:34 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer icecast plugin
GST_PLUGIN= shout
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-sidplay80/Makefile b/audio/gstreamer-plugins-sidplay80/Makefile
index 0740d5f5332d..a94af677c190 100644
--- a/audio/gstreamer-plugins-sidplay80/Makefile
+++ b/audio/gstreamer-plugins-sidplay80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-sidplay80/Makefile,v 1.2 2006/02/23 18:05:34 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer Commodore SID decoder plugin
GST_PLUGIN= sidplay
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-smoothwave80/Makefile b/audio/gstreamer-plugins-smoothwave80/Makefile
index baf393cfc4c7..ccee8240240a 100644
--- a/audio/gstreamer-plugins-smoothwave80/Makefile
+++ b/audio/gstreamer-plugins-smoothwave80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-smoothwave80/Makefile,v 1.2 2006/02/23 18:05:34 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer visualisation plugin
GST_PLUGIN= smoothwave
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-sndfile80/Makefile b/audio/gstreamer-plugins-sndfile80/Makefile
index e07dea1fbcea..4d74c32f6067 100644
--- a/audio/gstreamer-plugins-sndfile80/Makefile
+++ b/audio/gstreamer-plugins-sndfile80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-sndfile80/Makefile,v 1.2 2006/02/23 18:05:34 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer sndfile plugin
GST_PLUGIN= sndfile
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-speex80/Makefile b/audio/gstreamer-plugins-speex80/Makefile
index e7a9302017ee..48a09089118e 100644
--- a/audio/gstreamer-plugins-speex80/Makefile
+++ b/audio/gstreamer-plugins-speex80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-speex80/Makefile,v 1.2 2006/02/23 18:05:34 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer speex voice plugin
GST_PLUGIN= speex
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-vorbis80/Makefile b/audio/gstreamer-plugins-vorbis80/Makefile
index c8589f8050cf..4e2752bb8298 100644
--- a/audio/gstreamer-plugins-vorbis80/Makefile
+++ b/audio/gstreamer-plugins-vorbis80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-vorbis80/Makefile,v 1.2 2006/02/23 18:05:35 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer vorbis encoder/decoder plugin
GST_PLUGIN= vorbis
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-wavpack80/Makefile b/audio/gstreamer-plugins-wavpack80/Makefile
index 2d41ba2ffa64..ede6ce26ec28 100644
--- a/audio/gstreamer-plugins-wavpack80/Makefile
+++ b/audio/gstreamer-plugins-wavpack80/Makefile
@@ -3,13 +3,14 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/audio/gstreamer-plugins-wavpack80/Makefile,v 1.2 2006/02/23 18:05:35 marcus Exp $
#
CATEGORIES= audio
-PORTREVISION= 1
+PORTREVISION= 2
GST_PLUGIN= wavpack
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/audio/jamboree/Makefile b/audio/jamboree/Makefile
index 3bba05bc33f3..cf3714c98175 100644
--- a/audio/jamboree/Makefile
+++ b/audio/jamboree/Makefile
@@ -20,13 +20,13 @@ LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui libglade2
-USE_GSTREAMER= vorbis mad gconf
-GNU_CONFIGURE= yes
+USE_GSTREAMER80= vorbis mad gconf
+GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
+ GST_INSPECT="${X11BASE}/bin/gst-inspect-0.8"
GCONF_SCHEMAS= jamboree.schemas
-USE_REINPLACE= yes
post-patch:
@${REINPLACE_CMD} -e 's|^\(@GCONF_SCHEMAS_INSTALL_TRUE@\) |\1 |' \
diff --git a/audio/jamboree/distinfo b/audio/jamboree/distinfo
index 1157a6d88053..b0043bb13076 100644
--- a/audio/jamboree/distinfo
+++ b/audio/jamboree/distinfo
@@ -1,3 +1,2 @@
MD5 (jamboree-0.5.tar.bz2) = 23a0b5e3eda5e73bf838af66ba4b3180
-SHA256 (jamboree-0.5.tar.bz2) = 09d0f302668f9e56ad5dcb47cd7de64b72a0c2eae20329be64bf3c7e3f45a4f0
SIZE (jamboree-0.5.tar.bz2) = 430659
diff --git a/audio/jamboree/files/patch-src_Makefile.in b/audio/jamboree/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..d77847729c28
--- /dev/null
+++ b/audio/jamboree/files/patch-src_Makefile.in
@@ -0,0 +1,12 @@
+--- src/Makefile.in.orig Tue Sep 28 05:07:49 2004
++++ src/Makefile.in Sat Jan 28 01:02:06 2006
+@@ -279,8 +279,7 @@
+ target_alias = @target_alias@
+ INCLUDES = @JAMBOREE_CFLAGS@ \
+ -DDATADIR=\""$(datadir)"\" \
+- -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED \
+- $(WARN_CFLAGS)
++ -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED $(WARN_CFLAGS)
+
+ @HAVE_DBUS_TRUE@dbus_sources = dbus.c dbus.h
+ jamboree_built_headers = jamboree-marshal.h
diff --git a/audio/klira/Makefile b/audio/klira/Makefile
index d781b36e998e..3020fa2785b5 100644
--- a/audio/klira/Makefile
+++ b/audio/klira/Makefile
@@ -19,9 +19,8 @@ DEPENDS= ${PORTSDIR}/misc/kdehier
LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib
USE_BZIP2= yes
-USE_GSTREAMER= yes
+USE_GSTREAMER80= yes
USE_KDELIBS_VER=3
-USE_REINPLACE= yes
USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
diff --git a/audio/lindele/Makefile b/audio/lindele/Makefile
index 75136826a455..28441e7be43c 100644
--- a/audio/lindele/Makefile
+++ b/audio/lindele/Makefile
@@ -19,9 +19,8 @@ LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \
tag:${PORTSDIR}/audio/taglib
USE_X_PREFIX= yes
-USE_REINPLACE= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
-USE_GSTREAMER= gconf
+USE_GSTREAMER80= gconf
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/lindele/distinfo b/audio/lindele/distinfo
index fc1da08c6d84..d066bd939936 100644
--- a/audio/lindele/distinfo
+++ b/audio/lindele/distinfo
@@ -1,3 +1,2 @@
MD5 (lindele-0.1.1.tar.gz) = 6d5387fd607fe0516bcc3ddd84dc4a77
-SHA256 (lindele-0.1.1.tar.gz) = d0aaa1b3a5be06711c5bac5dda6669c3056b510e01ccc355659a3d931f8ec363
SIZE (lindele-0.1.1.tar.gz) = 168572
diff --git a/audio/marlin/Makefile b/audio/marlin/Makefile
index a7ae2048d170..bafd9cdcdcb1 100644
--- a/audio/marlin/Makefile
+++ b/audio/marlin/Makefile
@@ -6,7 +6,7 @@
PORTNAME= marlin
PORTVERSION= 0.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -20,7 +20,7 @@ LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnometarget intlhack libgnomeui nautiluscdburner
-USE_GSTREAMER= flac gconf mad vorbis
+USE_GSTREAMER80= flac gconf mad vorbis
INSTALLS_OMF= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index 410b311a8bc6..3d81fd0268a3 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/rhythmbox/Makefile,v 1.40 2005/10/28 08:03:53 jylefort Exp $
+# $MCom: ports/audio/rhythmbox/Makefile,v 1.54 2006/04/25 17:52:32 marcus Exp $
#
PORTNAME= rhythmbox
PORTVERSION= 0.9.4.1
+PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9
@@ -18,7 +19,7 @@ COMMENT= Audio player for the Gnome 2 desktop environment
LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
id3tag.0:${PORTSDIR}/audio/libid3tag \
- totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
+ totem-plparser.2:${PORTSDIR}/multimedia/totem-gstreamer \
dbus-1.2:${PORTSDIR}/devel/dbus \
sexy.1:${PORTSDIR}/x11-toolkits/libsexy \
gnome-media-profiles.0:${PORTSDIR}/audio/gnomemedia2
@@ -31,7 +32,7 @@ USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner
WANT_GNOME= yes
USE_GSTREAMER= flac mad gnomevfs gconf jpeg
USE_AUTOTOOLS= libtool:15
-CONFIGURE_ARGS= --enable-nautilus-menu
+CONFIGURE_ARGS= --enable-nautilus-menu --with-playback=gstreamer-0-10
CONFIGURE_ENV= LIBS="-lm" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
@@ -65,12 +66,12 @@ USE_GSTREAMER+= faad
.endif
.if defined(WITH_DAAP)
-CONFIGURE_ARGS+= --enable-daap --with-mdns=howl
+CONFIGURE_ARGS+= --enable-daap --with-mdns=avahi
LIB_DEPENDS+= soup-2.2.8:${PORTSDIR}/devel/libsoup \
- howl.0:${PORTSDIR}/net/howl
+ avahi-client:${PORTSDIR}/net/avahi
.else
-.if exists(${LOCALBASE}/lib/libhowl.a)
-LIB_DEPENDS+= howl.0:${PORTSDIR}/net/howl
+.if exists(${LOCALBASE}/lib/libavahi-client.a)
+LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi
.endif
CONFIGURE_ARGS+= --disable-daap
.endif
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 410b311a8bc6..3d81fd0268a3 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/rhythmbox/Makefile,v 1.40 2005/10/28 08:03:53 jylefort Exp $
+# $MCom: ports/audio/rhythmbox/Makefile,v 1.54 2006/04/25 17:52:32 marcus Exp $
#
PORTNAME= rhythmbox
PORTVERSION= 0.9.4.1
+PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9
@@ -18,7 +19,7 @@ COMMENT= Audio player for the Gnome 2 desktop environment
LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
id3tag.0:${PORTSDIR}/audio/libid3tag \
- totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
+ totem-plparser.2:${PORTSDIR}/multimedia/totem-gstreamer \
dbus-1.2:${PORTSDIR}/devel/dbus \
sexy.1:${PORTSDIR}/x11-toolkits/libsexy \
gnome-media-profiles.0:${PORTSDIR}/audio/gnomemedia2
@@ -31,7 +32,7 @@ USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner
WANT_GNOME= yes
USE_GSTREAMER= flac mad gnomevfs gconf jpeg
USE_AUTOTOOLS= libtool:15
-CONFIGURE_ARGS= --enable-nautilus-menu
+CONFIGURE_ARGS= --enable-nautilus-menu --with-playback=gstreamer-0-10
CONFIGURE_ENV= LIBS="-lm" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
@@ -65,12 +66,12 @@ USE_GSTREAMER+= faad
.endif
.if defined(WITH_DAAP)
-CONFIGURE_ARGS+= --enable-daap --with-mdns=howl
+CONFIGURE_ARGS+= --enable-daap --with-mdns=avahi
LIB_DEPENDS+= soup-2.2.8:${PORTSDIR}/devel/libsoup \
- howl.0:${PORTSDIR}/net/howl
+ avahi-client:${PORTSDIR}/net/avahi
.else
-.if exists(${LOCALBASE}/lib/libhowl.a)
-LIB_DEPENDS+= howl.0:${PORTSDIR}/net/howl
+.if exists(${LOCALBASE}/lib/libavahi-client.a)
+LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi
.endif
CONFIGURE_ARGS+= --disable-daap
.endif
diff --git a/audio/tunesbrowser/Makefile b/audio/tunesbrowser/Makefile
index 7a584f313038..d2621c6e3e26 100644
--- a/audio/tunesbrowser/Makefile
+++ b/audio/tunesbrowser/Makefile
@@ -3,7 +3,7 @@
# Whom: Michael Johnson <ahze@ahze.net>
#
# $FreeBSD$
-#
+# $MCom: ports/audio/tunesbrowser/Makefile,v 1.7 2006/04/29 10:51:51 pav Exp $
PORTNAME= tunesbrowser
PORTVERSION= 0.3.0
@@ -20,7 +20,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnometarget libglade2
WANT_GNOME= yes
-USE_GSTREAMER= mad
+USE_GSTREAMER80= mad
GNU_CONFIGURE= yes
MAN1= tunesbrowser.1
@@ -30,7 +30,7 @@ OPTIONS= FAAD "Enable AAC/MP4 Audio output" Off
.include <bsd.port.pre.mk>
.if defined(WITH_FAAD)
-USE_GSTREAMER+= faad
+USE_GSTREAMER80+= faad
.endif
.if ${HAVE_GNOME:Mlibgnome}!=""
diff --git a/devel/Makefile b/devel/Makefile
index 3f5cd2ed9046..1bd50d38d58c 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -356,8 +356,11 @@
SUBDIR += gputils
SUBDIR += gsoap
SUBDIR += gstreamer-plugins-gconf
+ SUBDIR += gstreamer-plugins-gconf80
SUBDIR += gstreamer-plugins-gnomevfs
+ SUBDIR += gstreamer-plugins-gnomevfs80
SUBDIR += gstreamer-plugins-sdl
+ SUBDIR += gstreamer-plugins-sdl80
SUBDIR += gtgt
SUBDIR += gtkmozedit
SUBDIR += gtranslator
diff --git a/devel/gstreamer-plugins-gconf/Makefile b/devel/gstreamer-plugins-gconf/Makefile
index 08d2c14c8893..7aa392bdd509 100644
--- a/devel/gstreamer-plugins-gconf/Makefile
+++ b/devel/gstreamer-plugins-gconf/Makefile
@@ -6,7 +6,7 @@
#
CATEGORIES= devel
-PORTREVISION= 1
+PORTREVISION= 3
COMMENT= Gstreamer gconf plugin
diff --git a/devel/gstreamer-plugins-gconf80/Makefile b/devel/gstreamer-plugins-gconf80/Makefile
index 08d2c14c8893..6e15783fe7a5 100644
--- a/devel/gstreamer-plugins-gconf80/Makefile
+++ b/devel/gstreamer-plugins-gconf80/Makefile
@@ -3,15 +3,16 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/devel/gstreamer-plugins-gconf80/Makefile,v 1.2 2006/02/24 18:24:27 marcus Exp $
#
CATEGORIES= devel
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer gconf plugin
GST_PLUGIN= gconf
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/devel/gstreamer-plugins-gnomevfs80/Makefile b/devel/gstreamer-plugins-gnomevfs80/Makefile
index ff4b0287bb96..86270edb0983 100644
--- a/devel/gstreamer-plugins-gnomevfs80/Makefile
+++ b/devel/gstreamer-plugins-gnomevfs80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/devel/gstreamer-plugins-gnomevfs80/Makefile,v 1.2 2006/02/24 18:24:27 marcus Exp $
#
CATEGORIES= devel
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer gnomevfs plugin
GST_PLUGIN= gnomevfs
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/devel/gstreamer-plugins-sdl80/Makefile b/devel/gstreamer-plugins-sdl80/Makefile
index bf320b82fee1..1946a8cde9d1 100644
--- a/devel/gstreamer-plugins-sdl80/Makefile
+++ b/devel/gstreamer-plugins-sdl80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/devel/gstreamer-plugins-sdl80/Makefile,v 1.2 2006/02/24 18:24:52 marcus Exp $
#
CATEGORIES= devel
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer SDL plugin
GST_PLUGIN= sdl
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/games/gnome-music-quiz/Makefile b/games/gnome-music-quiz/Makefile
index a1a0f9599724..4cec8f316557 100644
--- a/games/gnome-music-quiz/Makefile
+++ b/games/gnome-music-quiz/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= rhythmbox:${PORTSDIR}/audio/rhythmbox
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix libgnomeui
-USE_GSTREAMER= gconf
+USE_GSTREAMER80= gconf
GNU_CONFIGURE= yes
pre-configure:
diff --git a/games/monkeybubble/Makefile b/games/monkeybubble/Makefile
index 070b858f715c..458a09b5632e 100644
--- a/games/monkeybubble/Makefile
+++ b/games/monkeybubble/Makefile
@@ -16,15 +16,16 @@ MAINTAINER= adamw@FreeBSD.org
COMMENT= GTK2 Puzzle Bobble clone with monkeys
USE_X_PREFIX= yes
-USE_REINPLACE= yes
HAS_MONKEYS= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GSTREAMER= ogg gconf
+USE_GSTREAMER80= ogg gconf
USE_GNOME= gnomehack gnomeprefix librsvg2 libgnomeui \
intlhack
+GCONF_SCHEMAS= monkey-bubble.schemas
+
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/games/monkeybubble/pkg-plist b/games/monkeybubble/pkg-plist
index 0bc871f55572..6781cd0296ef 100644
--- a/games/monkeybubble/pkg-plist
+++ b/games/monkeybubble/pkg-plist
@@ -1,8 +1,5 @@
bin/monkey-bubble
bin/monkey-srv
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/monkey-bubble.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/monkey-bubble.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/monkey-bubble.schemas > /dev/null || /usr/bin/true
share/gnome/applications/monkey-bubble.desktop
share/gnome/help/monkey-bubble/C/empty.xml
share/gnome/help/monkey-bubble/C/monkey-bubble.xml
diff --git a/graphics/Makefile b/graphics/Makefile
index 1d2c609dbee4..8115b898f90e 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -201,16 +201,27 @@
SUBDIR += gridpix
SUBDIR += gsculpt
SUBDIR += gstreamer-plugins-aalib
+ SUBDIR += gstreamer-plugins-aalib80
SUBDIR += gstreamer-plugins-cairo
+ SUBDIR += gstreamer-plugins-cairo80
SUBDIR += gstreamer-plugins-gdkpixbuf
+ SUBDIR += gstreamer-plugins-gdkpixbuf80
SUBDIR += gstreamer-plugins-hermes
+ SUBDIR += gstreamer-plugins-hermes80
SUBDIR += gstreamer-plugins-jpeg
SUBDIR += gstreamer-plugins-jpeg-mmx
+ SUBDIR += gstreamer-plugins-jpeg-mmx80
+ SUBDIR += gstreamer-plugins-jpeg80
SUBDIR += gstreamer-plugins-libcaca
+ SUBDIR += gstreamer-plugins-libcaca80
SUBDIR += gstreamer-plugins-libmng
+ SUBDIR += gstreamer-plugins-libmng80
SUBDIR += gstreamer-plugins-libpng
+ SUBDIR += gstreamer-plugins-libpng80
SUBDIR += gstreamer-plugins-libvisual
+ SUBDIR += gstreamer-plugins-libvisual80
SUBDIR += gstreamer-plugins-swfdec
+ SUBDIR += gstreamer-plugins-swfdec80
SUBDIR += gthumb
SUBDIR += gtkam
SUBDIR += gtkcairo
diff --git a/graphics/gstreamer-plugins-aalib80/Makefile b/graphics/gstreamer-plugins-aalib80/Makefile
index 41af21f7835d..01a1524f9f73 100644
--- a/graphics/gstreamer-plugins-aalib80/Makefile
+++ b/graphics/gstreamer-plugins-aalib80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/graphics/gstreamer-plugins-aalib80/Makefile,v 1.2 2006/02/24 18:50:32 marcus Exp $
#
CATEGORIES= graphics
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer ascii art plugin
GST_PLUGIN= aalib
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/graphics/gstreamer-plugins-cairo80/Makefile b/graphics/gstreamer-plugins-cairo80/Makefile
index dad4675ed464..78eb0aea5bef 100644
--- a/graphics/gstreamer-plugins-cairo80/Makefile
+++ b/graphics/gstreamer-plugins-cairo80/Makefile
@@ -3,16 +3,17 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/gstreamer-plugins-cairo/Makefile,v 1.2 2005/10/14 20:39:57 adamw Exp $
+# $MCom: ports/graphics/gstreamer-plugins-cairo80/Makefile,v 1.2 2006/02/24 18:50:32 marcus Exp $
+# $MCom: ports/graphics/gstreamer-plugins-cairo80/Makefile,v 1.2 2006/02/24 18:50:32 marcus Exp $
#
CATEGORIES= graphics
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer vector graphics plugin
GST_PLUGIN= cairo
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/graphics/gstreamer-plugins-gdkpixbuf80/Makefile b/graphics/gstreamer-plugins-gdkpixbuf80/Makefile
index 2f15f941726f..5493524a72a9 100644
--- a/graphics/gstreamer-plugins-gdkpixbuf80/Makefile
+++ b/graphics/gstreamer-plugins-gdkpixbuf80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/graphics/gstreamer-plugins-gdkpixbuf80/Makefile,v 1.2 2006/02/24 18:50:33 marcus Exp $
#
CATEGORIES= graphics
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer image decoder plugin
GST_PLUGIN= gdkpixbuf
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/graphics/gstreamer-plugins-hermes80/Makefile b/graphics/gstreamer-plugins-hermes80/Makefile
index 194ac9562182..3d092b811ccc 100644
--- a/graphics/gstreamer-plugins-hermes80/Makefile
+++ b/graphics/gstreamer-plugins-hermes80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/graphics/gstreamer-plugins-hermes80/Makefile,v 1.2 2006/02/24 18:50:33 marcus Exp $
#
CATEGORIES= graphics
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer hermes colorspace plugin
GST_PLUGIN= hermes
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/graphics/gstreamer-plugins-jpeg-mmx80/Makefile b/graphics/gstreamer-plugins-jpeg-mmx80/Makefile
index d5be4d9aecc4..7c2c262cd389 100644
--- a/graphics/gstreamer-plugins-jpeg-mmx80/Makefile
+++ b/graphics/gstreamer-plugins-jpeg-mmx80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/graphics/gstreamer-plugins-jpeg-mmx80/Makefile,v 1.2 2006/02/24 18:50:33 marcus Exp $
#
CATEGORIES= graphics
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer jpeg encoder/decoder plugin with mmx optimalizations
GST_PLUGIN= jpeg-mmx
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/graphics/gstreamer-plugins-jpeg80/Makefile b/graphics/gstreamer-plugins-jpeg80/Makefile
index 3a91bd143feb..58ad19519386 100644
--- a/graphics/gstreamer-plugins-jpeg80/Makefile
+++ b/graphics/gstreamer-plugins-jpeg80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/graphics/gstreamer-plugins-jpeg80/Makefile,v 1.2 2006/02/24 18:50:33 marcus Exp $
#
CATEGORIES= graphics
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer jpeg encoder/decoder plugin
GST_PLUGIN= jpeg
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/graphics/gstreamer-plugins-libcaca80/Makefile b/graphics/gstreamer-plugins-libcaca80/Makefile
index 844acfe4b2f3..2298d8a7025a 100644
--- a/graphics/gstreamer-plugins-libcaca80/Makefile
+++ b/graphics/gstreamer-plugins-libcaca80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/graphics/gstreamer-plugins-libcaca80/Makefile,v 1.2 2006/02/24 18:50:33 marcus Exp $
#
CATEGORIES= graphics
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer color ascii art plugin
GST_PLUGIN= libcaca
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/graphics/gstreamer-plugins-libmng80/Makefile b/graphics/gstreamer-plugins-libmng80/Makefile
index 6cc4aeaea245..7d123ed9c2b5 100644
--- a/graphics/gstreamer-plugins-libmng80/Makefile
+++ b/graphics/gstreamer-plugins-libmng80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/graphics/gstreamer-plugins-libmng80/Makefile,v 1.2 2006/02/24 18:50:34 marcus Exp $
#
CATEGORIES= graphics
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer Multiple-image Network Graphics plugin
GST_PLUGIN= libmng
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/graphics/gstreamer-plugins-libpng80/Makefile b/graphics/gstreamer-plugins-libpng80/Makefile
index 723240495aa8..38bfc8931d70 100644
--- a/graphics/gstreamer-plugins-libpng80/Makefile
+++ b/graphics/gstreamer-plugins-libpng80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/graphics/gstreamer-plugins-libpng80/Makefile,v 1.2 2006/02/24 18:50:34 marcus Exp $
#
CATEGORIES= graphics
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer png plugin
GST_PLUGIN= libpng
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/graphics/gstreamer-plugins-libvisual80/Makefile b/graphics/gstreamer-plugins-libvisual80/Makefile
index 687d12372d72..8cdc484dddb0 100644
--- a/graphics/gstreamer-plugins-libvisual80/Makefile
+++ b/graphics/gstreamer-plugins-libvisual80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/graphics/gstreamer-plugins-libvisual80/Makefile,v 1.2 2006/02/24 18:50:34 marcus Exp $
#
CATEGORIES= graphics
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer libvisual plugin
GST_PLUGIN= libvisual
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/graphics/gstreamer-plugins-swfdec80/Makefile b/graphics/gstreamer-plugins-swfdec80/Makefile
index 5efd89348528..13c7ed120bfd 100644
--- a/graphics/gstreamer-plugins-swfdec80/Makefile
+++ b/graphics/gstreamer-plugins-swfdec80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/graphics/gstreamer-plugins-swfdec80/Makefile,v 1.2 2006/02/24 18:50:34 marcus Exp $
#
CATEGORIES= graphics
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer flash redering plugin
GST_PLUGIN= swfdec
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index 1591107eadf9..ff6fb97a6c75 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -8,6 +8,7 @@
PORTNAME= swfdec
PORTVERSION= 0.3.6
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.schleef.org/swfdec/download/
@@ -20,7 +21,7 @@ LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \
USE_X_PREFIX= yes
USE_SDL= sdl
USE_GNOME= gnomehack gtk20 libartlgpl2
-USE_GSTREAMER= gconf
+USE_GSTREAMER80= gconf
USE_GETOPT_LONG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/multimedia/Makefile b/multimedia/Makefile
index b8b9c6bb502e..a8607e4c5bfd 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -46,21 +46,41 @@
SUBDIR += gstreamer
SUBDIR += gstreamer-editor
SUBDIR += gstreamer-ffmpeg
+ SUBDIR += gstreamer-ffmpeg80
+ SUBDIR += gstreamer-pitfdll
SUBDIR += gstreamer-plugins
SUBDIR += gstreamer-plugins-all
+ SUBDIR += gstreamer-plugins-all80
+ SUBDIR += gstreamer-plugins-bad
SUBDIR += gstreamer-plugins-core
+ SUBDIR += gstreamer-plugins-core80
SUBDIR += gstreamer-plugins-dirac
+ SUBDIR += gstreamer-plugins-dirac80
SUBDIR += gstreamer-plugins-dts
+ SUBDIR += gstreamer-plugins-dts80
SUBDIR += gstreamer-plugins-dv
+ SUBDIR += gstreamer-plugins-dv80
SUBDIR += gstreamer-plugins-dvd
+ SUBDIR += gstreamer-plugins-dvd80
+ SUBDIR += gstreamer-plugins-gnonlin
+ SUBDIR += gstreamer-plugins-good
SUBDIR += gstreamer-plugins-libfame
+ SUBDIR += gstreamer-plugins-libfame80
SUBDIR += gstreamer-plugins-mpeg2dec
+ SUBDIR += gstreamer-plugins-mpeg2dec80
SUBDIR += gstreamer-plugins-mpeg2enc
+ SUBDIR += gstreamer-plugins-mpeg2enc80
SUBDIR += gstreamer-plugins-mplex
- SUBDIR += gstreamer-pitfdll
+ SUBDIR += gstreamer-plugins-mplex80
SUBDIR += gstreamer-plugins-theora
+ SUBDIR += gstreamer-plugins-theora80
+ SUBDIR += gstreamer-plugins-ugly
SUBDIR += gstreamer-plugins-x264
+ SUBDIR += gstreamer-plugins-x26480
SUBDIR += gstreamer-plugins-xvid
+ SUBDIR += gstreamer-plugins-xvid80
+ SUBDIR += gstreamer-plugins80
+ SUBDIR += gstreamer80
SUBDIR += gsubedit
SUBDIR += gtksubtitler
SUBDIR += gxanim
@@ -154,6 +174,7 @@
SUBDIR += pvr250
SUBDIR += pwcbsd
SUBDIR += py-gstreamer
+ SUBDIR += py-gstreamer80
SUBDIR += qdvdauthor
SUBDIR += quodlibet
SUBDIR += quark
diff --git a/multimedia/gnonlin/Makefile b/multimedia/gnonlin/Makefile
index 08de06e448ce..0b92c9b5bcde 100644
--- a/multimedia/gnonlin/Makefile
+++ b/multimedia/gnonlin/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= GStreamer extension library for non-linear editing
-LIB_DEPENDS= gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer
+LIB_DEPENDS= gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer80
CONFLICTS= pitivi-0.1.1*
diff --git a/multimedia/gnonlin/distinfo b/multimedia/gnonlin/distinfo
index 352a11a6ada9..f7af041573da 100644
--- a/multimedia/gnonlin/distinfo
+++ b/multimedia/gnonlin/distinfo
@@ -1,3 +1,2 @@
MD5 (gnonlin-0.2.2.tar.bz2) = 7ff9f2e58463a3bb783a1c77445e9863
-SHA256 (gnonlin-0.2.2.tar.bz2) = 3ca192cf3eab186f5217d11a4e001564b515b08c5a3f9f79c77dcf329e75dc97
SIZE (gnonlin-0.2.2.tar.bz2) = 284397
diff --git a/multimedia/gnonlin/pkg-plist b/multimedia/gnonlin/pkg-plist
index c5f6a639ae91..10841c907278 100644
--- a/multimedia/gnonlin/pkg-plist
+++ b/multimedia/gnonlin/pkg-plist
@@ -14,6 +14,6 @@ lib/gstreamer-0.8/libgnl.so
lib/gstreamer-0.8/libgnl.so.0
libdata/pkgconfig/gnonlin.pc
@dirrm include/gnl
-@unexec /bin/rmdir %D/share/gtk-doc/html/gnonlin 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/gtk-doc/html 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/gtk-doc 2>/dev/null || /usr/bin/true
+@dirrmtry share/gtk-doc/html/gnonlin
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
diff --git a/multimedia/gstreamer-editor/Makefile b/multimedia/gstreamer-editor/Makefile
index f5f5c3521af0..d14ffb86cc7a 100644
--- a/multimedia/gstreamer-editor/Makefile
+++ b/multimedia/gstreamer-editor/Makefile
@@ -13,12 +13,12 @@ MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-editor/
PKGNAMESUFFIX= -editor
DISTNAME= gst-editor-${PORTVERSION}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= gnome@FreeBSD.org
COMMENT= Provide View and Controller counterparts to GStreamer's Model
-LIB_DEPENDS= gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer \
+LIB_DEPENDS= gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer80 \
popt.0:${PORTSDIR}/devel/popt
-RUN_DEPENDS= gst-visualise-0.8:${PORTSDIR}/multimedia/gstreamer-plugins
+RUN_DEPENDS= gst-visualise-0.8:${PORTSDIR}/multimedia/gstreamer-plugins80
USE_BZIP2= yes
USE_X_PREFIX= yes
@@ -34,13 +34,14 @@ USE_GNOME= gnomehack \
PLIST_SUB= \
VERSION="${PORTVERSION}"
INSTALLS_SHLIB= yes
+INSTALLS_OMF= yes
MAN1= gst-editor.1 gst-inspect-gui.1 gst-launch-gui.1
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
-BROKEN= "Does not compile on FreeBSD 4.x"
+BROKEN= Does not compile on FreeBSD 4.x
.endif
.include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer-editor/distinfo b/multimedia/gstreamer-editor/distinfo
index 8eb8e326e2c3..138d4e031e0f 100644
--- a/multimedia/gstreamer-editor/distinfo
+++ b/multimedia/gstreamer-editor/distinfo
@@ -1,3 +1,2 @@
MD5 (gst-editor-0.8.0.tar.bz2) = 6552880c22f8571438ed29852e28f273
-SHA256 (gst-editor-0.8.0.tar.bz2) = cbc31be94e1045676b423cd6081b276c00f48fdca99c78be5cde40ae31ed4fe9
SIZE (gst-editor-0.8.0.tar.bz2) = 356642
diff --git a/multimedia/gstreamer-editor/pkg-plist b/multimedia/gstreamer-editor/pkg-plist
index 96702f51c605..beec387893f3 100644
--- a/multimedia/gstreamer-editor/pkg-plist
+++ b/multimedia/gstreamer-editor/pkg-plist
@@ -39,24 +39,18 @@ share/gnome/gst-editor/gnome/help/gst-editor/C/gst-editor-manual.xml
share/gnome/gst-editor/gnome/help/gst-editor/C/legal.xml
share/gnome/gst-editor/gst-editor.png
share/gnome/omf/gst-editor/gst-editor-manual-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gst-editor/gst-editor-manual-C.omf 2>/dev/null || /usr/bin/true
share/gnome/pixmaps/gst-editor.png
share/gnome/pixmaps/gst-inspect.png
share/gnome/pixmaps/gst-launch.png
-@dirrmtry share/gnome/pixmaps
@dirrm share/gnome/omf/gst-editor
-@dirrmtry share/gnome/omf
@dirrm share/gnome/gst-editor/gnome/help/gst-editor/C
@dirrm share/gnome/gst-editor/gnome/help/gst-editor
@dirrm share/gnome/gst-editor/gnome/help
@dirrm share/gnome/gst-editor/gnome
@dirrm share/gnome/gst-editor
-@dirrmtry share/gnome/applications
-@dirrmtry share/gnome
@dirrm include/gst-editor-%%VERSION%%/gst/element-ui
@dirrm include/gst-editor-%%VERSION%%/gst/element-browser
@dirrm include/gst-editor-%%VERSION%%/gst/editor
@dirrm include/gst-editor-%%VERSION%%/gst/debug-ui
@dirrm include/gst-editor-%%VERSION%%/gst
@dirrm include/gst-editor-%%VERSION%%
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gst-editor/gst-editor-manual-C.omf 2>/dev/null || /usr/bin/true
diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile
index ceb34cdd0f37..92d589e3e59d 100644
--- a/multimedia/gstreamer-ffmpeg/Makefile
+++ b/multimedia/gstreamer-ffmpeg/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gstreamer
-PORTVERSION= 0.8.7
-PORTREVISION= 2
+PORTVERSION= 0.10.1
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/
PKGNAMESUFFIX= -ffmpeg
@@ -18,7 +17,6 @@ COMMENT= GStreamer plug-in for manipulating MPEG video streams
USE_X_PREFIX= yes
USE_BZIP2= yes
-USE_REINPLACE= yes
USE_GMAKE= yes
USE_GNOME= gnometarget
USE_GSTREAMER= yes
@@ -45,9 +43,4 @@ post-patch:
's|make|${GMAKE}|' \
${WRKSRC}/gst-libs/ext/Makefile.in
-post-install:
-# register plugins
- -@${X11BASE}/bin/gst-register-${GST_VERSION} \
- --gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST_VERSION}/registry.xml 2>/dev/null
-
.include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer-ffmpeg/distinfo b/multimedia/gstreamer-ffmpeg/distinfo
index d031ea23b3bc..0dd279d010f5 100644
--- a/multimedia/gstreamer-ffmpeg/distinfo
+++ b/multimedia/gstreamer-ffmpeg/distinfo
@@ -1,3 +1,3 @@
-MD5 (gst-ffmpeg-0.8.7.tar.bz2) = 6435ef3954ee05de79829e262f86187a
-SHA256 (gst-ffmpeg-0.8.7.tar.bz2) = 42c5c1ce64ac1ca382e1d95cc48d5e1d6aa48391f22d99c3dc0dc4cd5ab1a414
-SIZE (gst-ffmpeg-0.8.7.tar.bz2) = 2110685
+MD5 (gst-ffmpeg-0.10.1.tar.bz2) = e21aef9a84d67dea9a68c1379781f763
+SHA256 (gst-ffmpeg-0.10.1.tar.bz2) = a2c877c38d057875c7dfbf1803030c5cc9707020b77f91673500d6ea8d858607
+SIZE (gst-ffmpeg-0.10.1.tar.bz2) = 2246682
diff --git a/multimedia/gstreamer-ffmpeg/pkg-plist b/multimedia/gstreamer-ffmpeg/pkg-plist
index 2a16b0bee610..2f12c2978ba5 100644
--- a/multimedia/gstreamer-ffmpeg/pkg-plist
+++ b/multimedia/gstreamer-ffmpeg/pkg-plist
@@ -1,6 +1,2 @@
-@exec %D/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
lib/gstreamer-%%VERSION%%/libgstffmpeg.la
lib/gstreamer-%%VERSION%%/libgstffmpeg.so
-lib/gstreamer-%%VERSION%%/libgstpostproc.la
-lib/gstreamer-%%VERSION%%/libgstpostproc.so
-@unexec %D/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
diff --git a/multimedia/gstreamer-ffmpeg80/Makefile b/multimedia/gstreamer-ffmpeg80/Makefile
index ceb34cdd0f37..115d28bd6c1f 100644
--- a/multimedia/gstreamer-ffmpeg80/Makefile
+++ b/multimedia/gstreamer-ffmpeg80/Makefile
@@ -7,10 +7,10 @@
PORTNAME= gstreamer
PORTVERSION= 0.8.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/
-PKGNAMESUFFIX= -ffmpeg
+PKGNAMESUFFIX= -ffmpeg80
DISTNAME= gst-ffmpeg-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
@@ -18,21 +18,19 @@ COMMENT= GStreamer plug-in for manipulating MPEG video streams
USE_X_PREFIX= yes
USE_BZIP2= yes
-USE_REINPLACE= yes
USE_GMAKE= yes
USE_GNOME= gnometarget
-USE_GSTREAMER= yes
+USE_GSTREAMER80= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \
CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
CFLAGS="${CFLAGS} -fno-force-addr" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
PLIST_SUB= \
- VERSION="${GST_VERSION}"
+ VERSION="${GST80_VERSION}"
WITHOUT_CPU_CFLAGS= yes
PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
-GST_VERSION=${PORTVERSION:C/..$//}
.include <bsd.port.pre.mk>
@@ -47,7 +45,7 @@ post-patch:
post-install:
# register plugins
- -@${X11BASE}/bin/gst-register-${GST_VERSION} \
- --gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST_VERSION}/registry.xml 2>/dev/null
+ -@${X11BASE}/bin/gst-register-${GST80_VERSION} \
+ --gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST80_VERSION}/registry.xml 2>/dev/null
.include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer-ffmpeg80/distinfo b/multimedia/gstreamer-ffmpeg80/distinfo
index d031ea23b3bc..abb70b9ecd2b 100644
--- a/multimedia/gstreamer-ffmpeg80/distinfo
+++ b/multimedia/gstreamer-ffmpeg80/distinfo
@@ -1,3 +1,2 @@
MD5 (gst-ffmpeg-0.8.7.tar.bz2) = 6435ef3954ee05de79829e262f86187a
-SHA256 (gst-ffmpeg-0.8.7.tar.bz2) = 42c5c1ce64ac1ca382e1d95cc48d5e1d6aa48391f22d99c3dc0dc4cd5ab1a414
SIZE (gst-ffmpeg-0.8.7.tar.bz2) = 2110685
diff --git a/multimedia/gstreamer-ffmpeg80/pkg-plist b/multimedia/gstreamer-ffmpeg80/pkg-plist
index 2a16b0bee610..8f34c517fd8c 100644
--- a/multimedia/gstreamer-ffmpeg80/pkg-plist
+++ b/multimedia/gstreamer-ffmpeg80/pkg-plist
@@ -1,6 +1,6 @@
-@exec %D/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
+@exec %D/bin/gst-register-%%VERSION%% --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
lib/gstreamer-%%VERSION%%/libgstffmpeg.la
lib/gstreamer-%%VERSION%%/libgstffmpeg.so
lib/gstreamer-%%VERSION%%/libgstpostproc.la
lib/gstreamer-%%VERSION%%/libgstpostproc.so
-@unexec %D/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
+@unexec %D/bin/gst-register-%%VERSION%% --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
diff --git a/multimedia/gstreamer-pitfdll/Makefile b/multimedia/gstreamer-pitfdll/Makefile
index 2cb9edfcf8a9..5539a340aed1 100644
--- a/multimedia/gstreamer-pitfdll/Makefile
+++ b/multimedia/gstreamer-pitfdll/Makefile
@@ -24,8 +24,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gnometarget
-USE_REINPLACE= yes
-USE_GSTREAMER= yes
+USE_GSTREAMER80= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
PLIST_SUB= VERSION="${GST_VERSION}"
diff --git a/multimedia/gstreamer-plugins-all/Makefile b/multimedia/gstreamer-plugins-all/Makefile
index 043981611e14..eeb72c4c0996 100644
--- a/multimedia/gstreamer-plugins-all/Makefile
+++ b/multimedia/gstreamer-plugins-all/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins-all/Makefile,v 1.3 2005/10/22 06:20:02 ahze Exp $
+# $MCom: ports/multimedia/gstreamer-plugins-all/Makefile,v 1.8 2006/01/25 18:54:32 ahze Exp $
#
PORTNAME= gstreamer-plugins-all
-PORTVERSION= 1.0.${GST_VERSION}.${GST_SHLIB_VERSION}
+PORTVERSION= 1.2.${GST_VERSION}.${GST_SHLIB_VERSION}
CATEGORIES= multimedia
MASTER_SITES= # empty
DISTFILES= # empty
@@ -27,22 +27,10 @@ OPTIONS= # Hacky.. but it works the way it is set up...
WITHOUT_FAAC= yes # Mp4 Dolby license , no package
WITHOUT_LAME= yes # MP3 License , no package
.endif
+WITHOUT_LADSPA= yes # Broken
WITHOUT_MPEG2ENC=yes # Broken from updated mjpegtools
.if ${OSVERSION} < 500000
WITHOUT_LIBVISUAL=yes # Broken on 4.x
-WITHOUT_POLYPAUDIO=yes # Broken on 4.x
-.endif
-# Shout & Shout2 Conflict
-.if !defined(WITHOUT_SHOUT) && !defined(WITHOUT_SHOUT2)
-WITHOUT_SHOUT= yes
-.endif
-# Jpeg & Jpeg-mmx Conflict
-.if ${ARCH}!="i386"
-WITHOUT_JPEG-MMX= yes
-.else
-.if !defined(WITHOUT_JPEG) && !defined(WITHOUT_JPEG-MMX)
-WITHOUT_JPEG-MMX= yes
-.endif
.endif
# Remove core, yes
diff --git a/multimedia/gstreamer-plugins-all80/Makefile b/multimedia/gstreamer-plugins-all80/Makefile
index 043981611e14..d1908d958b79 100644
--- a/multimedia/gstreamer-plugins-all80/Makefile
+++ b/multimedia/gstreamer-plugins-all80/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins-all/Makefile,v 1.3 2005/10/22 06:20:02 ahze Exp $
+# $MCom: ports/multimedia/gstreamer-plugins-all80/Makefile,v 1.2 2006/01/20 14:27:43 ahze Exp $
#
-PORTNAME= gstreamer-plugins-all
-PORTVERSION= 1.0.${GST_VERSION}.${GST_SHLIB_VERSION}
+PORTNAME= gstreamer-plugins-all80
+PORTVERSION= 1.1.${GST80_VERSION}.${GST80_SHLIB_VERSION}
CATEGORIES= multimedia
MASTER_SITES= # empty
DISTFILES= # empty
@@ -17,7 +17,7 @@ MAINTAINER= ahze@FreeBSD.org
COMMENT= Meta-port of all gstreamer plugins with options
NO_BUILD= yes
-USE_GSTREAMER= yes
+USE_GSTREAMER80= yes
OPTIONS= # Hacky.. but it works the way it is set up...
.include <bsd.port.pre.mk>
@@ -46,7 +46,7 @@ WITHOUT_JPEG-MMX= yes
.endif
# Remove core, yes
-PLUGS= ${_USE_GSTREAMER_ALL:S/core//:S/yes//}
+PLUGS= ${_USE_GSTREAMER80_ALL:S/core//:S/yes//}
.for all in ${PLUGS}
OPTIONS+= ${all:U} "${all} plugin " on
@@ -54,7 +54,7 @@ OPTIONS+= ${all:U} "${all} plugin " on
.for f in ${PLUGS}
.if !defined(WITHOUT_${f:U})
-USE_GSTREAMER+= ${f}
+USE_GSTREAMER80+= ${f}
.endif
.endfor
diff --git a/multimedia/gstreamer-plugins-bad/Makefile b/multimedia/gstreamer-plugins-bad/Makefile
new file mode 100644
index 000000000000..0b18e113a617
--- /dev/null
+++ b/multimedia/gstreamer-plugins-bad/Makefile
@@ -0,0 +1,41 @@
+# New ports collection makefile for: gstreamer-plugins-bad
+# Date created: 20 Jan 2006
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/multimedia/gstreamer-plugins-bad/Makefile,v 1.2 2006/02/26 19:23:20 marcus Exp $
+#
+
+PORTREVISION= 1
+CATEGORIES= multimedia
+
+COMMENT= Bad gstreamer-plugins
+
+GST_PLUGIN= bad
+GST_PLUGIN_SUFFIX= -bad
+
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+
+BUILD_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
+RUN_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
+
+EXTRACT_ONLY= ${BAD_DISTFILE}
+WRKSRC= ${WRKDIR}/${BAD_DISTNAME}
+
+BAD_GST_DIRS= gst sys
+PLIST_SUB= VERSION="${GST_VERSION}"
+NO_GSTREAMER_COMMON= yes
+PLIST= ${.CURDIR}/pkg-plist
+
+do-build:
+.for dir in ${BAD_GST_DIRS}
+ @(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+.endfor
+
+do-install:
+.for dir in ${BAD_GST_DIRS}
+ @(cd ${INSTALL_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+
+.endfor
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-bad/pkg-plist b/multimedia/gstreamer-plugins-bad/pkg-plist
new file mode 100644
index 000000000000..965c4c366b7d
--- /dev/null
+++ b/multimedia/gstreamer-plugins-bad/pkg-plist
@@ -0,0 +1,9 @@
+lib/gstreamer-%%VERSION%%/libgstqtdemux.a
+lib/gstreamer-%%VERSION%%/libgstqtdemux.la
+lib/gstreamer-%%VERSION%%/libgstqtdemux.so
+lib/gstreamer-%%VERSION%%/libgstspeed.a
+lib/gstreamer-%%VERSION%%/libgstspeed.la
+lib/gstreamer-%%VERSION%%/libgstspeed.so
+lib/gstreamer-%%VERSION%%/libgsttta.a
+lib/gstreamer-%%VERSION%%/libgsttta.la
+lib/gstreamer-%%VERSION%%/libgsttta.so
diff --git a/multimedia/gstreamer-plugins-core/Makefile b/multimedia/gstreamer-plugins-core/Makefile
index 6d47936803bc..2339ad2aecf2 100644
--- a/multimedia/gstreamer-plugins-core/Makefile
+++ b/multimedia/gstreamer-plugins-core/Makefile
@@ -3,12 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins-core/Makefile,v 1.8 2005/07/13 06:48:22 ahze Exp $
-#
+# $MCom: ports/multimedia/gstreamer-plugins-core/Makefile,v 1.14 2006/01/21 21:22:18 ahze Exp $
PORTNAME= gstreamer-plugins-core
-PORTVERSION= 0.8
-PORTREVISION= 6
+PORTVERSION= 0.10
+PORTREVISION= 4
CATEGORIES= multimedia audio
MASTER_SITES= # empty
DISTFILES= # empty
@@ -28,7 +27,7 @@ WANT_GSTREAMER= yes
.include <bsd.port.pre.mk>
# Audio plugins
-USE_GSTREAMER+= mad vorbis
+USE_GSTREAMER+= mad ogg vorbis
# Graphics plugins
USE_GSTREAMER+= libpng
@@ -37,28 +36,17 @@ USE_GSTREAMER+= libpng
USE_GSTREAMER+= pango
# Multimedia plugins
-USE_GSTREAMER+= ffmpeg
-
-.if ${OSVERSION} > 500035 || defined(WITH_XVID)
-USE_GSTREAMER+= xvid
-.endif
+USE_GSTREAMER+= ffmpeg good theora
.if !defined(WITHOUT_DVD)
# Audio plugins
USE_GSTREAMER+= a52dec
-
-# Multimedia plugins
-USE_GSTREAMER+= dts dvd
.endif
pre-everything::
@${ECHO_MSG} ""
@${ECHO_MSG} " Disable DVD plugins by defining WITHOUT_DVD"
@${ECHO_MSG} ""
-.if ${OSVERSION} < 500035 && !defined(WITH_XVID)
- @${ECHO_MSG} " Enable XVID plugins by defining WITH_XVID"
- @${ECHO_MSG} ""
-.endif
do-install:
if [ ! -d ${PREFIX}/${GST_DIR} ]; then \
diff --git a/multimedia/gstreamer-plugins-core80/Makefile b/multimedia/gstreamer-plugins-core80/Makefile
index 6d47936803bc..532b759ba7d1 100644
--- a/multimedia/gstreamer-plugins-core80/Makefile
+++ b/multimedia/gstreamer-plugins-core80/Makefile
@@ -3,12 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/gstreamer-plugins-core/Makefile,v 1.8 2005/07/13 06:48:22 ahze Exp $
-#
+# $MCom: ports/multimedia/gstreamer-plugins-core80/Makefile,v 1.4 2006/01/24 18:49:48 marcus Exp $
-PORTNAME= gstreamer-plugins-core
-PORTVERSION= 0.8
-PORTREVISION= 6
+PORTNAME= gstreamer-plugins-core80
+PORTVERSION= 0.8.11
+PORTREVISION= 7
CATEGORIES= multimedia audio
MASTER_SITES= # empty
DISTFILES= # empty
@@ -20,7 +19,7 @@ COMMENT= Core set of typical audio and video gstreamer-plugins
USE_X_PREFIX= yes
NO_BUILD= yes
-GST_DIR= lib/gstreamer-${PORTVERSION}
+GST_DIR= lib/gstreamer-${GST80_VERSION}
PLIST_FILES= ${GST_DIR}/.gstreamer-plugins-core.keep
WANT_GSTREAMER= yes
@@ -28,27 +27,27 @@ WANT_GSTREAMER= yes
.include <bsd.port.pre.mk>
# Audio plugins
-USE_GSTREAMER+= mad vorbis
+USE_GSTREAMER80+= mad vorbis
# Graphics plugins
-USE_GSTREAMER+= libpng
+USE_GSTREAMER80+= libpng
# Misc plugins
-USE_GSTREAMER+= pango
+USE_GSTREAMER80+= pango
# Multimedia plugins
-USE_GSTREAMER+= ffmpeg
+USE_GSTREAMER80+= ffmpeg
.if ${OSVERSION} > 500035 || defined(WITH_XVID)
-USE_GSTREAMER+= xvid
+USE_GSTREAMER80+= xvid
.endif
.if !defined(WITHOUT_DVD)
# Audio plugins
-USE_GSTREAMER+= a52dec
+USE_GSTREAMER80+= a52dec
# Multimedia plugins
-USE_GSTREAMER+= dts dvd
+USE_GSTREAMER80+= dts dvd
.endif
pre-everything::
diff --git a/multimedia/gstreamer-plugins-dirac80/Makefile b/multimedia/gstreamer-plugins-dirac80/Makefile
index f67aeeaf949e..6f4885fbe0c4 100644
--- a/multimedia/gstreamer-plugins-dirac80/Makefile
+++ b/multimedia/gstreamer-plugins-dirac80/Makefile
@@ -3,6 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/multimedia/gstreamer-plugins-dirac80/Makefile,v 1.1 2006/01/20 02:56:05 ahze Exp $
#
CATEGORIES= multimedia
@@ -12,6 +13,6 @@ COMMENT= Gstreamer dirac plugin
GST_PLUGIN= dirac
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-dts80/Makefile b/multimedia/gstreamer-plugins-dts80/Makefile
new file mode 100644
index 000000000000..d0e2ee031834
--- /dev/null
+++ b/multimedia/gstreamer-plugins-dts80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for: gstreamer-plugins-dts
+# Date created: 3 Oct 2004
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/multimedia/gstreamer-plugins-dts80/Makefile,v 1.1 2006/01/20 02:56:05 ahze Exp $
+#
+
+CATEGORIES= multimedia
+PORTREVISION= 1
+
+COMMENT= Gstreamer dts plugin
+
+GST_PLUGIN= dts
+
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-dv80/Makefile b/multimedia/gstreamer-plugins-dv80/Makefile
index efa6e008a2fa..aebd409648ca 100644
--- a/multimedia/gstreamer-plugins-dv80/Makefile
+++ b/multimedia/gstreamer-plugins-dv80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/multimedia/gstreamer-plugins-dv80/Makefile,v 1.2 2006/01/25 02:18:17 ahze Exp $
#
CATEGORIES= multimedia
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer dv plugin
GST_PLUGIN= dv
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-dvd80/Makefile b/multimedia/gstreamer-plugins-dvd80/Makefile
index 24b516aa9a25..3bf5fb3e9324 100644
--- a/multimedia/gstreamer-plugins-dvd80/Makefile
+++ b/multimedia/gstreamer-plugins-dvd80/Makefile
@@ -3,6 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/multimedia/gstreamer-plugins-dvd80/Makefile,v 1.1 2006/01/20 02:56:06 ahze Exp $
#
CATEGORIES= multimedia
@@ -12,6 +13,6 @@ COMMENT= Gstreamer dvd plugin set
GST_PLUGIN= dvd
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-good/Makefile b/multimedia/gstreamer-plugins-good/Makefile
new file mode 100644
index 000000000000..9cf4d9ab75a3
--- /dev/null
+++ b/multimedia/gstreamer-plugins-good/Makefile
@@ -0,0 +1,43 @@
+# New ports collection makefile for: gstreamer-plugins-good
+# Date created: 20 Jan 2006
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/multimedia/gstreamer-plugins-good/Makefile,v 1.5 2006/04/02 07:33:41 marcus Exp $
+#
+
+PORTREVISION= 3
+CATEGORIES= multimedia
+
+COMMENT= Good gstreamer-plugins
+
+GST_PLUGIN= good
+GST_PLUGIN_SUFFIX= -good
+
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+
+BUILD_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
+RUN_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
+
+EXTRACT_ONLY= ${GOOD_DISTFILE}
+WRKSRC= ${WRKDIR}/${GOOD_DISTNAME}
+
+GOOD_GST_DIRS= gst sys
+PLIST_SUB= VERSION="${GST_VERSION}"
+NO_GSTREAMER_COMMON= yes
+PLIST= ${.CURDIR}/pkg-plist
+FILESDIR=${.CURDIR}/files
+PATCHDIR=${.CURDIR}/files
+
+do-build:
+.for dir in ${GOOD_GST_DIRS}
+ @(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+.endfor
+
+do-install:
+.for dir in ${GOOD_GST_DIRS}
+ @(cd ${INSTALL_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+
+.endfor
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-good/files/patch-sys_oss_gstosshelper.c b/multimedia/gstreamer-plugins-good/files/patch-sys_oss_gstosshelper.c
new file mode 100644
index 000000000000..34fdd31191a2
--- /dev/null
+++ b/multimedia/gstreamer-plugins-good/files/patch-sys_oss_gstosshelper.c
@@ -0,0 +1,20 @@
+--- sys/oss/gstosshelper.c.orig Sun Apr 2 03:23:53 2006
++++ sys/oss/gstosshelper.c Sun Apr 2 03:25:44 2006
+@@ -343,13 +344,17 @@ gst_oss_helper_rate_check_rate (GstOssPr
+ int format;
+ int n_channels;
+ int ret;
++ int rst;
+
+ rate = irate;
+ format = probe->format;
+ n_channels = probe->n_channels;
++ rst = 4000; /* XXX Lowest supported rate for FreeBSD. */
+
+ GST_LOG ("checking format %d, channels %d, rate %d",
+ format, n_channels, rate);
++ /* Reset rate to lowest supported rate. */
++ ioctl (probe->fd, SNDCTL_DSP_SPEED, &rst);
+ ret = ioctl (probe->fd, SNDCTL_DSP_SETFMT, &format);
+ if (ret < 0)
+ return -1;
diff --git a/multimedia/gstreamer-plugins-good/pkg-plist b/multimedia/gstreamer-plugins-good/pkg-plist
new file mode 100644
index 000000000000..6565484ea7ca
--- /dev/null
+++ b/multimedia/gstreamer-plugins-good/pkg-plist
@@ -0,0 +1,84 @@
+lib/gstreamer-%%VERSION%%/libgstalaw.a
+lib/gstreamer-%%VERSION%%/libgstalaw.la
+lib/gstreamer-%%VERSION%%/libgstalaw.so
+lib/gstreamer-%%VERSION%%/libgstalpha.a
+lib/gstreamer-%%VERSION%%/libgstalpha.la
+lib/gstreamer-%%VERSION%%/libgstalpha.so
+lib/gstreamer-%%VERSION%%/libgstalphacolor.a
+lib/gstreamer-%%VERSION%%/libgstalphacolor.la
+lib/gstreamer-%%VERSION%%/libgstalphacolor.so
+lib/gstreamer-%%VERSION%%/libgstapetag.a
+lib/gstreamer-%%VERSION%%/libgstapetag.la
+lib/gstreamer-%%VERSION%%/libgstapetag.so
+lib/gstreamer-%%VERSION%%/libgstauparse.a
+lib/gstreamer-%%VERSION%%/libgstauparse.la
+lib/gstreamer-%%VERSION%%/libgstauparse.so
+lib/gstreamer-%%VERSION%%/libgstautodetect.a
+lib/gstreamer-%%VERSION%%/libgstautodetect.la
+lib/gstreamer-%%VERSION%%/libgstautodetect.so
+lib/gstreamer-%%VERSION%%/libgstavi.a
+lib/gstreamer-%%VERSION%%/libgstavi.la
+lib/gstreamer-%%VERSION%%/libgstavi.so
+lib/gstreamer-%%VERSION%%/libgstcutter.a
+lib/gstreamer-%%VERSION%%/libgstcutter.la
+lib/gstreamer-%%VERSION%%/libgstcutter.so
+lib/gstreamer-%%VERSION%%/libgstdebug.a
+lib/gstreamer-%%VERSION%%/libgstdebug.la
+lib/gstreamer-%%VERSION%%/libgstdebug.so
+lib/gstreamer-%%VERSION%%/libgsteffectv.a
+lib/gstreamer-%%VERSION%%/libgsteffectv.la
+lib/gstreamer-%%VERSION%%/libgsteffectv.so
+lib/gstreamer-%%VERSION%%/libgstflxdec.a
+lib/gstreamer-%%VERSION%%/libgstflxdec.la
+lib/gstreamer-%%VERSION%%/libgstflxdec.so
+lib/gstreamer-%%VERSION%%/libgstgoom.a
+lib/gstreamer-%%VERSION%%/libgstgoom.la
+lib/gstreamer-%%VERSION%%/libgstgoom.so
+lib/gstreamer-%%VERSION%%/libgstid3demux.a
+lib/gstreamer-%%VERSION%%/libgstid3demux.la
+lib/gstreamer-%%VERSION%%/libgstid3demux.so
+lib/gstreamer-%%VERSION%%/libgstlevel.a
+lib/gstreamer-%%VERSION%%/libgstlevel.la
+lib/gstreamer-%%VERSION%%/libgstlevel.so
+lib/gstreamer-%%VERSION%%/libgstmatroska.a
+lib/gstreamer-%%VERSION%%/libgstmatroska.la
+lib/gstreamer-%%VERSION%%/libgstmatroska.so
+lib/gstreamer-%%VERSION%%/libgstmulaw.a
+lib/gstreamer-%%VERSION%%/libgstmulaw.la
+lib/gstreamer-%%VERSION%%/libgstmulaw.so
+lib/gstreamer-%%VERSION%%/libgstmultipart.a
+lib/gstreamer-%%VERSION%%/libgstmultipart.la
+lib/gstreamer-%%VERSION%%/libgstmultipart.so
+lib/gstreamer-%%VERSION%%/libgstnavigationtest.a
+lib/gstreamer-%%VERSION%%/libgstnavigationtest.la
+lib/gstreamer-%%VERSION%%/libgstnavigationtest.so
+lib/gstreamer-%%VERSION%%/libgstossaudio.a
+lib/gstreamer-%%VERSION%%/libgstossaudio.la
+lib/gstreamer-%%VERSION%%/libgstossaudio.so
+lib/gstreamer-%%VERSION%%/libgstrtp.a
+lib/gstreamer-%%VERSION%%/libgstrtp.la
+lib/gstreamer-%%VERSION%%/libgstrtp.so
+lib/gstreamer-%%VERSION%%/libgstrtsp.a
+lib/gstreamer-%%VERSION%%/libgstrtsp.la
+lib/gstreamer-%%VERSION%%/libgstrtsp.so
+lib/gstreamer-%%VERSION%%/libgstsmpte.a
+lib/gstreamer-%%VERSION%%/libgstsmpte.la
+lib/gstreamer-%%VERSION%%/libgstsmpte.so
+lib/gstreamer-%%VERSION%%/libgstudp.a
+lib/gstreamer-%%VERSION%%/libgstudp.la
+lib/gstreamer-%%VERSION%%/libgstudp.so
+lib/gstreamer-%%VERSION%%/libgstvideobox.a
+lib/gstreamer-%%VERSION%%/libgstvideobox.la
+lib/gstreamer-%%VERSION%%/libgstvideobox.so
+lib/gstreamer-%%VERSION%%/libgstvideoflip.a
+lib/gstreamer-%%VERSION%%/libgstvideoflip.la
+lib/gstreamer-%%VERSION%%/libgstvideoflip.so
+lib/gstreamer-%%VERSION%%/libgstvideomixer.a
+lib/gstreamer-%%VERSION%%/libgstvideomixer.la
+lib/gstreamer-%%VERSION%%/libgstvideomixer.so
+lib/gstreamer-%%VERSION%%/libgstwavenc.a
+lib/gstreamer-%%VERSION%%/libgstwavenc.la
+lib/gstreamer-%%VERSION%%/libgstwavenc.so
+lib/gstreamer-%%VERSION%%/libgstwavparse.a
+lib/gstreamer-%%VERSION%%/libgstwavparse.la
+lib/gstreamer-%%VERSION%%/libgstwavparse.so
diff --git a/multimedia/gstreamer-plugins-libfame80/Makefile b/multimedia/gstreamer-plugins-libfame80/Makefile
index 0cfead528fc9..3aad3f75e9ca 100644
--- a/multimedia/gstreamer-plugins-libfame80/Makefile
+++ b/multimedia/gstreamer-plugins-libfame80/Makefile
@@ -3,6 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/multimedia/gstreamer-plugins-libfame80/Makefile,v 1.1 2006/01/20 02:56:06 ahze Exp $
#
CATEGORIES= multimedia
@@ -10,6 +11,6 @@ PORTREVISION= 1
GST_PLUGIN= libfame
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-mpeg2dec80/Makefile b/multimedia/gstreamer-plugins-mpeg2dec80/Makefile
index 9722a79b8499..4038d3f58b4c 100644
--- a/multimedia/gstreamer-plugins-mpeg2dec80/Makefile
+++ b/multimedia/gstreamer-plugins-mpeg2dec80/Makefile
@@ -3,6 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/multimedia/gstreamer-plugins-mpeg2dec80/Makefile,v 1.1 2006/01/20 02:56:06 ahze Exp $
#
CATEGORIES= multimedia
@@ -12,6 +13,6 @@ COMMENT= Gstreamer mpeg decode plugin
GST_PLUGIN= mpeg2dec
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-mpeg2enc80/Makefile b/multimedia/gstreamer-plugins-mpeg2enc80/Makefile
index 9ed3a53f6648..4b7064e939f6 100644
--- a/multimedia/gstreamer-plugins-mpeg2enc80/Makefile
+++ b/multimedia/gstreamer-plugins-mpeg2enc80/Makefile
@@ -3,6 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/multimedia/gstreamer-plugins-mpeg2enc80/Makefile,v 1.1 2006/01/20 02:56:06 ahze Exp $
#
CATEGORIES= multimedia
@@ -14,6 +15,6 @@ BROKEN= Does not compile
GST_PLUGIN= mpeg2enc
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-mplex80/Makefile b/multimedia/gstreamer-plugins-mplex80/Makefile
index 0826fc08994f..fb9e8e6d5017 100644
--- a/multimedia/gstreamer-plugins-mplex80/Makefile
+++ b/multimedia/gstreamer-plugins-mplex80/Makefile
@@ -3,6 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/multimedia/gstreamer-plugins-mplex80/Makefile,v 1.1 2006/01/20 02:56:07 ahze Exp $
#
CATEGORIES= multimedia
@@ -12,6 +13,6 @@ COMMENT= Gstreamer mplex plugin
GST_PLUGIN= mplex
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-theora80/Makefile b/multimedia/gstreamer-plugins-theora80/Makefile
index ceda3841c025..d95f763fa9ff 100644
--- a/multimedia/gstreamer-plugins-theora80/Makefile
+++ b/multimedia/gstreamer-plugins-theora80/Makefile
@@ -3,6 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/multimedia/gstreamer-plugins-theora80/Makefile,v 1.1 2006/01/20 02:56:07 ahze Exp $
#
CATEGORIES= multimedia
@@ -12,6 +13,6 @@ COMMENT= Gstreamer theora plugin
GST_PLUGIN= theora
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-ugly/Makefile b/multimedia/gstreamer-plugins-ugly/Makefile
new file mode 100644
index 000000000000..f165480d1ffd
--- /dev/null
+++ b/multimedia/gstreamer-plugins-ugly/Makefile
@@ -0,0 +1,41 @@
+# New ports collection makefile for: gstreamer-plugins-ugly
+# Date created: 20 Jan 2006
+# Whom: Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/multimedia/gstreamer-plugins-ugly/Makefile,v 1.3 2006/04/16 08:42:06 marcus Exp $
+#
+
+PORTREVISION= 2
+CATEGORIES= multimedia
+
+COMMENT= Ugly gstreamer-plugins
+
+GST_PLUGIN= ugly
+GST_PLUGIN_SUFFIX= -ugly
+
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+
+BUILD_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
+RUN_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
+
+EXTRACT_ONLY= ${UGLY_DISTFILE}
+WRKSRC= ${WRKDIR}/${UGLY_DISTNAME}
+
+UGLY_GST_DIRS= gst
+PLIST_SUB= VERSION="${GST_VERSION}"
+NO_GSTREAMER_COMMON= yes
+PLIST= ${.CURDIR}/pkg-plist
+
+do-build:
+.for dir in ${UGLY_GST_DIRS}
+ @(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+.endfor
+
+do-install:
+.for dir in ${UGLY_GST_DIRS}
+ @(cd ${INSTALL_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+
+.endfor
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-ugly/pkg-plist b/multimedia/gstreamer-plugins-ugly/pkg-plist
new file mode 100644
index 000000000000..40aadb6bf1ff
--- /dev/null
+++ b/multimedia/gstreamer-plugins-ugly/pkg-plist
@@ -0,0 +1,21 @@
+lib/gstreamer-%%VERSION%%/libgstasf.a
+lib/gstreamer-%%VERSION%%/libgstasf.la
+lib/gstreamer-%%VERSION%%/libgstasf.so
+lib/gstreamer-%%VERSION%%/libgstdvdlpcmdec.a
+lib/gstreamer-%%VERSION%%/libgstdvdlpcmdec.la
+lib/gstreamer-%%VERSION%%/libgstdvdlpcmdec.so
+lib/gstreamer-%%VERSION%%/libgstdvdsub.a
+lib/gstreamer-%%VERSION%%/libgstdvdsub.la
+lib/gstreamer-%%VERSION%%/libgstdvdsub.so
+lib/gstreamer-%%VERSION%%/libgstiec958.a
+lib/gstreamer-%%VERSION%%/libgstiec958.la
+lib/gstreamer-%%VERSION%%/libgstiec958.so
+lib/gstreamer-%%VERSION%%/libgstmpegaudioparse.a
+lib/gstreamer-%%VERSION%%/libgstmpegaudioparse.la
+lib/gstreamer-%%VERSION%%/libgstmpegaudioparse.so
+lib/gstreamer-%%VERSION%%/libgstmpegstream.a
+lib/gstreamer-%%VERSION%%/libgstmpegstream.la
+lib/gstreamer-%%VERSION%%/libgstmpegstream.so
+lib/gstreamer-%%VERSION%%/libgstrmdemux.a
+lib/gstreamer-%%VERSION%%/libgstrmdemux.la
+lib/gstreamer-%%VERSION%%/libgstrmdemux.so
diff --git a/multimedia/gstreamer-plugins-x26480/Makefile b/multimedia/gstreamer-plugins-x26480/Makefile
index 79205a7d68bb..2977859838a2 100644
--- a/multimedia/gstreamer-plugins-x26480/Makefile
+++ b/multimedia/gstreamer-plugins-x26480/Makefile
@@ -3,6 +3,7 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/multimedia/gstreamer-plugins-x26480/Makefile,v 1.1 2006/01/20 02:56:07 ahze Exp $
#
CATEGORIES= multimedia
@@ -12,6 +13,6 @@ COMMENT= Gstreamer x264 plugin
GST_PLUGIN= x264
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-xvid80/Makefile b/multimedia/gstreamer-plugins-xvid80/Makefile
index 18fce588172d..08ab5a6cae20 100644
--- a/multimedia/gstreamer-plugins-xvid80/Makefile
+++ b/multimedia/gstreamer-plugins-xvid80/Makefile
@@ -3,6 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/multimedia/gstreamer-plugins-xvid80/Makefile,v 1.1 2006/01/20 02:56:07 ahze Exp $
#
CATEGORIES= multimedia
@@ -12,6 +13,6 @@ COMMENT= Gstreamer xvid plugin
GST_PLUGIN= xvid
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index b608ce711ccd..12267c76cbaa 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -3,71 +3,87 @@
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.80 2006/04/28 12:00:14 ahze Exp $
#
PORTNAME= gstreamer
-PORTVERSION= 0.8.11
-PORTREVISION?= 2
+PORTVERSION?= 0.10.6
+## SET BACK TO PORTREVISION?= when we reset PORTREVISION in all the gst plugin ports
+PORTREVISION?= 1
CATEGORIES?= multimedia audio
-MASTER_SITES= ${MASTER_SITE_GNOME} \
- http://gstreamer.freedesktop.org/src/gst-plugins/
-MASTER_SITE_SUBDIR= sources/gst-plugins/0.8
+MASTER_SITES= ${MASTER_SITE_GNOME:S|$|sources/gst-plugins-base/0.10/:base|} \
+ http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \
+ ${MASTER_SITE_LOCAL:S|$|ahze/:base|} \
+ ${MASTER_SITE_LOCAL:S|$|ahze/:good|} \
+ ${MASTER_SITE_LOCAL:S|$|ahze/:bad|} \
+ ${MASTER_SITE_LOCAL:S|$|ahze/:ugly|} \
+ http://gstreamer.freedesktop.org/src/gst-plugins-bad/:bad \
+ ${MASTER_SITE_GNOME:S|$|sources/gst-plugins-good/0.10/:good|} \
+ http://gstreamer.freedesktop.org/src/gst-plugins-good/:good \
+ http://gstreamer.freedesktop.org/src/gst-plugins-ugly/:ugly \
+ http://people.freebsd.org/~ahze/distfiles/:good \
+ http://people.freebsd.org/~ahze/distfiles/:bad \
+ http://people.freebsd.org/~ahze/distfiles/:ugly \
+ http://people.freebsd.org/~ahze/distfiles/:base
PKGNAMESUFFIX= -plugins${GST_PLUGIN_SUFFIX}
-DISTNAME= gst-plugins-${PORTVERSION}
+DISTFILES= ${BASE_DISTFILE}:base \
+ ${BAD_DISTFILE}:bad \
+ ${GOOD_DISTFILE}:good \
+ ${UGLY_DISTFILE}:ugly
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT?= GStreamer written collection of plugins handling several media types
-LIB_DEPENDS+= gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer \
- popt.0:${PORTSDIR}/devel/popt
+LIB_DEPENDS+= gstreamer-0.10.0:${PORTSDIR}/multimedia/gstreamer \
+ popt.0:${PORTSDIR}/devel/popt \
+ oil-0.3.1:${PORTSDIR}/devel/liboil
+
+BASE_PORTVERSION= ${PORTVERSION}
+BASE_DISTNAME= gst-plugins-base-${BASE_PORTVERSION}
+BASE_DISTFILE= ${BASE_DISTNAME}${EXTRACT_SUFX}
+BAD_PORTVERSION= 0.10.1
+BAD_DISTNAME= gst-plugins-bad-${BAD_PORTVERSION}
+BAD_DISTFILE= ${BAD_DISTNAME}${EXTRACT_SUFX}
+GOOD_PORTVERSION= 0.10.2
+GOOD_DISTNAME= gst-plugins-good-${GOOD_PORTVERSION}
+GOOD_DISTFILE= ${GOOD_DISTNAME}${EXTRACT_SUFX}
+UGLY_PORTVERSION= 0.10.3
+UGLY_DISTNAME= gst-plugins-ugly-${UGLY_PORTVERSION}
+UGLY_DISTFILE= ${UGLY_DISTNAME}${EXTRACT_SUFX}
SHLIB_VERSION= 1
-VERSION= 0.8
-
+USE_GETTEXT= yes
+VERSION= ${GST_VERSION}
WANT_GSTREAMER= yes
USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GNOME+= gnomehack \
- gnomeprefix \
- gnometarget \
- pkgconfig
-USE_REINPLACE= yes
-GNU_CONFIGURE= yes
+USE_GNOME+= gnomehack gnomeprefix gnometarget pkgconfig ltverhack
+USE_AUTOTOOLS= libtool:15
GST_PLUGIN?= base
-CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \
- CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib ${EXTRA_LIBS} ${PTHREAD_LIBS}"
+DEFAULT_AUDIOSINK?= osssink
+DEFAULT_AUDIOSRC?= osssrc
+
.include <bsd.port.pre.mk>
.include "${MASTERDIR}/Makefile.common"
.if !defined(WITH_CPUFLAGS)
-WITHOUT_CPU_CFLAGS= yes
+#WITHOUT_CPU_CFLAGS= yes
.endif
.if ${GST_PLUGIN} == "base"
-
INSTALLS_SHLIB= yes
-
+MAN1= gst-visualise-0.10.1
+WRKSRC=${WRKDIR}/${BASE_DISTNAME}
+EXTRACT_ONLY=${BASE_DISTFILE}
PLIST_SUB+= VERSION="${VERSION}" \
SHLIB_VERSION="${SHLIB_VERSION}"
-
-MAN1= gst-launch-ext-0.8.1 gst-visualise-0.8.1
-
-## Additional directories which should be both built and installed
-## but configure neglected to correctly identify them
-# cdrom/vcd support
-EXTRA_BUILD_DIR+= sys/vcd
-# modplug
-EXTRA_BUILD_DIR+= gst/modplug
-.else
-.for f in ${GST_PLUGIN_DIR}
-GST_PLUGIN_MAKEFILES+= ${f}/Makefile
-.endfor
.endif
# cdrom default device
@@ -103,61 +119,20 @@ pre-everything::
@${ECHO_MSG} ""
.endif
-post-extract:
-# for cdrom/vcd support
-# taken from mplayer distfile
-# MD5 (MPlayer-1.0pre4.tar.bz2) = 83ebac0f05b192516a41fca2350ca01a
- @${CP} ${FILESDIR}/bsdi_dvd.h ${WRKSRC}/sys/vcd/
-
post-patch:
@${FIND} ${WRKSRC} -type f | \
${XARGS} -n 10 ${REINPLACE_CMD} -e \
's|malloc\.h|stdlib.h|; \
s|stdint\.h|inttypes.h|; \
s|%%VERSION%%|${VERSION}|'
-# cdrom default device
- @${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
- ${WRKSRC}/ext/cdparanoia/gstcdparanoia.c \
- ${WRKSRC}/sys/cdrom/gstcdplayer.c \
- ${WRKSRC}/sys/vcd/vcdsrc.c
-# dvd default device
- @${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
- ${WRKSRC}/ext/dvdnav/dvdnavsrc.c \
- ${WRKSRC}/ext/dvdread/dvdreadsrc.c
-# cdrom/vcd support
- @${REINPLACE_CMD} -e 's|<linux/cdrom.h>|"bsdi_dvd.h"|' \
- ${WRKSRC}/sys/cdrom/gstcdplayer_ioctl.c \
- ${WRKSRC}/sys/vcd/vcdsrc.c \
- ${WRKSRC}/sys/vcd/vcdsrc.h
-# mplex fix -- gst configure does not use mjpegtool's config to find include.
- @${REINPLACE_CMD} -E \
- -e 's|PFLAGS@|PFLAGS@ -I${LOCALBASE}/include/mjpegtools -I${LOCALBASE}/include/mjpegtools/mplex|' \
- ${WRKSRC}/ext/mplex/Makefile.in
-.if ${GST_PLUGIN}!="base"
- @${REINPLACE_CMD} -E -e 's|ac_config_files=\"*\"|ac_config_files="$$ac_config_files Makefile ${GST_PLUGIN_MAKEFILES}" #|' \
- ${WRKSRC}/configure
-.else
-.for f in ${GST_ALL_PLUGINS}
- @${REINPLACE_CMD} -e 's|ext/${f}/Makefile||g' \
+ @${FIND} ${WRKSRC}/ext -name Makefile.in | \
+ ${XARGS} -n 10 ${REINPLACE_CMD} -e \
+ 's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la|${X11BASE}/lib/libgsttag-@GST_MAJORMINOR@.la|; \
+ s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la|${X11BASE}/lib/libgstaudio-@GST_MAJORMINOR@.la|; \
+ s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_MAJORMINOR@.la|${X11BASE}/lib/libgstriff-@GST_MAJORMINOR@.la|; \
+ s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la|${X11BASE}/lib/libgstcdda-@GST_MAJORMINOR@.la|'
+ @${REINPLACE_CMD} -e 's|DEFAULT_AUDIOSINK="alsasink"|DEFAULT_AUDIOSINK="${DEFAULT_AUDIOSINK}"|; \
+ s|DEFAULT_AUDIOSRC="alsasrc"|DEFAULT_AUDIOSRC="${DEFAULT_AUDIOSRC}"|' \
${WRKSRC}/configure
-.endfor
-.endif
-
-post-build:
-.ifdef(EXTRA_BUILD_DIR)
-. for dir in ${EXTRA_BUILD_DIR}
- @cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
-. endfor
-.endif
-
-post-install:
-.ifdef(EXTRA_BUILD_DIR)
-. for dir in ${EXTRA_BUILD_DIR}
- @cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
-. endfor
-.endif
-# register plugins
- -@${X11BASE}/bin/gst-register-${VERSION} \
- --gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${VERSION}/registry.xml 2>/dev/null
.include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index 4509c14ea83b..38addabc7eca 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -1,87 +1,60 @@
-GST_ALL_PLUGINS= \
- a52dec \
- aalib \
- aalibtest \
- arts \
- artstest \
- artsc \
- audiofile \
- audioresample \
- cairo \
- cdaudio \
- cdio \
+# $FreeBSD$
+# $MCom: ports/multimedia/gstreamer-plugins/Makefile.common,v 1.40 2006/04/23 21:40:21 marcus Exp $
+# base
+BASE_GST_ALL_PLUGINS= \
+ alsa \
cdparanoia \
- dirac \
+ gnomevfs \
+ libvisual \
+ ogg \
+ pango \
+ theora \
+ vorbis
+# bad
+BAD_GST_ALL_PLUGINS+= \
directfb \
- divx \
- dts \
- dvdnav \
- dvdread \
- dxr3 \
- esd \
- esdtest \
faac \
faad \
- flac \
- gconf \
- gdk_pixbuf \
- gnome_vfs \
gsm \
- hermes \
ivorbis \
- jack \
+ libmms \
+ musepack \
+ sdl \
+ wavpack
+# good
+GOOD_GST_ALL_PLUGINS+= \
+ aalib \
+ cairo \
+ dv \
+ esd \
+ flac \
+ gconf \
jpeg \
ladspa \
- lame \
- lcs \
libcaca \
- libdv \
- libfame \
- libfametest\
- libmng \
- libmms \
libpng \
- librfb \
- libvisual \
- mad \
- mikmod \
- libmikmodtest \
- mpeg2dec \
- mpeg2enc \
- mplex \
- musepack \
- musicbrainz \
- nas \
- ogg \
- oggtest \
- opengl \
- pango \
- polyp \
- dv1394 \
- qcam \
raw1394 \
- sdl \
- sdltest \
- shout \
shout2 \
- shout2test \
- sidplay \
- smoothwave \
- sndfile \
- speex \
- swfdec \
- theora \
- vcd \
- vorbis \
- vorbistest \
- wavpack \
- x264 \
- xvid
-
-# Disable all plugins by default\
+ speex
+# Ugly
+UGLY_GST_ALL_PLUGINS+= \
+ a52dec \
+ amrnb \
+ lame \
+ mad \
+ mpeg2dec \
+ sidplay
+
+CONFIG_GST_PLUGINS= gnome_vfs
+GST_ALL_PLUGINS= ${BASE_GST_ALL_PLUGINS} ${BAD_GST_ALL_PLUGINS} \
+ ${GOOD_GST_ALL_PLUGINS} ${UGLY_ALL_PLUGINS} \
+ ${CONFIG_GST_PLUGINS}
+
+# Disable all plugins by default
.for d in ${GST_ALL_PLUGINS}
CONFIGURE_ARGS+= --disable-${d}
.endfor
+CONFIGURE_ARGS+= --enable-${GST_PLUGIN}
CONFIGURE_ARGS+=--disable-tests \
--disable-examples \
@@ -115,8 +88,7 @@ CONFIGURE_ARGS+=--disable-spc
PLIST_SUB+= SPC="@comment "
#.endif
-.if ${GST_PLUGIN}!="base"
-
+.if ${GST_PLUGIN}!="base" && !defined(NO_GSTREAMER_COMMON)
GST_PLUGIN_SUFFIX?= -${GST_PLUGIN}
COMMENT= Gstreamer ${GST_PLUGIN} plugin
@@ -134,23 +106,25 @@ GST_LIB_DIR= lib/gstreamer-${VERSION}
# Auto create PLIST
PLIST= ${NONEXISTENT}
-PLIST_FILES?= ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.a \
- ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.la \
- ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.so
+PLIST_FILES?= ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.so \
+ ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.a \
+ ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.la
+
+# hack around WRKSRC stuff near the top... fix me
+DIST?= good
+
+# a52dec
+.if ${GST_PLUGIN}=="a52dec"
+LIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52
+DIST= ugly
+.endif
# aalib
.if ${GST_PLUGIN}=="aalib"
LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib
-PLIST_FILES= ${GST_LIB_DIR}/libgstaasink.a \
- ${GST_LIB_DIR}/libgstaasink.la \
- ${GST_LIB_DIR}/libgstaasink.so
-.endif
-
-# artsd
-.if ${GST_PLUGIN}=="artsd"
-LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts
-GST_PLIST_SUFFIX= sink
-CONFIGURE_ARGS+=--enable-artsc
+PLIST_FILES= ${GST_LIB_DIR}/libgstaasink.so \
+ ${GST_LIB_DIR}/libgstaasink.a \
+ ${GST_LIB_DIR}/libgstaasink.la
.endif
# cairo
@@ -161,37 +135,36 @@ LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo
# cdparanoia
.if ${GST_PLUGIN}=="cdparanoia"
LIB_DEPENDS+= cdda_interface.0:${PORTSDIR}/audio/cdparanoia
+EXTRA_LIBS+= -lgstcdda-${VERSION}
+DIST= base
.endif
-# dirac
-.if ${GST_PLUGIN}=="dirac"
-LIB_DEPENDS+= dirac_encoder.0:${PORTSDIR}/multimedia/dirac
-.endif
-
-# dts
-.if ${GST_PLUGIN}=="dts"
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libdts_pic.a:${PORTSDIR}/multimedia/libdts
-RUN_DEPENDS+= ${LOCALBASE}/lib/libdts_pic.a:${PORTSDIR}/multimedia/libdts
-GST_PLIST_SUFFIX= dec
+# dv
+.if ${GST_PLUGIN}=="dv"
+LIB_DEPENDS+= dv.4:${PORTSDIR}/multimedia/libdv
.endif
# esound
.if ${GST_PLUGIN}=="esound"
USE_GNOME+= esound
GST_PLUGIN_DIR= ext/esd
-PLIST_FILES= ${GST_LIB_DIR}/libgstesd.a \
- ${GST_LIB_DIR}/libgstesd.la \
- ${GST_LIB_DIR}/libgstesd.so
+CONFIGURE_ENV+= ESD_CFLAGS="`pkg-config --cflags esound`" \
+ ESD_LIBS="`pkg-config --libs esound`"
+PLIST_FILES= ${GST_LIB_DIR}/libgstesd.so \
+ ${GST_LIB_DIR}/libgstesd.a \
+ ${GST_LIB_DIR}/libgstesd.la
.endif
# faac
.if ${GST_PLUGIN}=="faac"
LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac
+DIST= bad
.endif
# faad
.if ${GST_PLUGIN}=="faad"
LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad
+DIST= bad
.endif
# flac
@@ -202,91 +175,36 @@ LIB_DEPENDS+= FLAC.7:${PORTSDIR}/audio/flac
# gconf
.if ${GST_PLUGIN}=="gconf"
USE_GNOME+= gconf2
-GST_PLUGIN_DIR= gst-libs/gst/gconf \
- ext/gconf \
+GST_PLUGIN_DIR= ext/gconf \
gconf
-GCONF_SCHEMAS= gstreamer-0.8.schemas
-
-PLIST_FILES= include/gstreamer-0.8/gst/gconf/gconf.h \
- lib/gstreamer-0.8/libgstgconfelements.a \
- lib/gstreamer-0.8/libgstgconfelements.la \
- lib/gstreamer-0.8/libgstgconfelements.so \
- lib/libgstgconf-0.8.a \
- lib/libgstgconf-0.8.la \
- lib/libgstgconf-0.8.so \
- lib/libgstgconf-0.8.so.1 \
- libdata/pkgconfig/gstreamer-gconf-0.8.pc \
- '@dirrmtry include/gstreamer-0.8/gst/gconf'
-.endif
-
-# gdkpixbuf
-.if ${GST_PLUGIN}=="gdkpixbuf"
-USE_GNOME+= gtk20
-GST_PLUGIN_DIR= ext/gdk_pixbuf
+GCONF_SCHEMAS= gstreamer-${GST_VERSION}.schemas
+PLIST_FILES= ${GST_LIB_DIR}/libgstgconfelements.so \
+ ${GST_LIB_DIR}/libgstgconfelements.a \
+ ${GST_LIB_DIR}/libgstgconfelements.la
.endif
# gnomevfs
.if ${GST_PLUGIN}=="gnomevfs"
USE_GNOME+= gnomevfs2
CONFIGURE_ARGS+=--enable-gnome_vfs
+DIST= base
.endif
# gsm
.if ${GST_PLUGIN}=="gsm"
LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm
+DIST= bad
.endif
-# jack
-.if ${GST_PLUGIN}=="jack"
-LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack
-.endif
-
-# libcdaudio
-.if ${GST_PLUGIN}=="cdaudio"
-LIB_DEPENDS+= cdaudio.1:${PORTSDIR}/audio/libcdaudio
-.endif
-
-# libcdio
-.if ${GST_PLUGIN}=="cdio"
-LIB_DEPENDS+= cdio.6:${PORTSDIR}/sysutils/libcdio
-PLIST_FILES= ${GST_LIB_DIR}/libgstcddasrc.a \
- ${GST_LIB_DIR}/libgstcddasrc.la \
- ${GST_LIB_DIR}/libgstcddasrc.so
-.endif
-
-# libvisual
-.if ${GST_PLUGIN}=="libvisual"
-LIB_DEPENDS+= visual.0:${PORTSDIR}/graphics/libvisual
-.endif
-
-# musepack
-.if ${GST_PLUGIN}=="musepack"
-LIB_DEPENDS+= mpcdec.4:${PORTSDIR}/audio/libmpcdec
-.endif
-
-# hermes
-.if ${GST_PLUGIN}=="hermes"
-LIB_DEPENDS+= Hermes.1:${PORTSDIR}/graphics/Hermes
-PLIST_FILES= ${GST_LIB_DIR}/libgsthermescolorspace.a \
- ${GST_LIB_DIR}/libgsthermescolorspace.la \
- ${GST_LIB_DIR}/libgsthermescolorspace.so
+# ivorbis
+.if ${GST_PLUGIN}=="ivorbis"
+LIB_DEPENDS+= vorbisidec.1:${PORTSDIR}/audio/libtremor
+DIST= bad
.endif
# jpeg
.if ${GST_PLUGIN}=="jpeg"
LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg
-CONFLICTS+= gstreamer-plugins-jpeg-mmx-*
-.endif
-
-# jpeg-mmx
-.if ${GST_PLUGIN}=="jpeg-mmx"
-LIB_DEPENDS+= jpeg-mmx.62:${PORTSDIR}/graphics/jpeg-mmx
-CONFLICTS+= gstreamer-plugins-jpeg-*.*
-
-GST_PLUGIN_DIR= ext/jpeg
-PLIST_FILES= ${GST_LIB_DIR}/libgstjpeg.a \
- ${GST_LIB_DIR}/libgstjpeg.la \
- ${GST_LIB_DIR}/libgstjpeg.so
.endif
# ladspa
@@ -297,187 +215,92 @@ BUILD_DEPENDS+= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
# lame
.if ${GST_PLUGIN}=="lame"
LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame
-.endif
-
-# a52dec
-.if ${GST_PLUGIN}=="a52dec"
-LIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52
-.endif
-
-# audiofile
-.if ${GST_PLUGIN}=="audiofile"
-LIB_DEPENDS+= audiofile.0:${PORTSDIR}/audio/libaudiofile
+DIST= ugly
.endif
# libcaca
.if ${GST_PLUGIN}=="libcaca"
BUILD_DEPENDS+= ${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
-PLIST_FILES= ${GST_LIB_DIR}/libgstcacasink.a \
- ${GST_LIB_DIR}/libgstcacasink.la \
- ${GST_LIB_DIR}/libgstcacasink.so
-.endif
-
-# dv
-.if ${GST_PLUGIN}=="dv"
-LIB_DEPENDS+= dv.4:${PORTSDIR}/multimedia/libdv
-GST_PLIST_SUFFIX= dec
-.endif
-
-# dvd (dvdnav dvdread)
-.if ${GST_PLUGIN}=="dvd"
-EXTRA_LIBS+= -ldvdnav
-LIB_DEPENDS+= dvdnav.4:${PORTSDIR}/multimedia/libdvdnav
-GST_PLUGIN_DIR= ext/dvdnav \
- ext/dvdread
-PLIST_FILES= ${GST_LIB_DIR}/libgstdvdnavsrc.a \
- ${GST_LIB_DIR}/libgstdvdnavsrc.la \
- ${GST_LIB_DIR}/libgstdvdnavsrc.so \
- ${GST_LIB_DIR}/libgstdvdreadsrc.a \
- ${GST_LIB_DIR}/libgstdvdreadsrc.la \
- ${GST_LIB_DIR}/libgstdvdreadsrc.so
-.endif
-
-# libfame
-.if ${GST_PLUGIN}=="libfame"
-LIB_DEPENDS+= fame-0.9.1:${PORTSDIR}/multimedia/libfame
+PLIST_FILES= ${GST_LIB_DIR}/libgstcacasink.so \
+ ${GST_LIB_DIR}/libgstcacasink.a \
+ ${GST_LIB_DIR}/libgstcacasink.la
.endif
# libmms
.if ${GST_PLUGIN}=="libmms"
-LIB_DEPENDS+= mms.0:${PORTSDIR}/net/libmms
-PLIST_FILES= ${GST_LIB_DIR}/libgstmms.a \
- ${GST_LIB_DIR}/libgstmms.la \
- ${GST_LIB_DIR}/libgstmms.so
-.endif
-
-# libmng
-.if ${GST_PLUGIN}=="libmng"
-LIB_DEPENDS+= mng.1:${PORTSDIR}/graphics/libmng
-PLIST_FILES= ${GST_LIB_DIR}/libgstmng.a \
- ${GST_LIB_DIR}/libgstmng.la \
- ${GST_LIB_DIR}/libgstmng.so
-.endif
-
-# mikmod
-.if ${GST_PLUGIN}=="mikmod"
-LIB_DEPENDS+= mikmod.2:${PORTSDIR}/audio/libmikmod
-.endif
-
-# mpeg2dec
-.if ${GST_PLUGIN}=="mpeg2dec"
-LIB_DEPENDS+= mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
-.endif
-
-# mplex
-.if ${GST_PLUGIN}=="mplex"
-LIB_DEPENDS+= lavjpeg-1.8.0:${PORTSDIR}/multimedia/mjpegtools
+LIB_DEPENDS+= mms.0:${PORTSDIR}/net/libmms
+PLIST_FILES= ${GST_LIB_DIR}/libgstmms.so \
+ ${GST_LIB_DIR}/libgstmms.a \
+ ${GST_LIB_DIR}/libgstmms.la
+DIST= bad
.endif
-# musicbrainz
-.if ${GST_PLUGIN}=="musicbrainz"
-LIB_DEPENDS+= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
-PLIST_FILES= lib/gstreamer-${VERSION}/libgsttrm.a \
- lib/gstreamer-${VERSION}/libgsttrm.la \
- lib/gstreamer-${VERSION}/libgsttrm.so
-.endif
-
-# shout
-.if ${GST_PLUGIN}=="shout"
-LIB_DEPENDS+= shout.2:${PORTSDIR}/audio/libshout
-.endif
-
-# shout2
-.if ${GST_PLUGIN}=="shout2"
-LIB_DEPENDS+= shout.5:${PORTSDIR}/audio/libshout2
-.endif
-
-# sidplay
-.if ${GST_PLUGIN}=="sidplay"
-LIB_DEPENDS+= sidplay.1:${PORTSDIR}/audio/libsidplay
-PLIST_FILES= ${GST_LIB_DIR}/libgstsid.a \
- ${GST_LIB_DIR}/libgstsid.la \
- ${GST_LIB_DIR}/libgstsid.so
-.endif
-
-# sndfile
-.if ${GST_PLUGIN}=="sndfile"
-LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile
+# libpng and the snapshot plugin
+.if ${GST_PLUGIN}=="libpng"
+LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png
+GST_PLUGIN_DIR= ext/libpng
+PLIST_FILES= ${GST_LIB_DIR}/libgstpng.so \
+ ${GST_LIB_DIR}/libgstpng.a \
+ ${GST_LIB_DIR}/libgstpng.la
.endif
-# theora
-.if ${GST_PLUGIN}=="theora"
-LIB_DEPENDS+= theora.1:${PORTSDIR}/multimedia/libtheora
+# libvisual
+.if ${GST_PLUGIN}=="libvisual"
+LIB_DEPENDS+= visual.0:${PORTSDIR}/graphics/libvisual
+DIST= base
.endif
# mad
.if ${GST_PLUGIN}=="mad"
LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad \
id3tag.0:${PORTSDIR}/audio/libid3tag
+DIST= ugly
.endif
-# mpeg2enc
-.if ${GST_PLUGIN}=="mpeg2enc"
-USE_GSTREAMER+= mplex
-LIB_DEPENDS+= lavjpeg-1.8.0:${PORTSDIR}/multimedia/mjpegtools
-
-# XXX - make sure CONFIGURE works with mpeg2enc even with "ccache
-# c++" ... weird but necessary
-CONFIGURE_ENV+= HAVE_CXX=yes
+# mpeg2dec
+.if ${GST_PLUGIN}=="mpeg2dec"
+LIB_DEPENDS+= mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
+DIST= ugly
.endif
-# nas
-.if ${GST_PLUGIN}=="nas"
-LIB_DEPENDS+= audio.2:${PORTSDIR}/audio/nas
-GST_PLIST_SUFFIX= sink
+# musepack
+.if ${GST_PLUGIN}=="musepack"
+LIB_DEPENDS+= mpcdec.4:${PORTSDIR}/audio/libmpcdec
+DIST= bad
.endif
# ogg
.if ${GST_PLUGIN}=="ogg"
LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg
+EXTRA_LIBS+= -lgstriff-${VERSION}
+DIST= base
.endif
# pango
.if ${GST_PLUGIN}=="pango"
USE_GNOME+= pango
-PLIST_FILES= ${GST_LIB_DIR}/libgsttextoverlay.a \
- ${GST_LIB_DIR}/libgsttextoverlay.la \
- ${GST_LIB_DIR}/libgsttextoverlay.so \
- ${GST_LIB_DIR}/libgsttimeoverlay.a \
- ${GST_LIB_DIR}/libgsttimeoverlay.la \
- ${GST_LIB_DIR}/libgsttimeoverlay.so
-.endif
-
-# libpng and the snapshot plugin
-.if ${GST_PLUGIN}=="libpng"
-LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png
-GST_PLUGIN_DIR= ext/libpng \
- ext/snapshot
-PLIST_FILES= ${GST_LIB_DIR}/libgstpng.a \
- ${GST_LIB_DIR}/libgstpng.la \
- ${GST_LIB_DIR}/libgstpng.so \
- ${GST_LIB_DIR}/libgstsnapshot.a \
- ${GST_LIB_DIR}/libgstsnapshot.la \
- ${GST_LIB_DIR}/libgstsnapshot.so
-.endif
-
-# polyp
-.if ${GST_PLUGIN}=="polyp"
-LIB_DEPENDS+= polyp-0.7.0:${PORTSDIR}/audio/polypaudio
-PLIST_FILES= ${GST_LIB_DIR}/libpolypaudio.a \
- ${GST_LIB_DIR}/libpolypaudio.la \
- ${GST_LIB_DIR}/libpolypaudio.so
-GST_PLUGIN_DIR= ext/polyp
+DIST= base
.endif
# sdl
.if ${GST_PLUGIN}=="sdl"
USE_SDL+= sdl
GST_PLIST_SUFFIX= videosink
+DIST= bad
.endif
-# smoothwave
-.if ${GST_PLUGIN}=="smoothwave"
-USE_GNOME+= gtk20
+# shout2
+.if ${GST_PLUGIN}=="shout2"
+LIB_DEPENDS+= shout.5:${PORTSDIR}/audio/libshout2
+.endif
+
+# sidplay
+.if ${GST_PLUGIN}=="sidplay"
+LIB_DEPENDS+= sidplay.1:${PORTSDIR}/audio/libsidplay
+PLIST_FILES= ${GST_LIB_DIR}/libgstsid.so \
+ ${GST_LIB_DIR}/libgstsid.a \
+ ${GST_LIB_DIR}/libgstsid.la
+DIST= ugly
.endif
# speex
@@ -485,63 +308,56 @@ USE_GNOME+= gtk20
LIB_DEPENDS+= speex.3:${PORTSDIR}/audio/speex
.endif
-# swfdec
-.if ${GST_PLUGIN}=="swfdec"
-LIB_DEPENDS+= swfdec-0.3.0:${PORTSDIR}/graphics/swfdec
+# theora
+.if ${GST_PLUGIN}=="theora"
+LIB_DEPENDS+= theora.1:${PORTSDIR}/multimedia/libtheora
+DIST= base
.endif
# vorbis
.if ${GST_PLUGIN}=="vorbis"
USE_GSTREAMER+= ogg
LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis
-.endif
-
-# ivorbis
-.if ${GST_PLUGIN}=="ivorbis"
-LIB_DEPENDS+= vorbisidec.1:${PORTSDIR}/audio/libtremor
+EXTRA_LIBS+= -lgsttag-${VERSION} -lgstaudio-${VERSION}
+DIST= base
.endif
# wavpack
.if ${GST_PLUGIN}=="wavpack"
LIB_DEPENDS+= wavpack.0:${PORTSDIR}/audio/wavpack
+DIST= bad
.endif
-# x264
-.if ${GST_PLUGIN}=="x264"
-LIB_DEPENDS+= x264.1:${PORTSDIR}/multimedia/x264
-PLIST_FILES= ${GST_LIB_DIR}/libx264.a \
- ${GST_LIB_DIR}/libx264.la \
- ${GST_LIB_DIR}/libx264.so
-.endif
-
-# xvid
-.if ${GST_PLUGIN}=="xvid"
-LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
+.if ${DIST}=="base"
+EXTRACT_ONLY=${BASE_DISTFILE}
+WRKSRC=${WRKDIR}/${BASE_DISTNAME}
+.elif ${DIST}=="bad"
+EXTRACT_ONLY=${BAD_DISTFILE}
+WRKSRC=${WRKDIR}/${BAD_DISTNAME}
+.elif ${DIST}=="ugly"
+EXTRACT_ONLY=${UGLY_DISTFILE}
+WRKSRC=${WRKDIR}/${UGLY_DISTNAME}
+.else
+EXTRACT_ONLY=${GOOD_DISTFILE}
+WRKSRC=${WRKDIR}/${GOOD_DISTNAME}
.endif
-LIB_DEPENDS+= gstplay-${VERSION}.${SHLIB_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
-
-PLIST_FILES+= '@exec %D/bin/gst-register-${VERSION} --gst-registry=%D/share/gnome/cache/gstreamer-${VERSION}/registry.xml 2>/dev/null || true'
-PLIST_FILES+= '@unexec %D/bin/gst-register-${VERSION} --gst-registry=%D/share/gnome/cache/gstreamer-${VERSION}/registry.xml 2>/dev/null || true'
+BUILD_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
+RUN_DEPENDS+= gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
+.if !target(do-build)
do-build:
-.if ${GST_PLUGIN} == "gconf"
- @cd ${WRKSRC}/pkgconfig && ../config.status &
-.endif
.for dir in ${GST_PREBUILD_DIR} ${GST_PLUGIN_DIR} ${GST_POSTBUILD_DIR}
@cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
.endfor
+.endif
+.if !target(do-install)
do-install:
.for dir in ${GST_PLUGIN_DIR}
@cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
.endfor
-.if ${GST_PLUGIN} == "gconf"
- @cd ${WRKSRC}/pkgconfig && ${GMAKE} gstreamer-gconf-0.8.pc
- @${INSTALL_SCRIPT} ${WRKSRC}/pkgconfig/gstreamer-gconf-0.8.pc \
- ${PREFIX}/libdata/pkgconfig/gstreamer-gconf-0.8.pc
.endif
-
.endif
diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo
index 43d75a7a6117..c68496ac3c46 100644
--- a/multimedia/gstreamer-plugins/distinfo
+++ b/multimedia/gstreamer-plugins/distinfo
@@ -1,3 +1,12 @@
-MD5 (gnome2/gst-plugins-0.8.11.tar.bz2) = ea787eeed3761ff03cb60ecebebe1c30
-SHA256 (gnome2/gst-plugins-0.8.11.tar.bz2) = 0e48eef1d3bfa2263c1047f9f84622a4e16e33d963252cb8153ff1b340c4ba90
-SIZE (gnome2/gst-plugins-0.8.11.tar.bz2) = 2439654
+MD5 (gnome2/gst-plugins-base-0.10.6.tar.bz2) = d8069d1026896d1379072b520de20ebc
+SHA256 (gnome2/gst-plugins-base-0.10.6.tar.bz2) = 0ef1b8cbe6d7e898d0636342479de46a780f720033c1b4f7217c903aac6d80ad
+SIZE (gnome2/gst-plugins-base-0.10.6.tar.bz2) = 1195072
+MD5 (gnome2/gst-plugins-bad-0.10.1.tar.bz2) = 398729b82b911eebb14156c2fa02525b
+SHA256 (gnome2/gst-plugins-bad-0.10.1.tar.bz2) = 05d83a609aaea44ea8c979897f336cb8b5537a39b271af2831e6cca3851d3007
+SIZE (gnome2/gst-plugins-bad-0.10.1.tar.bz2) = 652144
+MD5 (gnome2/gst-plugins-good-0.10.2.tar.bz2) = 03d3d0b5f19014fe0065234a3ea65ee6
+SHA256 (gnome2/gst-plugins-good-0.10.2.tar.bz2) = dd92993d08930cca071893b5d3f5cb40a4498f3ddaf12da98c0bbe8c27605e81
+SIZE (gnome2/gst-plugins-good-0.10.2.tar.bz2) = 963026
+MD5 (gnome2/gst-plugins-ugly-0.10.3.tar.bz2) = af6f238507b0040bf84fcbc6a241e559
+SHA256 (gnome2/gst-plugins-ugly-0.10.3.tar.bz2) = 0cd916b3f0c8867cea77243d20d8d56ed45b7ef5ec5c5dd1603860ece8e88a10
+SIZE (gnome2/gst-plugins-ugly-0.10.3.tar.bz2) = 605833
diff --git a/multimedia/gstreamer-plugins/files/bsdi_dvd.h b/multimedia/gstreamer-plugins/files/bsdi_dvd.h
deleted file mode 100644
index ff61ebd252f6..000000000000
--- a/multimedia/gstreamer-plugins/files/bsdi_dvd.h
+++ /dev/null
@@ -1,340 +0,0 @@
-#ifndef _DVD_H_
-#define _DVD_H_
-
-#include <sys/cdefs.h>
-#include <machine/endian.h>
-#include <sys/ioctl.h>
-
-__BEGIN_DECLS
-int dvd_cdrom_ioctl(int, unsigned long, void *);
-int cdrom_blocksize(int, int);
-void dvd_cdrom_debug(int);
-__END_DECLS
-
-#define ioctl(a,b,c) dvd_cdrom_ioctl((a),(b),(c))
-
-typedef unsigned char __u8;
-typedef unsigned short __u16;
-typedef unsigned int __u32;
-
-#define DVD_READ_STRUCT 0x5390 /* Read structure */
-#define DVD_WRITE_STRUCT 0x5391 /* Write structure */
-#define DVD_AUTH 0x5392 /* Authentication */
-
-#define DVD_STRUCT_PHYSICAL 0x00
-#define DVD_STRUCT_COPYRIGHT 0x01
-#define DVD_STRUCT_DISCKEY 0x02
-#define DVD_STRUCT_BCA 0x03
-#define DVD_STRUCT_MANUFACT 0x04
-
-struct dvd_layer {
- __u8 book_version : 4;
- __u8 book_type : 4;
- __u8 min_rate : 4;
- __u8 disc_size : 4;
- __u8 layer_type : 4;
- __u8 track_path : 1;
- __u8 nlayers : 2;
- __u8 track_density : 4;
- __u8 linear_density : 4;
- __u8 bca : 1;
- __u32 start_sector;
- __u32 end_sector;
- __u32 end_sector_l0;
-};
-
-struct dvd_physical {
- __u8 type;
- __u8 layer_num;
- struct dvd_layer layer[4];
-};
-
-struct dvd_copyright {
- __u8 type;
-
- __u8 layer_num;
- __u8 cpst;
- __u8 rmi;
-};
-
-struct dvd_disckey {
- __u8 type;
-
- unsigned agid : 2;
- __u8 value[2048];
-};
-
-struct dvd_bca {
- __u8 type;
-
- int len;
- __u8 value[188];
-};
-
-struct dvd_manufact {
- __u8 type;
-
- __u8 layer_num;
- int len;
- __u8 value[2048];
-};
-
-typedef union {
- __u8 type;
-
- struct dvd_physical physical;
- struct dvd_copyright copyright;
- struct dvd_disckey disckey;
- struct dvd_bca bca;
- struct dvd_manufact manufact;
-} dvd_struct;
-
-/*
- * DVD authentication ioctl
- */
-
-/* Authentication states */
-#define DVD_LU_SEND_AGID 0
-#define DVD_HOST_SEND_CHALLENGE 1
-#define DVD_LU_SEND_KEY1 2
-#define DVD_LU_SEND_CHALLENGE 3
-#define DVD_HOST_SEND_KEY2 4
-
-/* Termination states */
-#define DVD_AUTH_ESTABLISHED 5
-#define DVD_AUTH_FAILURE 6
-
-/* Other functions */
-#define DVD_LU_SEND_TITLE_KEY 7
-#define DVD_LU_SEND_ASF 8
-#define DVD_INVALIDATE_AGID 9
-#define DVD_LU_SEND_RPC_STATE 10
-#define DVD_HOST_SEND_RPC_STATE 11
-
-/* State data */
-typedef __u8 dvd_key[5]; /* 40-bit value, MSB is first elem. */
-typedef __u8 dvd_challenge[10]; /* 80-bit value, MSB is first elem. */
-
-struct dvd_lu_send_agid {
- __u8 type;
- unsigned agid : 2;
-};
-
-struct dvd_host_send_challenge {
- __u8 type;
- unsigned agid : 2;
-
- dvd_challenge chal;
-};
-
-struct dvd_send_key {
- __u8 type;
- unsigned agid : 2;
-
- dvd_key key;
-};
-
-struct dvd_lu_send_challenge {
- __u8 type;
- unsigned agid : 2;
-
- dvd_challenge chal;
-};
-
-#define DVD_CPM_NO_COPYRIGHT 0
-#define DVD_CPM_COPYRIGHTED 1
-
-#define DVD_CP_SEC_NONE 0
-#define DVD_CP_SEC_EXIST 1
-
-#define DVD_CGMS_UNRESTRICTED 0
-#define DVD_CGMS_SINGLE 2
-#define DVD_CGMS_RESTRICTED 3
-
-struct dvd_lu_send_title_key {
- __u8 type;
- unsigned agid : 2;
-
- dvd_key title_key;
- int lba;
- unsigned cpm : 1;
- unsigned cp_sec : 1;
- unsigned cgms : 2;
-};
-
-struct dvd_lu_send_asf {
- __u8 type;
- unsigned agid : 2;
-
- unsigned asf : 1;
-};
-
-struct dvd_host_send_rpcstate {
- __u8 type;
- __u8 pdrc;
-};
-
-struct dvd_lu_send_rpcstate {
- __u8 type : 2;
- __u8 vra : 3;
- __u8 ucca : 3;
- __u8 region_mask;
- __u8 rpc_scheme;
-};
-
-typedef union {
- __u8 type;
-
- struct dvd_lu_send_agid lsa;
- struct dvd_host_send_challenge hsc;
- struct dvd_send_key lsk;
- struct dvd_lu_send_challenge lsc;
- struct dvd_send_key hsk;
- struct dvd_lu_send_title_key lstk;
- struct dvd_lu_send_asf lsasf;
- struct dvd_host_send_rpcstate hrpcs;
- struct dvd_lu_send_rpcstate lrpcs;
-} dvd_authinfo;
-
-
-typedef struct {
- __u16 report_key_length;
- __u8 reserved1;
- __u8 reserved2;
-#if BYTE_ORDER == BIG_ENDIAN
- __u8 type_code : 2;
- __u8 vra : 3;
- __u8 ucca : 3;
-#elif BYTE_ORDER == LITTLE_ENDIAN
- __u8 ucca : 3;
- __u8 vra : 3;
- __u8 type_code : 2;
-#endif
- __u8 region_mask;
- __u8 rpc_scheme;
- __u8 reserved3;
-} rpc_state_t;
-
-/*
- * Stuff for the CDROM ioctls
-*/
-
-#define CDROMREADTOCHDR 0x5305 /* Read TOC header (cdrom_tochdr) */
-#define CDROMREADTOCENTRY 0x5306 /* Read TOC entry (cdrom_tocentry) */
-#define CDROMEJECT 0x5309 /* Ejects the cdrom media */
-#define CDROMCLOSETRAY 0x5319 /* Reverse of CDROMEJECT */
-#define CDROM_DRIVE_STATUS 0x5326 /* Get tray position, etc. */
-#define CDROM_DISC_STATUS 0x5327 /* Get disc type, etc. */
-#define CDROMREADMODE2 0x530c /* Read CDROM mode 2 data (2336 Bytes) */
-#define CDROMREADMODE1 0x530d /* Read CDROM mode 1 data (2048 Bytes) */
-#define CDROMREADRAW 0x5314 /* read data in raw mode (2352 bytes) */
-
-#define CD_MINS 74 /* max. minutes per CD, not really a limit */
-#define CD_SECS 60 /* seconds per minute */
-#define CD_FRAMES 75 /* frames per second */
-#define CD_MSF_OFFSET 150 /* MSF numbering offset of first frame */
-
-#define CD_HEAD_SIZE 4 /* header (address) bytes per raw data frame */
-#define CD_SYNC_SIZE 12 /* 12 sync bytes per raw data frame */
-#define CD_FRAMESIZE 2048 /* bytes per frame, "cooked" mode */
-#define CD_FRAMESIZE_RAW 2352 /* bytes per frame, "raw" mode */
-#define CD_FRAMESIZE_RAW0 (CD_FRAMESIZE_RAW-CD_SYNC_SIZE-CD_HEAD_SIZE) /*2336*/
-#define CD_FRAMESIZE_RAW1 (CD_FRAMESIZE_RAW-CD_SYNC_SIZE) /*2340*/
-
-/* CD-ROM address types (cdrom_tocentry.cdte_format) */
-#define CDROM_LBA 0x01 /* logical block: first frame is #0 */
-#define CDROM_MSF 0x02 /* minute-second-frame: binary. not bcd here!*/
-
-/* bit to tell whether track is data or audio (cdrom_tocentry.cdte_ctrl) */
-#define CDROM_DATA_TRACK 0x04
-
-/* The leadout track is always 0xAA, regardless of # of tracks on disc */
-#define CDROM_LEADOUT 0xAA
-
-/* drive status returned by CDROM_DRIVE_STATUS ioctl */
-#define CDS_NO_INFO 0 /* if not implemented */
-#define CDS_NO_DISC 1
-#define CDS_TRAY_OPEN 2
-#define CDS_DRIVE_NOT_READY 3
-#define CDS_DISC_OK 4
-
-/*
- * Return values for CDROM_DISC_STATUS ioctl.
- * Can also return CDS_NO_INFO and CDS_NO_DISC from above
-*/
-#define CDS_AUDIO 100
-#define CDS_DATA_1 101
-#define CDS_DATA_2 102
-#define CDS_XA_2_1 103
-#define CDS_XA_2_2 104
-#define CDS_MIXED 105
-
-/* For compile compatibility only - we don't support changers */
-#define CDSL_NONE ((int) (~0U>>1)-1)
-#define CDSL_CURRENT ((int) (~0U>>1))
-
-struct cdrom_msf
-{
- __u8 cdmsf_min0; /* start minute */
- __u8 cdmsf_sec0; /* start second */
- __u8 cdmsf_frame0; /* start frame */
- __u8 cdmsf_min1; /* end minute */
- __u8 cdmsf_sec1; /* end second */
- __u8 cdmsf_frame1; /* end frame */
-};
-
-struct cdrom_tochdr
- {
- __u8 cdth_trk0; /* start track */
- __u8 cdth_trk1; /* end track */
- };
-
-struct cdrom_msf0
-{
- __u8 minute;
- __u8 second;
- __u8 frame;
-};
-
-union cdrom_addr
-{
- struct cdrom_msf0 msf;
- int lba;
-};
-
-struct cdrom_tocentry
-{
- __u8 cdte_track;
- __u8 cdte_adr :4;
- __u8 cdte_ctrl :4;
- __u8 cdte_format;
- union cdrom_addr cdte_addr;
- __u8 cdte_datamode;
-};
-
-struct modesel_head
-{
- __u8 reserved1;
- __u8 medium;
- __u8 reserved2;
- __u8 block_desc_length;
- __u8 density;
- __u8 number_of_blocks_hi;
- __u8 number_of_blocks_med;
- __u8 number_of_blocks_lo;
- __u8 reserved3;
- __u8 block_length_hi;
- __u8 block_length_med;
- __u8 block_length_lo;
-};
-
-typedef struct
-{
- int data;
- int audio;
- int cdi;
- int xa;
- int error;
-} tracktype;
-
-#endif /* _DVD_H_ */
diff --git a/multimedia/gstreamer-plugins/files/patch-configure b/multimedia/gstreamer-plugins/files/patch-configure
deleted file mode 100644
index 92b1deb51a64..000000000000
--- a/multimedia/gstreamer-plugins/files/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig Wed Jun 23 21:30:24 2004
-+++ configure Wed Jun 23 21:30:25 2004
-@@ -46068,7 +46068,8 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-laudio $X_LIBS $LIBS"
-+#xxx fix the non x case is er niet...
-+LIBS="-laudio -lm -lXt $X_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
diff --git a/multimedia/gstreamer-plugins/files/patch-ext::ivorbis::vorbisenc.h b/multimedia/gstreamer-plugins/files/patch-ext::ivorbis::vorbisenc.h
deleted file mode 100644
index 90d39a1a29b2..000000000000
--- a/multimedia/gstreamer-plugins/files/patch-ext::ivorbis::vorbisenc.h
+++ /dev/null
@@ -1,103 +0,0 @@
---- /dev/null Thu Feb 12 22:22:00 2004
-+++ ext/ivorbis/vorbisenc.h Thu Feb 12 22:24:08 2004
-@@ -0,0 +1,100 @@
-+/* GStreamer
-+ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Library General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Library General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Library General Public
-+ * License along with this library; if not, write to the
-+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ * Boston, MA 02111-1307, USA.
-+ */
-+
-+
-+#ifndef __VORBISENC_H__
-+#define __VORBISENC_H__
-+
-+
-+#include <gst/gst.h>
-+
-+#include <tremor/ivorbiscodec.h>
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-+
-+#define GST_TYPE_VORBISENC \
-+ (vorbisenc_get_type())
-+#define GST_VORBISENC(obj) \
-+ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VORBISENC,VorbisEnc))
-+#define GST_VORBISENC_CLASS(klass) \
-+ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VORBISENC,VorbisEncClass))
-+#define GST_IS_VORBISENC(obj) \
-+ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VORBISENC))
-+#define GST_IS_VORBISENC_CLASS(obj) \
-+ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VORBISENC))
-+
-+typedef struct _VorbisEnc VorbisEnc;
-+typedef struct _VorbisEncClass VorbisEncClass;
-+
-+struct _VorbisEnc {
-+ GstElement element;
-+
-+ GstPad *sinkpad,
-+ *srcpad;
-+
-+ ogg_stream_state os; /* take physical pages, weld into a logical
-+ stream of packets */
-+ ogg_page og; /* one Ogg bitstream page. Vorbis packets are inside */
-+ ogg_packet op; /* one raw packet of data for decode */
-+
-+ vorbis_info vi; /* struct that stores all the static vorbis bitstream
-+ settings */
-+ vorbis_comment vc; /* struct that stores all the user comments */
-+
-+ vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */
-+ vorbis_block vb; /* local working space for packet->PCM decode */
-+
-+ gboolean eos;
-+
-+ gboolean managed;
-+ gint bitrate;
-+ gint min_bitrate;
-+ gint max_bitrate;
-+ gfloat quality;
-+ gboolean quality_set;
-+ gint serial;
-+
-+ gint channels;
-+ gint frequency;
-+
-+ guint64 samples_in;
-+ guint64 bytes_out;
-+
-+ GstCaps *metadata;
-+
-+ gboolean setup;
-+ gboolean flush_header;
-+ gchar *last_message;
-+};
-+
-+struct _VorbisEncClass {
-+ GstElementClass parent_class;
-+};
-+
-+GType vorbisenc_get_type(void);
-+
-+
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
-+
-+
-+#endif /* __VORBISENC_H__ */
diff --git a/multimedia/gstreamer-plugins/files/patch-ext_cdparanoia_gstcdparanoia.c b/multimedia/gstreamer-plugins/files/patch-ext_cdparanoia_gstcdparanoia.c
deleted file mode 100644
index f3eb910fd77b..000000000000
--- a/multimedia/gstreamer-plugins/files/patch-ext_cdparanoia_gstcdparanoia.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- ext/cdparanoia/gstcdparanoia.c.orig Mon Aug 29 13:50:49 2005
-+++ ext/cdparanoia/gstcdparanoia.c Thu Sep 1 15:30:11 2005
-@@ -562,6 +562,7 @@
- gint16 *cdda_buf;
- gint64 timestamp;
- GstFormat format;
-+ GstEvent *discont_ev;
-
- /* convert the sequence sector number to a timestamp */
- format = GST_FORMAT_TIME;
-@@ -572,7 +573,6 @@
-
- if (!src->discont_sent && (is_track_switch (src, src->cur_sector) ||
- (src->prev_sec != src->cur_sector))) {
-- GstEvent *discont_ev;
-
- if (src->cur_track == src->d->tracks) {
- GST_DEBUG_OBJECT (src, "End of CD");
-@@ -815,9 +815,15 @@
-
- /* open the disc */
- if (cdda_open (src->d)) {
-+#if defined(__FreeBSD__)
-+ GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ,
-+ (_("Could not open CD device %s for reading."),
-+ src->d->dev->device_path), ("cdda_open failed"));
-+#else
- GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ,
- (_("Could not open CD device %s for reading."),
- src->d->cdda_device_name), ("cdda_open failed"));
-+#endif
- cdda_close (src->d);
- src->d = NULL;
- return FALSE;
diff --git a/multimedia/gstreamer-plugins/files/patch-ext_libcaca_Makefile.in b/multimedia/gstreamer-plugins/files/patch-ext_libcaca_Makefile.in
deleted file mode 100644
index 0ee53a92ecd6..000000000000
--- a/multimedia/gstreamer-plugins/files/patch-ext_libcaca_Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- ext/libcaca/Makefile.in.orig Mon Oct 4 00:07:18 2004
-+++ ext/libcaca/Makefile.in Mon Oct 4 00:07:59 2004
-@@ -76,8 +76,7 @@
- pluginLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(plugin_LTLIBRARIES)
- am__DEPENDENCIES_1 =
--libgstcacasink_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-- $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la
-+libgstcacasink_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am_libgstcacasink_la_OBJECTS = libgstcacasink_la-gstcacasink.lo
- libgstcacasink_la_OBJECTS = $(am_libgstcacasink_la_OBJECTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-@@ -616,9 +615,7 @@
- plugin_LTLIBRARIES = libgstcacasink.la
- libgstcacasink_la_SOURCES = gstcacasink.c
- libgstcacasink_la_CFLAGS = $(GST_CFLAGS) $(LIBCACA_CFLAGS)
--libgstcacasink_la_LIBADD = $(LIBCACA_LIBS) \
-- $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la
--
-+libgstcacasink_la_LIBADD = $(LIBCACA_LIBS) -lgstinterfaces-%%VERSION%%
- libgstcacasink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
- noinst_HEADERS = gstcacasink.h
- all: all-am
diff --git a/multimedia/gstreamer-plugins/files/patch-ext_mpeg2enc_gstmpeg2encoptions.cc b/multimedia/gstreamer-plugins/files/patch-ext_mpeg2enc_gstmpeg2encoptions.cc
deleted file mode 100644
index aabbc2971c4d..000000000000
--- a/multimedia/gstreamer-plugins/files/patch-ext_mpeg2enc_gstmpeg2encoptions.cc
+++ /dev/null
@@ -1,26 +0,0 @@
---- ext/mpeg2enc/gstmpeg2encoptions.cc.orig Mon Jul 5 19:54:18 2004
-+++ ext/mpeg2enc/gstmpeg2encoptions.cc Mon Jul 5 20:05:37 2004
-@@ -267,11 +267,23 @@
- * Class init stuff.
- */
-
-+#if !defined(_SC_NPROCESSORS_ONLN) && defined(__FreeBSD__)
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#endif
-+
- GstMpeg2EncOptions::GstMpeg2EncOptions ():
- MPEG2EncOptions ()
- {
- /* autodetect number of CPUs */
-+#if !defined(_SC_NPROCESSORS_ONLN) && defined(__FreeBSD__)
-+ /* We need to use a sysctl to get the number of CPUs. */
-+ size_t len = sizeof (num_cpus);
-+
-+ sysctlbyname ("hw.ncpu", &num_cpus, &len, NULL, 0);
-+#else
- num_cpus = sysconf (_SC_NPROCESSORS_ONLN);
-+#endif
- if (num_cpus < 0)
- num_cpus = 1;
- if (num_cpus > 32)
diff --git a/multimedia/gstreamer-plugins/files/patch-ext_sdl_Makefile.in b/multimedia/gstreamer-plugins/files/patch-ext_sdl_Makefile.in
deleted file mode 100644
index c943042ad72a..000000000000
--- a/multimedia/gstreamer-plugins/files/patch-ext_sdl_Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- ext/sdl/Makefile.in.orig Mon Oct 4 00:56:57 2004
-+++ ext/sdl/Makefile.in Mon Oct 4 00:57:47 2004
-@@ -76,8 +76,7 @@
- pluginLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(plugin_LTLIBRARIES)
- am__DEPENDENCIES_1 =
--libgstsdlvideosink_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-- $(top_builddir)/gst-libs/gst/libgstinterfaces-@GST_MAJORMINOR@.la
-+libgstsdlvideosink_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am_libgstsdlvideosink_la_OBJECTS = \
- libgstsdlvideosink_la-sdlvideosink.lo
- libgstsdlvideosink_la_OBJECTS = $(am_libgstsdlvideosink_la_OBJECTS)
-@@ -617,9 +616,7 @@
- plugin_LTLIBRARIES = libgstsdlvideosink.la
- libgstsdlvideosink_la_SOURCES = sdlvideosink.c
- libgstsdlvideosink_la_CFLAGS = $(GST_CFLAGS) $(SDL_CFLAGS)
--libgstsdlvideosink_la_LIBADD = $(SDL_LIBS) \
-- $(top_builddir)/gst-libs/gst/libgstinterfaces-@GST_MAJORMINOR@.la
--
-+libgstsdlvideosink_la_LIBADD = $(SDL_LIBS) -lgstinterfaces-%%VERSION%%
- libgstsdlvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
- noinst_HEADERS = sdlvideosink.h
- all: all-am
diff --git a/multimedia/gstreamer-plugins/files/patch-gcc295 b/multimedia/gstreamer-plugins/files/patch-gcc295
deleted file mode 100644
index a7a8491067c8..000000000000
--- a/multimedia/gstreamer-plugins/files/patch-gcc295
+++ /dev/null
@@ -1,77 +0,0 @@
---- ext/polyp/polypsink.c.orig Sat Sep 10 19:39:39 2005
-+++ ext/polyp/polypsink.c Sat Sep 10 19:40:17 2005
-@@ -48,18 +48,6 @@
- "width = (int) 16, "
- "depth = (int) 16, "
- "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 16 ]"
--#if 0
-- ";audio/x-raw-float, "
-- "endianness = (int) { LITTLE_ENDIAN, BIG_ENDIAN }, "
-- "width = (int) 32, "
-- "rate = (int) [ 1, MAX ], "
-- "channels = (int) [ 1, 16 ];"
-- "audio/x-raw-int, "
-- "signed = (boolean) FALSE, "
-- "width = (int) 8, "
-- "depth = (int) 8, "
-- "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 16 ]"
--#endif
- )
- );
-
---- ext/pango/gsttextrender.c.orig Sat Sep 10 19:41:24 2005
-+++ ext/pango/gsttextrender.c Sat Sep 10 19:41:58 2005
-@@ -251,6 +251,7 @@
- GstTextRender *overlay = GST_TEXT_RENDER (gst_pad_get_parent (pad));
- guint size = GST_BUFFER_SIZE (buf);
- guint8 *data = GST_BUFFER_DATA (buf);
-+ gint n;
-
- /* somehow pango barfs over "\0" buffers... */
- while (size > 0 &&
-@@ -274,7 +275,6 @@
- gst_buffer_stamp (out, GST_BUFFER (buf));
- // gst_buffer_stamp (out, buf);
- data = GST_BUFFER_DATA (out);
-- gint n;
-
- for (n = 0; n < overlay->width * overlay->height; n++) {
- data[n * 4] = 0;
---- ext/ogg/gstoggparse.c.orig Sat Sep 10 19:43:13 2005
-+++ ext/ogg/gstoggparse.c Sat Sep 10 19:44:04 2005
-@@ -365,6 +365,7 @@
- guint32 serialno;
- GstBuffer *pagebuffer;
- GstClockTime buffertimestamp = GST_BUFFER_TIMESTAMP (buffer);
-+ page_type type;
-
- ogg = GST_OGG_PARSE (GST_OBJECT_PARENT (pad));
-
-@@ -464,7 +465,7 @@
-
- ogg->last_page_not_bos = TRUE;
-
-- page_type type = gst_ogg_parse_is_header (ogg, stream, &page);
-+ type = gst_ogg_parse_is_header (ogg, stream, &page);
-
- if (type == PAGE_PENDING && ogg->in_headers) {
- gst_buffer_ref (pagebuffer);
---- ext/gnomevfs/gstgnomevfssrc.c.orig Sat Sep 10 19:44:44 2005
-+++ ext/gnomevfs/gstgnomevfssrc.c Sat Sep 10 19:45:15 2005
-@@ -1114,6 +1114,7 @@
- GstBuffer *buf;
- GnomeVFSFileSize readbytes;
- guint8 *data;
-+ GstEvent *event;
-
- g_return_val_if_fail (pad != NULL, NULL);
- src = GST_GNOMEVFSSRC (gst_pad_get_parent (pad));
-@@ -1132,7 +1133,7 @@
- /* deal with tag list */
- if (src->icy_taglist) {
- gst_element_found_tags (GST_ELEMENT (src), src->icy_taglist);
-- GstEvent *event = gst_event_new_tag (src->icy_taglist);
-+ event = gst_event_new_tag (src->icy_taglist);
-
- gst_object_ref (GST_OBJECT (src));
- event->src = GST_OBJECT (src);
diff --git a/multimedia/gstreamer-plugins/files/patch-gst_ffmpegcolorspace_Makefile.in b/multimedia/gstreamer-plugins/files/patch-gst_ffmpegcolorspace_Makefile.in
deleted file mode 100644
index fb2afdfb0ef3..000000000000
--- a/multimedia/gstreamer-plugins/files/patch-gst_ffmpegcolorspace_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gst/ffmpegcolorspace/Makefile.in.orig Wed Mar 9 01:40:27 2005
-+++ gst/ffmpegcolorspace/Makefile.in Wed Mar 9 01:41:10 2005
-@@ -360,7 +360,7 @@
- LAME_LIBS = @LAME_LIBS@
- LCS_CFLAGS = @LCS_CFLAGS@
- LCS_LIBS = @LCS_LIBS@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -Wl,-Bsymbolic -lc
- LIBCACA_CFLAGS = @LIBCACA_CFLAGS@
- LIBCACA_CONFIG = @LIBCACA_CONFIG@
- LIBCACA_LIBS = @LIBCACA_LIBS@
diff --git a/multimedia/gstreamer-plugins/files/patch-gst_librfb_gstrfbsrc.c b/multimedia/gstreamer-plugins/files/patch-gst_librfb_gstrfbsrc.c
deleted file mode 100644
index e83f136502cf..000000000000
--- a/multimedia/gstreamer-plugins/files/patch-gst_librfb_gstrfbsrc.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gst/librfb/gstrfbsrc.c.orig Fri Jun 3 06:06:43 2005
-+++ gst/librfb/gstrfbsrc.c Fri Jun 3 06:08:21 2005
-@@ -28,6 +28,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <sys/time.h>
-
- #include <librfb/rfb.h>
-
diff --git a/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h b/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h
deleted file mode 100644
index daaefac5eb5d..000000000000
--- a/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h
+++ /dev/null
@@ -1,72 +0,0 @@
---- sys/cdrom/gstcdplayer_ioctl_bsd.h.orig Mon Mar 1 06:52:03 2004
-+++ sys/cdrom/gstcdplayer_ioctl_bsd.h Tue Mar 9 16:05:36 2004
-@@ -142,6 +142,7 @@
- {
- struct ioc_toc_header toc_header;
- struct ioc_read_toc_entry toc_entry;
-+ struct cd_toc_entry toc_entry_data;
- guint i;
-
- cd->fd = open(device,O_RDONLY | O_NONBLOCK);
-@@ -151,7 +152,7 @@
- }
-
- /* get the toc header information */
-- if (ioctl(cd->fd,CDIOREADTOCHDR,&toc_header) != 0) {
-+ if (ioctl(cd->fd,CDIOREADTOCHEADER,&toc_header) != 0) {
- close(cd->fd);
- cd->fd = -1;
- return FALSE;
-@@ -161,6 +162,8 @@
- for (i = 1; i <= toc_header.ending_track; i++) {
- toc_entry.address_format = CD_MSF_FORMAT;
- toc_entry.starting_track = i;
-+ toc_entry.data = &toc_entry_data;
-+ toc_entry.data_len = sizeof(toc_entry_data);
-
- if (ioctl(cd->fd,CDIOREADTOCENTRYS,&toc_entry) != 0) {
- close(cd->fd);
-@@ -168,9 +171,9 @@
- return FALSE;
- }
-
-- cd->tracks[i].minute = toc_entry.entry.addr.msf.minute;
-- cd->tracks[i].second = toc_entry.entry.addr.msf.second;
-- cd->tracks[i].frame = toc_entry.entry.addr.msf.frame;
-+ cd->tracks[i].minute = toc_entry.data->addr.msf.minute;
-+ cd->tracks[i].second = toc_entry.data->addr.msf.second;
-+ cd->tracks[i].frame = toc_entry.data->addr.msf.frame;
- cd->tracks[i].data_track = (toc_entry.data->control & 4) == 4;
- }
-
-@@ -186,9 +189,9 @@
- return FALSE;
- }
-
-- cd->tracks[LEADOUT].minute = toc_entry.entry.addr.msf.minute;
-- cd->tracks[LEADOUT].second = toc_entry.entry.addr.msf.second;
-- cd->tracks[LEADOUT].frame = toc_entry.entry.addr.msf.frame;
-+ cd->tracks[LEADOUT].minute = toc_entry.data->addr.msf.minute;
-+ cd->tracks[LEADOUT].second = toc_entry.data->addr.msf.second;
-+ cd->tracks[LEADOUT].frame = toc_entry.data->addr.msf.frame;
-
- cd->num_tracks = toc_header.ending_track;
-
-@@ -224,6 +227,8 @@
- return FALSE;
- }
-
-+ /* lets return TRUE and lets see what happes (may not be correct)*/
-+ return TRUE;
- }
-
- gboolean cd_pause(struct cd *cd)
-@@ -321,7 +326,7 @@
- return -1;
- }
-
--#ifdef __NetBSD__
-+#if defined(__NetBSD__) || defined(__FreeBSD__)
- return sub_channel.data->what.track_info.track_number;
- #else
- return sub_channel.data->track_number;
diff --git a/multimedia/gstreamer-plugins/files/patch-sys_oss_gstosselement.h b/multimedia/gstreamer-plugins/files/patch-sys_oss_gstosselement.h
deleted file mode 100644
index 30258ba113c1..000000000000
--- a/multimedia/gstreamer-plugins/files/patch-sys_oss_gstosselement.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- sys/oss/gstosselement.h.orig Tue Mar 9 16:46:05 2004
-+++ sys/oss/gstosselement.h Tue Mar 9 16:46:14 2004
-@@ -23,6 +23,7 @@
- #ifndef __GST_OSS_ELEMENT_H__
- #define __GST_OSS_ELEMENT_H__
-
-+#include <sys/types.h>
- #include <gst/gst.h>
-
- /* debugging category */
diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist
index cf5b6c64da04..f4720a089850 100644
--- a/multimedia/gstreamer-plugins/pkg-plist
+++ b/multimedia/gstreamer-plugins/pkg-plist
@@ -1,316 +1,73 @@
-bin/gst-launch-ext-%%VERSION%%
bin/gst-visualise-%%VERSION%%
include/gstreamer-%%VERSION%%/gst/audio/audio.h
-include/gstreamer-%%VERSION%%/gst/audio/audioclock.h
+include/gstreamer-%%VERSION%%/gst/audio/gstaudioclock.h
+include/gstreamer-%%VERSION%%/gst/audio/gstaudiofilter.h
+include/gstreamer-%%VERSION%%/gst/audio/gstaudiosink.h
+include/gstreamer-%%VERSION%%/gst/audio/gstaudiosrc.h
+include/gstreamer-%%VERSION%%/gst/audio/gstbaseaudiosink.h
+include/gstreamer-%%VERSION%%/gst/audio/gstbaseaudiosrc.h
+include/gstreamer-%%VERSION%%/gst/audio/gstringbuffer.h
+include/gstreamer-%%VERSION%%/gst/audio/mixerutils.h
include/gstreamer-%%VERSION%%/gst/audio/multichannel-enumtypes.h
include/gstreamer-%%VERSION%%/gst/audio/multichannel.h
-include/gstreamer-%%VERSION%%/gst/audio/gstaudiofilter.h
-include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalance-enumtypes.h
-include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalance.h
-include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalancechannel.h
+include/gstreamer-%%VERSION%%/gst/cdda/gstcddabasesrc.h
include/gstreamer-%%VERSION%%/gst/floatcast/floatcast.h
-include/gstreamer-%%VERSION%%/gst/idct/idct.h
-include/gstreamer-%%VERSION%%/gst/media-info/media-info.h
-include/gstreamer-%%VERSION%%/gst/mixer/mixer-enumtypes.h
-include/gstreamer-%%VERSION%%/gst/mixer/mixer.h
-include/gstreamer-%%VERSION%%/gst/mixer/mixeroptions.h
-include/gstreamer-%%VERSION%%/gst/mixer/mixertrack.h
-include/gstreamer-%%VERSION%%/gst/navigation/navigation.h
-include/gstreamer-%%VERSION%%/gst/play/play-enumtypes.h
-include/gstreamer-%%VERSION%%/gst/play/play.h
-include/gstreamer-%%VERSION%%/gst/propertyprobe/propertyprobe.h
-include/gstreamer-%%VERSION%%/gst/resample/resample.h
+include/gstreamer-%%VERSION%%/gst/interfaces/colorbalance.h
+include/gstreamer-%%VERSION%%/gst/interfaces/colorbalancechannel.h
+include/gstreamer-%%VERSION%%/gst/interfaces/interfaces-enumtypes.h
+include/gstreamer-%%VERSION%%/gst/interfaces/mixer.h
+include/gstreamer-%%VERSION%%/gst/interfaces/mixeroptions.h
+include/gstreamer-%%VERSION%%/gst/interfaces/mixertrack.h
+include/gstreamer-%%VERSION%%/gst/interfaces/navigation.h
+include/gstreamer-%%VERSION%%/gst/interfaces/propertyprobe.h
+include/gstreamer-%%VERSION%%/gst/interfaces/tuner.h
+include/gstreamer-%%VERSION%%/gst/interfaces/tunerchannel.h
+include/gstreamer-%%VERSION%%/gst/interfaces/tunernorm.h
+include/gstreamer-%%VERSION%%/gst/interfaces/xoverlay.h
+include/gstreamer-%%VERSION%%/gst/netbuffer/gstnetbuffer.h
include/gstreamer-%%VERSION%%/gst/riff/riff-ids.h
include/gstreamer-%%VERSION%%/gst/riff/riff-media.h
include/gstreamer-%%VERSION%%/gst/riff/riff-read.h
+include/gstreamer-%%VERSION%%/gst/rtp/gstbasertpdepayload.h
+include/gstreamer-%%VERSION%%/gst/rtp/gstbasertppayload.h
+include/gstreamer-%%VERSION%%/gst/rtp/gstrtpbuffer.h
include/gstreamer-%%VERSION%%/gst/tag/tag.h
-include/gstreamer-%%VERSION%%/gst/tuner/tuner-enumtypes.h
-include/gstreamer-%%VERSION%%/gst/tuner/tuner.h
-include/gstreamer-%%VERSION%%/gst/tuner/tunerchannel.h
-include/gstreamer-%%VERSION%%/gst/tuner/tunernorm.h
+include/gstreamer-%%VERSION%%/gst/video/gstvideofilter.h
+include/gstreamer-%%VERSION%%/gst/video/gstvideosink.h
include/gstreamer-%%VERSION%%/gst/video/video.h
-include/gstreamer-%%VERSION%%/gst/video/videosink.h
-include/gstreamer-%%VERSION%%/gst/xoverlay/xoverlay.h
-include/gstreamer-%%VERSION%%/gst/xwindowlistener/xwindowlistener.h
-lib/gstreamer-%%VERSION%%/libgstac3parse.a
-lib/gstreamer-%%VERSION%%/libgstac3parse.la
-lib/gstreamer-%%VERSION%%/libgstac3parse.so
lib/gstreamer-%%VERSION%%/libgstadder.a
lib/gstreamer-%%VERSION%%/libgstadder.la
lib/gstreamer-%%VERSION%%/libgstadder.so
-lib/gstreamer-%%VERSION%%/libgstalaw.a
-lib/gstreamer-%%VERSION%%/libgstalaw.la
-lib/gstreamer-%%VERSION%%/libgstalaw.so
-lib/gstreamer-%%VERSION%%/libgstalpha.a
-lib/gstreamer-%%VERSION%%/libgstalpha.la
-lib/gstreamer-%%VERSION%%/libgstalpha.so
-lib/gstreamer-%%VERSION%%/libgstalphacolor.a
-lib/gstreamer-%%VERSION%%/libgstalphacolor.la
-lib/gstreamer-%%VERSION%%/libgstalphacolor.so
-lib/gstreamer-%%VERSION%%/libgstapetag.a
-lib/gstreamer-%%VERSION%%/libgstapetag.la
-lib/gstreamer-%%VERSION%%/libgstapetag.so
-lib/gstreamer-%%VERSION%%/libgstasf.a
-lib/gstreamer-%%VERSION%%/libgstasf.la
-lib/gstreamer-%%VERSION%%/libgstasf.so
-lib/gstreamer-%%VERSION%%/libgstaudio.a
-lib/gstreamer-%%VERSION%%/libgstaudio.la
-lib/gstreamer-%%VERSION%%/libgstaudio.so
lib/gstreamer-%%VERSION%%/libgstaudioconvert.a
lib/gstreamer-%%VERSION%%/libgstaudioconvert.la
lib/gstreamer-%%VERSION%%/libgstaudioconvert.so
-lib/gstreamer-%%VERSION%%/libgstaudiofilter.a
-lib/gstreamer-%%VERSION%%/libgstaudiofilter.la
-lib/gstreamer-%%VERSION%%/libgstaudiofilter.so
lib/gstreamer-%%VERSION%%/libgstaudiorate.a
lib/gstreamer-%%VERSION%%/libgstaudiorate.la
lib/gstreamer-%%VERSION%%/libgstaudiorate.so
-lib/gstreamer-%%VERSION%%/libgstaudioscale.a
-lib/gstreamer-%%VERSION%%/libgstaudioscale.la
-lib/gstreamer-%%VERSION%%/libgstaudioscale.so
-lib/gstreamer-%%VERSION%%/libgstauparse.a
-lib/gstreamer-%%VERSION%%/libgstauparse.la
-lib/gstreamer-%%VERSION%%/libgstauparse.so
-lib/gstreamer-%%VERSION%%/libgstautodetect.a
-lib/gstreamer-%%VERSION%%/libgstautodetect.la
-lib/gstreamer-%%VERSION%%/libgstautodetect.so
-lib/gstreamer-%%VERSION%%/libgstavi.a
-lib/gstreamer-%%VERSION%%/libgstavi.la
-lib/gstreamer-%%VERSION%%/libgstavi.so
-lib/gstreamer-%%VERSION%%/libgstcdplayer.a
-lib/gstreamer-%%VERSION%%/libgstcdplayer.la
-lib/gstreamer-%%VERSION%%/libgstcdplayer.so
-lib/gstreamer-%%VERSION%%/libgstcdxaparse.a
-lib/gstreamer-%%VERSION%%/libgstcdxaparse.la
-lib/gstreamer-%%VERSION%%/libgstcdxaparse.so
-lib/gstreamer-%%VERSION%%/libgstchart.a
-lib/gstreamer-%%VERSION%%/libgstchart.la
-lib/gstreamer-%%VERSION%%/libgstchart.so
-lib/gstreamer-%%VERSION%%/libgstcolorspace.a
-lib/gstreamer-%%VERSION%%/libgstcolorspace.la
-lib/gstreamer-%%VERSION%%/libgstcolorspace.so
-lib/gstreamer-%%VERSION%%/libgstcutter.a
-lib/gstreamer-%%VERSION%%/libgstcutter.la
-lib/gstreamer-%%VERSION%%/libgstcutter.so
-lib/gstreamer-%%VERSION%%/libgstdebug.a
-lib/gstreamer-%%VERSION%%/libgstdebug.la
-lib/gstreamer-%%VERSION%%/libgstdebug.so
+lib/gstreamer-%%VERSION%%/libgstaudioresample.a
+lib/gstreamer-%%VERSION%%/libgstaudioresample.la
+lib/gstreamer-%%VERSION%%/libgstaudioresample.so
+lib/gstreamer-%%VERSION%%/libgstaudiotestsrc.a
+lib/gstreamer-%%VERSION%%/libgstaudiotestsrc.la
+lib/gstreamer-%%VERSION%%/libgstaudiotestsrc.so
lib/gstreamer-%%VERSION%%/libgstdecodebin.a
lib/gstreamer-%%VERSION%%/libgstdecodebin.la
lib/gstreamer-%%VERSION%%/libgstdecodebin.so
-lib/gstreamer-%%VERSION%%/libgstdeinterlace.a
-lib/gstreamer-%%VERSION%%/libgstdeinterlace.la
-lib/gstreamer-%%VERSION%%/libgstdeinterlace.so
-lib/gstreamer-%%VERSION%%/libgstdvdlpcmdec.a
-lib/gstreamer-%%VERSION%%/libgstdvdlpcmdec.la
-lib/gstreamer-%%VERSION%%/libgstdvdlpcmdec.so
-lib/gstreamer-%%VERSION%%/libgstdvdsubdec.a
-lib/gstreamer-%%VERSION%%/libgstdvdsubdec.la
-lib/gstreamer-%%VERSION%%/libgstdvdsubdec.so
-lib/gstreamer-%%VERSION%%/libgstefence.a
-lib/gstreamer-%%VERSION%%/libgstefence.la
-lib/gstreamer-%%VERSION%%/libgstefence.so
-lib/gstreamer-%%VERSION%%/libgsteffectv.a
-lib/gstreamer-%%VERSION%%/libgsteffectv.la
-lib/gstreamer-%%VERSION%%/libgsteffectv.so
-lib/gstreamer-%%VERSION%%/libgstequalizer.a
-lib/gstreamer-%%VERSION%%/libgstequalizer.la
-lib/gstreamer-%%VERSION%%/libgstequalizer.so
-lib/gstreamer-%%VERSION%%/libgstfestival.a
-lib/gstreamer-%%VERSION%%/libgstfestival.la
-lib/gstreamer-%%VERSION%%/libgstfestival.so
lib/gstreamer-%%VERSION%%/libgstffmpegcolorspace.a
lib/gstreamer-%%VERSION%%/libgstffmpegcolorspace.la
lib/gstreamer-%%VERSION%%/libgstffmpegcolorspace.so
-lib/gstreamer-%%VERSION%%/libgstfilter.a
-lib/gstreamer-%%VERSION%%/libgstfilter.la
-lib/gstreamer-%%VERSION%%/libgstfilter.so
-lib/gstreamer-%%VERSION%%/libgstflxdec.a
-lib/gstreamer-%%VERSION%%/libgstflxdec.la
-lib/gstreamer-%%VERSION%%/libgstflxdec.so
-lib/gstreamer-%%VERSION%%/libgstfreeze.a
-lib/gstreamer-%%VERSION%%/libgstfreeze.la
-lib/gstreamer-%%VERSION%%/libgstfreeze.so
-lib/gstreamer-%%VERSION%%/libgstgamma.a
-lib/gstreamer-%%VERSION%%/libgstgamma.la
-lib/gstreamer-%%VERSION%%/libgstgamma.so
-lib/gstreamer-%%VERSION%%/libgstgoom.a
-lib/gstreamer-%%VERSION%%/libgstgoom.la
-lib/gstreamer-%%VERSION%%/libgstgoom.so
-lib/gstreamer-%%VERSION%%/libgstidct.a
-lib/gstreamer-%%VERSION%%/libgstidct.la
-lib/gstreamer-%%VERSION%%/libgstidct.so
-lib/gstreamer-%%VERSION%%/libgstimagemixer.a
-lib/gstreamer-%%VERSION%%/libgstimagemixer.la
-lib/gstreamer-%%VERSION%%/libgstimagemixer.so
-lib/gstreamer-%%VERSION%%/libgstinterleave.a
-lib/gstreamer-%%VERSION%%/libgstinterleave.la
-lib/gstreamer-%%VERSION%%/libgstinterleave.so
-lib/gstreamer-%%VERSION%%/libgstlevel.a
-lib/gstreamer-%%VERSION%%/libgstlevel.la
-lib/gstreamer-%%VERSION%%/libgstlevel.so
-lib/gstreamer-%%VERSION%%/libgstmatroska.a
-lib/gstreamer-%%VERSION%%/libgstmatroska.la
-lib/gstreamer-%%VERSION%%/libgstmatroska.so
-lib/gstreamer-%%VERSION%%/libgstmedian.a
-lib/gstreamer-%%VERSION%%/libgstmedian.la
-lib/gstreamer-%%VERSION%%/libgstmedian.so
-lib/gstreamer-%%VERSION%%/libgstmixmatrix.a
-lib/gstreamer-%%VERSION%%/libgstmixmatrix.la
-lib/gstreamer-%%VERSION%%/libgstmixmatrix.so
-lib/gstreamer-%%VERSION%%/libgstmodplug.a
-lib/gstreamer-%%VERSION%%/libgstmodplug.la
-lib/gstreamer-%%VERSION%%/libgstmodplug.so
-lib/gstreamer-%%VERSION%%/libgstmonoscope.a
-lib/gstreamer-%%VERSION%%/libgstmonoscope.la
-lib/gstreamer-%%VERSION%%/libgstmonoscope.so
-lib/gstreamer-%%VERSION%%/libgstmp1videoparse.a
-lib/gstreamer-%%VERSION%%/libgstmp1videoparse.la
-lib/gstreamer-%%VERSION%%/libgstmp1videoparse.so
-lib/gstreamer-%%VERSION%%/libgstmpeg1systemencode.a
-lib/gstreamer-%%VERSION%%/libgstmpeg1systemencode.la
-lib/gstreamer-%%VERSION%%/libgstmpeg1systemencode.so
-lib/gstreamer-%%VERSION%%/libgstmpeg2subt.a
-lib/gstreamer-%%VERSION%%/libgstmpeg2subt.la
-lib/gstreamer-%%VERSION%%/libgstmpeg2subt.so
-lib/gstreamer-%%VERSION%%/libgstmpegaudio.a
-lib/gstreamer-%%VERSION%%/libgstmpegaudio.la
-lib/gstreamer-%%VERSION%%/libgstmpegaudio.so
-lib/gstreamer-%%VERSION%%/libgstmpegaudioparse.a
-lib/gstreamer-%%VERSION%%/libgstmpegaudioparse.la
-lib/gstreamer-%%VERSION%%/libgstmpegaudioparse.so
-lib/gstreamer-%%VERSION%%/libgstmpegstream.a
-lib/gstreamer-%%VERSION%%/libgstmpegstream.la
-lib/gstreamer-%%VERSION%%/libgstmpegstream.so
-lib/gstreamer-%%VERSION%%/libgstmulaw.a
-lib/gstreamer-%%VERSION%%/libgstmulaw.la
-lib/gstreamer-%%VERSION%%/libgstmulaw.so
-lib/gstreamer-%%VERSION%%/libgstmultifilesink.a
-lib/gstreamer-%%VERSION%%/libgstmultifilesink.la
-lib/gstreamer-%%VERSION%%/libgstmultifilesink.so
-lib/gstreamer-%%VERSION%%/libgstmultipart.a
-lib/gstreamer-%%VERSION%%/libgstmultipart.la
-lib/gstreamer-%%VERSION%%/libgstmultipart.so
-lib/gstreamer-%%VERSION%%/libgstnavigationtest.a
-lib/gstreamer-%%VERSION%%/libgstnavigationtest.la
-lib/gstreamer-%%VERSION%%/libgstnavigationtest.so
-lib/gstreamer-%%VERSION%%/libgstossaudio.a
-lib/gstreamer-%%VERSION%%/libgstossaudio.la
-lib/gstreamer-%%VERSION%%/libgstossaudio.so
-lib/gstreamer-%%VERSION%%/libgstoverlay.a
-lib/gstreamer-%%VERSION%%/libgstoverlay.la
-lib/gstreamer-%%VERSION%%/libgstoverlay.so
-lib/gstreamer-%%VERSION%%/libgstpassthrough.a
-lib/gstreamer-%%VERSION%%/libgstpassthrough.la
-lib/gstreamer-%%VERSION%%/libgstpassthrough.so
lib/gstreamer-%%VERSION%%/libgstplaybin.a
lib/gstreamer-%%VERSION%%/libgstplaybin.la
lib/gstreamer-%%VERSION%%/libgstplaybin.so
-lib/gstreamer-%%VERSION%%/libgstplayondemand.a
-lib/gstreamer-%%VERSION%%/libgstplayondemand.la
-lib/gstreamer-%%VERSION%%/libgstplayondemand.so
-lib/gstreamer-%%VERSION%%/libgstpuzzle.a
-lib/gstreamer-%%VERSION%%/libgstpuzzle.la
-lib/gstreamer-%%VERSION%%/libgstpuzzle.so
-lib/gstreamer-%%VERSION%%/libgstqtdemux.a
-lib/gstreamer-%%VERSION%%/libgstqtdemux.la
-lib/gstreamer-%%VERSION%%/libgstqtdemux.so
-lib/gstreamer-%%VERSION%%/libgstresample.a
-lib/gstreamer-%%VERSION%%/libgstresample.la
-lib/gstreamer-%%VERSION%%/libgstresample.so
-lib/gstreamer-%%VERSION%%/libgstrfbsrc.a
-lib/gstreamer-%%VERSION%%/libgstrfbsrc.la
-lib/gstreamer-%%VERSION%%/libgstrfbsrc.so
-lib/gstreamer-%%VERSION%%/libgstriff.a
-lib/gstreamer-%%VERSION%%/libgstriff.la
-lib/gstreamer-%%VERSION%%/libgstriff.so
-lib/gstreamer-%%VERSION%%/libgstrmdemux.a
-lib/gstreamer-%%VERSION%%/libgstrmdemux.la
-lib/gstreamer-%%VERSION%%/libgstrmdemux.so
-lib/gstreamer-%%VERSION%%/libgstrtjpeg.a
-lib/gstreamer-%%VERSION%%/libgstrtjpeg.la
-lib/gstreamer-%%VERSION%%/libgstrtjpeg.so
-lib/gstreamer-%%VERSION%%/libgstrtp.a
-lib/gstreamer-%%VERSION%%/libgstrtp.la
-lib/gstreamer-%%VERSION%%/libgstrtp.so
-lib/gstreamer-%%VERSION%%/libgstsilence.a
-lib/gstreamer-%%VERSION%%/libgstsilence.la
-lib/gstreamer-%%VERSION%%/libgstsilence.so
-lib/gstreamer-%%VERSION%%/libgstsinesrc.a
-lib/gstreamer-%%VERSION%%/libgstsinesrc.la
-lib/gstreamer-%%VERSION%%/libgstsinesrc.so
-lib/gstreamer-%%VERSION%%/libgstsmooth.a
-lib/gstreamer-%%VERSION%%/libgstsmooth.la
-lib/gstreamer-%%VERSION%%/libgstsmooth.so
-lib/gstreamer-%%VERSION%%/libgstsmpte.a
-lib/gstreamer-%%VERSION%%/libgstsmpte.la
-lib/gstreamer-%%VERSION%%/libgstsmpte.so
-%%SPC%%lib/gstreamer-%%VERSION%%/libgstspc.a
-%%SPC%%lib/gstreamer-%%VERSION%%/libgstspc.la
-%%SPC%%lib/gstreamer-%%VERSION%%/libgstspc.so
-lib/gstreamer-%%VERSION%%/libgstspectrum.a
-lib/gstreamer-%%VERSION%%/libgstspectrum.la
-lib/gstreamer-%%VERSION%%/libgstspectrum.so
-lib/gstreamer-%%VERSION%%/libgstspeed.a
-lib/gstreamer-%%VERSION%%/libgstspeed.la
-lib/gstreamer-%%VERSION%%/libgstspeed.so
-lib/gstreamer-%%VERSION%%/libgststereo.a
-lib/gstreamer-%%VERSION%%/libgststereo.la
-lib/gstreamer-%%VERSION%%/libgststereo.so
lib/gstreamer-%%VERSION%%/libgstsubparse.a
lib/gstreamer-%%VERSION%%/libgstsubparse.la
lib/gstreamer-%%VERSION%%/libgstsubparse.so
-lib/gstreamer-%%VERSION%%/libgstswitch.a
-lib/gstreamer-%%VERSION%%/libgstswitch.la
-lib/gstreamer-%%VERSION%%/libgstswitch.so
-lib/gstreamer-%%VERSION%%/libgstsynaesthesia.a
-lib/gstreamer-%%VERSION%%/libgstsynaesthesia.la
-lib/gstreamer-%%VERSION%%/libgstsynaesthesia.so
-lib/gstreamer-%%VERSION%%/libgsttagedit.a
-lib/gstreamer-%%VERSION%%/libgsttagedit.la
-lib/gstreamer-%%VERSION%%/libgsttagedit.so
lib/gstreamer-%%VERSION%%/libgsttcp.a
lib/gstreamer-%%VERSION%%/libgsttcp.la
lib/gstreamer-%%VERSION%%/libgsttcp.so
-lib/gstreamer-%%VERSION%%/libgsttta.a
-lib/gstreamer-%%VERSION%%/libgsttta.la
-lib/gstreamer-%%VERSION%%/libgsttta.so
lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.a
lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.la
lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.so
-lib/gstreamer-%%VERSION%%/libgstudp.a
-lib/gstreamer-%%VERSION%%/libgstudp.la
-lib/gstreamer-%%VERSION%%/libgstudp.so
-lib/gstreamer-%%VERSION%%/libgstvbidec.a
-lib/gstreamer-%%VERSION%%/libgstvbidec.la
-lib/gstreamer-%%VERSION%%/libgstvbidec.so
-lib/gstreamer-%%VERSION%%/libgstvcdsrc.a
-lib/gstreamer-%%VERSION%%/libgstvcdsrc.la
-lib/gstreamer-%%VERSION%%/libgstvcdsrc.so
-lib/gstreamer-%%VERSION%%/libgstvideo.a
-lib/gstreamer-%%VERSION%%/libgstvideo.la
-lib/gstreamer-%%VERSION%%/libgstvideo.so
-lib/gstreamer-%%VERSION%%/libgstvideobalance.a
-lib/gstreamer-%%VERSION%%/libgstvideobalance.la
-lib/gstreamer-%%VERSION%%/libgstvideobalance.so
-lib/gstreamer-%%VERSION%%/libgstvideobox.a
-lib/gstreamer-%%VERSION%%/libgstvideobox.la
-lib/gstreamer-%%VERSION%%/libgstvideobox.so
-lib/gstreamer-%%VERSION%%/libgstvideocrop.a
-lib/gstreamer-%%VERSION%%/libgstvideocrop.la
-lib/gstreamer-%%VERSION%%/libgstvideocrop.so
-lib/gstreamer-%%VERSION%%/libgstvideodrop.a
-lib/gstreamer-%%VERSION%%/libgstvideodrop.la
-lib/gstreamer-%%VERSION%%/libgstvideodrop.so
-lib/gstreamer-%%VERSION%%/libgstvideofilter.a
-lib/gstreamer-%%VERSION%%/libgstvideofilter.la
-lib/gstreamer-%%VERSION%%/libgstvideofilter.so
-lib/gstreamer-%%VERSION%%/libgstvideoflip.a
-lib/gstreamer-%%VERSION%%/libgstvideoflip.la
-lib/gstreamer-%%VERSION%%/libgstvideoflip.so
-lib/gstreamer-%%VERSION%%/libgstvideomixer.a
-lib/gstreamer-%%VERSION%%/libgstvideomixer.la
-lib/gstreamer-%%VERSION%%/libgstvideomixer.so
lib/gstreamer-%%VERSION%%/libgstvideorate.a
lib/gstreamer-%%VERSION%%/libgstvideorate.la
lib/gstreamer-%%VERSION%%/libgstvideorate.so
@@ -320,80 +77,68 @@ lib/gstreamer-%%VERSION%%/libgstvideoscale.so
lib/gstreamer-%%VERSION%%/libgstvideotestsrc.a
lib/gstreamer-%%VERSION%%/libgstvideotestsrc.la
lib/gstreamer-%%VERSION%%/libgstvideotestsrc.so
-lib/gstreamer-%%VERSION%%/libgstvolenv.a
-lib/gstreamer-%%VERSION%%/libgstvolenv.la
-lib/gstreamer-%%VERSION%%/libgstvolenv.so
lib/gstreamer-%%VERSION%%/libgstvolume.a
lib/gstreamer-%%VERSION%%/libgstvolume.la
lib/gstreamer-%%VERSION%%/libgstvolume.so
-lib/gstreamer-%%VERSION%%/libgstwavenc.a
-lib/gstreamer-%%VERSION%%/libgstwavenc.la
-lib/gstreamer-%%VERSION%%/libgstwavenc.so
-lib/gstreamer-%%VERSION%%/libgstwavparse.a
-lib/gstreamer-%%VERSION%%/libgstwavparse.la
-lib/gstreamer-%%VERSION%%/libgstwavparse.so
lib/gstreamer-%%VERSION%%/libgstximagesink.a
lib/gstreamer-%%VERSION%%/libgstximagesink.la
lib/gstreamer-%%VERSION%%/libgstximagesink.so
lib/gstreamer-%%VERSION%%/libgstxvimagesink.a
lib/gstreamer-%%VERSION%%/libgstxvimagesink.la
lib/gstreamer-%%VERSION%%/libgstxvimagesink.so
-lib/gstreamer-%%VERSION%%/libgstxwindowlistener.a
-lib/gstreamer-%%VERSION%%/libgstxwindowlistener.la
-lib/gstreamer-%%VERSION%%/libgstxwindowlistener.so
-lib/gstreamer-%%VERSION%%/libgsty4menc.a
-lib/gstreamer-%%VERSION%%/libgsty4menc.la
-lib/gstreamer-%%VERSION%%/libgsty4menc.so
+lib/libgstaudio-%%VERSION%%.a
+lib/libgstaudio-%%VERSION%%.la
+lib/libgstaudio-%%VERSION%%.so
+lib/libgstaudio-%%VERSION%%.so.0
+lib/libgstcdda-%%VERSION%%.a
+lib/libgstcdda-%%VERSION%%.la
+lib/libgstcdda-%%VERSION%%.so
+lib/libgstcdda-%%VERSION%%.so.0
lib/libgstinterfaces-%%VERSION%%.a
lib/libgstinterfaces-%%VERSION%%.la
lib/libgstinterfaces-%%VERSION%%.so
-lib/libgstinterfaces-%%VERSION%%.so.%%SHLIB_VERSION%%
-lib/libgstmedia-info-%%VERSION%%.a
-lib/libgstmedia-info-%%VERSION%%.la
-lib/libgstmedia-info-%%VERSION%%.so
-lib/libgstmedia-info-%%VERSION%%.so.%%SHLIB_VERSION%%
-lib/libgstplay-%%VERSION%%.a
-lib/libgstplay-%%VERSION%%.la
-lib/libgstplay-%%VERSION%%.so
-lib/libgstplay-%%VERSION%%.so.%%SHLIB_VERSION%%
-libdata/pkgconfig/gstreamer-interfaces-%%VERSION%%.pc
-libdata/pkgconfig/gstreamer-libs-%%VERSION%%.pc
-libdata/pkgconfig/gstreamer-media-info-%%VERSION%%.pc
-libdata/pkgconfig/gstreamer-play-%%VERSION%%.pc
-libdata/pkgconfig/gstreamer-plugins-%%VERSION%%.pc
-share/locale/af/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
-share/locale/az/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
-share/locale/cs/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
-share/locale/en_GB/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
-share/locale/hu/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
-share/locale/it/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
-share/locale/nb/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
-share/locale/nl/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
-share/locale/or/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
-share/locale/sq/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
-share/locale/sr/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
-share/locale/sv/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
-share/locale/uk/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
-share/locale/vi/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
-share/locale/zh_TW/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
-@dirrm lib/gstreamer-%%VERSION%%
-@dirrm include/gstreamer-%%VERSION%%/gst/xwindowlistener
-@dirrm include/gstreamer-%%VERSION%%/gst/xoverlay
+lib/libgstinterfaces-%%VERSION%%.so.0
+lib/libgstnetbuffer-%%VERSION%%.a
+lib/libgstnetbuffer-%%VERSION%%.la
+lib/libgstnetbuffer-%%VERSION%%.so
+lib/libgstnetbuffer-%%VERSION%%.so.0
+lib/libgstriff-%%VERSION%%.a
+lib/libgstriff-%%VERSION%%.la
+lib/libgstriff-%%VERSION%%.so
+lib/libgstriff-%%VERSION%%.so.0
+lib/libgstrtp-%%VERSION%%.a
+lib/libgstrtp-%%VERSION%%.la
+lib/libgstrtp-%%VERSION%%.so
+lib/libgstrtp-%%VERSION%%.so.0
+lib/libgsttag-%%VERSION%%.a
+lib/libgsttag-%%VERSION%%.la
+lib/libgsttag-%%VERSION%%.so
+lib/libgsttag-%%VERSION%%.so.0
+lib/libgstvideo-%%VERSION%%.a
+lib/libgstvideo-%%VERSION%%.la
+lib/libgstvideo-%%VERSION%%.so
+lib/libgstvideo-%%VERSION%%.so.0
+libdata/pkgconfig/gstreamer-plugins-base-%%VERSION%%.pc
+share/locale/af/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
+share/locale/nb/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
+share/locale/or/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
+share/locale/sq/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
@dirrm include/gstreamer-%%VERSION%%/gst/video
-@dirrm include/gstreamer-%%VERSION%%/gst/tuner
@dirrm include/gstreamer-%%VERSION%%/gst/tag
+@dirrm include/gstreamer-%%VERSION%%/gst/rtp
@dirrm include/gstreamer-%%VERSION%%/gst/riff
-@dirrm include/gstreamer-%%VERSION%%/gst/resample
-@dirrm include/gstreamer-%%VERSION%%/gst/propertyprobe
-@dirrm include/gstreamer-%%VERSION%%/gst/play
-@dirrm include/gstreamer-%%VERSION%%/gst/navigation
-@dirrm include/gstreamer-%%VERSION%%/gst/mixer
-@dirrm include/gstreamer-%%VERSION%%/gst/media-info
-@dirrm include/gstreamer-%%VERSION%%/gst/idct
+@dirrm include/gstreamer-%%VERSION%%/gst/netbuffer
+@dirrm include/gstreamer-%%VERSION%%/gst/interfaces
@dirrm include/gstreamer-%%VERSION%%/gst/floatcast
-@dirrm include/gstreamer-%%VERSION%%/gst/colorbalance
+@dirrm include/gstreamer-%%VERSION%%/gst/cdda
@dirrm include/gstreamer-%%VERSION%%/gst/audio
-@dirrmtry include/gstreamer-%%VERSION%%/gst
-@dirrmtry include/gstreamer-%%VERSION%%
-@exec %D/bin/gst-register-${VERSION} --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
-@unexec %D/bin/gst-register-${VERSION} --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index b608ce711ccd..7c06048373ec 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -3,23 +3,24 @@
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/multimedia/gstreamer-plugins80/Makefile,v 1.60 2006/04/23 22:55:30 mezz Exp $
#
PORTNAME= gstreamer
-PORTVERSION= 0.8.11
-PORTREVISION?= 2
+PORTVERSION= 0.8.12
+PORTREVISION?= 1
CATEGORIES?= multimedia audio
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://gstreamer.freedesktop.org/src/gst-plugins/
MASTER_SITE_SUBDIR= sources/gst-plugins/0.8
-PKGNAMESUFFIX= -plugins${GST_PLUGIN_SUFFIX}
+PKGNAMESUFFIX= -plugins${GST_PLUGIN_SUFFIX}80
DISTNAME= gst-plugins-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT?= GStreamer written collection of plugins handling several media types
-LIB_DEPENDS+= gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer \
+LIB_DEPENDS+= gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer80 \
popt.0:${PORTSDIR}/devel/popt
SHLIB_VERSION= 1
@@ -29,11 +30,11 @@ WANT_GSTREAMER= yes
USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
+USE_GETTEXT= yes
USE_GNOME+= gnomehack \
gnomeprefix \
gnometarget \
pkgconfig
-USE_REINPLACE= yes
GNU_CONFIGURE= yes
GST_PLUGIN?= base
diff --git a/multimedia/gstreamer-plugins80/Makefile.common b/multimedia/gstreamer-plugins80/Makefile.common
index 4509c14ea83b..b080a69004b3 100644
--- a/multimedia/gstreamer-plugins80/Makefile.common
+++ b/multimedia/gstreamer-plugins80/Makefile.common
@@ -134,16 +134,16 @@ GST_LIB_DIR= lib/gstreamer-${VERSION}
# Auto create PLIST
PLIST= ${NONEXISTENT}
-PLIST_FILES?= ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.a \
- ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.la \
- ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.so
+PLIST_FILES?= ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.so \
+ ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.a \
+ ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.la
# aalib
.if ${GST_PLUGIN}=="aalib"
LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib
-PLIST_FILES= ${GST_LIB_DIR}/libgstaasink.a \
- ${GST_LIB_DIR}/libgstaasink.la \
- ${GST_LIB_DIR}/libgstaasink.so
+PLIST_FILES= ${GST_LIB_DIR}/libgstaasink.so \
+ ${GST_LIB_DIR}/libgstaasink.a \
+ ${GST_LIB_DIR}/libgstaasink.la
.endif
# artsd
@@ -179,9 +179,9 @@ GST_PLIST_SUFFIX= dec
.if ${GST_PLUGIN}=="esound"
USE_GNOME+= esound
GST_PLUGIN_DIR= ext/esd
-PLIST_FILES= ${GST_LIB_DIR}/libgstesd.a \
- ${GST_LIB_DIR}/libgstesd.la \
- ${GST_LIB_DIR}/libgstesd.so
+PLIST_FILES= ${GST_LIB_DIR}/libgstesd.so \
+ ${GST_LIB_DIR}/libgstesd.a \
+ ${GST_LIB_DIR}/libgstesd.la
.endif
# faac
@@ -216,7 +216,7 @@ PLIST_FILES= include/gstreamer-0.8/gst/gconf/gconf.h \
lib/libgstgconf-0.8.so \
lib/libgstgconf-0.8.so.1 \
libdata/pkgconfig/gstreamer-gconf-0.8.pc \
- '@dirrmtry include/gstreamer-0.8/gst/gconf'
+ '@unexec rmdir %D/include/gstreamer-0.8/gst/gconf 2>/dev/null || true'
.endif
# gdkpixbuf
@@ -249,9 +249,9 @@ LIB_DEPENDS+= cdaudio.1:${PORTSDIR}/audio/libcdaudio
# libcdio
.if ${GST_PLUGIN}=="cdio"
LIB_DEPENDS+= cdio.6:${PORTSDIR}/sysutils/libcdio
-PLIST_FILES= ${GST_LIB_DIR}/libgstcddasrc.a \
- ${GST_LIB_DIR}/libgstcddasrc.la \
- ${GST_LIB_DIR}/libgstcddasrc.so
+PLIST_FILES= ${GST_LIB_DIR}/libgstcddasrc.so \
+ ${GST_LIB_DIR}/libgstcddasrc.a \
+ ${GST_LIB_DIR}/libgstcddasrc.la
.endif
# libvisual
@@ -267,9 +267,9 @@ LIB_DEPENDS+= mpcdec.4:${PORTSDIR}/audio/libmpcdec
# hermes
.if ${GST_PLUGIN}=="hermes"
LIB_DEPENDS+= Hermes.1:${PORTSDIR}/graphics/Hermes
-PLIST_FILES= ${GST_LIB_DIR}/libgsthermescolorspace.a \
- ${GST_LIB_DIR}/libgsthermescolorspace.la \
- ${GST_LIB_DIR}/libgsthermescolorspace.so
+PLIST_FILES= ${GST_LIB_DIR}/libgsthermescolorspace.so \
+ ${GST_LIB_DIR}/libgsthermescolorspace.a \
+ ${GST_LIB_DIR}/libgsthermescolorspace.la
.endif
# jpeg
@@ -284,9 +284,9 @@ LIB_DEPENDS+= jpeg-mmx.62:${PORTSDIR}/graphics/jpeg-mmx
CONFLICTS+= gstreamer-plugins-jpeg-*.*
GST_PLUGIN_DIR= ext/jpeg
-PLIST_FILES= ${GST_LIB_DIR}/libgstjpeg.a \
- ${GST_LIB_DIR}/libgstjpeg.la \
- ${GST_LIB_DIR}/libgstjpeg.so
+PLIST_FILES= ${GST_LIB_DIR}/libgstjpeg.so \
+ ${GST_LIB_DIR}/libgstjpeg.a \
+ ${GST_LIB_DIR}/libgstjpeg.la
.endif
# ladspa
@@ -312,15 +312,16 @@ LIB_DEPENDS+= audiofile.0:${PORTSDIR}/audio/libaudiofile
# libcaca
.if ${GST_PLUGIN}=="libcaca"
BUILD_DEPENDS+= ${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
-PLIST_FILES= ${GST_LIB_DIR}/libgstcacasink.a \
- ${GST_LIB_DIR}/libgstcacasink.la \
- ${GST_LIB_DIR}/libgstcacasink.so
+PLIST_FILES= ${GST_LIB_DIR}/libgstcacasink.so \
+ ${GST_LIB_DIR}/libgstcacasink.a \
+ ${GST_LIB_DIR}/libgstcacasink.la
.endif
# dv
.if ${GST_PLUGIN}=="dv"
LIB_DEPENDS+= dv.4:${PORTSDIR}/multimedia/libdv
GST_PLIST_SUFFIX= dec
+EXTRA_LIBS= -ldv
.endif
# dvd (dvdnav dvdread)
@@ -329,9 +330,9 @@ EXTRA_LIBS+= -ldvdnav
LIB_DEPENDS+= dvdnav.4:${PORTSDIR}/multimedia/libdvdnav
GST_PLUGIN_DIR= ext/dvdnav \
ext/dvdread
-PLIST_FILES= ${GST_LIB_DIR}/libgstdvdnavsrc.a \
+PLIST_FILES= ${GST_LIB_DIR}/libgstdvdnavsrc.so \
+ ${GST_LIB_DIR}/libgstdvdnavsrc.a \
${GST_LIB_DIR}/libgstdvdnavsrc.la \
- ${GST_LIB_DIR}/libgstdvdnavsrc.so \
${GST_LIB_DIR}/libgstdvdreadsrc.a \
${GST_LIB_DIR}/libgstdvdreadsrc.la \
${GST_LIB_DIR}/libgstdvdreadsrc.so
@@ -345,17 +346,17 @@ LIB_DEPENDS+= fame-0.9.1:${PORTSDIR}/multimedia/libfame
# libmms
.if ${GST_PLUGIN}=="libmms"
LIB_DEPENDS+= mms.0:${PORTSDIR}/net/libmms
-PLIST_FILES= ${GST_LIB_DIR}/libgstmms.a \
- ${GST_LIB_DIR}/libgstmms.la \
- ${GST_LIB_DIR}/libgstmms.so
+PLIST_FILES= ${GST_LIB_DIR}/libgstmms.so \
+ ${GST_LIB_DIR}/libgstmms.a \
+ ${GST_LIB_DIR}/libgstmms.la
.endif
# libmng
.if ${GST_PLUGIN}=="libmng"
LIB_DEPENDS+= mng.1:${PORTSDIR}/graphics/libmng
-PLIST_FILES= ${GST_LIB_DIR}/libgstmng.a \
- ${GST_LIB_DIR}/libgstmng.la \
- ${GST_LIB_DIR}/libgstmng.so
+PLIST_FILES= ${GST_LIB_DIR}/libgstmng.so \
+ ${GST_LIB_DIR}/libgstmng.a \
+ ${GST_LIB_DIR}/libgstmng.la
.endif
# mikmod
@@ -376,9 +377,9 @@ LIB_DEPENDS+= lavjpeg-1.8.0:${PORTSDIR}/multimedia/mjpegtools
# musicbrainz
.if ${GST_PLUGIN}=="musicbrainz"
LIB_DEPENDS+= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
-PLIST_FILES= lib/gstreamer-${VERSION}/libgsttrm.a \
- lib/gstreamer-${VERSION}/libgsttrm.la \
- lib/gstreamer-${VERSION}/libgsttrm.so
+PLIST_FILES= lib/gstreamer-${VERSION}/libgsttrm.so \
+ lib/gstreamer-${VERSION}/libgsttrm.a \
+ lib/gstreamer-${VERSION}/libgsttrm.la
.endif
# shout
@@ -394,9 +395,9 @@ LIB_DEPENDS+= shout.5:${PORTSDIR}/audio/libshout2
# sidplay
.if ${GST_PLUGIN}=="sidplay"
LIB_DEPENDS+= sidplay.1:${PORTSDIR}/audio/libsidplay
-PLIST_FILES= ${GST_LIB_DIR}/libgstsid.a \
- ${GST_LIB_DIR}/libgstsid.la \
- ${GST_LIB_DIR}/libgstsid.so
+PLIST_FILES= ${GST_LIB_DIR}/libgstsid.so \
+ ${GST_LIB_DIR}/libgstsid.a \
+ ${GST_LIB_DIR}/libgstsid.la
.endif
# sndfile
@@ -439,9 +440,9 @@ LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg
# pango
.if ${GST_PLUGIN}=="pango"
USE_GNOME+= pango
-PLIST_FILES= ${GST_LIB_DIR}/libgsttextoverlay.a \
+PLIST_FILES= ${GST_LIB_DIR}/libgsttextoverlay.so \
+ ${GST_LIB_DIR}/libgsttextoverlay.a \
${GST_LIB_DIR}/libgsttextoverlay.la \
- ${GST_LIB_DIR}/libgsttextoverlay.so \
${GST_LIB_DIR}/libgsttimeoverlay.a \
${GST_LIB_DIR}/libgsttimeoverlay.la \
${GST_LIB_DIR}/libgsttimeoverlay.so
@@ -452,20 +453,20 @@ PLIST_FILES= ${GST_LIB_DIR}/libgsttextoverlay.a \
LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png
GST_PLUGIN_DIR= ext/libpng \
ext/snapshot
-PLIST_FILES= ${GST_LIB_DIR}/libgstpng.a \
+PLIST_FILES= ${GST_LIB_DIR}/libgstpng.so \
+ ${GST_LIB_DIR}/libgstpng.a \
+ ${GST_LIB_DIR}/libgstpng.la \
+ ${GST_LIB_DIR}/libgstpng.a \
${GST_LIB_DIR}/libgstpng.la \
- ${GST_LIB_DIR}/libgstpng.so \
- ${GST_LIB_DIR}/libgstsnapshot.a \
- ${GST_LIB_DIR}/libgstsnapshot.la \
${GST_LIB_DIR}/libgstsnapshot.so
.endif
-# polyp
+# poly
.if ${GST_PLUGIN}=="polyp"
LIB_DEPENDS+= polyp-0.7.0:${PORTSDIR}/audio/polypaudio
-PLIST_FILES= ${GST_LIB_DIR}/libpolypaudio.a \
- ${GST_LIB_DIR}/libpolypaudio.la \
- ${GST_LIB_DIR}/libpolypaudio.so
+PLIST_FILES= ${GST_LIB_DIR}/libpolypaudio.so \
+ ${GST_LIB_DIR}/libpolypaudio.a \
+ ${GST_LIB_DIR}/libpolypaudio.la
GST_PLUGIN_DIR= ext/polyp
.endif
@@ -509,9 +510,9 @@ LIB_DEPENDS+= wavpack.0:${PORTSDIR}/audio/wavpack
# x264
.if ${GST_PLUGIN}=="x264"
LIB_DEPENDS+= x264.1:${PORTSDIR}/multimedia/x264
-PLIST_FILES= ${GST_LIB_DIR}/libx264.a \
- ${GST_LIB_DIR}/libx264.la \
- ${GST_LIB_DIR}/libx264.so
+PLIST_FILES= ${GST_LIB_DIR}/libx264.so \
+ ${GST_LIB_DIR}/libx264.a \
+ ${GST_LIB_DIR}/libx264.la
.endif
# xvid
@@ -519,7 +520,7 @@ PLIST_FILES= ${GST_LIB_DIR}/libx264.a \
LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
.endif
-LIB_DEPENDS+= gstplay-${VERSION}.${SHLIB_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
+LIB_DEPENDS+= gstplay-${VERSION}.${SHLIB_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins80
PLIST_FILES+= '@exec %D/bin/gst-register-${VERSION} --gst-registry=%D/share/gnome/cache/gstreamer-${VERSION}/registry.xml 2>/dev/null || true'
PLIST_FILES+= '@unexec %D/bin/gst-register-${VERSION} --gst-registry=%D/share/gnome/cache/gstreamer-${VERSION}/registry.xml 2>/dev/null || true'
diff --git a/multimedia/gstreamer-plugins80/distinfo b/multimedia/gstreamer-plugins80/distinfo
index 43d75a7a6117..c77b12705a06 100644
--- a/multimedia/gstreamer-plugins80/distinfo
+++ b/multimedia/gstreamer-plugins80/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gst-plugins-0.8.11.tar.bz2) = ea787eeed3761ff03cb60ecebebe1c30
-SHA256 (gnome2/gst-plugins-0.8.11.tar.bz2) = 0e48eef1d3bfa2263c1047f9f84622a4e16e33d963252cb8153ff1b340c4ba90
-SIZE (gnome2/gst-plugins-0.8.11.tar.bz2) = 2439654
+MD5 (gnome2/gst-plugins-0.8.12.tar.bz2) = c5cb7312d96fe008763b3ac56e665ca5
+SHA256 (gnome2/gst-plugins-0.8.12.tar.bz2) = 8728da4f71bc87e10fb064d28154220d66a3d8332482fd2c8a7ed47c5f0a03ba
+SIZE (gnome2/gst-plugins-0.8.12.tar.bz2) = 2506926
diff --git a/multimedia/gstreamer-plugins80/pkg-plist b/multimedia/gstreamer-plugins80/pkg-plist
index cf5b6c64da04..da806a454c4a 100644
--- a/multimedia/gstreamer-plugins80/pkg-plist
+++ b/multimedia/gstreamer-plugins80/pkg-plist
@@ -134,18 +134,16 @@ lib/gstreamer-%%VERSION%%/libgstfreeze.so
lib/gstreamer-%%VERSION%%/libgstgamma.a
lib/gstreamer-%%VERSION%%/libgstgamma.la
lib/gstreamer-%%VERSION%%/libgstgamma.so
-lib/gstreamer-%%VERSION%%/libgstgoom.a
-lib/gstreamer-%%VERSION%%/libgstgoom.la
lib/gstreamer-%%VERSION%%/libgstgoom.so
lib/gstreamer-%%VERSION%%/libgstidct.a
lib/gstreamer-%%VERSION%%/libgstidct.la
lib/gstreamer-%%VERSION%%/libgstidct.so
-lib/gstreamer-%%VERSION%%/libgstimagemixer.a
-lib/gstreamer-%%VERSION%%/libgstimagemixer.la
-lib/gstreamer-%%VERSION%%/libgstimagemixer.so
lib/gstreamer-%%VERSION%%/libgstinterleave.a
lib/gstreamer-%%VERSION%%/libgstinterleave.la
lib/gstreamer-%%VERSION%%/libgstinterleave.so
+lib/gstreamer-%%VERSION%%/libgstimagemixer.a
+lib/gstreamer-%%VERSION%%/libgstimagemixer.la
+lib/gstreamer-%%VERSION%%/libgstimagemixer.so
lib/gstreamer-%%VERSION%%/libgstlevel.a
lib/gstreamer-%%VERSION%%/libgstlevel.la
lib/gstreamer-%%VERSION%%/libgstlevel.so
@@ -298,7 +296,6 @@ lib/gstreamer-%%VERSION%%/libgstvideobox.la
lib/gstreamer-%%VERSION%%/libgstvideobox.so
lib/gstreamer-%%VERSION%%/libgstvideocrop.a
lib/gstreamer-%%VERSION%%/libgstvideocrop.la
-lib/gstreamer-%%VERSION%%/libgstvideocrop.so
lib/gstreamer-%%VERSION%%/libgstvideodrop.a
lib/gstreamer-%%VERSION%%/libgstvideodrop.la
lib/gstreamer-%%VERSION%%/libgstvideodrop.so
@@ -364,6 +361,7 @@ libdata/pkgconfig/gstreamer-plugins-%%VERSION%%.pc
share/locale/af/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
share/locale/az/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
+share/locale/da/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
share/locale/en_GB/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
share/locale/hu/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
share/locale/it/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index a0f1da4097c6..82317dd78aa5 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -3,15 +3,14 @@
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/multimedia/gstreamer/Makefile,v 1.45 2006/04/28 11:44:33 ahze Exp $
PORTNAME= gstreamer
-PORTVERSION= 0.8.11
-PORTREVISION= 2
+PORTVERSION= 0.10.5
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://gstreamer.freedesktop.org/src/gstreamer/
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${GST_VERSION}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -24,43 +23,22 @@ USE_BISON= yes
USE_BZIP2= yes
USE_GMAKE= yes
WANT_GNOME= yes
-USE_GNOME= gnomehack \
- gnomeprefix \
- glib20 \
- libxml2
-GNU_CONFIGURE= yes
+USE_GNOME= gnomehack gnomeprefix glib20 libxml2 ltverhack
+USE_GETTEXT= yes
+USE_AUTOTOOLS= libtool:15
CONFIGURE_ARGS= --disable-tests \
--disable-examples \
--disable-docs-build \
--disable-failing-tests
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
-PLIST_SUB= \
- VERSION="${GST_VERSION}" \
- SHLIB_VERSION="${SHLIB_VERSION}" \
- PORTVERSION="${PORTVERSION}"
+PLIST_SUB= VERSION="${GST_VERSION}"
INSTALLS_SHLIB= yes
+GST_VERSION= 0.10
-MAN1= gst-complete-${GST_VERSION}.1 gst-compprep-${GST_VERSION}.1 \
- gst-feedback-${GST_VERSION}.1 gst-inspect-${GST_VERSION}.1 \
- gst-launch-${GST_VERSION}.1 gst-md5sum-${GST_VERSION}.1 \
- gst-register-${GST_VERSION}.1 gst-typefind-${GST_VERSION}.1 \
- gst-xmllaunch-${GST_VERSION}.1 gst-xmlinspect-${GST_VERSION}.1
-
-GST_VERSION=${PORTVERSION:C/...$//}
-
-# library minor number
-SHLIB_VERSION= 5
-
-.include <bsd.port.pre.mk>
-
-.if ( ( ${OSVERSION} < 504101 ) || ( ${OSVERSION} >= 600000 && ${OSVERSION} < 600012 ) )
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gst::cothreads.c
-.endif
-
-post-install:
-# register plugins
- -@${PREFIX}/bin/gst-register-${GST_VERSION} \
- --gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST_VERSION}/registry.xml 2>/dev/null
+MAN1= gst-feedback-${GST_VERSION}.1 gst-inspect-${GST_VERSION}.1 \
+ gst-launch-${GST_VERSION}.1 \
+ gst-typefind-${GST_VERSION}.1 gst-xmlinspect-${GST_VERSION}.1 \
+ gst-xmllaunch-${GST_VERSION}.1
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/gstreamer/distinfo b/multimedia/gstreamer/distinfo
index 2a24d9cb5c2e..111acca1cdef 100644
--- a/multimedia/gstreamer/distinfo
+++ b/multimedia/gstreamer/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gstreamer-0.8.11.tar.bz2) = 3a251cf05b794ebac04e18f71e5b26eb
-SHA256 (gnome2/gstreamer-0.8.11.tar.bz2) = 29aaec0f345b614dfa8da97cef629d68f74b4523dd28cb0abc04352cf14e6064
-SIZE (gnome2/gstreamer-0.8.11.tar.bz2) = 1459651
+MD5 (gnome2/gstreamer-0.10.5.tar.bz2) = f088c1303f19f0423f35d699deed92e3
+SHA256 (gnome2/gstreamer-0.10.5.tar.bz2) = 1c055d04fc31ac5730a766743ece1402f93f967c8f815cd5c97112dfab8f4aa1
+SIZE (gnome2/gstreamer-0.10.5.tar.bz2) = 1620535
diff --git a/multimedia/gstreamer/files/patch-configure b/multimedia/gstreamer/files/patch-configure
deleted file mode 100644
index 672c3d3170fe..000000000000
--- a/multimedia/gstreamer/files/patch-configure
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.orig Fri Jun 4 18:19:18 2004
-+++ configure Fri Jun 4 18:20:27 2004
-@@ -21877,7 +21877,7 @@
-
-
- EXP_VAR=LOCALEDIR
-- FROM_VAR=$datadir/locale
-+ FROM_VAR=$prefix/share/locale
-
- prefix_save=$prefix
- exec_prefix_save=$exec_prefix
-@@ -21981,7 +21981,7 @@
- echo $ECHO_N "checking to see if compiler understands -Werror... $ECHO_C" >&6
-
- save_CFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS -Werror"
-+ CFLAGS="$CFLAGS"
-
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -22031,7 +22031,7 @@
- CFLAGS="$save_CFLAGS"
-
- if test "X$flag_ok" = Xyes ; then
-- GST_ERROR_CFLAGS="$GST_ERROR_CFLAGS -Werror"
-+ GST_ERROR_CFLAGS="$GST_ERROR_CFLAGS"
- true
- else
-
diff --git a/multimedia/gstreamer/files/patch-gst::cothreads.c b/multimedia/gstreamer/files/patch-gst::cothreads.c
deleted file mode 100644
index a756de582f5e..000000000000
--- a/multimedia/gstreamer/files/patch-gst::cothreads.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- gst/cothreads.c.orig Mon Feb 2 06:56:53 2004
-+++ gst/cothreads.c Fri Feb 6 13:05:26 2004
-@@ -42,6 +42,10 @@
- #include <ucontext.h>
- #endif
-
-+#ifdef HAVE_MAKECONTEXT
-+#include <ucontext.h>
-+#endif
-+
- #ifndef MAP_ANONYMOUS
- #ifdef MAP_ANON
- /* older glibc's have MAP_ANON instead of MAP_ANONYMOUS */
diff --git a/multimedia/gstreamer/files/patch-gst__gstbin.c b/multimedia/gstreamer/files/patch-gst__gstbin.c
new file mode 100644
index 000000000000..edff58cedd14
--- /dev/null
+++ b/multimedia/gstreamer/files/patch-gst__gstbin.c
@@ -0,0 +1,11 @@
+--- gst/gstbin.c.orig Tue Apr 18 21:12:49 2006
++++ gst/gstbin.c Tue Apr 18 21:39:56 2006
+@@ -2406,7 +2406,7 @@
+ {
+ gint ret;
+
+- if (G_TYPE_CHECK_INSTANCE_TYPE (element, GPOINTER_TO_INT (interface))) {
++ if (G_TYPE_CHECK_INSTANCE_TYPE (element, (GType)interface)) {
+ ret = 0;
+ } else {
+ /* we did not find the element, need to release the ref
diff --git a/multimedia/gstreamer/files/patch-gst_gstmemchunk.c b/multimedia/gstreamer/files/patch-gst_gstmemchunk.c
deleted file mode 100644
index 5a3a624cbb73..000000000000
--- a/multimedia/gstreamer/files/patch-gst_gstmemchunk.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gst/gstmemchunk.c.orig Wed Aug 4 15:31:41 2004
-+++ gst/gstmemchunk.c Wed Aug 4 15:31:52 2004
-@@ -24,6 +24,7 @@
- #include "gstmemchunk.h"
- #include "gsttrashstack.h"
- #ifdef HAVE_VALGRIND
-+#include <sys/types.h>
- #include <sys/mman.h>
- #include <valgrind/valgrind.h>
- #endif
diff --git a/multimedia/gstreamer/pkg-plist b/multimedia/gstreamer/pkg-plist
index 7a2d99b411c4..caaa89e4494a 100644
--- a/multimedia/gstreamer/pkg-plist
+++ b/multimedia/gstreamer/pkg-plist
@@ -1,140 +1,113 @@
-bin/gst-complete
-bin/gst-complete-%%VERSION%%
-bin/gst-compprep
-bin/gst-compprep-%%VERSION%%
bin/gst-feedback
bin/gst-feedback-%%VERSION%%
bin/gst-inspect
bin/gst-inspect-%%VERSION%%
bin/gst-launch
bin/gst-launch-%%VERSION%%
-bin/gst-md5sum
-bin/gst-md5sum-%%VERSION%%
-bin/gst-register
-bin/gst-register-%%VERSION%%
bin/gst-typefind
bin/gst-typefind-%%VERSION%%
bin/gst-xmlinspect
bin/gst-xmlinspect-%%VERSION%%
bin/gst-xmllaunch
bin/gst-xmllaunch-%%VERSION%%
-include/gstreamer-%%VERSION%%/gst/bytestream/adapter.h
-include/gstreamer-%%VERSION%%/gst/bytestream/bytestream.h
-include/gstreamer-%%VERSION%%/gst/bytestream/filepad.h
-include/gstreamer-%%VERSION%%/gst/control/control.h
-include/gstreamer-%%VERSION%%/gst/control/dparam.h
-include/gstreamer-%%VERSION%%/gst/control/dparam_smooth.h
-include/gstreamer-%%VERSION%%/gst/control/dparamcommon.h
-include/gstreamer-%%VERSION%%/gst/control/dparammanager.h
-include/gstreamer-%%VERSION%%/gst/control/dplinearinterp.h
-include/gstreamer-%%VERSION%%/gst/control/unitconvert.h
+include/gstreamer-%%VERSION%%/gst/base/gstadapter.h
+include/gstreamer-%%VERSION%%/gst/base/gstbasesink.h
+include/gstreamer-%%VERSION%%/gst/base/gstbasesrc.h
+include/gstreamer-%%VERSION%%/gst/base/gstbasetransform.h
+include/gstreamer-%%VERSION%%/gst/base/gstcollectpads.h
+include/gstreamer-%%VERSION%%/gst/base/gstpushsrc.h
+include/gstreamer-%%VERSION%%/gst/base/gsttypefindhelper.h
+include/gstreamer-%%VERSION%%/gst/controller/gstcontroller.h
include/gstreamer-%%VERSION%%/gst/dataprotocol/dataprotocol.h
-include/gstreamer-%%VERSION%%/gst/getbits/getbits.h
+include/gstreamer-%%VERSION%%/gst/glib-compat.h
include/gstreamer-%%VERSION%%/gst/gst.h
-include/gstreamer-%%VERSION%%/gst/gstatomic.h
include/gstreamer-%%VERSION%%/gst/gstbin.h
include/gstreamer-%%VERSION%%/gst/gstbuffer.h
+include/gstreamer-%%VERSION%%/gst/gstbus.h
include/gstreamer-%%VERSION%%/gst/gstcaps.h
include/gstreamer-%%VERSION%%/gst/gstchildproxy.h
include/gstreamer-%%VERSION%%/gst/gstclock.h
include/gstreamer-%%VERSION%%/gst/gstcompat.h
include/gstreamer-%%VERSION%%/gst/gstconfig.h
-include/gstreamer-%%VERSION%%/gst/gstcpu.h
-include/gstreamer-%%VERSION%%/gst/gstdata.h
include/gstreamer-%%VERSION%%/gst/gstelement.h
+include/gstreamer-%%VERSION%%/gst/gstelementfactory.h
include/gstreamer-%%VERSION%%/gst/gstenumtypes.h
include/gstreamer-%%VERSION%%/gst/gsterror.h
include/gstreamer-%%VERSION%%/gst/gstevent.h
include/gstreamer-%%VERSION%%/gst/gstfilter.h
include/gstreamer-%%VERSION%%/gst/gstformat.h
+include/gstreamer-%%VERSION%%/gst/gstghostpad.h
include/gstreamer-%%VERSION%%/gst/gstindex.h
+include/gstreamer-%%VERSION%%/gst/gstindexfactory.h
include/gstreamer-%%VERSION%%/gst/gstinfo.h
include/gstreamer-%%VERSION%%/gst/gstinterface.h
+include/gstreamer-%%VERSION%%/gst/gstiterator.h
include/gstreamer-%%VERSION%%/gst/gstmacros.h
include/gstreamer-%%VERSION%%/gst/gstmarshal.h
-include/gstreamer-%%VERSION%%/gst/gstmemchunk.h
+include/gstreamer-%%VERSION%%/gst/gstmessage.h
+include/gstreamer-%%VERSION%%/gst/gstminiobject.h
include/gstreamer-%%VERSION%%/gst/gstobject.h
include/gstreamer-%%VERSION%%/gst/gstpad.h
+include/gstreamer-%%VERSION%%/gst/gstpadtemplate.h
include/gstreamer-%%VERSION%%/gst/gstparse.h
include/gstreamer-%%VERSION%%/gst/gstpipeline.h
include/gstreamer-%%VERSION%%/gst/gstplugin.h
include/gstreamer-%%VERSION%%/gst/gstpluginfeature.h
-include/gstreamer-%%VERSION%%/gst/gstprobe.h
include/gstreamer-%%VERSION%%/gst/gstquery.h
-include/gstreamer-%%VERSION%%/gst/gstqueue.h
include/gstreamer-%%VERSION%%/gst/gstregistry.h
-include/gstreamer-%%VERSION%%/gst/gstregistrypool.h
-include/gstreamer-%%VERSION%%/gst/gstscheduler.h
+include/gstreamer-%%VERSION%%/gst/gstsegment.h
include/gstreamer-%%VERSION%%/gst/gststructure.h
include/gstreamer-%%VERSION%%/gst/gstsystemclock.h
-include/gstreamer-%%VERSION%%/gst/gsttag.h
-include/gstreamer-%%VERSION%%/gst/gsttaginterface.h
-include/gstreamer-%%VERSION%%/gst/gstthread.h
+include/gstreamer-%%VERSION%%/gst/gsttaglist.h
+include/gstreamer-%%VERSION%%/gst/gsttagsetter.h
+include/gstreamer-%%VERSION%%/gst/gsttask.h
include/gstreamer-%%VERSION%%/gst/gsttrace.h
-include/gstreamer-%%VERSION%%/gst/gsttrashstack.h
include/gstreamer-%%VERSION%%/gst/gsttypefind.h
-include/gstreamer-%%VERSION%%/gst/gsttypes.h
+include/gstreamer-%%VERSION%%/gst/gsttypefindfactory.h
include/gstreamer-%%VERSION%%/gst/gsturi.h
-include/gstreamer-%%VERSION%%/gst/gsturitype.h
include/gstreamer-%%VERSION%%/gst/gstutils.h
include/gstreamer-%%VERSION%%/gst/gstvalue.h
include/gstreamer-%%VERSION%%/gst/gstversion.h
include/gstreamer-%%VERSION%%/gst/gstxml.h
-lib/gstreamer-%%VERSION%%/libgstbasicgthreadscheduler.a
-lib/gstreamer-%%VERSION%%/libgstbasicgthreadscheduler.la
-lib/gstreamer-%%VERSION%%/libgstbasicgthreadscheduler.so
-lib/gstreamer-%%VERSION%%/libgstbasicomegascheduler.a
-lib/gstreamer-%%VERSION%%/libgstbasicomegascheduler.la
-lib/gstreamer-%%VERSION%%/libgstbasicomegascheduler.so
-lib/gstreamer-%%VERSION%%/libgstbytestream.a
-lib/gstreamer-%%VERSION%%/libgstbytestream.la
-lib/gstreamer-%%VERSION%%/libgstbytestream.so
-lib/gstreamer-%%VERSION%%/libgstdataprotocol.a
-lib/gstreamer-%%VERSION%%/libgstdataprotocol.la
-lib/gstreamer-%%VERSION%%/libgstdataprotocol.so
-lib/gstreamer-%%VERSION%%/libgstelements.a
-lib/gstreamer-%%VERSION%%/libgstelements.la
-lib/gstreamer-%%VERSION%%/libgstelements.so
-lib/gstreamer-%%VERSION%%/libgstentrygthreadscheduler.a
-lib/gstreamer-%%VERSION%%/libgstentrygthreadscheduler.la
-lib/gstreamer-%%VERSION%%/libgstentrygthreadscheduler.so
-lib/gstreamer-%%VERSION%%/libgstentryomegascheduler.a
-lib/gstreamer-%%VERSION%%/libgstentryomegascheduler.la
-lib/gstreamer-%%VERSION%%/libgstentryomegascheduler.so
-lib/gstreamer-%%VERSION%%/libgstfairgthreadscheduler.a
-lib/gstreamer-%%VERSION%%/libgstfairgthreadscheduler.la
-lib/gstreamer-%%VERSION%%/libgstfairgthreadscheduler.so
-lib/gstreamer-%%VERSION%%/libgstgetbits.a
-lib/gstreamer-%%VERSION%%/libgstgetbits.la
-lib/gstreamer-%%VERSION%%/libgstgetbits.so
-lib/gstreamer-%%VERSION%%/libgstindexers.a
-lib/gstreamer-%%VERSION%%/libgstindexers.la
-lib/gstreamer-%%VERSION%%/libgstindexers.so
-lib/gstreamer-%%VERSION%%/libgstoptgthreadscheduler.a
-lib/gstreamer-%%VERSION%%/libgstoptgthreadscheduler.la
-lib/gstreamer-%%VERSION%%/libgstoptgthreadscheduler.so
-lib/gstreamer-%%VERSION%%/libgstoptomegascheduler.a
-lib/gstreamer-%%VERSION%%/libgstoptomegascheduler.la
-lib/gstreamer-%%VERSION%%/libgstoptomegascheduler.so
-lib/gstreamer-%%VERSION%%/libgstoptscheduler.a
-lib/gstreamer-%%VERSION%%/libgstoptscheduler.la
-lib/gstreamer-%%VERSION%%/libgstoptscheduler.so
-lib/gstreamer-%%VERSION%%/libgstspider.a
-lib/gstreamer-%%VERSION%%/libgstspider.la
-lib/gstreamer-%%VERSION%%/libgstspider.so
-lib/libgstcontrol-%%VERSION%%.a
-lib/libgstcontrol-%%VERSION%%.la
-lib/libgstcontrol-%%VERSION%%.so
-lib/libgstcontrol-%%VERSION%%.so.%%SHLIB_VERSION%%
+include/gstreamer-%%VERSION%%/gst/net/gstnet.h
+include/gstreamer-%%VERSION%%/gst/net/gstnetclientclock.h
+include/gstreamer-%%VERSION%%/gst/net/gstnettimepacket.h
+include/gstreamer-%%VERSION%%/gst/net/gstnettimeprovider.h
+lib/gstreamer-%%VERSION%%/libgstcoreelements.a
+lib/gstreamer-%%VERSION%%/libgstcoreelements.la
+lib/gstreamer-%%VERSION%%/libgstcoreelements.so
+lib/gstreamer-%%VERSION%%/libgstcoreindexers.a
+lib/gstreamer-%%VERSION%%/libgstcoreindexers.la
+lib/gstreamer-%%VERSION%%/libgstcoreindexers.so
+lib/libgstbase-%%VERSION%%.a
+lib/libgstbase-%%VERSION%%.la
+lib/libgstbase-%%VERSION%%.so
+lib/libgstbase-%%VERSION%%.so.0
+lib/libgstcontroller-%%VERSION%%.a
+lib/libgstcontroller-%%VERSION%%.la
+lib/libgstcontroller-%%VERSION%%.so
+lib/libgstcontroller-%%VERSION%%.so.0
+lib/libgstdataprotocol-%%VERSION%%.a
+lib/libgstdataprotocol-%%VERSION%%.la
+lib/libgstdataprotocol-%%VERSION%%.so
+lib/libgstdataprotocol-%%VERSION%%.so.0
+lib/libgstnet-%%VERSION%%.a
+lib/libgstnet-%%VERSION%%.la
+lib/libgstnet-%%VERSION%%.so
+lib/libgstnet-%%VERSION%%.so.0
lib/libgstreamer-%%VERSION%%.a
lib/libgstreamer-%%VERSION%%.la
lib/libgstreamer-%%VERSION%%.so
-lib/libgstreamer-%%VERSION%%.so.%%SHLIB_VERSION%%
+lib/libgstreamer-%%VERSION%%.so.0
libdata/pkgconfig/gstreamer-%%VERSION%%.pc
-libdata/pkgconfig/gstreamer-control-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-base-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-controller-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-dataprotocol-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-net-%%VERSION%%.pc
share/aclocal/gst-element-check-%%VERSION%%.m4
share/locale/af/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/az/LC_MESSAGES/gstreamer-%%VERSION%%.mo
+share/locale/bg/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/ca/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/de/LC_MESSAGES/gstreamer-%%VERSION%%.mo
@@ -150,14 +123,12 @@ share/locale/sv/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/tr/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/uk/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/vi/LC_MESSAGES/gstreamer-%%VERSION%%.mo
-@unexec rm %D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
-@dirrm share/gnome/cache/gstreamer-%%VERSION%%
-@dirrmtry share/gnome/cache
-@dirrm lib/gstreamer-%%VERSION%%
-@dirrm include/gstreamer-%%VERSION%%/gst/getbits
+share/locale/zh_CN/LC_MESSAGES/gstreamer-%%VERSION%%.mo
+share/locale/zh_TW/LC_MESSAGES/gstreamer-%%VERSION%%.mo
+@dirrm include/gstreamer-%%VERSION%%/gst/net
@dirrm include/gstreamer-%%VERSION%%/gst/dataprotocol
-@dirrm include/gstreamer-%%VERSION%%/gst/control
-@dirrm include/gstreamer-%%VERSION%%/gst/bytestream
+@dirrm include/gstreamer-%%VERSION%%/gst/controller
+@dirrm include/gstreamer-%%VERSION%%/gst/base
@dirrm include/gstreamer-%%VERSION%%/gst
@dirrm include/gstreamer-%%VERSION%%
-@exec %D/bin/gst-register-0.8 --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
+@dirrm lib/gstreamer-%%VERSION%%
diff --git a/multimedia/gstreamer80/Makefile b/multimedia/gstreamer80/Makefile
index a0f1da4097c6..75e304ff670e 100644
--- a/multimedia/gstreamer80/Makefile
+++ b/multimedia/gstreamer80/Makefile
@@ -3,15 +3,17 @@
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/multimedia/gstreamer80/Makefile,v 1.40 2006/04/23 22:58:42 mezz Exp $
#
PORTNAME= gstreamer
-PORTVERSION= 0.8.11
-PORTREVISION= 2
+PORTVERSION= 0.8.12
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://gstreamer.freedesktop.org/src/gstreamer/
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${GST_VERSION}
+PKGNAMESUFFIX= 80
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -24,6 +26,7 @@ USE_BISON= yes
USE_BZIP2= yes
USE_GMAKE= yes
WANT_GNOME= yes
+USE_GETTEXT= yes
USE_GNOME= gnomehack \
gnomeprefix \
glib20 \
diff --git a/multimedia/gstreamer80/distinfo b/multimedia/gstreamer80/distinfo
index 2a24d9cb5c2e..70d63384bc08 100644
--- a/multimedia/gstreamer80/distinfo
+++ b/multimedia/gstreamer80/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gstreamer-0.8.11.tar.bz2) = 3a251cf05b794ebac04e18f71e5b26eb
-SHA256 (gnome2/gstreamer-0.8.11.tar.bz2) = 29aaec0f345b614dfa8da97cef629d68f74b4523dd28cb0abc04352cf14e6064
-SIZE (gnome2/gstreamer-0.8.11.tar.bz2) = 1459651
+MD5 (gnome2/gstreamer-0.8.12.tar.bz2) = 80f3c4957ab3e254cc90016f87ba5482
+SHA256 (gnome2/gstreamer-0.8.12.tar.bz2) = fd90caa93889bd0abbe41b4a36d2b7e27d3987650182004656f9dc4e6fbc3d8c
+SIZE (gnome2/gstreamer-0.8.12.tar.bz2) = 1534775
diff --git a/multimedia/gstreamer80/files/patch-tools_Makefile.in b/multimedia/gstreamer80/files/patch-tools_Makefile.in
new file mode 100644
index 000000000000..c20261a9cb6a
--- /dev/null
+++ b/multimedia/gstreamer80/files/patch-tools_Makefile.in
@@ -0,0 +1,20 @@
+--- tools/Makefile.in.orig Thu Jan 19 14:34:47 2006
++++ tools/Makefile.in Thu Jan 19 14:36:45 2006
+@@ -73,17 +73,10 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-@GST_DISABLE_REGISTRY_FALSE@am__EXEEXT_1 = gst-register$(EXEEXT)
+ @GST_DISABLE_REGISTRY_FALSE@am__EXEEXT_2 = gst-register-@GST_MAJORMINOR@$(EXEEXT)
+-@GST_DISABLE_LOADSAVE_FALSE@am__EXEEXT_3 = gst-complete$(EXEEXT) \
+-@GST_DISABLE_LOADSAVE_FALSE@ gst-compprep$(EXEEXT) \
+-@GST_DISABLE_LOADSAVE_FALSE@ gst-xmllaunch$(EXEEXT)
+ @GST_DISABLE_LOADSAVE_FALSE@am__EXEEXT_4 = gst-complete-@GST_MAJORMINOR@$(EXEEXT) \
+ @GST_DISABLE_LOADSAVE_FALSE@ gst-compprep-@GST_MAJORMINOR@$(EXEEXT) \
+ @GST_DISABLE_LOADSAVE_FALSE@ gst-xmllaunch-@GST_MAJORMINOR@$(EXEEXT)
+-am__EXEEXT_5 = gst-feedback$(EXEEXT) gst-inspect$(EXEEXT) \
+- gst-launch$(EXEEXT) gst-md5sum$(EXEEXT) gst-typefind$(EXEEXT) \
+- gst-xmlinspect$(EXEEXT)
+ am__EXEEXT_6 = gst-inspect-@GST_MAJORMINOR@$(EXEEXT) \
+ gst-launch-@GST_MAJORMINOR@$(EXEEXT) \
+ gst-md5sum-@GST_MAJORMINOR@$(EXEEXT) \
diff --git a/multimedia/gstreamer80/pkg-plist b/multimedia/gstreamer80/pkg-plist
index 7a2d99b411c4..638edaeefb3c 100644
--- a/multimedia/gstreamer80/pkg-plist
+++ b/multimedia/gstreamer80/pkg-plist
@@ -1,22 +1,12 @@
-bin/gst-complete
bin/gst-complete-%%VERSION%%
-bin/gst-compprep
bin/gst-compprep-%%VERSION%%
-bin/gst-feedback
bin/gst-feedback-%%VERSION%%
-bin/gst-inspect
bin/gst-inspect-%%VERSION%%
-bin/gst-launch
bin/gst-launch-%%VERSION%%
-bin/gst-md5sum
bin/gst-md5sum-%%VERSION%%
-bin/gst-register
bin/gst-register-%%VERSION%%
-bin/gst-typefind
bin/gst-typefind-%%VERSION%%
-bin/gst-xmlinspect
bin/gst-xmlinspect-%%VERSION%%
-bin/gst-xmllaunch
bin/gst-xmllaunch-%%VERSION%%
include/gstreamer-%%VERSION%%/gst/bytestream/adapter.h
include/gstreamer-%%VERSION%%/gst/bytestream/bytestream.h
@@ -137,8 +127,10 @@ share/locale/af/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/az/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/ca/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/gstreamer-%%VERSION%%.mo
+share/locale/da/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/de/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/en_GB/LC_MESSAGES/gstreamer-%%VERSION%%.mo
+share/locale/fi/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/fr/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/it/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/nb/LC_MESSAGES/gstreamer-%%VERSION%%.mo
diff --git a/multimedia/istanbul/Makefile b/multimedia/istanbul/Makefile
index 6ae1cb8254dc..8a2bd6d5aa52 100644
--- a/multimedia/istanbul/Makefile
+++ b/multimedia/istanbul/Makefile
@@ -6,7 +6,7 @@
PORTNAME= istanbul
PORTVERSION= 0.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= http://live.hujjat.org/
@@ -14,17 +14,16 @@ MAINTAINER= dominique.goncalves@gmail.com
COMMENT= Istanbul is a desktop session recorder for the Free Desktop
RUN_DEPENDS= icecast:${PORTSDIR}/audio/icecast2 \
- ${PYTHON_SITELIBDIR}/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer
+ ${PYTHON_SITELIBDIR}/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer80
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer80
USE_GNOME= pygtk2
USE_GMAKE= yes
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
USE_PYTHON= 2.4+
USE_BZIP2= yes
USE_X_PREFIX= yes
-USE_GSTREAMER= shout2 theora ogg
-USE_REINPLACE= yes
+USE_GSTREAMER80= shout2 theora ogg
.include <bsd.port.pre.mk>
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index 1a5c59cc5d5b..e2eea8295a46 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -22,7 +22,7 @@ USE_KDELIBS_VER= 3
USE_GMAKE= yes
.ifndef (WITHOUT_GSTREAMER)
-USE_GSTREAMER= yes
+USE_GSTREAMER80= yes
PLIST_SUB+= NOGSTREAMER=""
.else
PLIST_SUB+= NOGSTREAMER="@comment "
diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile
index 684be4d7e844..f60128eeb83f 100644
--- a/multimedia/pitivi/Makefile
+++ b/multimedia/pitivi/Makefile
@@ -3,11 +3,10 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/multimedia/pitivi/Makefile,v 1.8 2006/04/26 19:31:01 ahze Exp $
PORTNAME= pitivi
-PORTVERSION= 0.1.10
-PORTREVISION= 1
+PORTVERSION= 0.10.0
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,16 +14,13 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Gstreamer based non-linear audio/video editor
-BUILD_DEPENDS= gnonlin-config:${PORTSDIR}/multimedia/gnonlin \
- ${PYTHON_SITELIBDIR}/gst/_gst.so:${PORTSDIR}/multimedia/py-gstreamer
-RUN_DEPENDS= gnonlin-config:${PORTSDIR}/multimedia/gnonlin \
- ${PYTHON_SITELIBDIR}/gst/_gst.so:${PORTSDIR}/multimedia/py-gstreamer
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gst-0.10/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gst-0.10/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer
USE_BZIP2= yes
USE_GMAKE= yes
-USE_REINPLACE= yes
USE_GNOME= gnometarget pygtk2 pkgconfig pygnome2
-USE_GSTREAMER= yes
+USE_GSTREAMER= gnonlin
USE_PYTHON= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-docs-build
diff --git a/multimedia/pitivi/distinfo b/multimedia/pitivi/distinfo
index 7db557f83837..7a7f57efcc75 100644
--- a/multimedia/pitivi/distinfo
+++ b/multimedia/pitivi/distinfo
@@ -1,3 +1,3 @@
-MD5 (pitivi-0.1.10.tar.bz2) = 9d9c0351e5d21a162c07baaaa56ec7b6
-SHA256 (pitivi-0.1.10.tar.bz2) = dcdbbff359cdb4b2070f39d465ac395c4a9f4f7f962e52993f7d7153f8b781ea
-SIZE (pitivi-0.1.10.tar.bz2) = 284126
+MD5 (pitivi-0.10.0.tar.bz2) = a03b026d0784659905519f59e7abd4e1
+SHA256 (pitivi-0.10.0.tar.bz2) = 73b0d9bf0bc6ff4dc4cbfa4eda3d3e5e2c6154b3d3ec7753650c1982fcf08ad3
+SIZE (pitivi-0.10.0.tar.bz2) = 268532
diff --git a/multimedia/pitivi/pkg-plist b/multimedia/pitivi/pkg-plist
index 3fa7118a60c5..7e2ac53b290d 100644
--- a/multimedia/pitivi/pkg-plist
+++ b/multimedia/pitivi/pkg-plist
@@ -1,62 +1,124 @@
bin/pitivi
-lib/pitivi/__init__.py
-lib/pitivi/__init__.pyc
-lib/pitivi/__init__.pyo
-lib/pitivi/bin.py
-lib/pitivi/bin.pyc
-lib/pitivi/bin.pyo
-lib/pitivi/configure.py
-lib/pitivi/configure.pyc
-lib/pitivi/configure.pyo
-lib/pitivi/discoverer.py
-lib/pitivi/discoverer.pyc
-lib/pitivi/discoverer.pyo
-lib/pitivi/dnd.py
-lib/pitivi/dnd.pyc
-lib/pitivi/dnd.pyo
-lib/pitivi/effects.py
-lib/pitivi/effects.pyc
-lib/pitivi/effects.pyo
-lib/pitivi/objectfactory.py
-lib/pitivi/objectfactory.pyc
-lib/pitivi/objectfactory.pyo
-lib/pitivi/pitivi.py
-lib/pitivi/pitivi.pyc
-lib/pitivi/pitivi.pyo
-lib/pitivi/playground.py
-lib/pitivi/playground.pyc
-lib/pitivi/playground.pyo
-lib/pitivi/project.py
-lib/pitivi/project.pyc
-lib/pitivi/project.pyo
-lib/pitivi/settings.py
-lib/pitivi/settings.pyc
-lib/pitivi/settings.pyo
-lib/pitivi/sourcelist.py
-lib/pitivi/sourcelist.pyc
-lib/pitivi/sourcelist.pyo
-lib/pitivi/timeline.py
-lib/pitivi/timeline.pyc
-lib/pitivi/timeline.pyo
-lib/pitivi/ui/__init__.py
-lib/pitivi/ui/actions.xml
-lib/pitivi/ui/encodingdialog.glade
-lib/pitivi/ui/elementsettingsdialog.glade
-lib/pitivi/ui/exportsettingswidget.glade
-lib/pitivi/ui/exportsettingswidget.py
-lib/pitivi/ui/glade.py
-lib/pitivi/ui/gstwidget.py
-lib/pitivi/ui/mainwindow.py
-lib/pitivi/ui/projectsettings.glade
-lib/pitivi/ui/projectsettings.py
-lib/pitivi/ui/sourcefactories.py
-lib/pitivi/ui/timeline.py
-lib/pitivi/ui/timelineobjects.py
-lib/pitivi/ui/viewer.py
-share/pitivi/pixmaps/pitivi-file.png
-share/pitivi/pixmaps/pitivi-sound.png
-share/pitivi/pixmaps/pitivi-video.png
-@dirrm share/pitivi/pixmaps
+lib/pitivi/python/pitivi/__init__.py
+lib/pitivi/python/pitivi/__init__.pyc
+lib/pitivi/python/pitivi/__init__.pyo
+lib/pitivi/python/pitivi/bin.py
+lib/pitivi/python/pitivi/bin.pyc
+lib/pitivi/python/pitivi/bin.pyo
+lib/pitivi/python/pitivi/check.py
+lib/pitivi/python/pitivi/check.pyc
+lib/pitivi/python/pitivi/check.pyo
+lib/pitivi/python/pitivi/configure.py
+lib/pitivi/python/pitivi/configure.pyc
+lib/pitivi/python/pitivi/configure.pyo
+lib/pitivi/python/pitivi/discoverer.py
+lib/pitivi/python/pitivi/discoverer.pyc
+lib/pitivi/python/pitivi/discoverer.pyo
+lib/pitivi/python/pitivi/dnd.py
+lib/pitivi/python/pitivi/dnd.pyc
+lib/pitivi/python/pitivi/dnd.pyo
+lib/pitivi/python/pitivi/effects.py
+lib/pitivi/python/pitivi/effects.pyc
+lib/pitivi/python/pitivi/effects.pyo
+lib/pitivi/python/pitivi/instance.py
+lib/pitivi/python/pitivi/instance.pyc
+lib/pitivi/python/pitivi/instance.pyo
+lib/pitivi/python/pitivi/objectfactory.py
+lib/pitivi/python/pitivi/objectfactory.pyc
+lib/pitivi/python/pitivi/objectfactory.pyo
+lib/pitivi/python/pitivi/pitivi.py
+lib/pitivi/python/pitivi/pitivi.pyc
+lib/pitivi/python/pitivi/pitivi.pyo
+lib/pitivi/python/pitivi/playground.py
+lib/pitivi/python/pitivi/playground.pyc
+lib/pitivi/python/pitivi/playground.pyo
+lib/pitivi/python/pitivi/project.py
+lib/pitivi/python/pitivi/project.pyc
+lib/pitivi/python/pitivi/project.pyo
+lib/pitivi/python/pitivi/settings.py
+lib/pitivi/python/pitivi/settings.pyc
+lib/pitivi/python/pitivi/settings.pyo
+lib/pitivi/python/pitivi/sourcelist.py
+lib/pitivi/python/pitivi/sourcelist.pyc
+lib/pitivi/python/pitivi/sourcelist.pyo
+lib/pitivi/python/pitivi/timeline.py
+lib/pitivi/python/pitivi/timeline.pyc
+lib/pitivi/python/pitivi/timeline.pyo
+lib/pitivi/python/pitivi/ui/__init__.py
+lib/pitivi/python/pitivi/ui/__init__.pyc
+lib/pitivi/python/pitivi/ui/__init__.pyo
+lib/pitivi/python/pitivi/ui/actions.xml
+lib/pitivi/python/pitivi/ui/complexinterface.py
+lib/pitivi/python/pitivi/ui/complexinterface.pyc
+lib/pitivi/python/pitivi/ui/complexinterface.pyo
+lib/pitivi/python/pitivi/ui/complexlayer.py
+lib/pitivi/python/pitivi/ui/complexlayer.pyc
+lib/pitivi/python/pitivi/ui/complexlayer.pyo
+lib/pitivi/python/pitivi/ui/complexsource.py
+lib/pitivi/python/pitivi/ui/complexsource.pyc
+lib/pitivi/python/pitivi/ui/complexsource.pyo
+lib/pitivi/python/pitivi/ui/complextimeline.py
+lib/pitivi/python/pitivi/ui/complextimeline.pyc
+lib/pitivi/python/pitivi/ui/complextimeline.pyo
+lib/pitivi/python/pitivi/ui/discoverererrordialog.glade
+lib/pitivi/python/pitivi/ui/elementsettingsdialog.glade
+lib/pitivi/python/pitivi/ui/encodingdialog.glade
+lib/pitivi/python/pitivi/ui/exportsettingswidget.glade
+lib/pitivi/python/pitivi/ui/exportsettingswidget.py
+lib/pitivi/python/pitivi/ui/exportsettingswidget.pyc
+lib/pitivi/python/pitivi/ui/exportsettingswidget.pyo
+lib/pitivi/python/pitivi/ui/glade.py
+lib/pitivi/python/pitivi/ui/glade.pyc
+lib/pitivi/python/pitivi/ui/glade.pyo
+lib/pitivi/python/pitivi/ui/gstwidget.py
+lib/pitivi/python/pitivi/ui/gstwidget.pyc
+lib/pitivi/python/pitivi/ui/gstwidget.pyo
+lib/pitivi/python/pitivi/ui/infolayer.py
+lib/pitivi/python/pitivi/ui/infolayer.pyc
+lib/pitivi/python/pitivi/ui/infolayer.pyo
+lib/pitivi/python/pitivi/ui/layerwidgets.py
+lib/pitivi/python/pitivi/ui/layerwidgets.pyc
+lib/pitivi/python/pitivi/ui/layerwidgets.pyo
+lib/pitivi/python/pitivi/ui/mainwindow.py
+lib/pitivi/python/pitivi/ui/mainwindow.pyc
+lib/pitivi/python/pitivi/ui/mainwindow.pyo
+lib/pitivi/python/pitivi/ui/plumber.py
+lib/pitivi/python/pitivi/ui/plumber.pyc
+lib/pitivi/python/pitivi/ui/plumber.pyo
+lib/pitivi/python/pitivi/ui/projectsettings.glade
+lib/pitivi/python/pitivi/ui/projectsettings.py
+lib/pitivi/python/pitivi/ui/projectsettings.pyc
+lib/pitivi/python/pitivi/ui/projectsettings.pyo
+lib/pitivi/python/pitivi/ui/ruler.py
+lib/pitivi/python/pitivi/ui/ruler.pyc
+lib/pitivi/python/pitivi/ui/ruler.pyo
+lib/pitivi/python/pitivi/ui/sourcefactories.py
+lib/pitivi/python/pitivi/ui/sourcefactories.pyc
+lib/pitivi/python/pitivi/ui/sourcefactories.pyo
+lib/pitivi/python/pitivi/ui/timeline.py
+lib/pitivi/python/pitivi/ui/timeline.pyc
+lib/pitivi/python/pitivi/ui/timeline.pyo
+lib/pitivi/python/pitivi/ui/timelineobjects.py
+lib/pitivi/python/pitivi/ui/timelineobjects.pyc
+lib/pitivi/python/pitivi/ui/timelineobjects.pyo
+lib/pitivi/python/pitivi/ui/tracklayer.py
+lib/pitivi/python/pitivi/ui/tracklayer.pyc
+lib/pitivi/python/pitivi/ui/tracklayer.pyo
+lib/pitivi/python/pitivi/ui/viewer.py
+lib/pitivi/python/pitivi/ui/viewer.pyc
+lib/pitivi/python/pitivi/ui/viewer.pyo
+lib/pitivi/python/pitivi/utils.py
+lib/pitivi/python/pitivi/utils.pyc
+lib/pitivi/python/pitivi/utils.pyo
+share/applications/pitivi.desktop
+%%DATADIR%%/pixmaps/pitivi-file.png
+%%DATADIR%%/pixmaps/pitivi-sound.png
+%%DATADIR%%/pixmaps/pitivi-video.png
+share/pixmaps/pitivi.png
+@dirrmtry share/pixmaps
+@dirrm %%DATADIR%%/pixmaps
@dirrm share/pitivi
-@dirrm lib/pitivi/ui
+@dirrm lib/pitivi/python/pitivi/ui
+@dirrm lib/pitivi/python/pitivi
+@dirrm lib/pitivi/python
@dirrm lib/pitivi
diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile
index 9aebc1746bad..9b1f75bc5d60 100644
--- a/multimedia/py-gstreamer/Makefile
+++ b/multimedia/py-gstreamer/Makefile
@@ -6,12 +6,10 @@
#
PORTNAME= gstreamer
-PORTVERSION= 0.8.2
-PORTREVISION= 2
+PORTVERSION= 0.10.3
+PORTREVISION= 1
CATEGORIES= multimedia python gnome
-MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-python/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= kwm
+MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-python/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= gst-python-${PORTVERSION}
@@ -29,7 +27,6 @@ USE_GNOME= pygtk2 \
pkgconfig
USE_GSTREAMER= yes
GNU_CONFIGURE= yes
-USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}"
diff --git a/multimedia/py-gstreamer/distinfo b/multimedia/py-gstreamer/distinfo
index f7d5e63b23c5..d1a40e9ed2e4 100644
--- a/multimedia/py-gstreamer/distinfo
+++ b/multimedia/py-gstreamer/distinfo
@@ -1,3 +1,3 @@
-MD5 (gst-python-0.8.2.tar.bz2) = bfad80dda50e30aea4f6f322ea58c6c8
-SHA256 (gst-python-0.8.2.tar.bz2) = 665d156a1e14c27b1d039e6554e1d99f4d5489934048907826dc4819ffaf4b50
-SIZE (gst-python-0.8.2.tar.bz2) = 310714
+MD5 (gst-python-0.10.3.tar.bz2) = 5587ae25d9d81148050a63000dbb5d76
+SHA256 (gst-python-0.10.3.tar.bz2) = 0a59194eb861e96fa41304f6532bd9cab694ba787734604ba7d88e863480c571
+SIZE (gst-python-0.10.3.tar.bz2) = 404591
diff --git a/multimedia/py-gstreamer/pkg-plist b/multimedia/py-gstreamer/pkg-plist
index d476cf913c5f..3debdf66453b 100644
--- a/multimedia/py-gstreamer/pkg-plist
+++ b/multimedia/py-gstreamer/pkg-plist
@@ -1,29 +1,48 @@
-%%PYTHON_SITELIBDIR%%/gst/__init__.py
-%%PYTHON_SITELIBDIR%%/gst/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gst/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gst/_gst.la
-%%PYTHON_SITELIBDIR%%/gst/_gst.so
-%%PYTHON_SITELIBDIR%%/gst/interfaces.la
-%%PYTHON_SITELIBDIR%%/gst/interfaces.so
-%%PYTHON_SITELIBDIR%%/gst/play.la
-%%PYTHON_SITELIBDIR%%/gst/play.so
-libdata/pkgconfig/gst-python-0.8.pc
-share/gst-python/2.0/defs/gst-extrafuncs.defs
-share/gst-python/2.0/defs/gst-types.defs
-share/gst-python/examples/audioconcat.py
-share/gst-python/examples/bps.py
-share/gst-python/examples/cp.py
-share/gst-python/examples/f2f.py
-share/gst-python/examples/filesrc.py
-share/gst-python/examples/gst123
-share/gst-python/examples/gstfile.py
-share/gst-python/examples/play.py
-share/gst-python/examples/player.py
-share/gst-python/examples/videoplayer.py
-share/gst-python/examples/vorbisplay.py
-@dirrm share/gst-python/examples
-@dirrm share/gst-python/2.0/defs
-@dirrm share/gst-python/2.0
-@dirrm share/gst-python
-@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/gst
+%%PYTHON_SITELIBDIR%%/gst-0.10/gst/__init__.py
+%%PYTHON_SITELIBDIR%%/gst-0.10/gst/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gst-0.10/gst/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gst-0.10/gst/_gst.la
+%%PYTHON_SITELIBDIR%%/gst-0.10/gst/_gst.so
+%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/__init__.py
+%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/discoverer.py
+%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/discoverer.pyc
+%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/discoverer.pyo
+%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/pygobject.py
+%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/pygobject.pyc
+%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/pygobject.pyo
+%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/utils.py
+%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/utils.pyc
+%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/utils.pyo
+%%PYTHON_SITELIBDIR%%/gst-0.10/gst/interfaces.la
+%%PYTHON_SITELIBDIR%%/gst-0.10/gst/interfaces.so
+%%PYTHON_SITELIBDIR%%/pygst.pth
+%%PYTHON_SITELIBDIR%%/pygst.py
+libdata/pkgconfig/gst-python-0.10.pc
+share/gst-python/0.10/defs/base.defs
+share/gst-python/0.10/defs/gst-extrafuncs.defs
+share/gst-python/0.10/defs/gst-types.defs
+share/gst-python/0.10/defs/libs.defs
+share/gst-python/0.10/examples/audio-controller.py
+share/gst-python/0.10/examples/audioconcat.py
+share/gst-python/0.10/examples/bps.py
+share/gst-python/0.10/examples/cp.py
+share/gst-python/0.10/examples/debugslider.py
+share/gst-python/0.10/examples/f2f.py
+share/gst-python/0.10/examples/filesrc.py
+share/gst-python/0.10/examples/fvumeter.py
+share/gst-python/0.10/examples/gst123
+share/gst-python/0.10/examples/gstfile.py
+share/gst-python/0.10/examples/pipeline-tester
+share/gst-python/0.10/examples/play.py
+share/gst-python/0.10/examples/sinkelement.py
+share/gst-python/0.10/examples/vorbisplay.py
+share/gst-python/0.10/examples/vumeter.py
+@dirrm share/gst-python/0.10/examples
+@dirrm share/gst-python/0.10/defs
+@dirrm share/gst-python/0.10
+@dirrmtry share/gst-python
+@dirrm %%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend
+@dirrm %%PYTHON_SITELIBDIR%%/gst-0.10/gst
+@dirrm %%PYTHON_SITELIBDIR%%/gst-0.10
diff --git a/multimedia/py-gstreamer80/Makefile b/multimedia/py-gstreamer80/Makefile
index 9aebc1746bad..579ad1843235 100644
--- a/multimedia/py-gstreamer80/Makefile
+++ b/multimedia/py-gstreamer80/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-python/ \
${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= kwm
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX= 80
DISTNAME= gst-python-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
@@ -27,9 +28,8 @@ USE_GMAKE= yes
USE_GNOME= pygtk2 \
gnomehack \
pkgconfig
-USE_GSTREAMER= yes
+USE_GSTREAMER80= yes
GNU_CONFIGURE= yes
-USE_REINPLACE= yes
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}"
diff --git a/multimedia/py-gstreamer80/distinfo b/multimedia/py-gstreamer80/distinfo
index f7d5e63b23c5..5046947f9354 100644
--- a/multimedia/py-gstreamer80/distinfo
+++ b/multimedia/py-gstreamer80/distinfo
@@ -1,3 +1,2 @@
MD5 (gst-python-0.8.2.tar.bz2) = bfad80dda50e30aea4f6f322ea58c6c8
-SHA256 (gst-python-0.8.2.tar.bz2) = 665d156a1e14c27b1d039e6554e1d99f4d5489934048907826dc4819ffaf4b50
SIZE (gst-python-0.8.2.tar.bz2) = 310714
diff --git a/multimedia/py-gstreamer80/pkg-plist b/multimedia/py-gstreamer80/pkg-plist
index d476cf913c5f..2accea360823 100644
--- a/multimedia/py-gstreamer80/pkg-plist
+++ b/multimedia/py-gstreamer80/pkg-plist
@@ -24,6 +24,6 @@ share/gst-python/examples/vorbisplay.py
@dirrm share/gst-python/examples
@dirrm share/gst-python/2.0/defs
@dirrm share/gst-python/2.0
-@dirrm share/gst-python
+@dirrmtry share/gst-python
@dirrm %%DOCSDIR%%
@dirrm %%PYTHON_SITELIBDIR%%/gst
diff --git a/multimedia/quodlibet/Makefile b/multimedia/quodlibet/Makefile
index 72afd06b982d..0dd81b1918d9 100644
--- a/multimedia/quodlibet/Makefile
+++ b/multimedia/quodlibet/Makefile
@@ -7,20 +7,21 @@
PORTNAME= quodlibet
PORTVERSION= 0.17.1
+PORTREVISION= 1
CATEGORIES= multimedia audio python gnome
MASTER_SITES= http://www.sacredchao.net/~piman/software/
MAINTAINER= changbom.yoon@gmail.com
COMMENT= A GTK+-based audio player written in Python
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer80
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer80
USE_PYTHON= 2.3+
USE_GNOME= pygtk2
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_GSTREAMER= gconf
+USE_GSTREAMER80= gconf
MAN1= exfalso.1 quodlibet.1
@@ -33,29 +34,29 @@ WANT_QUODLIBET_${format:U}= yes
.if defined(WANT_QUODLIBET_OGG)
BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/ogg/_ogg.so:${PORTSDIR}/audio/py-ogg
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/ogg/_ogg.so:${PORTSDIR}/audio/py-ogg
-USE_GSTREAMER+= ogg
+USE_GSTREAMER80+= ogg
.endif
.if defined(WANT_QUODLIBET_VORBIS)
BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
-USE_GSTREAMER+= vorbis
+USE_GSTREAMER80+= vorbis
.endif
.if defined(WANT_QUODLIBET_MAD)
BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/madmodule.so:${PORTSDIR}/audio/py-mad
RUN_DEPNDS+= ${PYTHON_SITELIBDIR}/madmodule.so:${PORTSDIR}/audio/py-mad
-USE_GSTREAMER+= mad
+USE_GSTREAMER80+= mad
.endif
.if defined(WANT_QUODLIBET_FLAC)
-USE_GSTREAMER+= flac
+USE_GSTREAMER80+= flac
.endif
.if defined(WANT_QUODLIBET_REMOTE)
BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/feedparser.py:${PORTSDIR}/textproc/py-feedparser
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/feedparser.py:${PORTSDIR}/textproc/py-feedparser
-USE_GSTREAMER+= gnomevfs
+USE_GSTREAMER80+= gnomevfs
.endif
.if defined(WITH_EXTENSIONS)
diff --git a/multimedia/ruby-gst/Makefile b/multimedia/ruby-gst/Makefile
index 0dcdfd8012a8..842a791217a3 100644
--- a/multimedia/ruby-gst/Makefile
+++ b/multimedia/ruby-gst/Makefile
@@ -3,7 +3,7 @@
# Whom: Akinori MUSHA aka knu <knu@idaemons.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/ruby-gst/Makefile,v 1.2 2005/10/17 07:05:41 mezz Exp $
+# $MCom: ports/multimedia/ruby-gst/Makefile,v 1.5 2006/01/31 20:36:52 marcus Exp $
#
PORTNAME= gst
@@ -21,8 +21,7 @@ COMMENT= Ruby bindings for the GStreamer framework
RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2
USE_RUBY= yes
-USE_GSTREAMER= core
-USE_REINPLACE= yes
+USE_GSTREAMER80= core
USE_RUBY_EXTCONF= yes
.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
diff --git a/multimedia/totem-gstreamer/Makefile b/multimedia/totem-gstreamer/Makefile
index 28bda1cea398..9a9fa6180e36 100644
--- a/multimedia/totem-gstreamer/Makefile
+++ b/multimedia/totem-gstreamer/Makefile
@@ -3,9 +3,10 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/multimedia/totem-gstreamer/Makefile,v 1.13 2006/03/01 04:32:55 marcus Exp $
#
-PORTREVISION= 1
+PORTREVISION= 0
PKGNAMESUFFIX= -gstreamer
MAINTAINER= gnome@FreeBSD.org
@@ -13,7 +14,7 @@ COMMENT= A Gstreamer-based video player for the Gnome 2 desktop
MASTERDIR= ${.CURDIR}/../totem
-OPTIONS=
+OPTIONS= MOZILLA_PLUGIN "Totem mozilla plugin" off
WITH_GSTREAMER= yes
CONFLICTS= totem-[0-9]*
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 87bbe6b2ec7c..7f17eec05a82 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -6,24 +6,25 @@
#
PORTNAME= totem
-PORTVERSION= 1.2.1
-PORTREVISION= 2
+PORTVERSION= 1.4.0
CATEGORIES= multimedia gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome2
MAINTAINER?= hendrik@scholz.net
COMMENT?= A Xine-based video player for the Gnome 2 Desktop
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+LIB_DEPENDS= musicbrainz:${PORTSDIR}/audio/libmusicbrainz
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-USE_REINPLACE= yes
USE_BZIP2= yes
+USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix intlhack gnomehack gnomedesktop desktopfileutils \
nautiluscdburner
+GNOME_DESKTOP_VERSION=2
WANT_GSTREAMER= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -40,12 +41,10 @@ OPTIONS?= DVDNAV "Enable DVD support" on \
MAN1= totem.1 totem-video-thumbnailer.1
GCONF_SCHEMAS= totem-handlers.schemas totem-video-thumbnail.schemas \
totem.schemas
-CONFLICTS= totem-gstreamer-[0-9]*
+CONFLICTS?= totem-gstreamer-[0-9]*
.include <bsd.port.pre.mk>
-LIB_DEPENDS+= musicbrainz:${PORTSDIR}/audio/libmusicbrainz
-
.if defined(WITH_MOZILLA_PLUGIN)
USE_GECKO= firefox mozilla seamonkey
.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
@@ -58,9 +57,7 @@ CONFIGURE_ARGS+=--disable-mozilla
.endif
.if defined(WITH_GSTREAMER)
-BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-CONFIGURE_ARGS+=--enable-gstreamer
+CONFIGURE_ARGS+=--enable-gstreamer=0.10
USE_GSTREAMER+= gnomevfs core gconf
WITHOUT_DVDNAV= yes
PLIST_SUB+= GSTREAMER=""
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index 3925a5b76a93..47d1fdd4b826 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/totem-1.2.1.tar.bz2) = 7915469973500dba01d51edfd9e49cf3
-SHA256 (gnome2/totem-1.2.1.tar.bz2) = 569c265cd184ef559cf2e266812f09f93d1642c6fd612c92e1a639e0f91c6621
-SIZE (gnome2/totem-1.2.1.tar.bz2) = 1411347
+MD5 (gnome2/totem-1.4.0.tar.bz2) = 34be929fc384b078afabd6d81ab47285
+SHA256 (gnome2/totem-1.4.0.tar.bz2) = 96d19746c60416f38fbd8a82f6e0220ec5eeace054061fad7af08d61481eeb5e
+SIZE (gnome2/totem-1.4.0.tar.bz2) = 1669373
diff --git a/multimedia/totem/files/patch-src_totem-disk.c b/multimedia/totem/files/patch-src_totem-disk.c
index d522008f04bc..6b6ef565e287 100644
--- a/multimedia/totem/files/patch-src_totem-disk.c
+++ b/multimedia/totem/files/patch-src_totem-disk.c
@@ -1,14 +1,8 @@
---- src/plparse/totem-disc.c.orig Sun Mar 13 08:37:57 2005
-+++ src/plparse/totem-disc.c Wed Mar 23 03:29:26 2005
-@@ -34,18 +34,40 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <errno.h>
--#include <mntent.h>
- #include <string.h>
-
- #include <sys/ioctl.h>
- #include <sys/stat.h>
+--- src/plparse/totem-disc.c.orig Thu Nov 24 16:53:02 2005
++++ src/plparse/totem-disc.c Sun Dec 18 13:34:12 2005
+@@ -43,7 +43,29 @@
+ #include <glib/gi18n.h>
+ #include <libgnomevfs/gnome-vfs.h>
+#ifdef __FreeBSD__
+#include <sys/cdio.h>
@@ -31,16 +25,8 @@
+#define ENOMEDIUM ENODEV
+#define CDROM_GET_CAPABILITY CDIOCCLRDEBUG
+#else
-+#include <mntent.h>
-+#include <linux/cdrom.h>
+ #include <linux/cdrom.h>
+#endif
-+
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <libgnomevfs/gnome-vfs.h>
--#include <linux/cdrom.h>
--
#include "totem-disc.h"
- typedef struct _CdCache {
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index 3bcad3799c87..137cc15c4098 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -2,6 +2,7 @@ bin/totem
bin/totem-video-thumbnailer
include/totem/1/plparser/totem-disc.h
include/totem/1/plparser/totem-pl-parser-builtins.h
+include/totem/1/plparser/totem-pl-parser-features.h
include/totem/1/plparser/totem-pl-parser.h
%%MOZILLA%%lib/browser_plugins/libtotem_mozilla.a
%%MOZILLA%%lib/browser_plugins/libtotem_mozilla.la
@@ -10,7 +11,7 @@ include/totem/1/plparser/totem-pl-parser.h
lib/libtotem-plparser.a
lib/libtotem-plparser.la
lib/libtotem-plparser.so
-lib/libtotem-plparser.so.1
+lib/libtotem-plparser.so.2
lib/nautilus/extensions-1.0/libtotem-properties-page.a
lib/nautilus/extensions-1.0/libtotem-properties-page.la
lib/nautilus/extensions-1.0/libtotem-properties-page.so
@@ -28,6 +29,9 @@ share/gnome/help/totem/C/figures/totem_volume_maximum_button.png
share/gnome/help/totem/C/figures/totem_volume_mute_button.png
share/gnome/help/totem/C/legal.xml
share/gnome/help/totem/C/totem.xml
+share/gnome/help/totem/bg/figures/totem_start_window.png
+share/gnome/help/totem/bg/legal.xml
+share/gnome/help/totem/bg/totem.xml
share/gnome/help/totem/de/figures/totem_next_button.png
share/gnome/help/totem/de/figures/totem_pause_button.png
share/gnome/help/totem/de/figures/totem_play_button.png
@@ -73,6 +77,7 @@ share/gnome/help/totem/uk/figures/totem_volume_mute_button.png
share/gnome/help/totem/uk/legal.xml
share/gnome/help/totem/uk/totem.xml
share/gnome/omf/totem/totem-C.omf
+share/gnome/omf/totem/totem-bg.omf
share/gnome/omf/totem/totem-de.omf
share/gnome/omf/totem/totem-es.omf
share/gnome/omf/totem/totem-fr.omf
@@ -109,6 +114,7 @@ share/locale/az/LC_MESSAGES/totem.mo
share/locale/be/LC_MESSAGES/totem.mo
share/locale/bg/LC_MESSAGES/totem.mo
share/locale/bn/LC_MESSAGES/totem.mo
+share/locale/br/LC_MESSAGES/totem.mo
share/locale/ca/LC_MESSAGES/totem.mo
share/locale/cs/LC_MESSAGES/totem.mo
share/locale/cy/LC_MESSAGES/totem.mo
@@ -135,6 +141,7 @@ share/locale/is/LC_MESSAGES/totem.mo
share/locale/it/LC_MESSAGES/totem.mo
share/locale/ja/LC_MESSAGES/totem.mo
share/locale/ko/LC_MESSAGES/totem.mo
+share/locale/ku/LC_MESSAGES/totem.mo
share/locale/lt/LC_MESSAGES/totem.mo
share/locale/lv/LC_MESSAGES/totem.mo
share/locale/mk/LC_MESSAGES/totem.mo
@@ -165,7 +172,10 @@ share/locale/vi/LC_MESSAGES/totem.mo
share/locale/wa/LC_MESSAGES/totem.mo
share/locale/xh/LC_MESSAGES/totem.mo
share/locale/zh_CN/LC_MESSAGES/totem.mo
+share/locale/zh_HK/LC_MESSAGES/totem.mo
share/locale/zh_TW/LC_MESSAGES/totem.mo
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrm share/gnome/totem
@dirrm share/gnome/omf/totem
@dirrm share/gnome/help/totem/uk/figures
@@ -178,6 +188,8 @@ share/locale/zh_TW/LC_MESSAGES/totem.mo
@dirrm share/gnome/help/totem/es
@dirrm share/gnome/help/totem/de/figures
@dirrm share/gnome/help/totem/de
+@dirrm share/gnome/help/totem/bg/figures
+@dirrm share/gnome/help/totem/bg
@dirrm share/gnome/help/totem/C/figures
@dirrm share/gnome/help/totem/C
@dirrm share/gnome/help/totem
diff --git a/net/Makefile b/net/Makefile
index 522aec89a592..bcfb69f1d3b4 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -168,6 +168,7 @@
SUBDIR += gsk
SUBDIR += gspoof
SUBDIR += gstreamer-plugins-libmms
+ SUBDIR += gstreamer-plugins-libmms80
SUBDIR += gtic
SUBDIR += gutenfetch
SUBDIR += happystats
diff --git a/net/gstreamer-plugins-libmms80/Makefile b/net/gstreamer-plugins-libmms80/Makefile
index 7d0d432ce650..a39407cb71fd 100644
--- a/net/gstreamer-plugins-libmms80/Makefile
+++ b/net/gstreamer-plugins-libmms80/Makefile
@@ -3,15 +3,16 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/net/gstreamer-plugins-libmms80/Makefile,v 1.2 2006/02/25 00:12:31 marcus Exp $
#
CATEGORIES= net
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer mms:// and mmsh:// plugin
GST_PLUGIN= libmms
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 0ea7b8892629..79c327210933 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -224,6 +224,7 @@
SUBDIR += grub
SUBDIR += gstopd
SUBDIR += gstreamer-plugins-cdio
+ SUBDIR += gstreamer-plugins-cdio80
SUBDIR += gtk-imonc
SUBDIR += gtk-send-pr
SUBDIR += gtoaster
diff --git a/sysutils/gnomebaker/Makefile b/sysutils/gnomebaker/Makefile
index 964d70780b45..52fe8b1bfc4e 100644
--- a/sysutils/gnomebaker/Makefile
+++ b/sysutils/gnomebaker/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
INSTALLS_OMF= yes
USE_GCC= 3.4+
-USE_GSTREAMER= vorbis mad flac
+USE_GSTREAMER80= vorbis mad flac
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/gstreamer-plugins-cdio80/Makefile b/sysutils/gstreamer-plugins-cdio80/Makefile
index 695cc405b4d5..8c70a00eb556 100644
--- a/sysutils/gstreamer-plugins-cdio80/Makefile
+++ b/sysutils/gstreamer-plugins-cdio80/Makefile
@@ -3,15 +3,16 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/sysutils/gstreamer-plugins-cdio80/Makefile,v 1.2 2006/02/25 00:19:56 marcus Exp $
#
CATEGORIES= sysutils
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer compact disc input and control library
GST_PLUGIN= cdio
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/serpentine/Makefile b/sysutils/serpentine/Makefile
index 9248a5334503..a0b73e29464c 100644
--- a/sysutils/serpentine/Makefile
+++ b/sysutils/serpentine/Makefile
@@ -3,20 +3,20 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/sysutils/serpentine/Makefile,v 1.2 2006/04/25 15:17:05 ahze Exp $
PORTNAME= serpentine
PORTVERSION= 0.6.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= http://download.berlios.de/${PORTNAME}/
MAINTAINER= ahze@FreeBSD.org
COMMENT= Gnome Audio Cd Buner
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer \
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer80 \
xmlproc_parse:${PORTSDIR}/textproc/py-xml
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer \
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer80 \
xmlproc_parse:${PORTSDIR}/textproc/py-xml
USE_X_PREFIX= yes
@@ -24,7 +24,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GNOME= pygnomeextras intlhack
USE_GMAKE= yes
-USE_GSTREAMER= core gnomevfs
+USE_GSTREAMER80= core gnomevfs
USE_PYTHON= 2.4+
OPTIONS= MUINE "Cd-Burner Plugin for muine audio player (i386 only)" Off
diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile
index 814bc9f9742c..59749a3eeefd 100644
--- a/www/swfdec-plugin/Makefile
+++ b/www/swfdec-plugin/Makefile
@@ -26,15 +26,14 @@ RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${POR
BROKEN= Does not compile
-USE_REINPLACE= yes
USE_X_PREFIX= yes
USE_SDL= sdl
USE_GNOME= gnomehack gtk20 libartlgpl2
-USE_GSTREAMER= gconf
-USE_GETOPT_LONG=yes
+USE_GSTREAMER80= gconf
+USE_GETOPT_LONG= yes
USE_REINPLACE= yes
USE_AUTOTOOLS= libtool:15
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/nspr" \
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox"
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index b723ac05414b..8b6d99991db5 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -40,6 +40,7 @@
SUBDIR += gnustep-xdps
SUBDIR += gob
SUBDIR += gstreamer-plugins-pango
+ SUBDIR += gstreamer-plugins-pango80
SUBDIR += gtk--
SUBDIR += gtk--2
SUBDIR += gtk-sharp10
diff --git a/x11-toolkits/gstreamer-plugins-pango80/Makefile b/x11-toolkits/gstreamer-plugins-pango80/Makefile
index 48e775335e9c..116306d6a4b8 100644
--- a/x11-toolkits/gstreamer-plugins-pango80/Makefile
+++ b/x11-toolkits/gstreamer-plugins-pango80/Makefile
@@ -3,15 +3,16 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/x11-toolkits/gstreamer-plugins-pango80/Makefile,v 1.2 2006/02/25 00:40:47 marcus Exp $
#
CATEGORIES= x11-toolkits
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Gstreamer pango textoverlay plugin
GST_PLUGIN= pango
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins80
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
index ea79ad14a86b..6e6113b2acd4 100644
--- a/x11-toolkits/wxgtk26/Makefile
+++ b/x11-toolkits/wxgtk26/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\
jpeg.9:${PORTSDIR}/graphics/jpeg\
tiff.4:${PORTSDIR}/graphics/tiff\
expat.6:${PORTSDIR}/textproc/expat2\
- mspack.1:${PORTSDIR}/archivers/libmspack\
- gstinterfaces-0.8.1:${PORTSDIR}/multimedia/gstreamer-plugins
+ mspack.1:${PORTSDIR}/archivers/libmspack
USE_BZIP2= yes
USE_X_PREFIX= yes
@@ -29,6 +28,7 @@ USE_GL= yes
USE_GMAKE= yes
USE_ICONV= yes
USE_GNOME= gtk20
+USE_GSTREAMER80=yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libpng=sys\
--with-libjpeg=sys\
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index ea79ad14a86b..6e6113b2acd4 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\
jpeg.9:${PORTSDIR}/graphics/jpeg\
tiff.4:${PORTSDIR}/graphics/tiff\
expat.6:${PORTSDIR}/textproc/expat2\
- mspack.1:${PORTSDIR}/archivers/libmspack\
- gstinterfaces-0.8.1:${PORTSDIR}/multimedia/gstreamer-plugins
+ mspack.1:${PORTSDIR}/archivers/libmspack
USE_BZIP2= yes
USE_X_PREFIX= yes
@@ -29,6 +28,7 @@ USE_GL= yes
USE_GMAKE= yes
USE_ICONV= yes
USE_GNOME= gtk20
+USE_GSTREAMER80=yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libpng=sys\
--with-libjpeg=sys\
diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index ea79ad14a86b..6e6113b2acd4 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\
jpeg.9:${PORTSDIR}/graphics/jpeg\
tiff.4:${PORTSDIR}/graphics/tiff\
expat.6:${PORTSDIR}/textproc/expat2\
- mspack.1:${PORTSDIR}/archivers/libmspack\
- gstinterfaces-0.8.1:${PORTSDIR}/multimedia/gstreamer-plugins
+ mspack.1:${PORTSDIR}/archivers/libmspack
USE_BZIP2= yes
USE_X_PREFIX= yes
@@ -29,6 +28,7 @@ USE_GL= yes
USE_GMAKE= yes
USE_ICONV= yes
USE_GNOME= gtk20
+USE_GSTREAMER80=yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libpng=sys\
--with-libjpeg=sys\