diff options
author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2002-10-26 16:25:05 +0000 |
---|---|---|
committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2002-10-26 16:25:05 +0000 |
commit | 294a3b99704d6a8787d73a4c9727c99c9dac6932 (patch) | |
tree | da2bff6636b67f7e571cd32da956f463229666a4 /multimedia | |
parent | Added USES_GMAKE. The allows the port to build with the upcoming bsd.port.mk (diff) |
Update to 0.4.1
Notes
Notes:
svn path=/head/; revision=68876
Diffstat (limited to 'multimedia')
22 files changed, 86 insertions, 348 deletions
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index b11bb2c3d377..677aa0e9a566 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gstreamer -PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTVERSION= 0.4.1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -28,6 +27,7 @@ USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-tests \ --disable-alsa \ + --disable-cdrom \ --disable-mjpegtools \ --disable-qcam \ --disable-v4l @@ -37,6 +37,7 @@ CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \ CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +CONFIGURE_TARGET= INSTALLS_SHLIB= yes PLIST_SUB= LOCALBASE="${LOCALBASE}" @@ -54,8 +55,7 @@ post-patch: # as of this writing, FreeBSD does not support lrint* C99 math functions # do not prefix binary names with anything @${REINPLACE_CMD} -E -e \ - 's|^#define.*LRINT.*$$||; \ - s|(@program_transform_name@),[^,]+,|\1,s/$$$$//,|' \ + 's|^#define.*LRINT.*$$||' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} # use proper dir @${REINPLACE_CMD} -E -e \ @@ -66,9 +66,12 @@ post-patch: 's|-@VERSION@||' \ ${WRKSRC}/gstreamer-libs.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|^(lib[[:alpha:]]+includedir.+)-@VERSION@|\1|; \ + s,-O(2|3),,; \ + s|-mcpu=i486||' # gconf is not working in this release @${REINPLACE_CMD} -E -e \ 's,^((DIST_SUBDIRS|SUBDIRS).+)gconf,\1,' \ @@ -89,6 +92,10 @@ post-patch: 's|malloc.h|stdlib.h|; \ s|stdint.h|inttypes.h|' +post-install: +# register plugins + @${LOCALBASE}/bin/gst-register 2>/dev/null + .include <bsd.port.pre.mk> CONFIGURE_ARGS+= \ @@ -138,9 +145,8 @@ WITH_AVIFILE=yes .endif # esound -.if exists(${LOCALBASE}/lib/libesd.a) -USE_GNOME+= esound -PKGNAMESUFFIX= -esound +.if (${HAVE_GNOME:Mesound}!="") +WITH_ESOUND=yes .endif # flac @@ -265,13 +271,12 @@ PLIST_SUB+= AVIFILE="" .endif # esound -.if !(${HAVE_GNOME:Mesound}!="" || defined(WITH_ESOUND)) +.ifndef(WITH_ESOUND) CONFIGURE_ARGS+= --disable-esd \ --disable-esdtest PLIST_SUB+= ESOUND="@comment " .else USE_GNOME+= esound -PKGNAMESUFFIX= -esound CONFIGURE_ARGS+= --with-esd-prefix=${LOCALBASE} \ --with-esd-exec-prefix=${LOCALBASE} PLIST_SUB+= ESOUND="" @@ -468,7 +473,7 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_AVIFILE to enable avifile Video plugin' .endif -.if !(${HAVE_GNOME:Mesound}!="" || defined(WITH_ESOUND)) +.ifndef(WITH_ESOUND) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_ESOUND to enable esound Audio plugin' .endif diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo index 1f3233ae1353..fd0fc2e3d6e9 100644 --- a/multimedia/gstreamer-plugins/distinfo +++ b/multimedia/gstreamer-plugins/distinfo @@ -1 +1 @@ -MD5 (gst-plugins-0.4.0.tar.bz2) = 06c7252240e0779d58ec962b539b6ae6 +MD5 (gst-plugins-0.4.1.tar.bz2) = 9b190733771be21bf8bf18971a652955 diff --git a/multimedia/gstreamer-plugins/files/patch-ext::flac::gstflacdec.c b/multimedia/gstreamer-plugins/files/patch-ext::flac::gstflacdec.c deleted file mode 100644 index 37a11fd7d5e3..000000000000 --- a/multimedia/gstreamer-plugins/files/patch-ext::flac::gstflacdec.c +++ /dev/null @@ -1,83 +0,0 @@ ---- ext/flac/gstflacdec.c.orig Thu Jul 11 21:35:29 2002 -+++ ext/flac/gstflacdec.c Thu Jul 11 21:44:42 2002 -@@ -74,10 +74,10 @@ - void *client_data); - static FLAC__StreamDecoderWriteStatus - gst_flacdec_write (const FLAC__SeekableStreamDecoder *decoder, -- const FLAC__Frame *frame, const FLAC__int32 *buffer[], -+ const FLAC__Frame *frame, const FLAC__int32 * const buffer[], - void *client_data); - static void gst_flacdec_metadata_callback (const FLAC__SeekableStreamDecoder *decoder, -- const FLAC__StreamMetaData *metadata, -+ const FLAC__StreamMetadata *metadata, - void *client_data); - static void gst_flacdec_error_callback (const FLAC__SeekableStreamDecoder *decoder, - FLAC__StreamDecoderErrorStatus status, -@@ -152,7 +152,7 @@ - - static void - gst_flacdec_metadata_callback (const FLAC__SeekableStreamDecoder *decoder, -- const FLAC__StreamMetaData *metadata, void *client_data) -+ const FLAC__StreamMetadata *metadata, void *client_data) - { - FlacDec *flacdec; - -@@ -171,13 +171,13 @@ - flacdec = GST_FLACDEC (client_data); - - switch (status) { -- case FLAC__STREAM_DECODER_ERROR_LOST_SYNC: -+ case FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC: - error = "lost sync"; - break; -- case FLAC__STREAM_DECODER_ERROR_BAD_HEADER: -+ case FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER: - error = "bad header"; - break; -- case FLAC__STREAM_DECODER_ERROR_FRAME_CRC_MISMATCH: -+ case FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH: - error = "CRC mismatch"; - break; - default: -@@ -271,6 +271,7 @@ - GST_DEBUG (0, "eos"); - flacdec->eos = TRUE; - if (avail == 0) { -+ gst_event_free (event); - return 0; - } - break; -@@ -301,7 +302,7 @@ - - static FLAC__StreamDecoderWriteStatus - gst_flacdec_write (const FLAC__SeekableStreamDecoder *decoder, const FLAC__Frame *frame, -- const FLAC__int32 *buffer[], void *client_data) -+ const FLAC__int32 * const buffer[], void *client_data) - { - FlacDec *flacdec; - GstBuffer *outbuf; -@@ -383,14 +384,14 @@ - } - else { - g_warning ("flacdec: invalid depth %d found\n", depth); -- return FLAC__STREAM_DECODER_WRITE_ABORT; -+ return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT; - } - - flacdec->total_samples += samples; - - gst_pad_push (flacdec->srcpad, outbuf); - -- return FLAC__STREAM_DECODER_WRITE_CONTINUE; -+ return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE; - } - - static void -@@ -554,6 +555,7 @@ - res = FALSE; - break; - } -+ gst_event_free (event); - return res; - } - diff --git a/multimedia/gstreamer-plugins/files/patch-ext::flac::gstflacenc.c b/multimedia/gstreamer-plugins/files/patch-ext::flac::gstflacenc.c deleted file mode 100644 index f661efeb1f0a..000000000000 --- a/multimedia/gstreamer-plugins/files/patch-ext::flac::gstflacenc.c +++ /dev/null @@ -1,20 +0,0 @@ ---- ext/flac/gstflacenc.c.orig Thu Jul 11 21:17:58 2002 -+++ ext/flac/gstflacenc.c Thu Jul 11 21:33:45 2002 -@@ -56,7 +56,7 @@ - static FLAC__StreamEncoderWriteStatus - gst_flacenc_write_callback (const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, - unsigned samples, unsigned current_frame, void *client_data); --static void gst_flacenc_metadata_callback (const FLAC__StreamEncoder *encoder, const FLAC__StreamMetaData *metadata, -+static void gst_flacenc_metadata_callback (const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, - void *client_data); - - static GstElementClass *parent_class = NULL; -@@ -170,7 +170,7 @@ - } - - static void --gst_flacenc_metadata_callback (const FLAC__StreamEncoder *encoder, const FLAC__StreamMetaData *metadata, void *client_data) -+gst_flacenc_metadata_callback (const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, void *client_data) - { - GstEvent *event; - FlacEnc *flacenc; diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist index e26cd73dfa9b..6f8087569b59 100644 --- a/multimedia/gstreamer-plugins/pkg-plist +++ b/multimedia/gstreamer-plugins/pkg-plist @@ -12,14 +12,12 @@ lib/gst/libgstadder.so lib/gst/libgstalaw.so %%ARTS%%lib/gst/libgstartsdsink.so lib/gst/libgstaudio.so -%%LIBAUDIOFILE%%lib/gst/libgstaudiofile.so lib/gst/libgstaudioscale.so lib/gst/libgstauparse.so %%AVIFILE%%lib/gst/libgstavidemux.so %%AVIFILE%%lib/gst/libgstavimux.so lib/gst/libgstcdxaparse.so lib/gst/libgstchart.so -lib/gst/libgstcolorspace.so lib/gst/libgstcutter.so lib/gst/libgstdeinterlace.so %%LIBDVDREAD%%lib/gst/libgstdvdreadsrc.so @@ -42,7 +40,6 @@ lib/gst/libgstlevel.so %%LIBMAD%%lib/gst/libgstmad.so lib/gst/libgstmedian.so %%LIBMIKMOD%%lib/gst/libgstmikmod.so -lib/gst/libgstmodplug.so lib/gst/libgstmono2stereo.so lib/gst/libgstmonoscope.so lib/gst/libgstmp1videoparse.so @@ -79,14 +76,16 @@ lib/gst/libgststereo2mono.so lib/gst/libgststereosplit.so lib/gst/libgstsynaesthesia.so lib/gst/libgstudp.so +lib/gst/libgstvideocrop.so lib/gst/libgstvideoscale.so +lib/gst/libgstvideotestsrc.so lib/gst/libgstvolenv.so lib/gst/libgstvolume.so %%VORBIS%%lib/gst/libgstvorbis.so lib/gst/libgstvumeter.so lib/gst/libgstwavparse.so -%%AVIFILE%%lib/gst/libgstwincodec.so lib/gst/libgsty4menc.so +lib/gst/libmixmatrix.so libdata/pkgconfig/gstreamer-libs.pc @dirrm include/gst-plugins/gst/riff @dirrm include/gst-plugins/gst/resample diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile index b11bb2c3d377..677aa0e9a566 100644 --- a/multimedia/gstreamer-plugins80/Makefile +++ b/multimedia/gstreamer-plugins80/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gstreamer -PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTVERSION= 0.4.1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -28,6 +27,7 @@ USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-tests \ --disable-alsa \ + --disable-cdrom \ --disable-mjpegtools \ --disable-qcam \ --disable-v4l @@ -37,6 +37,7 @@ CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \ CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +CONFIGURE_TARGET= INSTALLS_SHLIB= yes PLIST_SUB= LOCALBASE="${LOCALBASE}" @@ -54,8 +55,7 @@ post-patch: # as of this writing, FreeBSD does not support lrint* C99 math functions # do not prefix binary names with anything @${REINPLACE_CMD} -E -e \ - 's|^#define.*LRINT.*$$||; \ - s|(@program_transform_name@),[^,]+,|\1,s/$$$$//,|' \ + 's|^#define.*LRINT.*$$||' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} # use proper dir @${REINPLACE_CMD} -E -e \ @@ -66,9 +66,12 @@ post-patch: 's|-@VERSION@||' \ ${WRKSRC}/gstreamer-libs.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|^(lib[[:alpha:]]+includedir.+)-@VERSION@|\1|; \ + s,-O(2|3),,; \ + s|-mcpu=i486||' # gconf is not working in this release @${REINPLACE_CMD} -E -e \ 's,^((DIST_SUBDIRS|SUBDIRS).+)gconf,\1,' \ @@ -89,6 +92,10 @@ post-patch: 's|malloc.h|stdlib.h|; \ s|stdint.h|inttypes.h|' +post-install: +# register plugins + @${LOCALBASE}/bin/gst-register 2>/dev/null + .include <bsd.port.pre.mk> CONFIGURE_ARGS+= \ @@ -138,9 +145,8 @@ WITH_AVIFILE=yes .endif # esound -.if exists(${LOCALBASE}/lib/libesd.a) -USE_GNOME+= esound -PKGNAMESUFFIX= -esound +.if (${HAVE_GNOME:Mesound}!="") +WITH_ESOUND=yes .endif # flac @@ -265,13 +271,12 @@ PLIST_SUB+= AVIFILE="" .endif # esound -.if !(${HAVE_GNOME:Mesound}!="" || defined(WITH_ESOUND)) +.ifndef(WITH_ESOUND) CONFIGURE_ARGS+= --disable-esd \ --disable-esdtest PLIST_SUB+= ESOUND="@comment " .else USE_GNOME+= esound -PKGNAMESUFFIX= -esound CONFIGURE_ARGS+= --with-esd-prefix=${LOCALBASE} \ --with-esd-exec-prefix=${LOCALBASE} PLIST_SUB+= ESOUND="" @@ -468,7 +473,7 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_AVIFILE to enable avifile Video plugin' .endif -.if !(${HAVE_GNOME:Mesound}!="" || defined(WITH_ESOUND)) +.ifndef(WITH_ESOUND) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_ESOUND to enable esound Audio plugin' .endif diff --git a/multimedia/gstreamer-plugins80/distinfo b/multimedia/gstreamer-plugins80/distinfo index 1f3233ae1353..fd0fc2e3d6e9 100644 --- a/multimedia/gstreamer-plugins80/distinfo +++ b/multimedia/gstreamer-plugins80/distinfo @@ -1 +1 @@ -MD5 (gst-plugins-0.4.0.tar.bz2) = 06c7252240e0779d58ec962b539b6ae6 +MD5 (gst-plugins-0.4.1.tar.bz2) = 9b190733771be21bf8bf18971a652955 diff --git a/multimedia/gstreamer-plugins80/files/patch-ext::flac::gstflacdec.c b/multimedia/gstreamer-plugins80/files/patch-ext::flac::gstflacdec.c deleted file mode 100644 index 37a11fd7d5e3..000000000000 --- a/multimedia/gstreamer-plugins80/files/patch-ext::flac::gstflacdec.c +++ /dev/null @@ -1,83 +0,0 @@ ---- ext/flac/gstflacdec.c.orig Thu Jul 11 21:35:29 2002 -+++ ext/flac/gstflacdec.c Thu Jul 11 21:44:42 2002 -@@ -74,10 +74,10 @@ - void *client_data); - static FLAC__StreamDecoderWriteStatus - gst_flacdec_write (const FLAC__SeekableStreamDecoder *decoder, -- const FLAC__Frame *frame, const FLAC__int32 *buffer[], -+ const FLAC__Frame *frame, const FLAC__int32 * const buffer[], - void *client_data); - static void gst_flacdec_metadata_callback (const FLAC__SeekableStreamDecoder *decoder, -- const FLAC__StreamMetaData *metadata, -+ const FLAC__StreamMetadata *metadata, - void *client_data); - static void gst_flacdec_error_callback (const FLAC__SeekableStreamDecoder *decoder, - FLAC__StreamDecoderErrorStatus status, -@@ -152,7 +152,7 @@ - - static void - gst_flacdec_metadata_callback (const FLAC__SeekableStreamDecoder *decoder, -- const FLAC__StreamMetaData *metadata, void *client_data) -+ const FLAC__StreamMetadata *metadata, void *client_data) - { - FlacDec *flacdec; - -@@ -171,13 +171,13 @@ - flacdec = GST_FLACDEC (client_data); - - switch (status) { -- case FLAC__STREAM_DECODER_ERROR_LOST_SYNC: -+ case FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC: - error = "lost sync"; - break; -- case FLAC__STREAM_DECODER_ERROR_BAD_HEADER: -+ case FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER: - error = "bad header"; - break; -- case FLAC__STREAM_DECODER_ERROR_FRAME_CRC_MISMATCH: -+ case FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH: - error = "CRC mismatch"; - break; - default: -@@ -271,6 +271,7 @@ - GST_DEBUG (0, "eos"); - flacdec->eos = TRUE; - if (avail == 0) { -+ gst_event_free (event); - return 0; - } - break; -@@ -301,7 +302,7 @@ - - static FLAC__StreamDecoderWriteStatus - gst_flacdec_write (const FLAC__SeekableStreamDecoder *decoder, const FLAC__Frame *frame, -- const FLAC__int32 *buffer[], void *client_data) -+ const FLAC__int32 * const buffer[], void *client_data) - { - FlacDec *flacdec; - GstBuffer *outbuf; -@@ -383,14 +384,14 @@ - } - else { - g_warning ("flacdec: invalid depth %d found\n", depth); -- return FLAC__STREAM_DECODER_WRITE_ABORT; -+ return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT; - } - - flacdec->total_samples += samples; - - gst_pad_push (flacdec->srcpad, outbuf); - -- return FLAC__STREAM_DECODER_WRITE_CONTINUE; -+ return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE; - } - - static void -@@ -554,6 +555,7 @@ - res = FALSE; - break; - } -+ gst_event_free (event); - return res; - } - diff --git a/multimedia/gstreamer-plugins80/files/patch-ext::flac::gstflacenc.c b/multimedia/gstreamer-plugins80/files/patch-ext::flac::gstflacenc.c deleted file mode 100644 index f661efeb1f0a..000000000000 --- a/multimedia/gstreamer-plugins80/files/patch-ext::flac::gstflacenc.c +++ /dev/null @@ -1,20 +0,0 @@ ---- ext/flac/gstflacenc.c.orig Thu Jul 11 21:17:58 2002 -+++ ext/flac/gstflacenc.c Thu Jul 11 21:33:45 2002 -@@ -56,7 +56,7 @@ - static FLAC__StreamEncoderWriteStatus - gst_flacenc_write_callback (const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, - unsigned samples, unsigned current_frame, void *client_data); --static void gst_flacenc_metadata_callback (const FLAC__StreamEncoder *encoder, const FLAC__StreamMetaData *metadata, -+static void gst_flacenc_metadata_callback (const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, - void *client_data); - - static GstElementClass *parent_class = NULL; -@@ -170,7 +170,7 @@ - } - - static void --gst_flacenc_metadata_callback (const FLAC__StreamEncoder *encoder, const FLAC__StreamMetaData *metadata, void *client_data) -+gst_flacenc_metadata_callback (const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, void *client_data) - { - GstEvent *event; - FlacEnc *flacenc; diff --git a/multimedia/gstreamer-plugins80/pkg-plist b/multimedia/gstreamer-plugins80/pkg-plist index e26cd73dfa9b..6f8087569b59 100644 --- a/multimedia/gstreamer-plugins80/pkg-plist +++ b/multimedia/gstreamer-plugins80/pkg-plist @@ -12,14 +12,12 @@ lib/gst/libgstadder.so lib/gst/libgstalaw.so %%ARTS%%lib/gst/libgstartsdsink.so lib/gst/libgstaudio.so -%%LIBAUDIOFILE%%lib/gst/libgstaudiofile.so lib/gst/libgstaudioscale.so lib/gst/libgstauparse.so %%AVIFILE%%lib/gst/libgstavidemux.so %%AVIFILE%%lib/gst/libgstavimux.so lib/gst/libgstcdxaparse.so lib/gst/libgstchart.so -lib/gst/libgstcolorspace.so lib/gst/libgstcutter.so lib/gst/libgstdeinterlace.so %%LIBDVDREAD%%lib/gst/libgstdvdreadsrc.so @@ -42,7 +40,6 @@ lib/gst/libgstlevel.so %%LIBMAD%%lib/gst/libgstmad.so lib/gst/libgstmedian.so %%LIBMIKMOD%%lib/gst/libgstmikmod.so -lib/gst/libgstmodplug.so lib/gst/libgstmono2stereo.so lib/gst/libgstmonoscope.so lib/gst/libgstmp1videoparse.so @@ -79,14 +76,16 @@ lib/gst/libgststereo2mono.so lib/gst/libgststereosplit.so lib/gst/libgstsynaesthesia.so lib/gst/libgstudp.so +lib/gst/libgstvideocrop.so lib/gst/libgstvideoscale.so +lib/gst/libgstvideotestsrc.so lib/gst/libgstvolenv.so lib/gst/libgstvolume.so %%VORBIS%%lib/gst/libgstvorbis.so lib/gst/libgstvumeter.so lib/gst/libgstwavparse.so -%%AVIFILE%%lib/gst/libgstwincodec.so lib/gst/libgsty4menc.so +lib/gst/libmixmatrix.so libdata/pkgconfig/gstreamer-libs.pc @dirrm include/gst-plugins/gst/riff @dirrm include/gst-plugins/gst/resample diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile index 544466bc9f30..f644f9a04208 100644 --- a/multimedia/gstreamer/Makefile +++ b/multimedia/gstreamer/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gstreamer -PORTVERSION= 0.4.0 +PORTVERSION= 0.4.1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -22,6 +22,7 @@ IGNORE= Needs help fixing scheduling code under FreeBSD USE_BISON= yes USE_BZIP2= yes +USE_GMAKE= yes USE_LIBTOOL= yes USE_REINPLACE= yes GNU_CONFIGURE= yes @@ -30,18 +31,16 @@ CONFIGURE_ARGS= --disable-tests \ CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +CONFIGURE_TARGET= INSTALLS_SHLIB= yes MAN1= gst-complete.1 gst-compprep.1 gst-inspect.1 gst-launch.1 \ + gst-feedback.1 gst-md5sum.1 \ gst-register.1 gst-xmllaunch.1 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config" post-patch: -# do not prefix binary names with anything - @${REINPLACE_CMD} -E -e \ - 's|(@program_transform_name@),[^,]+,|\1,s/$$$$//,|' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} # use proper dir @${REINPLACE_CMD} -E -e \ 's|^(pkgconfigdir).*$$|\1=${PREFIX}/libdata/pkgconfig|' \ @@ -65,4 +64,8 @@ post-configure: @${REINPLACE_CMD} -E -e 's|-release ${PORTVERSION}||' \ ${WRKSRC}/gst/Makefile +post-install: +# register plugins + @${PREFIX}/bin/gst-register 2>/dev/null + .include <bsd.port.mk> diff --git a/multimedia/gstreamer/distinfo b/multimedia/gstreamer/distinfo index 0f73d067088e..ce93e698886e 100644 --- a/multimedia/gstreamer/distinfo +++ b/multimedia/gstreamer/distinfo @@ -1 +1 @@ -MD5 (gstreamer-0.4.0.tar.bz2) = 6dffb9d8f8e0c82989966f6fc7a7c94e +MD5 (gstreamer-0.4.1.tar.bz2) = 3d0b97165b684e8939377ca74702ac0e diff --git a/multimedia/gstreamer/files/patch-gst::gstthread.c b/multimedia/gstreamer/files/patch-gst::gstthread.c deleted file mode 100644 index e6f33930cd3d..000000000000 --- a/multimedia/gstreamer/files/patch-gst::gstthread.c +++ /dev/null @@ -1,22 +0,0 @@ ---- gst/gstthread.c.orig Wed Jul 10 15:22:00 2002 -+++ gst/gstthread.c Wed Jul 10 15:22:52 2002 -@@ -147,7 +147,7 @@ - thread->cond = g_cond_new (); - - thread->ppid = getpid (); -- thread->thread_id = -1; -+ thread->thread_id = (pthread_t) -1; - } - - static void -@@ -276,8 +276,8 @@ - if (pthread_attr_init (&thread->attr) != 0) - g_warning ("pthread_attr_init returned an error !"); - if (gst_scheduler_get_preferred_stack (GST_ELEMENT_SCHED (element), &thread->stack, &stacksize)) { -- if (pthread_attr_setstack (&thread->attr, thread->stack, stacksize) != 0) { -- g_warning ("pthread_attr_setstack failed"); -+ if (pthread_attr_setstacksize (&thread->attr, stacksize) != 0) { -+ g_warning ("pthread_attr_setstacksize failed"); - return GST_STATE_FAILURE; - } - GST_DEBUG (GST_CAT_THREAD, "pthread attr set stack at %p of size %ld", diff --git a/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::Makefile.in b/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::Makefile.in index 19d00d8a9e23..fd554c27807f 100644 --- a/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::Makefile.in +++ b/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::Makefile.in @@ -1,6 +1,6 @@ ---- libs/ext/cothreads/tests/Makefile.in.orig Wed Jul 10 15:44:45 2002 -+++ libs/ext/cothreads/tests/Makefile.in Wed Jul 10 15:45:06 2002 -@@ -76,7 +76,7 @@ +--- libs/ext/cothreads/tests/Makefile.in.orig Sat Sep 28 23:05:55 2002 ++++ libs/ext/cothreads/tests/Makefile.in Sat Sep 28 23:06:23 2002 +@@ -83,7 +83,7 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ diff --git a/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::cothreads.c b/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::cothreads.c deleted file mode 100644 index a7ca2581f2b7..000000000000 --- a/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::cothreads.c +++ /dev/null @@ -1,18 +0,0 @@ ---- libs/ext/cothreads/tests/cothreads.c.orig Fri Jun 21 01:33:11 2002 -+++ libs/ext/cothreads/tests/cothreads.c Mon Jul 15 18:11:38 2002 -@@ -79,10 +79,13 @@ - printf ("0: creating the gthreads\n"); - for (i=0; i<NGTHREADS; i++) { - pthreadnum[i] = i+1; -- if (posix_memalign (&stack, MAIN_STACK_SIZE, MAIN_STACK_SIZE)) -+ stack = malloc (MAIN_STACK_SIZE * (1.0 + 1.0/16)); -+ if (!stack) - perror ("allocating pthread stack of size %d", MAIN_STACK_SIZE); -+ stack = (void*)((int)stack &~ (int)(MAIN_STACK_SIZE / 16 - 1)); -+ stack += 1; - pthread_attr_init (&attr[i]); -- if (!pthread_attr_setstack (&attr[i], stack, MAIN_STACK_SIZE)) -+ if (!pthread_attr_setstacksize (&attr[i], MAIN_STACK_SIZE)) - perror ("setting stack size"); - pthread_create (&thread[i], &attr[i], pthread, &pthreadnum[i]); - } diff --git a/multimedia/gstreamer/pkg-plist b/multimedia/gstreamer/pkg-plist index e1de17b4f5a6..09a207808a18 100644 --- a/multimedia/gstreamer/pkg-plist +++ b/multimedia/gstreamer/pkg-plist @@ -4,6 +4,7 @@ bin/gst-compprep bin/gst-feedback bin/gst-inspect bin/gst-launch +bin/gst-md5sum bin/gst-register bin/gst-xmllaunch include/gstreamer/gst/bytestream/bytestream.h @@ -16,10 +17,11 @@ include/gstreamer/gst/control/dplinearinterp.h include/gstreamer/gst/control/unitconvert.h include/gstreamer/gst/getbits/getbits.h include/gstreamer/gst/gst.h +include/gstreamer/gst/gstatomic.h include/gstreamer/gst/gstautoplug.h include/gstreamer/gst/gstbin.h include/gstreamer/gst/gstbuffer.h -include/gstreamer/gst/gstbufferpool.h +include/gstreamer/gst/gstbufferpool-default.h include/gstreamer/gst/gstcaps.h include/gstreamer/gst/gstclock.h include/gstreamer/gst/gstconfig.h @@ -33,6 +35,7 @@ include/gstreamer/gst/gstformat.h include/gstreamer/gst/gstinfo.h include/gstreamer/gst/gstlog.h include/gstreamer/gst/gstmarshal.h +include/gstreamer/gst/gstmemchunk.h include/gstreamer/gst/gstobject.h include/gstreamer/gst/gstpad.h include/gstreamer/gst/gstparse.h @@ -56,23 +59,25 @@ include/gstreamer/gst/gstxml.h include/gstreamer/gst/putbits/putbits.h lib/gst/libgstautoplugcache.so lib/gst/libgstautoplugger.so -lib/gst/libgstbasicscheduler.so +lib/gst/libgstbasicomegascheduler.so +lib/gst/libgstbasicwingoscheduler.so lib/gst/libgstbytestream.so -lib/gst/libgstcontrol.so lib/gst/libgstelements.so -lib/gst/libgstfastbasicscheduler.so -lib/gst/libgstfaststandardscheduler.so +lib/gst/libgstfastomegascheduler.so +lib/gst/libgstfastwingoscheduler.so lib/gst/libgstgetbits.so +lib/gst/libgstoptomegascheduler.so lib/gst/libgstputbits.so lib/gst/libgstspider.so -lib/gst/libgststandardscheduler.so lib/gst/libgststaticautoplug.so lib/gst/libgststaticautoplugrender.so lib/gst/libgsttypes.so +lib/libgstcontrol.so lib/libgstreamer.a lib/libgstreamer.so lib/libgstreamer.so.0 libdata/pkgconfig/gstreamer.pc +@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true @dirrm lib/gst @dirrm include/gstreamer/gst/putbits @dirrm include/gstreamer/gst/getbits diff --git a/multimedia/gstreamer80/Makefile b/multimedia/gstreamer80/Makefile index 544466bc9f30..f644f9a04208 100644 --- a/multimedia/gstreamer80/Makefile +++ b/multimedia/gstreamer80/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gstreamer -PORTVERSION= 0.4.0 +PORTVERSION= 0.4.1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -22,6 +22,7 @@ IGNORE= Needs help fixing scheduling code under FreeBSD USE_BISON= yes USE_BZIP2= yes +USE_GMAKE= yes USE_LIBTOOL= yes USE_REINPLACE= yes GNU_CONFIGURE= yes @@ -30,18 +31,16 @@ CONFIGURE_ARGS= --disable-tests \ CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +CONFIGURE_TARGET= INSTALLS_SHLIB= yes MAN1= gst-complete.1 gst-compprep.1 gst-inspect.1 gst-launch.1 \ + gst-feedback.1 gst-md5sum.1 \ gst-register.1 gst-xmllaunch.1 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config" post-patch: -# do not prefix binary names with anything - @${REINPLACE_CMD} -E -e \ - 's|(@program_transform_name@),[^,]+,|\1,s/$$$$//,|' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} # use proper dir @${REINPLACE_CMD} -E -e \ 's|^(pkgconfigdir).*$$|\1=${PREFIX}/libdata/pkgconfig|' \ @@ -65,4 +64,8 @@ post-configure: @${REINPLACE_CMD} -E -e 's|-release ${PORTVERSION}||' \ ${WRKSRC}/gst/Makefile +post-install: +# register plugins + @${PREFIX}/bin/gst-register 2>/dev/null + .include <bsd.port.mk> diff --git a/multimedia/gstreamer80/distinfo b/multimedia/gstreamer80/distinfo index 0f73d067088e..ce93e698886e 100644 --- a/multimedia/gstreamer80/distinfo +++ b/multimedia/gstreamer80/distinfo @@ -1 +1 @@ -MD5 (gstreamer-0.4.0.tar.bz2) = 6dffb9d8f8e0c82989966f6fc7a7c94e +MD5 (gstreamer-0.4.1.tar.bz2) = 3d0b97165b684e8939377ca74702ac0e diff --git a/multimedia/gstreamer80/files/patch-gst::gstthread.c b/multimedia/gstreamer80/files/patch-gst::gstthread.c deleted file mode 100644 index e6f33930cd3d..000000000000 --- a/multimedia/gstreamer80/files/patch-gst::gstthread.c +++ /dev/null @@ -1,22 +0,0 @@ ---- gst/gstthread.c.orig Wed Jul 10 15:22:00 2002 -+++ gst/gstthread.c Wed Jul 10 15:22:52 2002 -@@ -147,7 +147,7 @@ - thread->cond = g_cond_new (); - - thread->ppid = getpid (); -- thread->thread_id = -1; -+ thread->thread_id = (pthread_t) -1; - } - - static void -@@ -276,8 +276,8 @@ - if (pthread_attr_init (&thread->attr) != 0) - g_warning ("pthread_attr_init returned an error !"); - if (gst_scheduler_get_preferred_stack (GST_ELEMENT_SCHED (element), &thread->stack, &stacksize)) { -- if (pthread_attr_setstack (&thread->attr, thread->stack, stacksize) != 0) { -- g_warning ("pthread_attr_setstack failed"); -+ if (pthread_attr_setstacksize (&thread->attr, stacksize) != 0) { -+ g_warning ("pthread_attr_setstacksize failed"); - return GST_STATE_FAILURE; - } - GST_DEBUG (GST_CAT_THREAD, "pthread attr set stack at %p of size %ld", diff --git a/multimedia/gstreamer80/files/patch-libs::ext::cothreads::tests::Makefile.in b/multimedia/gstreamer80/files/patch-libs::ext::cothreads::tests::Makefile.in index 19d00d8a9e23..fd554c27807f 100644 --- a/multimedia/gstreamer80/files/patch-libs::ext::cothreads::tests::Makefile.in +++ b/multimedia/gstreamer80/files/patch-libs::ext::cothreads::tests::Makefile.in @@ -1,6 +1,6 @@ ---- libs/ext/cothreads/tests/Makefile.in.orig Wed Jul 10 15:44:45 2002 -+++ libs/ext/cothreads/tests/Makefile.in Wed Jul 10 15:45:06 2002 -@@ -76,7 +76,7 @@ +--- libs/ext/cothreads/tests/Makefile.in.orig Sat Sep 28 23:05:55 2002 ++++ libs/ext/cothreads/tests/Makefile.in Sat Sep 28 23:06:23 2002 +@@ -83,7 +83,7 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ diff --git a/multimedia/gstreamer80/files/patch-libs::ext::cothreads::tests::cothreads.c b/multimedia/gstreamer80/files/patch-libs::ext::cothreads::tests::cothreads.c deleted file mode 100644 index a7ca2581f2b7..000000000000 --- a/multimedia/gstreamer80/files/patch-libs::ext::cothreads::tests::cothreads.c +++ /dev/null @@ -1,18 +0,0 @@ ---- libs/ext/cothreads/tests/cothreads.c.orig Fri Jun 21 01:33:11 2002 -+++ libs/ext/cothreads/tests/cothreads.c Mon Jul 15 18:11:38 2002 -@@ -79,10 +79,13 @@ - printf ("0: creating the gthreads\n"); - for (i=0; i<NGTHREADS; i++) { - pthreadnum[i] = i+1; -- if (posix_memalign (&stack, MAIN_STACK_SIZE, MAIN_STACK_SIZE)) -+ stack = malloc (MAIN_STACK_SIZE * (1.0 + 1.0/16)); -+ if (!stack) - perror ("allocating pthread stack of size %d", MAIN_STACK_SIZE); -+ stack = (void*)((int)stack &~ (int)(MAIN_STACK_SIZE / 16 - 1)); -+ stack += 1; - pthread_attr_init (&attr[i]); -- if (!pthread_attr_setstack (&attr[i], stack, MAIN_STACK_SIZE)) -+ if (!pthread_attr_setstacksize (&attr[i], MAIN_STACK_SIZE)) - perror ("setting stack size"); - pthread_create (&thread[i], &attr[i], pthread, &pthreadnum[i]); - } diff --git a/multimedia/gstreamer80/pkg-plist b/multimedia/gstreamer80/pkg-plist index e1de17b4f5a6..09a207808a18 100644 --- a/multimedia/gstreamer80/pkg-plist +++ b/multimedia/gstreamer80/pkg-plist @@ -4,6 +4,7 @@ bin/gst-compprep bin/gst-feedback bin/gst-inspect bin/gst-launch +bin/gst-md5sum bin/gst-register bin/gst-xmllaunch include/gstreamer/gst/bytestream/bytestream.h @@ -16,10 +17,11 @@ include/gstreamer/gst/control/dplinearinterp.h include/gstreamer/gst/control/unitconvert.h include/gstreamer/gst/getbits/getbits.h include/gstreamer/gst/gst.h +include/gstreamer/gst/gstatomic.h include/gstreamer/gst/gstautoplug.h include/gstreamer/gst/gstbin.h include/gstreamer/gst/gstbuffer.h -include/gstreamer/gst/gstbufferpool.h +include/gstreamer/gst/gstbufferpool-default.h include/gstreamer/gst/gstcaps.h include/gstreamer/gst/gstclock.h include/gstreamer/gst/gstconfig.h @@ -33,6 +35,7 @@ include/gstreamer/gst/gstformat.h include/gstreamer/gst/gstinfo.h include/gstreamer/gst/gstlog.h include/gstreamer/gst/gstmarshal.h +include/gstreamer/gst/gstmemchunk.h include/gstreamer/gst/gstobject.h include/gstreamer/gst/gstpad.h include/gstreamer/gst/gstparse.h @@ -56,23 +59,25 @@ include/gstreamer/gst/gstxml.h include/gstreamer/gst/putbits/putbits.h lib/gst/libgstautoplugcache.so lib/gst/libgstautoplugger.so -lib/gst/libgstbasicscheduler.so +lib/gst/libgstbasicomegascheduler.so +lib/gst/libgstbasicwingoscheduler.so lib/gst/libgstbytestream.so -lib/gst/libgstcontrol.so lib/gst/libgstelements.so -lib/gst/libgstfastbasicscheduler.so -lib/gst/libgstfaststandardscheduler.so +lib/gst/libgstfastomegascheduler.so +lib/gst/libgstfastwingoscheduler.so lib/gst/libgstgetbits.so +lib/gst/libgstoptomegascheduler.so lib/gst/libgstputbits.so lib/gst/libgstspider.so -lib/gst/libgststandardscheduler.so lib/gst/libgststaticautoplug.so lib/gst/libgststaticautoplugrender.so lib/gst/libgsttypes.so +lib/libgstcontrol.so lib/libgstreamer.a lib/libgstreamer.so lib/libgstreamer.so.0 libdata/pkgconfig/gstreamer.pc +@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true @dirrm lib/gst @dirrm include/gstreamer/gst/putbits @dirrm include/gstreamer/gst/getbits |