Date: Wed, 6 Oct 2004 17:29:04 -0400 (EDT) From: Michael Johnson <ahze@ahze.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: lioux@FreeBSD.org Subject: ports/72404: [PATCH] multimedia/gstreamer-plugins: update to 0.8.5 Message-ID: <200410062129.i96LT49i036061@blueheron.ahze.net> Resent-Message-ID: <200410062130.i96LUThQ008991@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 72404 >Category: ports >Synopsis: [PATCH] multimedia/gstreamer-plugins: update to 0.8.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Oct 06 21:30:27 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Michael Johnson >Release: FreeBSD 5.3-BETA6 i386 >Organization: >Environment: System: FreeBSD blueheron.ahze.net 5.3-BETA6 FreeBSD 5.3-BETA6 #67: Fri Oct 1 15:03:41 EDT >Description: - Update to 0.8.5 Changes: - Removed KIO support - Add mplex from mjpegtools support - Add libmng support Removed file(s): - files/patch-ext_theora_theoradec.c - files/patch-ext_vorbis_vorbisparse.c Port maintainer (lioux@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- gstreamer-plugins-0.8.5.patch begins here --- diff -ruN --exclude=CVS /usr/ports/multimedia/gstreamer-plugins.orig/Makefile /usr/ports/multimedia/gstreamer-plugins/Makefile --- /usr/ports/multimedia/gstreamer-plugins.orig/Makefile Wed Oct 6 16:28:44 2004 +++ /usr/ports/multimedia/gstreamer-plugins/Makefile Wed Oct 6 17:25:30 2004 @@ -6,10 +6,10 @@ # PORTNAME= gstreamer -PORTVERSION= 0.8.4 +PORTVERSION= 0.8.5 CATEGORIES= multimedia audio -MASTER_SITES= ${MASTER_SITE_GNOME} \ - http://gstreamer.freedesktop.org/src/gst-plugins/ +MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-plugins/ \ + ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gst-plugins/0.8 PKGNAMESUFFIX= -plugins DISTNAME= gst-plugins-${PORTVERSION} @@ -54,7 +54,6 @@ CONFIGURE_ARGS+=\ --disable-tarkin \ --disable-lcs \ - --disable-mplex \ --disable-shout2 \ --disable-libvisual \ --disable-dirac \ @@ -133,11 +132,6 @@ ${WRKSRC}/sys/cdrom/gstcdplayer_ioctl.c \ ${WRKSRC}/sys/vcd/vcdsrc.c \ ${WRKSRC}/sys/vcd/vcdsrc.h -# KDE libkio required thread support - ${REINPLACE_CMD} -E \ - -e 's|(KIO_CFLAGS=.+)"$$|\1 ${PTHREAD_CFLAGS}"|' \ - -e 's|(KIO_LIBS=.+)"$$|\1 ${PTHREAD_LIBS}"|' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} .include <bsd.port.pre.mk> @@ -221,16 +215,16 @@ WITH_JACK=YES .endif -# KIO -.if exists(${LOCALBASE}/lib/libkio.so) -WITH_KIO=yes -.endif - # libcaca .if exists(${LOCALBASE}/lib/libcaca.a) WITH_LIBCACA=yes .endif +# libmng +.if exists(${LOCALBASE}/lib/libmng.a) +WITH_MNG=yes +.endif + # gsm .if exists(${LOCALBASE}/lib/libgsm.a) WITH_GSM=yes @@ -549,19 +543,6 @@ PLIST_SUB+= JACK="" .endif -# KIO -.ifndef(WITH_KIO) -CONFIGURE_ARGS+= --disable-kio -PLIST_SUB+= KIO="@comment " -.else -LIB_DEPENDS+= kio.6:${PORTSDIR}/x11/kdelibs3 - -CONFIGURE_ENV+= KDE_PREFIX="${LOCALBASE}" \ - KDE_MOC="${X11BASE}/bin/moc" \ - QTDIR="${X11BASE}" -PLIST_SUB+= KIO="" -.endif - # Hermes .ifndef(WITH_HERMES) CONFIGURE_ARGS+= --disable-hermes @@ -757,11 +738,12 @@ # mjpegtools .ifndef(WITH_MJPEGTOOLS) -CONFIGURE_ARGS+= --disable-mpeg2enc +CONFIGURE_ARGS+= --disable-mpeg2enc --disable-mplex PLIST_SUB+= MJPEGTOOLS="@comment " .else LIB_DEPENDS+= lavjpeg-1.6.2:${PORTSDIR}/multimedia/mjpegtools +EXTRA_BUILD_DIR+= ext/mpeg2enc # XXX - make sure CONFIGURE works with mpeg2enc even with "ccache # c++" ... weird but necessary CONFIGURE_ENV+= HAVE_CXX=yes @@ -806,6 +788,15 @@ PLIST_SUB+= PANGO="" .endif +# mng +.ifndef(WITH_MNG) +CONFIGURE_ARGS+= --disable-libmng +PLIST_SUB+= MNG="@comment " +.else +LIB_DEPENDS+= mng.1:${PORTSDIR}/graphics/libmng +PLIST_SUB+= MNG="" +.endif + # png .ifndef(WITH_PNG) CONFIGURE_ARGS+= --disable-libpng @@ -840,13 +831,14 @@ .endif # speex -.ifndef(WITH_SPEEX) +# !!!BROKEN RIGHT NOW!!! - need -devel speex +#.ifndef(WITH_SPEEX) CONFIGURE_ARGS+= --disable-speex PLIST_SUB+= SPEEX="@comment " -.else -LIB_DEPENDS+= speex.3:${PORTSDIR}/audio/speex -PLIST_SUB+= SPEEX="" -.endif +#.else +#LIB_DEPENDS+= speex.3:${PORTSDIR}/audio/speex +#PLIST_SUB+= SPEEX="" +#.endif # swfdec .ifndef(WITH_SWFDEC) @@ -987,10 +979,6 @@ @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_JACK to enable jackd audio plugin' .endif -.ifndef(WITH_KIO) - @${ECHO_MSG} '===>' - @${ECHO_MSG} '===> Define WITH_KIO to enable support for KIO slave sources' -.endif .ifndef(WITH_HERMES) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_HERMES to enable Hermes colorspace plugin' @@ -1066,6 +1054,10 @@ .ifndef(WITH_MAD) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_MAD to enable mad Audio plugin' +.endif +.ifndef(WITH_MNG) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_MNG to enable libmng plugin' .endif .ifndef(WITH_NAS) @${ECHO_MSG} '===>' diff -ruN --exclude=CVS /usr/ports/multimedia/gstreamer-plugins.orig/distinfo /usr/ports/multimedia/gstreamer-plugins/distinfo --- /usr/ports/multimedia/gstreamer-plugins.orig/distinfo Wed Oct 6 16:28:44 2004 +++ /usr/ports/multimedia/gstreamer-plugins/distinfo Wed Oct 6 16:10:30 2004 @@ -1,2 +1,2 @@ -MD5 (gnome2/gst-plugins-0.8.4.tar.bz2) = 203360bb6546ac45e5a76cbb34d514e0 -SIZE (gnome2/gst-plugins-0.8.4.tar.bz2) = 2005935 +MD5 (gnome2/gst-plugins-0.8.5.tar.bz2) = da9ed7c74b9ac0ccc5d2efcf4fd60db0 +SIZE (gnome2/gst-plugins-0.8.5.tar.bz2) = 2031638 diff -ruN --exclude=CVS /usr/ports/multimedia/gstreamer-plugins.orig/files/patch-ext_theora_theoradec.c /usr/ports/multimedia/gstreamer-plugins/files/patch-ext_theora_theoradec.c --- /usr/ports/multimedia/gstreamer-plugins.orig/files/patch-ext_theora_theoradec.c Wed Oct 6 16:28:44 2004 +++ /usr/ports/multimedia/gstreamer-plugins/files/patch-ext_theora_theoradec.c Wed Dec 31 19:00:00 1969 @@ -1,19 +0,0 @@ ---- ext/theora/theoradec.c.orig Wed Aug 4 16:29:13 2004 -+++ ext/theora/theoradec.c Wed Aug 4 16:30:47 2004 -@@ -385,6 +385,7 @@ - gboolean res = TRUE; - GstTheoraDec *dec; - GstFormat format; -+ GstEvent *real_seek; - - dec = GST_THEORA_DEC (gst_pad_get_parent (pad)); - -@@ -405,7 +406,7 @@ - goto error; - - /* then seek with time on the peer */ -- GstEvent *real_seek = gst_event_new_seek ( -+ real_seek = gst_event_new_seek ( - (GST_EVENT_SEEK_TYPE (event) & ~GST_SEEK_FORMAT_MASK) | - format, value); - diff -ruN --exclude=CVS /usr/ports/multimedia/gstreamer-plugins.orig/files/patch-ext_vorbis_vorbisparse.c /usr/ports/multimedia/gstreamer-plugins/files/patch-ext_vorbis_vorbisparse.c --- /usr/ports/multimedia/gstreamer-plugins.orig/files/patch-ext_vorbis_vorbisparse.c Wed Oct 6 16:28:44 2004 +++ /usr/ports/multimedia/gstreamer-plugins/files/patch-ext_vorbis_vorbisparse.c Wed Dec 31 19:00:00 1969 @@ -1,23 +0,0 @@ ---- ext/vorbis/vorbisparse.c.orig Wed Jun 23 23:49:17 2004 -+++ ext/vorbis/vorbisparse.c Wed Jun 23 23:50:16 2004 -@@ -103,6 +103,9 @@ - vorbis_parse_set_header_on_caps (GstVorbisParse * parse, GstCaps * caps) - { - GstBuffer *buf1, *buf2, *buf3; -+ GstStructure *structure; -+ GValue list = { 0 }; -+ GValue value = { 0 }; - - g_assert (parse); - g_assert (parse->streamheader); -@@ -115,9 +118,7 @@ - buf3 = parse->streamheader->next->next->data; - g_assert (buf3); - -- GstStructure *structure = gst_caps_get_structure (caps, 0); -- GValue list = { 0 }; -- GValue value = { 0 }; -+ structure = gst_caps_get_structure (caps, 0); - - /* mark buffers */ - GST_BUFFER_FLAG_SET (buf1, GST_BUFFER_IN_CAPS); diff -ruN --exclude=CVS /usr/ports/multimedia/gstreamer-plugins.orig/pkg-plist /usr/ports/multimedia/gstreamer-plugins/pkg-plist --- /usr/ports/multimedia/gstreamer-plugins.orig/pkg-plist Wed Oct 6 16:28:44 2004 +++ /usr/ports/multimedia/gstreamer-plugins/pkg-plist Wed Oct 6 17:22:22 2004 @@ -1,8 +1,8 @@ bin/gst-launch-ext-%%VERSION%% bin/gst-visualise-%%VERSION%% -@unexec GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gstreamer-%%VERSION%%.schemas > /dev/null || /usr/bin/true etc/gconf/schemas/gstreamer-%%VERSION%%.schemas -@exec GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gstreamer-%%VERSION%%.schemas > /dev/null || /usr/bin/true +@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gstreamer-%%VERSION%%.schemas >/dev/null || /usr/bin/true +@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gstreamer-%%VERSION%%.schemas >/dev/null || /usr/bin/true include/gstreamer-%%VERSION%%/gst/audio/gstaudiofilter.h include/gstreamer-%%VERSION%%/gst/audio/audioclock.h include/gstreamer-%%VERSION%%/gst/audio/audio.h @@ -87,7 +87,6 @@ %%IVORBIS%%lib/gstreamer-%%VERSION%%/libgstivorbis.so %%JACK%%lib/gstreamer-%%VERSION%%/libgstjack.so %%JPEG%%lib/gstreamer-%%VERSION%%/libgstjpeg.so -%%KIO%%lib/gstreamer-%%VERSION%%/libgstkio.so %%LADSPA%%lib/gstreamer-%%VERSION%%/libgstladspa.so %%LAME%%lib/gstreamer-%%VERSION%%/libgstlame.so lib/gstreamer-%%VERSION%%/libgstlevel.so @@ -107,6 +106,8 @@ lib/gstreamer-%%VERSION%%/libgstmpegaudio.so lib/gstreamer-%%VERSION%%/libgstmpegaudioparse.so lib/gstreamer-%%VERSION%%/libgstmpegstream.so +%%MNG%%lib/gstreamer-%%VERSION%%/libgstmng.so +%%MJPEGTOOLS%%lib/gstreamer-%%VERSION%%/libgstmplex.so lib/gstreamer-%%VERSION%%/libgstmulaw.so lib/gstreamer-%%VERSION%%/libgstmultifilesink.so lib/gstreamer-%%VERSION%%/libgstmultipart.so @@ -127,7 +128,7 @@ lib/gstreamer-%%VERSION%%/libgstrtp.so %%SDL%%lib/gstreamer-%%VERSION%%/libgstsdlvideosink.so %%LIBSHOUT%%lib/gstreamer-%%VERSION%%/libgstshout.so -%%LIBSIDPLAY%%lib/gstreamer-%%VERSION%%/libgstsid.a +%%LIBSIDPLAY%%lib/gstreamer-%%VERSION%%/libgstsid.so %%LIBSIDPLAY%%lib/gstreamer-%%VERSION%%/libgstsid.so lib/gstreamer-%%VERSION%%/libgstsilence.so lib/gstreamer-%%VERSION%%/libgstsinesrc.so --- gstreamer-plugins-0.8.5.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410062129.i96LT49i036061>