summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--multimedia/gstreamer-plugins/Makefile88
-rw-r--r--multimedia/gstreamer-plugins/distinfo2
-rw-r--r--multimedia/gstreamer-plugins/files/patch-gst-libs_ext_ffmpeg_Makefile.in11
-rw-r--r--multimedia/gstreamer-plugins/files/patch-gst_udp_gstudpsrc.h10
-rw-r--r--multimedia/gstreamer-plugins/pkg-plist270
-rw-r--r--multimedia/gstreamer-plugins80/Makefile88
-rw-r--r--multimedia/gstreamer-plugins80/distinfo2
-rw-r--r--multimedia/gstreamer-plugins80/files/patch-gst-libs_ext_ffmpeg_Makefile.in11
-rw-r--r--multimedia/gstreamer-plugins80/files/patch-gst_udp_gstudpsrc.h10
-rw-r--r--multimedia/gstreamer-plugins80/pkg-plist270
-rw-r--r--multimedia/gstreamer/Makefile35
-rw-r--r--multimedia/gstreamer/distinfo2
-rw-r--r--multimedia/gstreamer/files/patch-gst::cothreads.c15
-rw-r--r--multimedia/gstreamer/files/patch-gst_gstthreaddummy.c12
-rw-r--r--multimedia/gstreamer/pkg-plist180
-rw-r--r--multimedia/gstreamer80/Makefile35
-rw-r--r--multimedia/gstreamer80/distinfo2
-rw-r--r--multimedia/gstreamer80/files/patch-gst::cothreads.c15
-rw-r--r--multimedia/gstreamer80/files/patch-gst_gstthreaddummy.c12
-rw-r--r--multimedia/gstreamer80/pkg-plist180
20 files changed, 596 insertions, 654 deletions
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index e7add72fe..8b8ee04bb 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -2,11 +2,11 @@
# Date created: Wed Jul 10 23:38:01 UTC 2002
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
-# $FreeBSD$
+# $FreeBSD: ports/multimedia/gstreamer-plugins/Makefile,v 1.10 2003/01/16 18:44:33 lioux Exp $
#
PORTNAME= gstreamer
-PORTVERSION= 0.5.2
+PORTVERSION= 0.6.0
CATEGORIES= multimedia audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -18,7 +18,7 @@ MAINTAINER= lioux@FreeBSD.org
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20 \
gconf-2.5:${PORTSDIR}/devel/gconf2 \
- gstreamer-0.5.3:${PORTSDIR}/multimedia/gstreamer \
+ gstreamer-0.6.0:${PORTSDIR}/multimedia/gstreamer \
gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
popt.0:${PORTSDIR}/devel/popt \
xml2.5:${PORTSDIR}/textproc/libxml2
@@ -44,6 +44,9 @@ CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \
CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
CONFIGURE_TARGET=
+PLIST_SUB= \
+ VERSION="${PORTVERSION:C/..$//}" \
+ SHLIB_VERSION="${SHLIB_VERSION}"
INSTALLS_SHLIB= yes
# for esound detection
@@ -55,28 +58,19 @@ PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
SDL_CONFIG?="${LOCALBASE}/bin/sdl11-config"
XMMS_CONFIG?="${LOCALBASE}/bin/xmms-config"
+# library minor number
+SHLIB_VERSION= 0
+
post-patch:
# as of this writing, FreeBSD does not support lrint* C99 math functions
@${REINPLACE_CMD} -E -e \
's|^#define.*LRINT.*$$||' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-# remove version number from include dir name
- @${REINPLACE_CMD} -E -e \
- 's|-@VERSION@||' \
- ${WRKSRC}/gstreamer-libs.pc.in \
- ${WRKSRC}/gstreamer-play.pc.in
-# remove version number from include dir name
# respect CFLAGS
@${FIND} ${WRKSRC} -type f -name Makefile.in | \
${XARGS} -n 10 ${REINPLACE_CMD} -E -e \
- 's|^(lib[[:alpha:]]+includedir.+)-@VERSION@|\1|; \
- s,-O(2|3),,; \
+ 's,-O(2|3),,; \
s|-mcpu=i486||'
-# gconf is not working in this release
- @${REINPLACE_CMD} -E -e \
- 's,^((DIST_SUBDIRS|SUBDIRS).+)gconf,\1,' \
- ${WRKSRC}/Makefile.in \
- ${WRKSRC}/gst-libs/gst/Makefile.in
# mcopidl takes the file as the last argument
@${REINPLACE_CMD} -E -e \
's|(mcopidl.+)(\$$<)(.+)$$|\1 \3 \2|' \
@@ -91,6 +85,19 @@ post-patch:
${XARGS} -n 10 ${REINPLACE_CMD} -e \
's|malloc.h|stdlib.h|; \
s|stdint.h|inttypes.h|'
+# use GMAKE, not MAKE
+ @${REINPLACE_CMD} -E -e \
+ 's|make|${GMAKE}|' \
+ ${WRKSRC}/gst-libs/ext/ffmpeg/Makefile.in
+# force libaudiofile detection
+ @${REINPLACE_CMD} -E -e \
+ 's|^.*afOpenVirtualFile[[:space:]]*\(\);|;|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
+post-configure:
+# CC safeness
+ @${ECHO_CMD} "CC=${CC}" >> \
+ ${WRKSRC}/gst-libs/ext/ffmpeg/ffmpeg/config.mak
post-install:
# register plugins
@@ -142,21 +149,26 @@ WITH_LAME=yes
WITH_GNOMEVFS=yes
.endif
-# Hermes
-.if exists (${LOCALBASE}/lib/libHermes.a)
-WITH_HERMES=yes
-.endif
-
# gsm
.if exists(${LOCALBASE}/lib/libgsm.a)
WITH_GSM=yes
.endif
+# Hermes
+.if exists (${LOCALBASE}/lib/libHermes.a)
+WITH_HERMES=yes
+.endif
+
# jpeg
.if exists(${LOCALBASE}/lib/libjpeg.a)
WITH_JPEG=yes
.endif
+# ladspa
+.if exists(${LOCALBASE}/include/ladspa.h)
+WITH_LADSPA=yes
+.endif
+
# liba52
.if exists(${LOCALBASE}/lib/liba52.a)
WITH_LIBA52=yes
@@ -234,7 +246,7 @@ WITH_VORBIS=yes
# xmms
.if exists(${X11BASE}/lib/libxmms.a)
-WITH_XMMS=yes
+#WITH_XMMS=yes
.endif
##
@@ -322,15 +334,6 @@ LIB_DEPENDS+= gnomevfs-2.0:${PORTSDIR}/devel/gnomevfs2
PLIST_SUB+= GNOMEVFS=""
.endif
-# Hermes
-.ifndef(WITH_HERMES)
-CONFIGURE_ARGS+= --disable-hermes
-PLIST_SUB+= HERMES="@comment "
-.else
-LIB_DEPENDS+= Hermes.1:${PORTSDIR}/graphics/Hermes
-PLIST_SUB+= HERMES=""
-.endif
-
# gsm
.ifndef(WITH_GSM)
CONFIGURE_ARGS+= --disable-gsm
@@ -341,6 +344,15 @@ LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm
PLIST_SUB+= GSM=""
.endif
+# Hermes
+.ifndef(WITH_HERMES)
+CONFIGURE_ARGS+= --disable-hermes
+PLIST_SUB+= HERMES="@comment "
+.else
+LIB_DEPENDS+= Hermes.1:${PORTSDIR}/graphics/Hermes
+PLIST_SUB+= HERMES=""
+.endif
+
# http
.ifndef(WITH_HTTP)
CONFIGURE_ARGS+= --disable-http
@@ -359,6 +371,16 @@ LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg
PLIST_SUB+= JPEG=""
.endif
+# ladspa
+.ifndef(WITH_LADSPA)
+CONFIGURE_ARGS+= --disable-ladspa
+PLIST_SUB+= LADSPA="@comment "
+.else
+BUILD_DEPENDS+= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+
+PLIST_SUB+= LADSPA=""
+.endif
+
# lame
.ifndef(WITH_LAME)
CONFIGURE_ARGS+= --disable-lame
@@ -601,6 +623,10 @@ pre-everything::
@${ECHO_MSG} '===>'
@${ECHO_MSG} '===> Define WITH_JPEG to enable jpeg Video plugin'
.endif
+.ifndef(WITH_LADSPA)
+ @${ECHO_MSG} '===>'
+ @${ECHO_MSG} '===> Define WITH_LADSPA to enable LADSPA framework Audio plugin'
+.endif
.ifndef(WITH_LAME)
@${ECHO_MSG} '===>'
@${ECHO_MSG} '===> Define WITH_LAME to enable lame MP3 Audio plugin'
diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo
index 31dc380de..caeb20303 100644
--- a/multimedia/gstreamer-plugins/distinfo
+++ b/multimedia/gstreamer-plugins/distinfo
@@ -1 +1 @@
-MD5 (gst-plugins-0.5.2.tar.gz) = 6400f93c074fa632f12f07b83c3c3acf
+MD5 (gst-plugins-0.6.0.tar.gz) = c1eadcf2486577bb36d4e89cbfa2e65f
diff --git a/multimedia/gstreamer-plugins/files/patch-gst-libs_ext_ffmpeg_Makefile.in b/multimedia/gstreamer-plugins/files/patch-gst-libs_ext_ffmpeg_Makefile.in
deleted file mode 100644
index 4d96cac2a..000000000
--- a/multimedia/gstreamer-plugins/files/patch-gst-libs_ext_ffmpeg_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gst-libs/ext/ffmpeg/Makefile.in.orig Thu Jan 9 23:11:17 2003
-+++ gst-libs/ext/ffmpeg/Makefile.in Thu Jan 9 23:11:25 2003
-@@ -513,7 +513,7 @@
-
- # on running make install, make sure make has been run first
- install:
-- cd ffmpeg && make
-+ cd ffmpeg && ${MAKE}
-
- # override recursive targets
- dvi-recursive:
diff --git a/multimedia/gstreamer-plugins/files/patch-gst_udp_gstudpsrc.h b/multimedia/gstreamer-plugins/files/patch-gst_udp_gstudpsrc.h
deleted file mode 100644
index af26ec157..000000000
--- a/multimedia/gstreamer-plugins/files/patch-gst_udp_gstudpsrc.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- gst/udp/gstudpsrc.h.orig Wed Dec 11 13:49:50 2002
-+++ gst/udp/gstudpsrc.h Wed Dec 11 13:50:00 2002
-@@ -33,6 +33,7 @@
- #include <sys/types.h>
- #include <netdb.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <fcntl.h>
- #include "gstudp.h"
-
diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist
index c766d6786..89fefdf41 100644
--- a/multimedia/gstreamer-plugins/pkg-plist
+++ b/multimedia/gstreamer-plugins/pkg-plist
@@ -1,143 +1,137 @@
bin/gst-launch-ext
bin/gst-visualise
-etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/default/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/gstreamer/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/gstreamer/default/%gconf.xml
etc/gconf/schemas/gstreamer.schemas
-include/gstreamer-0.5/gst/audio/audio.h
-include/gstreamer-0.5/gst/floatcast/floatcast.h
-include/gstreamer-0.5/gst/gconf/gconf.h
-include/gstreamer-0.5/gst/idct/idct.h
-include/gstreamer-0.5/gst/media-info/media-info.h
-include/gstreamer-0.5/gst/play/play.h
-include/gstreamer-0.5/gst/resample/resample.h
-include/gstreamer-0.5/gst/riff/riff.h
-include/gstreamer-0.5/gst/video/video.h
-%%LIBA52%%lib/gstreamer-0.5/libgsta52dec.so
-%%AALIB%%lib/gstreamer-0.5/libgstaasink.so
-lib/gstreamer-0.5/libgstac3parse.so
-lib/gstreamer-0.5/libgstadder.so
-lib/gstreamer-0.5/libgstalaw.so
-%%ARTS%%lib/gstreamer-0.5/libgstartsdsink.so
-lib/gstreamer-0.5/libgstaudio.so
-lib/gstreamer-0.5/libgstaudioscale.so
-lib/gstreamer-0.5/libgstauparse.so
-lib/gstreamer-0.5/libgstavidemux.so
-lib/gstreamer-0.5/libgstavimux.so
-lib/gstreamer-0.5/libgstaviparse.so
-lib/gstreamer-0.5/libgstcdxaparse.so
-lib/gstreamer-0.5/libgstchart.so
-%%HERMES%%lib/gstreamer-0.5/libgstcolorspace.so
-lib/gstreamer-0.5/libgstcutter.so
-lib/gstreamer-0.5/libgstdeinterlace.so
-%%LIBDV%%lib/gstreamer-0.5/libgstdvdec.so
-%%LIBDVDNAV%%lib/gstreamer-0.5/libgstdvdnavsrc.so
-%%LIBDVDREAD%%lib/gstreamer-0.5/libgstdvdreadsrc.so
-lib/gstreamer-0.5/libgsteffectv.so
-%%ESOUND%%lib/gstreamer-0.5/libgstesdmon.so
-%%ESOUND%%lib/gstreamer-0.5/libgstesdsink.so
-lib/gstreamer-0.5/libgstfestival.so
-lib/gstreamer-0.5/libgstffmpeg.so
-lib/gstreamer-0.5/libgstffmpegall.so
-lib/gstreamer-0.5/libgstfilter.so
-%%FLAC%%lib/gstreamer-0.5/libgstflac.so
-lib/gstreamer-0.5/libgstflxdec.so
-%%GNOMEVFS%%lib/gstreamer-0.5/libgstgnomevfssink.so
-%%GNOMEVFS%%lib/gstreamer-0.5/libgstgnomevfssrc.so
-lib/gstreamer-0.5/libgstgoom.so
-%%GSM%%lib/gstreamer-0.5/libgstgsm.so
-%%HTTP%%lib/gstreamer-0.5/libgsthttpsrc.so
-lib/gstreamer-0.5/libgstidct.so
-lib/gstreamer-0.5/libgstintfloat.so
-%%JPEG%%lib/gstreamer-0.5/libgstjpeg.so
-%%LAME%%lib/gstreamer-0.5/libgstlame.so
-lib/gstreamer-0.5/libgstlevel.so
-%%LIBFAME%%lib/gstreamer-0.5/libgstlibfame.so
-%%LIBMAD%%lib/gstreamer-0.5/libgstmad.so
-lib/gstreamer-0.5/libgstmedian.so
-%%LIBMIKMOD%%lib/gstreamer-0.5/libgstmikmod.so
-lib/gstreamer-0.5/libgstmodplug.so
-lib/gstreamer-0.5/libgstmono2stereo.so
-lib/gstreamer-0.5/libgstmonoscope.so
-lib/gstreamer-0.5/libgstmp1videoparse.so
-lib/gstreamer-0.5/libgstmp3types.so
-lib/gstreamer-0.5/libgstmpeg1encoder.so
-lib/gstreamer-0.5/libgstmpeg1systemencode.so
-lib/gstreamer-0.5/libgstmpeg1types.so
-%%LIBMPEG2%%lib/gstreamer-0.5/libgstmpeg2dec.so
-lib/gstreamer-0.5/libgstmpeg2enc.so
-lib/gstreamer-0.5/libgstmpeg2subt.so
-lib/gstreamer-0.5/libgstmpeg2types.so
-lib/gstreamer-0.5/libgstmpegaudio.so
-lib/gstreamer-0.5/libgstmpegaudioparse.so
-lib/gstreamer-0.5/libgstmpegstream.so
-lib/gstreamer-0.5/libgstmulaw.so
-lib/gstreamer-0.5/libgstoneton.so
-%%OPENQUICKTIME%%lib/gstreamer-0.5/libgstopenquicktimedecoder.so
-%%OPENQUICKTIME%%lib/gstreamer-0.5/libgstopenquicktimedemux.so
-%%OPENQUICKTIME%%lib/gstreamer-0.5/libgstopenquicktimetypes.so
-%%OSS%%lib/gstreamer-0.5/libgstossaudio.so
-lib/gstreamer-0.5/libgstpassthrough.so
-lib/gstreamer-0.5/libgstplayondemand.so
-%%PNG%%lib/gstreamer-0.5/libgstpng.so
-lib/gstreamer-0.5/libgstqtdemux.so
-lib/gstreamer-0.5/libgstresample.so
-lib/gstreamer-0.5/libgstriff.so
-lib/gstreamer-0.5/libgstrtjpeg.so
-%%SDL%%lib/gstreamer-0.5/libgstsdlvideosink.so
-%%LIBSHOUT%%lib/gstreamer-0.5/libgstshout.so
-%%LIBSIDPLAY%%lib/gstreamer-0.5/libgstsid.so
-lib/gstreamer-0.5/libgstsilence.so
-lib/gstreamer-0.5/libgstsinesrc.so
-lib/gstreamer-0.5/libgstsmooth.so
-lib/gstreamer-0.5/libgstsmpte.so
-%%PNG%%lib/gstreamer-0.5/libgstsnapshot.so
-lib/gstreamer-0.5/libgstspectrum.so
-lib/gstreamer-0.5/libgstspeed.so
-lib/gstreamer-0.5/libgststereo.so
-lib/gstreamer-0.5/libgststereo2mono.so
-lib/gstreamer-0.5/libgststereosplit.so
-lib/gstreamer-0.5/libgstsynaesthesia.so
-lib/gstreamer-0.5/libgstudp.so
-lib/gstreamer-0.5/libgstvbidec.so
-lib/gstreamer-0.5/libgstvideo.so
-lib/gstreamer-0.5/libgstvideocrop.so
-lib/gstreamer-0.5/libgstvideoscale.so
-lib/gstreamer-0.5/libgstvideotestsrc.so
-lib/gstreamer-0.5/libgstvolenv.so
-lib/gstreamer-0.5/libgstvolume.so
-%%VORBIS%%lib/gstreamer-0.5/libgstvorbis.so
-lib/gstreamer-0.5/libgstvumeter.so
-lib/gstreamer-0.5/libgstwavenc.so
-lib/gstreamer-0.5/libgstwavparse.so
-%%AVIFILE%%lib/gstreamer-0.5/libgstwincodec.so
-%%XMMS%%lib/gstreamer-0.5/libgstxmms.so
-lib/gstreamer-0.5/libgsty4menc.so
-lib/gstreamer-0.5/libmixmatrix.so
-lib/libgstgconf-0.5.a
-lib/libgstgconf-0.5.so
-lib/libgstgconf-0.5.so.2
-lib/libgstmedia-info-0.5.a
-lib/libgstmedia-info-0.5.so
-lib/libgstmedia-info-0.5.so.0
-lib/libgstplay-0.5.a
-lib/libgstplay-0.5.so
-lib/libgstplay-0.5.so.2
-libdata/pkgconfig/gstreamer-libs-0.5.pc
-libdata/pkgconfig/gstreamer-play-0.5.pc
-share/aclocal/gst-element-check-0.5.m4
-@dirrm include/gstreamer-0.5/gst/video
-@dirrm include/gstreamer-0.5/gst/riff
-@dirrm include/gstreamer-0.5/gst/resample
-@dirrm include/gstreamer-0.5/gst/play
-@dirrm include/gstreamer-0.5/gst/idct
-@dirrm include/gstreamer-0.5/gst/gconf
-@dirrm include/gstreamer-0.5/gst/floatcast
-@dirrm include/gstreamer-0.5/gst/audio
-@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/default
-@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/default
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer
+include/gstreamer-%%VERSION%%/gst/audio/audio.h
+include/gstreamer-%%VERSION%%/gst/floatcast/floatcast.h
+include/gstreamer-%%VERSION%%/gst/gconf/gconf.h
+include/gstreamer-%%VERSION%%/gst/idct/idct.h
+include/gstreamer-%%VERSION%%/gst/media-info/media-info.h
+include/gstreamer-%%VERSION%%/gst/play/play.h
+include/gstreamer-%%VERSION%%/gst/resample/resample.h
+include/gstreamer-%%VERSION%%/gst/riff/riff.h
+include/gstreamer-%%VERSION%%/gst/video/video.h
+%%LIBA52%%lib/gstreamer-%%VERSION%%/libgsta52dec.so
+%%AALIB%%lib/gstreamer-%%VERSION%%/libgstaasink.so
+lib/gstreamer-%%VERSION%%/libgstac3parse.so
+lib/gstreamer-%%VERSION%%/libgstadder.so
+lib/gstreamer-%%VERSION%%/libgstalaw.so
+%%ARTS%%lib/gstreamer-%%VERSION%%/libgstartsdsink.so
+lib/gstreamer-%%VERSION%%/libgstaudio.so
+%%LIBAUDIOFILE%%lib/gstreamer-%%VERSION%%/libgstaudiofile.so
+lib/gstreamer-%%VERSION%%/libgstaudioscale.so
+lib/gstreamer-%%VERSION%%/libgstauparse.so
+%%AVIFILE%%lib/gstreamer-%%VERSION%%/libgstavidemux.so
+%%AVIFILE%%lib/gstreamer-%%VERSION%%/libgstavimux.so
+lib/gstreamer-%%VERSION%%/libgstcdxaparse.so
+lib/gstreamer-%%VERSION%%/libgstchart.so
+%%HERMES%%lib/gstreamer-%%VERSION%%/libgstcolorspace.so
+lib/gstreamer-%%VERSION%%/libgstcutter.so
+lib/gstreamer-%%VERSION%%/libgstdeinterlace.so
+%%LIBDV%%lib/gstreamer-%%VERSION%%/libgstdvdec.so
+%%LIBDVDNAV%%lib/gstreamer-%%VERSION%%/libgstdvdnavsrc.so
+%%LIBDVDREAD%%lib/gstreamer-%%VERSION%%/libgstdvdreadsrc.so
+lib/gstreamer-%%VERSION%%/libgsteffectv.so
+%%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesdmon.so
+%%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesdsink.so
+lib/gstreamer-%%VERSION%%/libgstfestival.so
+lib/gstreamer-%%VERSION%%/libgstffmpeg.so
+lib/gstreamer-%%VERSION%%/libgstffmpegall.so
+lib/gstreamer-%%VERSION%%/libgstfilter.so
+%%FLAC%%lib/gstreamer-%%VERSION%%/libgstflac.so
+lib/gstreamer-%%VERSION%%/libgstflxdec.so
+%%GNOMEVFS%%lib/gstreamer-%%VERSION%%/libgstgnomevfssink.so
+%%GNOMEVFS%%lib/gstreamer-%%VERSION%%/libgstgnomevfssrc.so
+lib/gstreamer-%%VERSION%%/libgstgoom.so
+%%GSM%%lib/gstreamer-%%VERSION%%/libgstgsm.so
+%%HTTP%%lib/gstreamer-%%VERSION%%/libgsthttpsrc.so
+lib/gstreamer-%%VERSION%%/libgstidct.so
+lib/gstreamer-%%VERSION%%/libgstintfloat.so
+%%JPEG%%lib/gstreamer-%%VERSION%%/libgstjpeg.so
+%%LADSPA%%lib/gstreamer-%%VERSION%%/libgstladspa.so
+%%LAME%%lib/gstreamer-%%VERSION%%/libgstlame.so
+lib/gstreamer-%%VERSION%%/libgstlevel.so
+%%LIBFAME%%lib/gstreamer-%%VERSION%%/libgstlibfame.so
+%%LIBMAD%%lib/gstreamer-%%VERSION%%/libgstmad.so
+lib/gstreamer-%%VERSION%%/libgstmedian.so
+%%LIBMIKMOD%%lib/gstreamer-%%VERSION%%/libgstmikmod.so
+lib/gstreamer-%%VERSION%%/libgstmono2stereo.so
+lib/gstreamer-%%VERSION%%/libgstmonoscope.so
+lib/gstreamer-%%VERSION%%/libgstmp1videoparse.so
+lib/gstreamer-%%VERSION%%/libgstmp3types.so
+lib/gstreamer-%%VERSION%%/libgstmpeg1encoder.so
+lib/gstreamer-%%VERSION%%/libgstmpeg1systemencode.so
+lib/gstreamer-%%VERSION%%/libgstmpeg1types.so
+%%LIBMPEG2%%lib/gstreamer-%%VERSION%%/libgstmpeg2dec.so
+lib/gstreamer-%%VERSION%%/libgstmpeg2enc.so
+lib/gstreamer-%%VERSION%%/libgstmpeg2subt.so
+lib/gstreamer-%%VERSION%%/libgstmpeg2types.so
+lib/gstreamer-%%VERSION%%/libgstmpegaudio.so
+lib/gstreamer-%%VERSION%%/libgstmpegaudioparse.so
+lib/gstreamer-%%VERSION%%/libgstmpegstream.so
+lib/gstreamer-%%VERSION%%/libgstmulaw.so
+lib/gstreamer-%%VERSION%%/libgstoneton.so
+%%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimedecoder.so
+%%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimedemux.so
+%%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimetypes.so
+%%OSS%%lib/gstreamer-%%VERSION%%/libgstossaudio.so
+lib/gstreamer-%%VERSION%%/libgstpassthrough.so
+lib/gstreamer-%%VERSION%%/libgstplayondemand.so
+%%PNG%%lib/gstreamer-%%VERSION%%/libgstpng.so
+lib/gstreamer-%%VERSION%%/libgstqtdemux.so
+lib/gstreamer-%%VERSION%%/libgstresample.so
+lib/gstreamer-%%VERSION%%/libgstriff.so
+lib/gstreamer-%%VERSION%%/libgstrtjpeg.so
+%%SDL%%lib/gstreamer-%%VERSION%%/libgstsdlvideosink.so
+%%LIBSHOUT%%lib/gstreamer-%%VERSION%%/libgstshout.so
+%%LIBSIDPLAY%%lib/gstreamer-%%VERSION%%/libgstsid.so
+lib/gstreamer-%%VERSION%%/libgstsilence.so
+lib/gstreamer-%%VERSION%%/libgstsinesrc.so
+lib/gstreamer-%%VERSION%%/libgstsmooth.so
+lib/gstreamer-%%VERSION%%/libgstsmpte.so
+%%PNG%%lib/gstreamer-%%VERSION%%/libgstsnapshot.so
+lib/gstreamer-%%VERSION%%/libgstspectrum.so
+lib/gstreamer-%%VERSION%%/libgstspeed.so
+lib/gstreamer-%%VERSION%%/libgststereo.so
+lib/gstreamer-%%VERSION%%/libgststereo2mono.so
+lib/gstreamer-%%VERSION%%/libgststereosplit.so
+lib/gstreamer-%%VERSION%%/libgstsynaesthesia.so
+lib/gstreamer-%%VERSION%%/libgstudp.so
+lib/gstreamer-%%VERSION%%/libgstvbidec.so
+lib/gstreamer-%%VERSION%%/libgstvideo.so
+lib/gstreamer-%%VERSION%%/libgstvideocrop.so
+lib/gstreamer-%%VERSION%%/libgstvideoscale.so
+lib/gstreamer-%%VERSION%%/libgstvideotestsrc.so
+lib/gstreamer-%%VERSION%%/libgstvolenv.so
+lib/gstreamer-%%VERSION%%/libgstvolume.so
+%%VORBIS%%lib/gstreamer-%%VERSION%%/libgstvorbis.so
+lib/gstreamer-%%VERSION%%/libgstvumeter.so
+lib/gstreamer-%%VERSION%%/libgstwavenc.so
+lib/gstreamer-%%VERSION%%/libgstwavparse.so
+lib/gstreamer-%%VERSION%%/libgsty4menc.so
+lib/gstreamer-%%VERSION%%/libmixmatrix.so
+lib/libgstgconf-%%VERSION%%.a
+lib/libgstgconf-%%VERSION%%.so
+lib/libgstgconf-%%VERSION%%.so.%%SHLIB_VERSION%%
+lib/libgstmedia-info-%%VERSION%%.a
+lib/libgstmedia-info-%%VERSION%%.so
+lib/libgstmedia-info-%%VERSION%%.so.%%SHLIB_VERSION%%
+lib/libgstplay-%%VERSION%%.a
+lib/libgstplay-%%VERSION%%.so
+lib/libgstplay-%%VERSION%%.so.%%SHLIB_VERSION%%
+libdata/pkgconfig/gstreamer-gconf-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-libs-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-play-%%VERSION%%.pc
+share/aclocal/gst-element-check-%%VERSION%%.m4
+@unexec rmdir %D/lib/gstreamer-%%VERSION%% 2>/dev/null || true
+@dirrm include/gstreamer-%%VERSION%%/gst/video
+@dirrm include/gstreamer-%%VERSION%%/gst/riff
+@dirrm include/gstreamer-%%VERSION%%/gst/resample
+@dirrm include/gstreamer-%%VERSION%%/gst/play
+@dirrm include/gstreamer-%%VERSION%%/gst/media-info
+@dirrm include/gstreamer-%%VERSION%%/gst/idct
+@dirrm include/gstreamer-%%VERSION%%/gst/gconf
+@dirrm include/gstreamer-%%VERSION%%/gst/floatcast
+@dirrm include/gstreamer-%%VERSION%%/gst/audio
+@unexec rmdir %D/include/gstreamer-%%VERSION%% 2>/dev/null || true
@exec %%X11BASE%%/bin/gst-register 2>/dev/null
@unexec %%X11BASE%%/bin/gst-register 2>/dev/null
diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index e7add72fe..8b8ee04bb 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -2,11 +2,11 @@
# Date created: Wed Jul 10 23:38:01 UTC 2002
# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
#
-# $FreeBSD$
+# $FreeBSD: ports/multimedia/gstreamer-plugins/Makefile,v 1.10 2003/01/16 18:44:33 lioux Exp $
#
PORTNAME= gstreamer
-PORTVERSION= 0.5.2
+PORTVERSION= 0.6.0
CATEGORIES= multimedia audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -18,7 +18,7 @@ MAINTAINER= lioux@FreeBSD.org
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20 \
gconf-2.5:${PORTSDIR}/devel/gconf2 \
- gstreamer-0.5.3:${PORTSDIR}/multimedia/gstreamer \
+ gstreamer-0.6.0:${PORTSDIR}/multimedia/gstreamer \
gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
popt.0:${PORTSDIR}/devel/popt \
xml2.5:${PORTSDIR}/textproc/libxml2
@@ -44,6 +44,9 @@ CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \
CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
CONFIGURE_TARGET=
+PLIST_SUB= \
+ VERSION="${PORTVERSION:C/..$//}" \
+ SHLIB_VERSION="${SHLIB_VERSION}"
INSTALLS_SHLIB= yes
# for esound detection
@@ -55,28 +58,19 @@ PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
SDL_CONFIG?="${LOCALBASE}/bin/sdl11-config"
XMMS_CONFIG?="${LOCALBASE}/bin/xmms-config"
+# library minor number
+SHLIB_VERSION= 0
+
post-patch:
# as of this writing, FreeBSD does not support lrint* C99 math functions
@${REINPLACE_CMD} -E -e \
's|^#define.*LRINT.*$$||' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-# remove version number from include dir name
- @${REINPLACE_CMD} -E -e \
- 's|-@VERSION@||' \
- ${WRKSRC}/gstreamer-libs.pc.in \
- ${WRKSRC}/gstreamer-play.pc.in
-# remove version number from include dir name
# respect CFLAGS
@${FIND} ${WRKSRC} -type f -name Makefile.in | \
${XARGS} -n 10 ${REINPLACE_CMD} -E -e \
- 's|^(lib[[:alpha:]]+includedir.+)-@VERSION@|\1|; \
- s,-O(2|3),,; \
+ 's,-O(2|3),,; \
s|-mcpu=i486||'
-# gconf is not working in this release
- @${REINPLACE_CMD} -E -e \
- 's,^((DIST_SUBDIRS|SUBDIRS).+)gconf,\1,' \
- ${WRKSRC}/Makefile.in \
- ${WRKSRC}/gst-libs/gst/Makefile.in
# mcopidl takes the file as the last argument
@${REINPLACE_CMD} -E -e \
's|(mcopidl.+)(\$$<)(.+)$$|\1 \3 \2|' \
@@ -91,6 +85,19 @@ post-patch:
${XARGS} -n 10 ${REINPLACE_CMD} -e \
's|malloc.h|stdlib.h|; \
s|stdint.h|inttypes.h|'
+# use GMAKE, not MAKE
+ @${REINPLACE_CMD} -E -e \
+ 's|make|${GMAKE}|' \
+ ${WRKSRC}/gst-libs/ext/ffmpeg/Makefile.in
+# force libaudiofile detection
+ @${REINPLACE_CMD} -E -e \
+ 's|^.*afOpenVirtualFile[[:space:]]*\(\);|;|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
+post-configure:
+# CC safeness
+ @${ECHO_CMD} "CC=${CC}" >> \
+ ${WRKSRC}/gst-libs/ext/ffmpeg/ffmpeg/config.mak
post-install:
# register plugins
@@ -142,21 +149,26 @@ WITH_LAME=yes
WITH_GNOMEVFS=yes
.endif
-# Hermes
-.if exists (${LOCALBASE}/lib/libHermes.a)
-WITH_HERMES=yes
-.endif
-
# gsm
.if exists(${LOCALBASE}/lib/libgsm.a)
WITH_GSM=yes
.endif
+# Hermes
+.if exists (${LOCALBASE}/lib/libHermes.a)
+WITH_HERMES=yes
+.endif
+
# jpeg
.if exists(${LOCALBASE}/lib/libjpeg.a)
WITH_JPEG=yes
.endif
+# ladspa
+.if exists(${LOCALBASE}/include/ladspa.h)
+WITH_LADSPA=yes
+.endif
+
# liba52
.if exists(${LOCALBASE}/lib/liba52.a)
WITH_LIBA52=yes
@@ -234,7 +246,7 @@ WITH_VORBIS=yes
# xmms
.if exists(${X11BASE}/lib/libxmms.a)
-WITH_XMMS=yes
+#WITH_XMMS=yes
.endif
##
@@ -322,15 +334,6 @@ LIB_DEPENDS+= gnomevfs-2.0:${PORTSDIR}/devel/gnomevfs2
PLIST_SUB+= GNOMEVFS=""
.endif
-# Hermes
-.ifndef(WITH_HERMES)
-CONFIGURE_ARGS+= --disable-hermes
-PLIST_SUB+= HERMES="@comment "
-.else
-LIB_DEPENDS+= Hermes.1:${PORTSDIR}/graphics/Hermes
-PLIST_SUB+= HERMES=""
-.endif
-
# gsm
.ifndef(WITH_GSM)
CONFIGURE_ARGS+= --disable-gsm
@@ -341,6 +344,15 @@ LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm
PLIST_SUB+= GSM=""
.endif
+# Hermes
+.ifndef(WITH_HERMES)
+CONFIGURE_ARGS+= --disable-hermes
+PLIST_SUB+= HERMES="@comment "
+.else
+LIB_DEPENDS+= Hermes.1:${PORTSDIR}/graphics/Hermes
+PLIST_SUB+= HERMES=""
+.endif
+
# http
.ifndef(WITH_HTTP)
CONFIGURE_ARGS+= --disable-http
@@ -359,6 +371,16 @@ LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg
PLIST_SUB+= JPEG=""
.endif
+# ladspa
+.ifndef(WITH_LADSPA)
+CONFIGURE_ARGS+= --disable-ladspa
+PLIST_SUB+= LADSPA="@comment "
+.else
+BUILD_DEPENDS+= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+
+PLIST_SUB+= LADSPA=""
+.endif
+
# lame
.ifndef(WITH_LAME)
CONFIGURE_ARGS+= --disable-lame
@@ -601,6 +623,10 @@ pre-everything::
@${ECHO_MSG} '===>'
@${ECHO_MSG} '===> Define WITH_JPEG to enable jpeg Video plugin'
.endif
+.ifndef(WITH_LADSPA)
+ @${ECHO_MSG} '===>'
+ @${ECHO_MSG} '===> Define WITH_LADSPA to enable LADSPA framework Audio plugin'
+.endif
.ifndef(WITH_LAME)
@${ECHO_MSG} '===>'
@${ECHO_MSG} '===> Define WITH_LAME to enable lame MP3 Audio plugin'
diff --git a/multimedia/gstreamer-plugins80/distinfo b/multimedia/gstreamer-plugins80/distinfo
index 31dc380de..caeb20303 100644
--- a/multimedia/gstreamer-plugins80/distinfo
+++ b/multimedia/gstreamer-plugins80/distinfo
@@ -1 +1 @@
-MD5 (gst-plugins-0.5.2.tar.gz) = 6400f93c074fa632f12f07b83c3c3acf
+MD5 (gst-plugins-0.6.0.tar.gz) = c1eadcf2486577bb36d4e89cbfa2e65f
diff --git a/multimedia/gstreamer-plugins80/files/patch-gst-libs_ext_ffmpeg_Makefile.in b/multimedia/gstreamer-plugins80/files/patch-gst-libs_ext_ffmpeg_Makefile.in
deleted file mode 100644
index 4d96cac2a..000000000
--- a/multimedia/gstreamer-plugins80/files/patch-gst-libs_ext_ffmpeg_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gst-libs/ext/ffmpeg/Makefile.in.orig Thu Jan 9 23:11:17 2003
-+++ gst-libs/ext/ffmpeg/Makefile.in Thu Jan 9 23:11:25 2003
-@@ -513,7 +513,7 @@
-
- # on running make install, make sure make has been run first
- install:
-- cd ffmpeg && make
-+ cd ffmpeg && ${MAKE}
-
- # override recursive targets
- dvi-recursive:
diff --git a/multimedia/gstreamer-plugins80/files/patch-gst_udp_gstudpsrc.h b/multimedia/gstreamer-plugins80/files/patch-gst_udp_gstudpsrc.h
deleted file mode 100644
index af26ec157..000000000
--- a/multimedia/gstreamer-plugins80/files/patch-gst_udp_gstudpsrc.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- gst/udp/gstudpsrc.h.orig Wed Dec 11 13:49:50 2002
-+++ gst/udp/gstudpsrc.h Wed Dec 11 13:50:00 2002
-@@ -33,6 +33,7 @@
- #include <sys/types.h>
- #include <netdb.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <fcntl.h>
- #include "gstudp.h"
-
diff --git a/multimedia/gstreamer-plugins80/pkg-plist b/multimedia/gstreamer-plugins80/pkg-plist
index c766d6786..89fefdf41 100644
--- a/multimedia/gstreamer-plugins80/pkg-plist
+++ b/multimedia/gstreamer-plugins80/pkg-plist
@@ -1,143 +1,137 @@
bin/gst-launch-ext
bin/gst-visualise
-etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/default/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/gstreamer/%gconf.xml
-etc/gconf/gconf.xml.defaults/system/gstreamer/default/%gconf.xml
etc/gconf/schemas/gstreamer.schemas
-include/gstreamer-0.5/gst/audio/audio.h
-include/gstreamer-0.5/gst/floatcast/floatcast.h
-include/gstreamer-0.5/gst/gconf/gconf.h
-include/gstreamer-0.5/gst/idct/idct.h
-include/gstreamer-0.5/gst/media-info/media-info.h
-include/gstreamer-0.5/gst/play/play.h
-include/gstreamer-0.5/gst/resample/resample.h
-include/gstreamer-0.5/gst/riff/riff.h
-include/gstreamer-0.5/gst/video/video.h
-%%LIBA52%%lib/gstreamer-0.5/libgsta52dec.so
-%%AALIB%%lib/gstreamer-0.5/libgstaasink.so
-lib/gstreamer-0.5/libgstac3parse.so
-lib/gstreamer-0.5/libgstadder.so
-lib/gstreamer-0.5/libgstalaw.so
-%%ARTS%%lib/gstreamer-0.5/libgstartsdsink.so
-lib/gstreamer-0.5/libgstaudio.so
-lib/gstreamer-0.5/libgstaudioscale.so
-lib/gstreamer-0.5/libgstauparse.so
-lib/gstreamer-0.5/libgstavidemux.so
-lib/gstreamer-0.5/libgstavimux.so
-lib/gstreamer-0.5/libgstaviparse.so
-lib/gstreamer-0.5/libgstcdxaparse.so
-lib/gstreamer-0.5/libgstchart.so
-%%HERMES%%lib/gstreamer-0.5/libgstcolorspace.so
-lib/gstreamer-0.5/libgstcutter.so
-lib/gstreamer-0.5/libgstdeinterlace.so
-%%LIBDV%%lib/gstreamer-0.5/libgstdvdec.so
-%%LIBDVDNAV%%lib/gstreamer-0.5/libgstdvdnavsrc.so
-%%LIBDVDREAD%%lib/gstreamer-0.5/libgstdvdreadsrc.so
-lib/gstreamer-0.5/libgsteffectv.so
-%%ESOUND%%lib/gstreamer-0.5/libgstesdmon.so
-%%ESOUND%%lib/gstreamer-0.5/libgstesdsink.so
-lib/gstreamer-0.5/libgstfestival.so
-lib/gstreamer-0.5/libgstffmpeg.so
-lib/gstreamer-0.5/libgstffmpegall.so
-lib/gstreamer-0.5/libgstfilter.so
-%%FLAC%%lib/gstreamer-0.5/libgstflac.so
-lib/gstreamer-0.5/libgstflxdec.so
-%%GNOMEVFS%%lib/gstreamer-0.5/libgstgnomevfssink.so
-%%GNOMEVFS%%lib/gstreamer-0.5/libgstgnomevfssrc.so
-lib/gstreamer-0.5/libgstgoom.so
-%%GSM%%lib/gstreamer-0.5/libgstgsm.so
-%%HTTP%%lib/gstreamer-0.5/libgsthttpsrc.so
-lib/gstreamer-0.5/libgstidct.so
-lib/gstreamer-0.5/libgstintfloat.so
-%%JPEG%%lib/gstreamer-0.5/libgstjpeg.so
-%%LAME%%lib/gstreamer-0.5/libgstlame.so
-lib/gstreamer-0.5/libgstlevel.so
-%%LIBFAME%%lib/gstreamer-0.5/libgstlibfame.so
-%%LIBMAD%%lib/gstreamer-0.5/libgstmad.so
-lib/gstreamer-0.5/libgstmedian.so
-%%LIBMIKMOD%%lib/gstreamer-0.5/libgstmikmod.so
-lib/gstreamer-0.5/libgstmodplug.so
-lib/gstreamer-0.5/libgstmono2stereo.so
-lib/gstreamer-0.5/libgstmonoscope.so
-lib/gstreamer-0.5/libgstmp1videoparse.so
-lib/gstreamer-0.5/libgstmp3types.so
-lib/gstreamer-0.5/libgstmpeg1encoder.so
-lib/gstreamer-0.5/libgstmpeg1systemencode.so
-lib/gstreamer-0.5/libgstmpeg1types.so
-%%LIBMPEG2%%lib/gstreamer-0.5/libgstmpeg2dec.so
-lib/gstreamer-0.5/libgstmpeg2enc.so
-lib/gstreamer-0.5/libgstmpeg2subt.so
-lib/gstreamer-0.5/libgstmpeg2types.so
-lib/gstreamer-0.5/libgstmpegaudio.so
-lib/gstreamer-0.5/libgstmpegaudioparse.so
-lib/gstreamer-0.5/libgstmpegstream.so
-lib/gstreamer-0.5/libgstmulaw.so
-lib/gstreamer-0.5/libgstoneton.so
-%%OPENQUICKTIME%%lib/gstreamer-0.5/libgstopenquicktimedecoder.so
-%%OPENQUICKTIME%%lib/gstreamer-0.5/libgstopenquicktimedemux.so
-%%OPENQUICKTIME%%lib/gstreamer-0.5/libgstopenquicktimetypes.so
-%%OSS%%lib/gstreamer-0.5/libgstossaudio.so
-lib/gstreamer-0.5/libgstpassthrough.so
-lib/gstreamer-0.5/libgstplayondemand.so
-%%PNG%%lib/gstreamer-0.5/libgstpng.so
-lib/gstreamer-0.5/libgstqtdemux.so
-lib/gstreamer-0.5/libgstresample.so
-lib/gstreamer-0.5/libgstriff.so
-lib/gstreamer-0.5/libgstrtjpeg.so
-%%SDL%%lib/gstreamer-0.5/libgstsdlvideosink.so
-%%LIBSHOUT%%lib/gstreamer-0.5/libgstshout.so
-%%LIBSIDPLAY%%lib/gstreamer-0.5/libgstsid.so
-lib/gstreamer-0.5/libgstsilence.so
-lib/gstreamer-0.5/libgstsinesrc.so
-lib/gstreamer-0.5/libgstsmooth.so
-lib/gstreamer-0.5/libgstsmpte.so
-%%PNG%%lib/gstreamer-0.5/libgstsnapshot.so
-lib/gstreamer-0.5/libgstspectrum.so
-lib/gstreamer-0.5/libgstspeed.so
-lib/gstreamer-0.5/libgststereo.so
-lib/gstreamer-0.5/libgststereo2mono.so
-lib/gstreamer-0.5/libgststereosplit.so
-lib/gstreamer-0.5/libgstsynaesthesia.so
-lib/gstreamer-0.5/libgstudp.so
-lib/gstreamer-0.5/libgstvbidec.so
-lib/gstreamer-0.5/libgstvideo.so
-lib/gstreamer-0.5/libgstvideocrop.so
-lib/gstreamer-0.5/libgstvideoscale.so
-lib/gstreamer-0.5/libgstvideotestsrc.so
-lib/gstreamer-0.5/libgstvolenv.so
-lib/gstreamer-0.5/libgstvolume.so
-%%VORBIS%%lib/gstreamer-0.5/libgstvorbis.so
-lib/gstreamer-0.5/libgstvumeter.so
-lib/gstreamer-0.5/libgstwavenc.so
-lib/gstreamer-0.5/libgstwavparse.so
-%%AVIFILE%%lib/gstreamer-0.5/libgstwincodec.so
-%%XMMS%%lib/gstreamer-0.5/libgstxmms.so
-lib/gstreamer-0.5/libgsty4menc.so
-lib/gstreamer-0.5/libmixmatrix.so
-lib/libgstgconf-0.5.a
-lib/libgstgconf-0.5.so
-lib/libgstgconf-0.5.so.2
-lib/libgstmedia-info-0.5.a
-lib/libgstmedia-info-0.5.so
-lib/libgstmedia-info-0.5.so.0
-lib/libgstplay-0.5.a
-lib/libgstplay-0.5.so
-lib/libgstplay-0.5.so.2
-libdata/pkgconfig/gstreamer-libs-0.5.pc
-libdata/pkgconfig/gstreamer-play-0.5.pc
-share/aclocal/gst-element-check-0.5.m4
-@dirrm include/gstreamer-0.5/gst/video
-@dirrm include/gstreamer-0.5/gst/riff
-@dirrm include/gstreamer-0.5/gst/resample
-@dirrm include/gstreamer-0.5/gst/play
-@dirrm include/gstreamer-0.5/gst/idct
-@dirrm include/gstreamer-0.5/gst/gconf
-@dirrm include/gstreamer-0.5/gst/floatcast
-@dirrm include/gstreamer-0.5/gst/audio
-@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/default
-@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/default
-@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer
+include/gstreamer-%%VERSION%%/gst/audio/audio.h
+include/gstreamer-%%VERSION%%/gst/floatcast/floatcast.h
+include/gstreamer-%%VERSION%%/gst/gconf/gconf.h
+include/gstreamer-%%VERSION%%/gst/idct/idct.h
+include/gstreamer-%%VERSION%%/gst/media-info/media-info.h
+include/gstreamer-%%VERSION%%/gst/play/play.h
+include/gstreamer-%%VERSION%%/gst/resample/resample.h
+include/gstreamer-%%VERSION%%/gst/riff/riff.h
+include/gstreamer-%%VERSION%%/gst/video/video.h
+%%LIBA52%%lib/gstreamer-%%VERSION%%/libgsta52dec.so
+%%AALIB%%lib/gstreamer-%%VERSION%%/libgstaasink.so
+lib/gstreamer-%%VERSION%%/libgstac3parse.so
+lib/gstreamer-%%VERSION%%/libgstadder.so
+lib/gstreamer-%%VERSION%%/libgstalaw.so
+%%ARTS%%lib/gstreamer-%%VERSION%%/libgstartsdsink.so
+lib/gstreamer-%%VERSION%%/libgstaudio.so
+%%LIBAUDIOFILE%%lib/gstreamer-%%VERSION%%/libgstaudiofile.so
+lib/gstreamer-%%VERSION%%/libgstaudioscale.so
+lib/gstreamer-%%VERSION%%/libgstauparse.so
+%%AVIFILE%%lib/gstreamer-%%VERSION%%/libgstavidemux.so
+%%AVIFILE%%lib/gstreamer-%%VERSION%%/libgstavimux.so
+lib/gstreamer-%%VERSION%%/libgstcdxaparse.so
+lib/gstreamer-%%VERSION%%/libgstchart.so
+%%HERMES%%lib/gstreamer-%%VERSION%%/libgstcolorspace.so
+lib/gstreamer-%%VERSION%%/libgstcutter.so
+lib/gstreamer-%%VERSION%%/libgstdeinterlace.so
+%%LIBDV%%lib/gstreamer-%%VERSION%%/libgstdvdec.so
+%%LIBDVDNAV%%lib/gstreamer-%%VERSION%%/libgstdvdnavsrc.so
+%%LIBDVDREAD%%lib/gstreamer-%%VERSION%%/libgstdvdreadsrc.so
+lib/gstreamer-%%VERSION%%/libgsteffectv.so
+%%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesdmon.so
+%%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesdsink.so
+lib/gstreamer-%%VERSION%%/libgstfestival.so
+lib/gstreamer-%%VERSION%%/libgstffmpeg.so
+lib/gstreamer-%%VERSION%%/libgstffmpegall.so
+lib/gstreamer-%%VERSION%%/libgstfilter.so
+%%FLAC%%lib/gstreamer-%%VERSION%%/libgstflac.so
+lib/gstreamer-%%VERSION%%/libgstflxdec.so
+%%GNOMEVFS%%lib/gstreamer-%%VERSION%%/libgstgnomevfssink.so
+%%GNOMEVFS%%lib/gstreamer-%%VERSION%%/libgstgnomevfssrc.so
+lib/gstreamer-%%VERSION%%/libgstgoom.so
+%%GSM%%lib/gstreamer-%%VERSION%%/libgstgsm.so
+%%HTTP%%lib/gstreamer-%%VERSION%%/libgsthttpsrc.so
+lib/gstreamer-%%VERSION%%/libgstidct.so
+lib/gstreamer-%%VERSION%%/libgstintfloat.so
+%%JPEG%%lib/gstreamer-%%VERSION%%/libgstjpeg.so
+%%LADSPA%%lib/gstreamer-%%VERSION%%/libgstladspa.so
+%%LAME%%lib/gstreamer-%%VERSION%%/libgstlame.so
+lib/gstreamer-%%VERSION%%/libgstlevel.so
+%%LIBFAME%%lib/gstreamer-%%VERSION%%/libgstlibfame.so
+%%LIBMAD%%lib/gstreamer-%%VERSION%%/libgstmad.so
+lib/gstreamer-%%VERSION%%/libgstmedian.so
+%%LIBMIKMOD%%lib/gstreamer-%%VERSION%%/libgstmikmod.so
+lib/gstreamer-%%VERSION%%/libgstmono2stereo.so
+lib/gstreamer-%%VERSION%%/libgstmonoscope.so
+lib/gstreamer-%%VERSION%%/libgstmp1videoparse.so
+lib/gstreamer-%%VERSION%%/libgstmp3types.so
+lib/gstreamer-%%VERSION%%/libgstmpeg1encoder.so
+lib/gstreamer-%%VERSION%%/libgstmpeg1systemencode.so
+lib/gstreamer-%%VERSION%%/libgstmpeg1types.so
+%%LIBMPEG2%%lib/gstreamer-%%VERSION%%/libgstmpeg2dec.so
+lib/gstreamer-%%VERSION%%/libgstmpeg2enc.so
+lib/gstreamer-%%VERSION%%/libgstmpeg2subt.so
+lib/gstreamer-%%VERSION%%/libgstmpeg2types.so
+lib/gstreamer-%%VERSION%%/libgstmpegaudio.so
+lib/gstreamer-%%VERSION%%/libgstmpegaudioparse.so
+lib/gstreamer-%%VERSION%%/libgstmpegstream.so
+lib/gstreamer-%%VERSION%%/libgstmulaw.so
+lib/gstreamer-%%VERSION%%/libgstoneton.so
+%%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimedecoder.so
+%%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimedemux.so
+%%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimetypes.so
+%%OSS%%lib/gstreamer-%%VERSION%%/libgstossaudio.so
+lib/gstreamer-%%VERSION%%/libgstpassthrough.so
+lib/gstreamer-%%VERSION%%/libgstplayondemand.so
+%%PNG%%lib/gstreamer-%%VERSION%%/libgstpng.so
+lib/gstreamer-%%VERSION%%/libgstqtdemux.so
+lib/gstreamer-%%VERSION%%/libgstresample.so
+lib/gstreamer-%%VERSION%%/libgstriff.so
+lib/gstreamer-%%VERSION%%/libgstrtjpeg.so
+%%SDL%%lib/gstreamer-%%VERSION%%/libgstsdlvideosink.so
+%%LIBSHOUT%%lib/gstreamer-%%VERSION%%/libgstshout.so
+%%LIBSIDPLAY%%lib/gstreamer-%%VERSION%%/libgstsid.so
+lib/gstreamer-%%VERSION%%/libgstsilence.so
+lib/gstreamer-%%VERSION%%/libgstsinesrc.so
+lib/gstreamer-%%VERSION%%/libgstsmooth.so
+lib/gstreamer-%%VERSION%%/libgstsmpte.so
+%%PNG%%lib/gstreamer-%%VERSION%%/libgstsnapshot.so
+lib/gstreamer-%%VERSION%%/libgstspectrum.so
+lib/gstreamer-%%VERSION%%/libgstspeed.so
+lib/gstreamer-%%VERSION%%/libgststereo.so
+lib/gstreamer-%%VERSION%%/libgststereo2mono.so
+lib/gstreamer-%%VERSION%%/libgststereosplit.so
+lib/gstreamer-%%VERSION%%/libgstsynaesthesia.so
+lib/gstreamer-%%VERSION%%/libgstudp.so
+lib/gstreamer-%%VERSION%%/libgstvbidec.so
+lib/gstreamer-%%VERSION%%/libgstvideo.so
+lib/gstreamer-%%VERSION%%/libgstvideocrop.so
+lib/gstreamer-%%VERSION%%/libgstvideoscale.so
+lib/gstreamer-%%VERSION%%/libgstvideotestsrc.so
+lib/gstreamer-%%VERSION%%/libgstvolenv.so
+lib/gstreamer-%%VERSION%%/libgstvolume.so
+%%VORBIS%%lib/gstreamer-%%VERSION%%/libgstvorbis.so
+lib/gstreamer-%%VERSION%%/libgstvumeter.so
+lib/gstreamer-%%VERSION%%/libgstwavenc.so
+lib/gstreamer-%%VERSION%%/libgstwavparse.so
+lib/gstreamer-%%VERSION%%/libgsty4menc.so
+lib/gstreamer-%%VERSION%%/libmixmatrix.so
+lib/libgstgconf-%%VERSION%%.a
+lib/libgstgconf-%%VERSION%%.so
+lib/libgstgconf-%%VERSION%%.so.%%SHLIB_VERSION%%
+lib/libgstmedia-info-%%VERSION%%.a
+lib/libgstmedia-info-%%VERSION%%.so
+lib/libgstmedia-info-%%VERSION%%.so.%%SHLIB_VERSION%%
+lib/libgstplay-%%VERSION%%.a
+lib/libgstplay-%%VERSION%%.so
+lib/libgstplay-%%VERSION%%.so.%%SHLIB_VERSION%%
+libdata/pkgconfig/gstreamer-gconf-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-libs-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-play-%%VERSION%%.pc
+share/aclocal/gst-element-check-%%VERSION%%.m4
+@unexec rmdir %D/lib/gstreamer-%%VERSION%% 2>/dev/null || true
+@dirrm include/gstreamer-%%VERSION%%/gst/video
+@dirrm include/gstreamer-%%VERSION%%/gst/riff
+@dirrm include/gstreamer-%%VERSION%%/gst/resample
+@dirrm include/gstreamer-%%VERSION%%/gst/play
+@dirrm include/gstreamer-%%VERSION%%/gst/media-info
+@dirrm include/gstreamer-%%VERSION%%/gst/idct
+@dirrm include/gstreamer-%%VERSION%%/gst/gconf
+@dirrm include/gstreamer-%%VERSION%%/gst/floatcast
+@dirrm include/gstreamer-%%VERSION%%/gst/audio
+@unexec rmdir %D/include/gstreamer-%%VERSION%% 2>/dev/null || true
@exec %%X11BASE%%/bin/gst-register 2>/dev/null
@unexec %%X11BASE%%/bin/gst-register 2>/dev/null
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index f569949d0..d6a3230b3 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gstreamer
-PORTVERSION= 0.5.2
-PORTREVISION= 1
+PORTVERSION= 0.6.0
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -35,6 +34,9 @@ CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \
CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
CONFIGURE_TARGET=
+PLIST_SUB= \
+ VERSION="${PORTVERSION:C/..$//}" \
+ SHLIB_VERSION="${SHLIB_VERSION}"
INSTALLS_SHLIB= yes
MAN1= gst-complete.1 gst-compprep.1 gst-inspect.1 gst-launch.1 \
@@ -43,32 +45,17 @@ MAN1= gst-complete.1 gst-compprep.1 gst-inspect.1 gst-launch.1 \
PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
+# library minor number
+SHLIB_VERSION= 0
+
+post-install:
+# register plugins
+ @${PREFIX}/bin/gst-register 2>/dev/null
+
.include <bsd.port.pre.mk>
.if exists(${X11BASE}/libdata/pkgconfig/libgnomeui-2.0.pc)
LIB_DEPENDS+= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
.endif
-post-patch:
-# use proper dir
-# remove version number from include dir name
- @${FIND} ${WRKSRC} -type f -name Makefile.in | \
- ${XARGS} -n 10 ${REINPLACE_CMD} -E \
- 's|^(lib[[:alpha:]]+includedir.+)-@VERSION@|\1|'
-# remove version number from include dir name AND
-# help dependent ports find popt.h
- @${REINPLACE_CMD} -E -e \
- 's|-@VERSION@||; \
- s|(-I\$${includedir})|\1 -I${LOCALBASE}/include|' \
- ${WRKSRC}/gstreamer.pc.in
-
-post-configure:
-# remove version number postfix from library names
- @${REINPLACE_CMD} -E -e 's|-release ${PORTVERSION}||' \
- ${WRKSRC}/gst/Makefile ${WRKSRC}/libs/gst/control/Makefile
-
-post-install:
-# register plugins
- @${PREFIX}/bin/gst-register 2>/dev/null
-
.include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer/distinfo b/multimedia/gstreamer/distinfo
index 9740078f1..e747bb091 100644
--- a/multimedia/gstreamer/distinfo
+++ b/multimedia/gstreamer/distinfo
@@ -1 +1 @@
-MD5 (gstreamer-0.5.2.tar.bz2) = 29e0a16a4bbb2f96d8bd493bc90a0fc8
+MD5 (gstreamer-0.6.0.tar.bz2) = 3d0dec37678b33bbcb23cb2e20a83fe4
diff --git a/multimedia/gstreamer/files/patch-gst::cothreads.c b/multimedia/gstreamer/files/patch-gst::cothreads.c
index 124e37d54..3519fb0e7 100644
--- a/multimedia/gstreamer/files/patch-gst::cothreads.c
+++ b/multimedia/gstreamer/files/patch-gst::cothreads.c
@@ -1,8 +1,8 @@
---- gst/cothreads.c.orig Tue Dec 31 23:28:32 2002
-+++ gst/cothreads.c Mon Jan 13 19:31:54 2003
-@@ -37,16 +37,20 @@
- #include "gstlog.h"
- #include "gstutils.h"
+--- gst/cothreads.c.orig Sat Feb 1 19:09:00 2003
++++ gst/cothreads.c Mon Feb 3 10:57:44 2003
+@@ -41,12 +41,16 @@
+ #include <ucontext.h>
+ #endif
+#ifdef HAVE_MAKECONTEXT
+#include <ucontext.h>
@@ -18,8 +18,3 @@
#define COTHREAD_MAGIC_NUMBER 0xabcdef
--#define COTHREAD_MAXTHREADS 16
-+#define COTHREAD_MAXTHREADS 16
- #define COTHREAD_STACKSIZE (STACK_SIZE/COTHREAD_MAXTHREADS)
-
- static void cothread_destroy (cothread_state *cothread);
diff --git a/multimedia/gstreamer/files/patch-gst_gstthreaddummy.c b/multimedia/gstreamer/files/patch-gst_gstthreaddummy.c
deleted file mode 100644
index 36343fdba..000000000
--- a/multimedia/gstreamer/files/patch-gst_gstthreaddummy.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- gst/gstthreaddummy.c.orig Sat Jan 25 18:06:11 2003
-+++ gst/gstthreaddummy.c Sat Jan 25 18:06:36 2003
-@@ -17,7 +17,9 @@
- * Boston, MA 02111-1307, USA.
- */
-
-+#include <sys/types.h>
- #include <sys/time.h>
-+#include <unistd.h>
- #include <glib.h>
- #include "gstlog.h"
-
diff --git a/multimedia/gstreamer/pkg-plist b/multimedia/gstreamer/pkg-plist
index ed855d086..b42f950ed 100644
--- a/multimedia/gstreamer/pkg-plist
+++ b/multimedia/gstreamer/pkg-plist
@@ -1,4 +1,4 @@
-@unexec %D/bin/gst-register 2>/dev/null
+@unexec %D/bin/gst-register 2>/dev/null || true
bin/gst-complete
bin/gst-compprep
bin/gst-feedback
@@ -7,92 +7,94 @@ bin/gst-launch
bin/gst-md5sum
bin/gst-register
bin/gst-xmllaunch
-include/gstreamer-0.5/gst/bytestream/bytestream.h
-include/gstreamer-0.5/gst/control/control.h
-include/gstreamer-0.5/gst/control/dparam.h
-include/gstreamer-0.5/gst/control/dparam_smooth.h
-include/gstreamer-0.5/gst/control/dparamcommon.h
-include/gstreamer-0.5/gst/control/dparammanager.h
-include/gstreamer-0.5/gst/control/dplinearinterp.h
-include/gstreamer-0.5/gst/control/unitconvert.h
-include/gstreamer-0.5/gst/getbits/getbits.h
-include/gstreamer-0.5/gst/gst.h
-include/gstreamer-0.5/gst/gstatomic.h
-include/gstreamer-0.5/gst/gstautoplug.h
-include/gstreamer-0.5/gst/gstbin.h
-include/gstreamer-0.5/gst/gstbuffer.h
-include/gstreamer-0.5/gst/gstbufferpool-default.h
-include/gstreamer-0.5/gst/gstcaps.h
-include/gstreamer-0.5/gst/gstclock.h
-include/gstreamer-0.5/gst/gstcompat.h
-include/gstreamer-0.5/gst/gstconfig.h
-include/gstreamer-0.5/gst/gstcpu.h
-include/gstreamer-0.5/gst/gstdata.h
-include/gstreamer-0.5/gst/gstelement.h
-include/gstreamer-0.5/gst/gstenumtypes.h
-include/gstreamer-0.5/gst/gstevent.h
-include/gstreamer-0.5/gst/gstextratypes.h
-include/gstreamer-0.5/gst/gstformat.h
-include/gstreamer-0.5/gst/gstindex.h
-include/gstreamer-0.5/gst/gstinfo.h
-include/gstreamer-0.5/gst/gstlog.h
-include/gstreamer-0.5/gst/gstmacros.h
-include/gstreamer-0.5/gst/gstmarshal.h
-include/gstreamer-0.5/gst/gstmemchunk.h
-include/gstreamer-0.5/gst/gstobject.h
-include/gstreamer-0.5/gst/gstpad.h
-include/gstreamer-0.5/gst/gstparse.h
-include/gstreamer-0.5/gst/gstpipeline.h
-include/gstreamer-0.5/gst/gstplugin.h
-include/gstreamer-0.5/gst/gstpluginfeature.h
-include/gstreamer-0.5/gst/gstprobe.h
-include/gstreamer-0.5/gst/gstprops.h
-include/gstreamer-0.5/gst/gstquery.h
-include/gstreamer-0.5/gst/gstqueue.h
-include/gstreamer-0.5/gst/gstregistry.h
-include/gstreamer-0.5/gst/gstscheduler.h
-include/gstreamer-0.5/gst/gstsystemclock.h
-include/gstreamer-0.5/gst/gstthread.h
-include/gstreamer-0.5/gst/gsttrace.h
-include/gstreamer-0.5/gst/gsttrashstack.h
-include/gstreamer-0.5/gst/gsttype.h
-include/gstreamer-0.5/gst/gsttypefind.h
-include/gstreamer-0.5/gst/gsttypes.h
-include/gstreamer-0.5/gst/gsturi.h
-include/gstreamer-0.5/gst/gstutils.h
-include/gstreamer-0.5/gst/gstversion.h
-include/gstreamer-0.5/gst/gstxml.h
-include/gstreamer-0.5/gst/putbits/putbits.h
-lib/gstreamer-0.5/libgstautoplugcache.so
-lib/gstreamer-0.5/libgstautoplugger.so
-lib/gstreamer-0.5/libgstbasicomegascheduler.so
-lib/gstreamer-0.5/libgstbasicwingoscheduler.so
-lib/gstreamer-0.5/libgstbytestream.so
-lib/gstreamer-0.5/libgstelements.so
-lib/gstreamer-0.5/libgstgetbits.so
-lib/gstreamer-0.5/libgstindexers.so
-lib/gstreamer-0.5/libgstoptomegascheduler.so
-lib/gstreamer-0.5/libgstoptscheduler.so
-lib/gstreamer-0.5/libgstoptwingoscheduler.so
-lib/gstreamer-0.5/libgstputbits.so
-lib/gstreamer-0.5/libgstspider.so
-lib/gstreamer-0.5/libgststaticautoplug.so
-lib/gstreamer-0.5/libgststaticautoplugrender.so
-lib/gstreamer-0.5/libgsttypes.so
-lib/libgstcontrol-0.5.a
-lib/libgstcontrol-0.5.so
-lib/libgstcontrol-0.5.so.3
-lib/libgstreamer-0.5.a
-lib/libgstreamer-0.5.so
-lib/libgstreamer-0.5.so.3
-libdata/pkgconfig/gstreamer-0.5.pc
-@exec %D/bin/gst-register 2>/dev/null
-@unexec rm %D/share/gnome/cache/gstreamer-0.5/registry.xml 2>/dev/null || true
-@unexec rmdir %D/share/gnome/cache/gstreamer-0.5 2>/dev/null || echo "There are some configuration files left in ${PKG_PREFIX}/etc/gstreamer, do not forget to remove them if you are permanently removing gstreamer port."
+include/gstreamer-%%VERSION%%/gst/bytestream/bytestream.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/getbits/getbits.h
+include/gstreamer-%%VERSION%%/gst/gst.h
+include/gstreamer-%%VERSION%%/gst/gstatomic.h
+include/gstreamer-%%VERSION%%/gst/gstautoplug.h
+include/gstreamer-%%VERSION%%/gst/gstbin.h
+include/gstreamer-%%VERSION%%/gst/gstbuffer.h
+include/gstreamer-%%VERSION%%/gst/gstbufferpool-default.h
+include/gstreamer-%%VERSION%%/gst/gstcaps.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/gstenumtypes.h
+include/gstreamer-%%VERSION%%/gst/gstevent.h
+include/gstreamer-%%VERSION%%/gst/gstextratypes.h
+include/gstreamer-%%VERSION%%/gst/gstformat.h
+include/gstreamer-%%VERSION%%/gst/gstindex.h
+include/gstreamer-%%VERSION%%/gst/gstinfo.h
+include/gstreamer-%%VERSION%%/gst/gstlog.h
+include/gstreamer-%%VERSION%%/gst/gstmacros.h
+include/gstreamer-%%VERSION%%/gst/gstmarshal.h
+include/gstreamer-%%VERSION%%/gst/gstmemchunk.h
+include/gstreamer-%%VERSION%%/gst/gstobject.h
+include/gstreamer-%%VERSION%%/gst/gstpad.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/gstprops.h
+include/gstreamer-%%VERSION%%/gst/gstquery.h
+include/gstreamer-%%VERSION%%/gst/gstqueue.h
+include/gstreamer-%%VERSION%%/gst/gstregistry.h
+include/gstreamer-%%VERSION%%/gst/gstscheduler.h
+include/gstreamer-%%VERSION%%/gst/gstsystemclock.h
+include/gstreamer-%%VERSION%%/gst/gstthread.h
+include/gstreamer-%%VERSION%%/gst/gsttrace.h
+include/gstreamer-%%VERSION%%/gst/gsttrashstack.h
+include/gstreamer-%%VERSION%%/gst/gsttype.h
+include/gstreamer-%%VERSION%%/gst/gsttypefind.h
+include/gstreamer-%%VERSION%%/gst/gsttypes.h
+include/gstreamer-%%VERSION%%/gst/gsturi.h
+include/gstreamer-%%VERSION%%/gst/gstutils.h
+include/gstreamer-%%VERSION%%/gst/gstversion.h
+include/gstreamer-%%VERSION%%/gst/gstxml.h
+include/gstreamer-%%VERSION%%/gst/putbits/putbits.h
+lib/gstreamer-%%VERSION%%/libgstautoplugcache.so
+lib/gstreamer-%%VERSION%%/libgstautoplugger.so
+lib/gstreamer-%%VERSION%%/libgstbasicomegascheduler.so
+lib/gstreamer-%%VERSION%%/libgstbasicwingoscheduler.so
+lib/gstreamer-%%VERSION%%/libgstbytestream.so
+lib/gstreamer-%%VERSION%%/libgstelements.so
+lib/gstreamer-%%VERSION%%/libgstgetbits.so
+lib/gstreamer-%%VERSION%%/libgstindexers.so
+lib/gstreamer-%%VERSION%%/libgstoptomegascheduler.so
+lib/gstreamer-%%VERSION%%/libgstoptscheduler.so
+lib/gstreamer-%%VERSION%%/libgstoptwingoscheduler.so
+lib/gstreamer-%%VERSION%%/libgstputbits.so
+lib/gstreamer-%%VERSION%%/libgstspider.so
+lib/gstreamer-%%VERSION%%/libgststaticautoplug.so
+lib/gstreamer-%%VERSION%%/libgststaticautoplugrender.so
+lib/gstreamer-%%VERSION%%/libgsttypes.so
+lib/libgstcontrol-%%VERSION%%.a
+lib/libgstcontrol-%%VERSION%%.so
+lib/libgstcontrol-%%VERSION%%.so.%%SHLIB_VERSION%%
+lib/libgstreamer-%%VERSION%%.a
+lib/libgstreamer-%%VERSION%%.so
+lib/libgstreamer-%%VERSION%%.so.%%SHLIB_VERSION%%
+libdata/pkgconfig/gstreamer-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-control-%%VERSION%%.pc
+@unexec rm %D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
+@dirrm share/gnome/cache/gstreamer-%%VERSION%%
@unexec rmdir %D/share/gnome/cache 2>/dev/null || true
-@dirrm include/gstreamer-0.5/gst/putbits
-@dirrm include/gstreamer-0.5/gst/getbits
-@dirrm include/gstreamer-0.5/gst/control
-@dirrm include/gstreamer-0.5/gst/bytestream
-@dirrm include/gstreamer-0.5/gst
-@dirrm include/gstreamer-0.5
+@dirrm lib/gstreamer-%%VERSION%%
+@dirrm include/gstreamer-%%VERSION%%/gst/putbits
+@dirrm include/gstreamer-%%VERSION%%/gst/getbits
+@dirrm include/gstreamer-%%VERSION%%/gst/control
+@dirrm include/gstreamer-%%VERSION%%/gst/bytestream
+@dirrm include/gstreamer-%%VERSION%%/gst
+@dirrm include/gstreamer-%%VERSION%%
+@exec %D/bin/gst-register 2>/dev/null || true
diff --git a/multimedia/gstreamer80/Makefile b/multimedia/gstreamer80/Makefile
index f569949d0..d6a3230b3 100644
--- a/multimedia/gstreamer80/Makefile
+++ b/multimedia/gstreamer80/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gstreamer
-PORTVERSION= 0.5.2
-PORTREVISION= 1
+PORTVERSION= 0.6.0
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -35,6 +34,9 @@ CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \
CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
CONFIGURE_TARGET=
+PLIST_SUB= \
+ VERSION="${PORTVERSION:C/..$//}" \
+ SHLIB_VERSION="${SHLIB_VERSION}"
INSTALLS_SHLIB= yes
MAN1= gst-complete.1 gst-compprep.1 gst-inspect.1 gst-launch.1 \
@@ -43,32 +45,17 @@ MAN1= gst-complete.1 gst-compprep.1 gst-inspect.1 gst-launch.1 \
PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
+# library minor number
+SHLIB_VERSION= 0
+
+post-install:
+# register plugins
+ @${PREFIX}/bin/gst-register 2>/dev/null
+
.include <bsd.port.pre.mk>
.if exists(${X11BASE}/libdata/pkgconfig/libgnomeui-2.0.pc)
LIB_DEPENDS+= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
.endif
-post-patch:
-# use proper dir
-# remove version number from include dir name
- @${FIND} ${WRKSRC} -type f -name Makefile.in | \
- ${XARGS} -n 10 ${REINPLACE_CMD} -E \
- 's|^(lib[[:alpha:]]+includedir.+)-@VERSION@|\1|'
-# remove version number from include dir name AND
-# help dependent ports find popt.h
- @${REINPLACE_CMD} -E -e \
- 's|-@VERSION@||; \
- s|(-I\$${includedir})|\1 -I${LOCALBASE}/include|' \
- ${WRKSRC}/gstreamer.pc.in
-
-post-configure:
-# remove version number postfix from library names
- @${REINPLACE_CMD} -E -e 's|-release ${PORTVERSION}||' \
- ${WRKSRC}/gst/Makefile ${WRKSRC}/libs/gst/control/Makefile
-
-post-install:
-# register plugins
- @${PREFIX}/bin/gst-register 2>/dev/null
-
.include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer80/distinfo b/multimedia/gstreamer80/distinfo
index 9740078f1..e747bb091 100644
--- a/multimedia/gstreamer80/distinfo
+++ b/multimedia/gstreamer80/distinfo
@@ -1 +1 @@
-MD5 (gstreamer-0.5.2.tar.bz2) = 29e0a16a4bbb2f96d8bd493bc90a0fc8
+MD5 (gstreamer-0.6.0.tar.bz2) = 3d0dec37678b33bbcb23cb2e20a83fe4
diff --git a/multimedia/gstreamer80/files/patch-gst::cothreads.c b/multimedia/gstreamer80/files/patch-gst::cothreads.c
index 124e37d54..3519fb0e7 100644
--- a/multimedia/gstreamer80/files/patch-gst::cothreads.c
+++ b/multimedia/gstreamer80/files/patch-gst::cothreads.c
@@ -1,8 +1,8 @@
---- gst/cothreads.c.orig Tue Dec 31 23:28:32 2002
-+++ gst/cothreads.c Mon Jan 13 19:31:54 2003
-@@ -37,16 +37,20 @@
- #include "gstlog.h"
- #include "gstutils.h"
+--- gst/cothreads.c.orig Sat Feb 1 19:09:00 2003
++++ gst/cothreads.c Mon Feb 3 10:57:44 2003
+@@ -41,12 +41,16 @@
+ #include <ucontext.h>
+ #endif
+#ifdef HAVE_MAKECONTEXT
+#include <ucontext.h>
@@ -18,8 +18,3 @@
#define COTHREAD_MAGIC_NUMBER 0xabcdef
--#define COTHREAD_MAXTHREADS 16
-+#define COTHREAD_MAXTHREADS 16
- #define COTHREAD_STACKSIZE (STACK_SIZE/COTHREAD_MAXTHREADS)
-
- static void cothread_destroy (cothread_state *cothread);
diff --git a/multimedia/gstreamer80/files/patch-gst_gstthreaddummy.c b/multimedia/gstreamer80/files/patch-gst_gstthreaddummy.c
deleted file mode 100644
index 36343fdba..000000000
--- a/multimedia/gstreamer80/files/patch-gst_gstthreaddummy.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- gst/gstthreaddummy.c.orig Sat Jan 25 18:06:11 2003
-+++ gst/gstthreaddummy.c Sat Jan 25 18:06:36 2003
-@@ -17,7 +17,9 @@
- * Boston, MA 02111-1307, USA.
- */
-
-+#include <sys/types.h>
- #include <sys/time.h>
-+#include <unistd.h>
- #include <glib.h>
- #include "gstlog.h"
-
diff --git a/multimedia/gstreamer80/pkg-plist b/multimedia/gstreamer80/pkg-plist
index ed855d086..b42f950ed 100644
--- a/multimedia/gstreamer80/pkg-plist
+++ b/multimedia/gstreamer80/pkg-plist
@@ -1,4 +1,4 @@
-@unexec %D/bin/gst-register 2>/dev/null
+@unexec %D/bin/gst-register 2>/dev/null || true
bin/gst-complete
bin/gst-compprep
bin/gst-feedback
@@ -7,92 +7,94 @@ bin/gst-launch
bin/gst-md5sum
bin/gst-register
bin/gst-xmllaunch
-include/gstreamer-0.5/gst/bytestream/bytestream.h
-include/gstreamer-0.5/gst/control/control.h
-include/gstreamer-0.5/gst/control/dparam.h
-include/gstreamer-0.5/gst/control/dparam_smooth.h
-include/gstreamer-0.5/gst/control/dparamcommon.h
-include/gstreamer-0.5/gst/control/dparammanager.h
-include/gstreamer-0.5/gst/control/dplinearinterp.h
-include/gstreamer-0.5/gst/control/unitconvert.h
-include/gstreamer-0.5/gst/getbits/getbits.h
-include/gstreamer-0.5/gst/gst.h
-include/gstreamer-0.5/gst/gstatomic.h
-include/gstreamer-0.5/gst/gstautoplug.h
-include/gstreamer-0.5/gst/gstbin.h
-include/gstreamer-0.5/gst/gstbuffer.h
-include/gstreamer-0.5/gst/gstbufferpool-default.h
-include/gstreamer-0.5/gst/gstcaps.h
-include/gstreamer-0.5/gst/gstclock.h
-include/gstreamer-0.5/gst/gstcompat.h
-include/gstreamer-0.5/gst/gstconfig.h
-include/gstreamer-0.5/gst/gstcpu.h
-include/gstreamer-0.5/gst/gstdata.h
-include/gstreamer-0.5/gst/gstelement.h
-include/gstreamer-0.5/gst/gstenumtypes.h
-include/gstreamer-0.5/gst/gstevent.h
-include/gstreamer-0.5/gst/gstextratypes.h
-include/gstreamer-0.5/gst/gstformat.h
-include/gstreamer-0.5/gst/gstindex.h
-include/gstreamer-0.5/gst/gstinfo.h
-include/gstreamer-0.5/gst/gstlog.h
-include/gstreamer-0.5/gst/gstmacros.h
-include/gstreamer-0.5/gst/gstmarshal.h
-include/gstreamer-0.5/gst/gstmemchunk.h
-include/gstreamer-0.5/gst/gstobject.h
-include/gstreamer-0.5/gst/gstpad.h
-include/gstreamer-0.5/gst/gstparse.h
-include/gstreamer-0.5/gst/gstpipeline.h
-include/gstreamer-0.5/gst/gstplugin.h
-include/gstreamer-0.5/gst/gstpluginfeature.h
-include/gstreamer-0.5/gst/gstprobe.h
-include/gstreamer-0.5/gst/gstprops.h
-include/gstreamer-0.5/gst/gstquery.h
-include/gstreamer-0.5/gst/gstqueue.h
-include/gstreamer-0.5/gst/gstregistry.h
-include/gstreamer-0.5/gst/gstscheduler.h
-include/gstreamer-0.5/gst/gstsystemclock.h
-include/gstreamer-0.5/gst/gstthread.h
-include/gstreamer-0.5/gst/gsttrace.h
-include/gstreamer-0.5/gst/gsttrashstack.h
-include/gstreamer-0.5/gst/gsttype.h
-include/gstreamer-0.5/gst/gsttypefind.h
-include/gstreamer-0.5/gst/gsttypes.h
-include/gstreamer-0.5/gst/gsturi.h
-include/gstreamer-0.5/gst/gstutils.h
-include/gstreamer-0.5/gst/gstversion.h
-include/gstreamer-0.5/gst/gstxml.h
-include/gstreamer-0.5/gst/putbits/putbits.h
-lib/gstreamer-0.5/libgstautoplugcache.so
-lib/gstreamer-0.5/libgstautoplugger.so
-lib/gstreamer-0.5/libgstbasicomegascheduler.so
-lib/gstreamer-0.5/libgstbasicwingoscheduler.so
-lib/gstreamer-0.5/libgstbytestream.so
-lib/gstreamer-0.5/libgstelements.so
-lib/gstreamer-0.5/libgstgetbits.so
-lib/gstreamer-0.5/libgstindexers.so
-lib/gstreamer-0.5/libgstoptomegascheduler.so
-lib/gstreamer-0.5/libgstoptscheduler.so
-lib/gstreamer-0.5/libgstoptwingoscheduler.so
-lib/gstreamer-0.5/libgstputbits.so
-lib/gstreamer-0.5/libgstspider.so
-lib/gstreamer-0.5/libgststaticautoplug.so
-lib/gstreamer-0.5/libgststaticautoplugrender.so
-lib/gstreamer-0.5/libgsttypes.so
-lib/libgstcontrol-0.5.a
-lib/libgstcontrol-0.5.so
-lib/libgstcontrol-0.5.so.3
-lib/libgstreamer-0.5.a
-lib/libgstreamer-0.5.so
-lib/libgstreamer-0.5.so.3
-libdata/pkgconfig/gstreamer-0.5.pc
-@exec %D/bin/gst-register 2>/dev/null
-@unexec rm %D/share/gnome/cache/gstreamer-0.5/registry.xml 2>/dev/null || true
-@unexec rmdir %D/share/gnome/cache/gstreamer-0.5 2>/dev/null || echo "There are some configuration files left in ${PKG_PREFIX}/etc/gstreamer, do not forget to remove them if you are permanently removing gstreamer port."
+include/gstreamer-%%VERSION%%/gst/bytestream/bytestream.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/getbits/getbits.h
+include/gstreamer-%%VERSION%%/gst/gst.h
+include/gstreamer-%%VERSION%%/gst/gstatomic.h
+include/gstreamer-%%VERSION%%/gst/gstautoplug.h
+include/gstreamer-%%VERSION%%/gst/gstbin.h
+include/gstreamer-%%VERSION%%/gst/gstbuffer.h
+include/gstreamer-%%VERSION%%/gst/gstbufferpool-default.h
+include/gstreamer-%%VERSION%%/gst/gstcaps.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/gstenumtypes.h
+include/gstreamer-%%VERSION%%/gst/gstevent.h
+include/gstreamer-%%VERSION%%/gst/gstextratypes.h
+include/gstreamer-%%VERSION%%/gst/gstformat.h
+include/gstreamer-%%VERSION%%/gst/gstindex.h
+include/gstreamer-%%VERSION%%/gst/gstinfo.h
+include/gstreamer-%%VERSION%%/gst/gstlog.h
+include/gstreamer-%%VERSION%%/gst/gstmacros.h
+include/gstreamer-%%VERSION%%/gst/gstmarshal.h
+include/gstreamer-%%VERSION%%/gst/gstmemchunk.h
+include/gstreamer-%%VERSION%%/gst/gstobject.h
+include/gstreamer-%%VERSION%%/gst/gstpad.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/gstprops.h
+include/gstreamer-%%VERSION%%/gst/gstquery.h
+include/gstreamer-%%VERSION%%/gst/gstqueue.h
+include/gstreamer-%%VERSION%%/gst/gstregistry.h
+include/gstreamer-%%VERSION%%/gst/gstscheduler.h
+include/gstreamer-%%VERSION%%/gst/gstsystemclock.h
+include/gstreamer-%%VERSION%%/gst/gstthread.h
+include/gstreamer-%%VERSION%%/gst/gsttrace.h
+include/gstreamer-%%VERSION%%/gst/gsttrashstack.h
+include/gstreamer-%%VERSION%%/gst/gsttype.h
+include/gstreamer-%%VERSION%%/gst/gsttypefind.h
+include/gstreamer-%%VERSION%%/gst/gsttypes.h
+include/gstreamer-%%VERSION%%/gst/gsturi.h
+include/gstreamer-%%VERSION%%/gst/gstutils.h
+include/gstreamer-%%VERSION%%/gst/gstversion.h
+include/gstreamer-%%VERSION%%/gst/gstxml.h
+include/gstreamer-%%VERSION%%/gst/putbits/putbits.h
+lib/gstreamer-%%VERSION%%/libgstautoplugcache.so
+lib/gstreamer-%%VERSION%%/libgstautoplugger.so
+lib/gstreamer-%%VERSION%%/libgstbasicomegascheduler.so
+lib/gstreamer-%%VERSION%%/libgstbasicwingoscheduler.so
+lib/gstreamer-%%VERSION%%/libgstbytestream.so
+lib/gstreamer-%%VERSION%%/libgstelements.so
+lib/gstreamer-%%VERSION%%/libgstgetbits.so
+lib/gstreamer-%%VERSION%%/libgstindexers.so
+lib/gstreamer-%%VERSION%%/libgstoptomegascheduler.so
+lib/gstreamer-%%VERSION%%/libgstoptscheduler.so
+lib/gstreamer-%%VERSION%%/libgstoptwingoscheduler.so
+lib/gstreamer-%%VERSION%%/libgstputbits.so
+lib/gstreamer-%%VERSION%%/libgstspider.so
+lib/gstreamer-%%VERSION%%/libgststaticautoplug.so
+lib/gstreamer-%%VERSION%%/libgststaticautoplugrender.so
+lib/gstreamer-%%VERSION%%/libgsttypes.so
+lib/libgstcontrol-%%VERSION%%.a
+lib/libgstcontrol-%%VERSION%%.so
+lib/libgstcontrol-%%VERSION%%.so.%%SHLIB_VERSION%%
+lib/libgstreamer-%%VERSION%%.a
+lib/libgstreamer-%%VERSION%%.so
+lib/libgstreamer-%%VERSION%%.so.%%SHLIB_VERSION%%
+libdata/pkgconfig/gstreamer-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-control-%%VERSION%%.pc
+@unexec rm %D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
+@dirrm share/gnome/cache/gstreamer-%%VERSION%%
@unexec rmdir %D/share/gnome/cache 2>/dev/null || true
-@dirrm include/gstreamer-0.5/gst/putbits
-@dirrm include/gstreamer-0.5/gst/getbits
-@dirrm include/gstreamer-0.5/gst/control
-@dirrm include/gstreamer-0.5/gst/bytestream
-@dirrm include/gstreamer-0.5/gst
-@dirrm include/gstreamer-0.5
+@dirrm lib/gstreamer-%%VERSION%%
+@dirrm include/gstreamer-%%VERSION%%/gst/putbits
+@dirrm include/gstreamer-%%VERSION%%/gst/getbits
+@dirrm include/gstreamer-%%VERSION%%/gst/control
+@dirrm include/gstreamer-%%VERSION%%/gst/bytestream
+@dirrm include/gstreamer-%%VERSION%%/gst
+@dirrm include/gstreamer-%%VERSION%%
+@exec %D/bin/gst-register 2>/dev/null || true