diff options
author | marcus <marcus@FreeBSD.org> | 2004-04-05 03:11:39 +0000 |
---|---|---|
committer | marcus <marcus@FreeBSD.org> | 2004-04-05 03:11:39 +0000 |
commit | 6e5039e5d8ce567e36edb3ab0ea7a8cbaca5698c (patch) | |
tree | 80dd01ef786490f07295a989b1efd8ed753a8fef /multimedia | |
parent | d49bf2116376af3147360d03cc88ffae85b3248d (diff) | |
download | FreeBSD-ports-6e5039e5d8ce567e36edb3ab0ea7a8cbaca5698c.zip FreeBSD-ports-6e5039e5d8ce567e36edb3ab0ea7a8cbaca5698c.tar.gz |
Presenting GNOME 2.6.0. The FreeBSD GNOME Team feels this our best release
ever. It fixes many bugs, and adds some features missing in previous
FreeBSD ports. To help users upgrade from GNOME 2.4, we have constructed an
upgrade FAQ at:
http://www.freebsd.org/gnome/docs/faq26.html
Please read it carefully. GNOME 2.6 packages are also available for all
supported i386 versions of FreeBSD at:
http://www.marcuscom.com/tinderbox/
The FreeBSD GNOME Team would like the thank the following users for their
wonderful testing and patching efforts. We would especially like to thank
Franz Klammer <klammer@webonaut.com> for his wonderful new splash screen.
Without these people, our team, and our team alumni, GNOME on FreeBSD would
not be possible.
Jeremy Messenger <mezz7@cox.net>
Khairil Yusof <kaeru@pd.jaring.my>
Koop Mast <kwm@rainbow-runner.nl>
Simon Barner <barner@in.tum.de>
Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Scott Dodson <sdodson@sdodson.com>
Vladimir Grebenschikov <vova@sw.ru>
Diffstat (limited to 'multimedia')
54 files changed, 1646 insertions, 632 deletions
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index 3bd7729..766898c 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gstreamer -PORTVERSION= 0.6.4 -PORTREVISION= 3 +PORTVERSION= 0.8.0 CATEGORIES= multimedia audio -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gst-plugins/0.6 +MASTER_SITES= ${MASTER_SITE_GNOME} \ + http://gstreamer.freedesktop.org/src/gst-plugins/ +MASTER_SITE_SUBDIR= sources/gst-plugins/0.8 PKGNAMESUFFIX= -plugins DISTNAME= gst-plugins-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,7 +18,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= lioux@FreeBSD.org COMMENT= GStreamer written collection of plugins handling several media types -LIB_DEPENDS= gstreamer-0.6.1:${PORTSDIR}/multimedia/gstreamer \ +LIB_DEPENDS= gstreamer-0.8.1:${PORTSDIR}/multimedia/gstreamer \ popt.0:${PORTSDIR}/devel/popt USE_X_PREFIX= yes @@ -29,38 +29,55 @@ USE_GNOME= gnomehack \ gnomeprefix \ pkgconfig \ gconf2 -USE_LIBTOOL_VER=13 USE_REINPLACE= yes -USE_SIZE= yes -WANT_SDL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-tests \ --disable-alsa \ - --disable-cdrom \ + --enable-cdrom \ --disable-mjpegtools \ + --disable-divx \ + --disable-dxr3 \ + --disable-http \ --disable-qcam \ + --disable-raw1394 \ --disable-v4l2 \ - --disable-v4l + --disable-v4l \ + --disable-vcd \ + --disable-dependency-tracking \ + --enable-xshm \ + --enable-static + +# list of plugins that need some work in one way or the other to work +# probable the lib needs to be ported, disable them for now. +CONFIGURE_ARGS+=--disable-mas \ + --disable-faac \ + --disable-tarkin \ + --disable-lcs \ + --disable-mplex \ + --disable-shout2 \ + --disable-librfb + CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \ CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib" CONFIGURE_TARGET= PLIST_SUB= \ - VERSION="${PORTVERSION:C/..$//}" \ + VERSION="${GST_VERSION}" \ SHLIB_VERSION="${SHLIB_VERSION}" INSTALLS_SHLIB= yes -# for esound detection +# for various GNOME-related component detection WANT_GNOME= yes -MAN1= gst-launch-ext.1 gst-visualise.1 +MAN1= gst-launch-ext-${GST_VERSION}.1 gst-visualise-${GST_VERSION}.1 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config" -XMMS_CONFIG?="${LOCALBASE}/bin/xmms-config" +SDL_CONFIG?="${LOCALBASE}/bin/sdl11-config" +GST_VERSION=${PORTVERSION:C/..$//} # library minor number -SHLIB_VERSION= 1 +SHLIB_VERSION= 1 post-patch: # as of this writing, FreeBSD does not support lrint* C99 math functions @@ -84,43 +101,26 @@ post-patch: # inttypes.h not stdint.h @${FIND} ${WRKSRC} -type f | \ ${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 + 's|malloc\.h|stdlib.h|; \ + s|stdint\.h|inttypes.h|' # 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 - -.include <bsd.port.pre.mk> - post-install: -.if ${ARCH} == "ia64" || ${ARCH} == "amd64" # register plugins - @-${X11BASE}/bin/gst-register 2>/dev/null -.else - @${X11BASE}/bin/gst-register 2>/dev/null -.endif + -@${X11BASE}/bin/gst-register-${GST_VERSION} 2>/dev/null -# Fix build on ia64. This patch breaks other archs, so include it -# conditionally -.if ${ARCH} == "ia64" || ${ARCH} == "amd64" -EXTRA_PATCHES= ${FILESDIR}/ia64-patch-ffmpeg::configure -.endif +.include <bsd.port.pre.mk> # hermes is required for gstreamer-player to work # since it is currently the only colorspace plugin available WITH_HERMES= yes # gnomevfs is required for gstreamer-player to work WITH_GNOMEVFS= yes +# Add default MAD support. This is required for rhythmbox to work. +WITH_MAD= yes ## ## auto detect possible plugins @@ -131,16 +131,11 @@ WITH_GNOMEVFS= yes WITH_AALIB=yes .endif -# aRts +# arts .if exists(${LOCALBASE}/lib/libartsc.so.0) && !defined(WITHOUT_ARTS) WITH_ARTS=yes .endif -# avifile -.if exists(${LOCALBASE}/lib/libaviplay.a) -WITH_AVIFILE=yes -.endif - # cdparanoia .if exists(${LOCALBASE}/lib/libcdda_paranoia.a) WITH_CDPARANOIA=yes @@ -151,6 +146,11 @@ WITH_CDPARANOIA=yes WITH_ESOUND=yes .endif +# faad +.if exists(${LOCALBASE}/lib/libfaad.a) +WITH_FAAD=yes +.endif + # flac .if exists(${LOCALBASE}/lib/libFLAC.a) WITH_FLAC=yes @@ -161,6 +161,11 @@ WITH_FLAC=yes WITH_FREETYPE=yes .endif +# gdkpixbuf +.if ${HAVE_GNOME:Mgtk20}!="" +WITH_GDKPIXBUF=yes +.endif + # lame .if exists(${LOCALBASE}/lib/libmp3lame.a) WITH_LAME=yes @@ -171,6 +176,16 @@ WITH_LAME=yes WITH_GNOMEVFS=yes .endif +# jack +.if exists(${LOCALBASE}/lib/libjack.so.0) +WITH_JACK=YES +.endif + +# libcaca +.if exists(${LOCALBASE}/lib/libcaca.a) +WITH_LIBCACA=yes +.endif + # gsm .if exists(${LOCALBASE}/lib/libgsm.a) WITH_GSM=yes @@ -207,7 +222,6 @@ WITH_LIBDV=yes .endif # libdvdnav -# XXX libdvdnav needs to be updated to 0.1.9 or higher .if exists(${LOCALBASE}/lib/libdvdnav.so) WITH_LIBDVDNAV=yes .endif @@ -232,8 +246,13 @@ WITH_LIBMIKMOD=yes WITH_LIBMPEG2=yes .endif +# libmusicbrainz +.if exists(${LOCALBASE}/lib/libmusicbrainz.a) +WITH_LIBMUSICBRAINZ=yes +.endif + # libshout -.if exists(${LOCALBASE}/lib/libshout.a) +.if exists(${LOCALBASE}/lib/libshout.so.2) WITH_LIBSHOUT=yes .endif @@ -242,14 +261,34 @@ WITH_LIBSHOUT=yes WITH_LIBSIDPLAY=yes .endif +# libsndfile +.if exists(${LOCALBASE}/lib/libsndfile.a) +WITH_LIBSNDFILE=yes +.endif + +# libtheora +.if exists(${LOCALBASE}/lib/libtheora.a) +WITH_LIBTHEORA=yes +.endif + # mad .if exists(${LOCALBASE}/lib/libmad.a) WITH_MAD=yes .endif -# openquicktime -.if exists(${LOCALBASE}/lib/libopenquicktime.so) -WITH_OPENQUICKTIME=yes +# nas +.if exists(${X11BASE}/lib/libaudio.a) +WITH_NAS=YES +.endif + +# ogg +.if exists(${LOCALBASE}/lib/libogg.a) +WITH_OGG=yes +.endif + +# pango +.if exists(${X11BASE}/lib/libpangoft2-1.0.a) +WITH_PANGO=yes .endif # png @@ -258,10 +297,20 @@ WITH_PNG=yes .endif # sdl -.if ${HAVE_SDL:Msdl} +.if exists(${LOCALBASE}/lib/libSDL-1.1.a) WITH_SDL=yes .endif +# smoothwave +.if exists(${X11BASE}/lib/libgtk-x11-2.0.a) +WITH_SMOOTHWAVE=yes +.endif + +# speex +.if exists(${LOCALBASE}/lib/libspeex.a) +WITH_SPEEX=yes +.endif + # swfdec .if exists(${X11BASE}/lib/libswfdec.a) WITH_SWFDEC=yes @@ -272,9 +321,20 @@ WITH_SWFDEC=yes WITH_VORBIS=yes .endif -# xmms -.if exists(${X11BASE}/lib/libxmms.a) -#WITH_XMMS=yes +# vorbisidec +.if exists(${LOCALBASE}/lib/libvorbisidec.a) +WITH_VORBISIDEC=yes +.endif + +# xine +# this plugins is meant to support plugins that gstreamer doesn't have (yet) +.if exists(${X11BASE}/lib/libxine.so.9) +WITH_XINE=yes +.endif + +# xvid +.if exists(${LOCALBASE}/lib/libxvidcore.so.2) +WITH_XVID=yes .endif ## @@ -294,8 +354,8 @@ CONFIGURE_ARGS+= --with-aalib-prefix=${LOCALBASE} \ PLIST_SUB+= AALIB="" .endif -# aRts -.if (!defined(WITH_ARTS) || defined(WITHOUT_ARTS)) +# arts +.ifndef(WITH_ARTS) CONFIGURE_ARGS+= --disable-arts \ --disable-artsc \ --disable-artstest @@ -308,16 +368,6 @@ CONFIGURE_ARGS+= --with-arts-prefix=${LOCALBASE} \ PLIST_SUB+= ARTS="" .endif -# avifile -.ifndef(WITH_AVIFILE) -CONFIGURE_ARGS+= --disable-avifile -PLIST_SUB+= AVIFILE="@comment " -.else -LIB_DEPENDS+= aviplay.0:${PORTSDIR}/multimedia/avifile - -PLIST_SUB+= AVIFILE="" -.endif - # cdparanoia .ifndef(WITH_CDPARANOIA) CONFIGURE_ARGS+= --disable-cdparanoia @@ -340,6 +390,15 @@ CONFIGURE_ARGS+= --with-esd-prefix=${LOCALBASE} \ PLIST_SUB+= ESOUND="" .endif +# faad +.ifndef(WITH_FAAD) +CONFIGURE_ARGS+= --disable-faad +PLIST_SUB+= FAAD="@comment " +.else +LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad +PLIST_SUB+= FAAD="" +.endif + # flac .ifndef(WITH_FLAC) CONFIGURE_ARGS+= --disable-flac @@ -362,6 +421,15 @@ CONFIGURE_ARGS+= --with-ft-prefix=${LOCALBASE} \ PLIST_SUB+= FREETYPE="" .endif +# gdkpixbuf +.ifndef(WITH_GDKPIXBUF) +CONFIGURE_ARGS+= --disable-gdk_pixbuf +PLIST_SUB+= GDKPIXBUF="@comment " +.else +USE_GNOME+= gtk20 +PLIST_SUB+= GDKPIXBUF="" +.endif + # gnomevfs .ifndef(WITH_GNOMEVFS) CONFIGURE_ARGS+= --disable-gnome_vfs @@ -381,6 +449,15 @@ LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm PLIST_SUB+= GSM="" .endif +# jack +.ifndef(WITH_JACK) +CONFIGURE_ARGS+= --disable-jack +PLIST_SUB+= JACK="@comment " +.else +LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack +PLIST_SUB+= JACK="" +.endif + # Hermes .ifndef(WITH_HERMES) CONFIGURE_ARGS+= --disable-hermes @@ -450,6 +527,15 @@ LIB_DEPENDS+= audiofile.0:${PORTSDIR}/audio/libaudiofile PLIST_SUB+= LIBAUDIOFILE="" .endif +# libcaca +.ifndef(WITH_LIBCACA) +CONFIGURE_ARGS+= --disable-libcaca +PLIST_SUB+= LIBCACA="@comment " +.else +BUILD_DEPENDS+= ${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca +PLIST_SUB+= LIBCACA="" +.endif + # libdv .ifndef(WITH_LIBDV) CONFIGURE_ARGS+= --disable-libdv @@ -517,12 +603,21 @@ CONFIGURE_ARGS+= --with-mpeg2dec-prefix=${LOCALBASE} PLIST_SUB+= LIBMPEG2="" .endif +# libmusicbrainz +.ifndef(WITH_LIBMUSICBRAINZ) +CONFIGURE_ARGS+= --disable-musicbrainz +PLIST_SUB+= LIBMUSICBRAINZ="@comment " +.else +LIB_DEPENDS+= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz +PLIST_SUB+= LIBMUSICBRAINZ="" +.endif + # libshout .ifndef(WITH_LIBSHOUT) CONFIGURE_ARGS+= --disable-shout PLIST_SUB+= LIBSHOUT="@comment " .else -LIB_DEPENDS+= shout.3:${PORTSDIR}/audio/libshout2 +LIB_DEPENDS+= shout.3:${PORTSDIR}/audio/libshout PLIST_SUB+= LIBSHOUT="" .endif @@ -537,6 +632,24 @@ LIB_DEPENDS+= sidplay.1:${PORTSDIR}/audio/libsidplay PLIST_SUB+= LIBSIDPLAY="" .endif +# libsndfile +.ifndef(WITH_LIBSNDFILE) +CONFIGURE_ARGS+= --disable-sndfile +PLIST_SUB+= LIBSNDFILE="@comment " +.else +LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile +PLIST_SUB+= LIBSNDFILE="" +.endif + +# libtheora +.ifndef(WITH_LIBTHEORA) +CONFIGURE_ARGS+= --disable-theora +PLIST_SUB+= LIBTHEORA="@comment " +.else +LIB_DEPENDS+= theora.0:${PORTSDIR}/graphics/libtheora +PLIST_SUB+= LIBTHEORA="" +.endif + # mad .ifndef(WITH_MAD) CONFIGURE_ARGS+= --disable-mad @@ -548,14 +661,24 @@ LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad \ PLIST_SUB+= LIBMAD="" .endif -# openquicktime -.ifndef(WITH_OPENQUICKTIME) -CONFIGURE_ARGS+= --disable-openquicktime -PLIST_SUB+= OPENQUICKTIME="@comment " +# nas +.ifndef(WITH_NAS) +CONFIGURE_ARGS+= --disable-nas +PLIST_SUB+= NAS="@comment " .else -LIB_DEPENDS+= openquicktime.0:${PORTSDIR}/multimedia/openquicktime +LIB_DEPENDS+= audio.2:${PORTSDIR}/audio/nas -PLIST_SUB+= OPENQUICKTIME="" +PLIST_SUB+= NAS="" +.endif + +# ogg +.ifndef(WITH_OGG) +CONFIGURE_ARGS+= --disable-ogg \ + --disable-oggtest +PLIST_SUB+= OGG="@comment " +.else +LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg +PLIST_SUB+= OGG="" .endif # oss @@ -566,6 +689,15 @@ PLIST_SUB+= OSS="@comment " PLIST_SUB+= OSS="" .endif +# pango +.ifndef(WITH_PANGO) +CONFIGURE_ARGS+= --disable-pango +PLIST_SUB+= PANGO="@comment " +.else +USE_GNOME+= pango +PLIST_SUB+= PANGO="" +.endif + # png .ifndef(WITH_PNG) CONFIGURE_ARGS+= --disable-libpng @@ -582,12 +714,32 @@ CONFIGURE_ARGS+= --disable-sdl \ --disable-sdltest PLIST_SUB+= SDL="@comment " .else -USE_SDL= sdl +LIB_DEPENDS+= SDL-1.1.7:${PORTSDIR}/devel/sdl12 + CONFIGURE_ARGS+= --with-sdl-prefix=${LOCALBASE} \ --with-sdl-exec-prefix=${LOCALBASE} +CONFIGURE_ENV+= SDL_CONFIG=${SDL_CONFIG} PLIST_SUB+= SDL="" .endif +# smoothwave +.ifndef(WITH_SMOOTHWAVE) +CONFIGURE_ARGS+= --disable-smoothwave +PLIST_SUB+= SMOOTHWAVE="@comment " +.else +USE_GNOME+= gtk20 +PLIST_SUB+= SMOOTHWAVE="" +.endif + +# speex +.ifndef(WITH_SPEEX) +CONFIGURE_ARGS+= --disable-speex +PLIST_SUB+= SPEEX="@comment " +.else +LIB_DEPENDS+= speex.2:${PORTSDIR}/audio/speex +PLIST_SUB+= SPEEX="" +.endif + # swfdec .ifndef(WITH_SWFDEC) CONFIGURE_ARGS+= --disable-swfdec @@ -613,17 +765,34 @@ CONFIGURE_ARGS+= --with-vorbis=${LOCALBASE} \ PLIST_SUB+= VORBIS="" .endif -# xmms -.ifndef(WITH_XMMS) -CONFIGURE_ARGS+= --disable-xmms -PLIST_SUB+= XMMS="@comment " +# vorbisidec +.ifndef(WITH_VORBISIDEC) +CONFIGURE_ARGS+= --disable-ivorbis +PLIST_SUB+= IVORBIS="@comment " +.else +LIB_DEPENDS+= vorbisidec.1:${PORTSDIR}/audio/libtremor +PLIST_SUB+= IVORBIS="" +.endif + +# xine +.ifndef(WITH_XINE) +CONFIGURE_ARGS+= --disable-xine +PLIST_SUB+= XINE="@comment " .else -LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms +CONFIGURE_ARGS+= --enable-xine +LIB_DEPENDS+= xine.9:${PORTSDIR}/multimedia/libxine + +PLIST_SUB+= XINE="" +.endif -CONFIGURE_ARGS+= --with-xmms-prefix=${X11BASE} \ - --with-xmms-exec-prefix=${X11BASE} -CONFIGURE_ENV+= XMMS_CONFIG=${XMMS_CONFIG} -PLIST_SUB+= XMMS="" +# xvid +.ifndef(WITH_XVID) +CONFIGURE_ARGS+= --disable-xvid +PLIST_SUB+= XVID="@comment " +.undef WITH_XVID +#.else +#LIB_DEPENDS+= xvidcore.2:${PORTSDIR}/multimedia/xvid +#PLIST_SUB+= XVID="" .endif pre-everything:: @@ -638,10 +807,6 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_ARTS to enable aRts Audio plugin' .endif -.ifndef(WITH_AVIFILE) - @${ECHO_MSG} '===>' - @${ECHO_MSG} '===> Define WITH_AVIFILE to enable avifile Video plugin' -.endif .ifndef(WITH_CDPARANOIA) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_CDPARANOIA to enable cdparanoia Audio plugin' @@ -650,6 +815,10 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_ESOUND to enable esound Audio plugin' .endif +.ifndef(WITH_FAAD) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_FAAD to enable faad Audio plugin' +.endif .ifndef(WITH_FLAC) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_FLAC to enable flac Audio plugin' @@ -658,6 +827,10 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_FREETYPE to enable freetype support' .endif +.ifndef(WITH_GDKPIXBUF) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_GDKPIXBUF to enable gdk-pixbuf plugin' +.endif .ifndef(WITH_GSM) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_GSM to enable gsm Audio plugin' @@ -666,6 +839,10 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_GNOMEVFS to enable gnomevfs Network plugin' .endif +.ifndef(WITH_JACK) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_JACK to enable jackd audio plugin' +.endif .ifndef(WITH_HERMES) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_HERMES to enable Hermes colorspace plugin' @@ -694,6 +871,10 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_LIBAUDIOFILE to enable libaudiofile Audio plugin' .endif +.ifndef(WITH_LIBCACA) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_LIBCACA to enable libcaca Video plugin' +.endif .ifndef(WITH_LIBDV) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_LIBDV to enable libdv Video plugin' @@ -718,6 +899,10 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_LIBMPEG2 to enable libmpeg2 Video plugin' .endif +.ifndef(WITH_LIBMUSICBRAINZ) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_LIBMUSICBRAINZ to enable libmusicbrainz Audio plugin' +.endif .ifndef(WITH_LIBSHOUT) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_LIBSHOUT to enable libshout Audio plugin' @@ -726,18 +911,30 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_LIBSIDPLAY to enable libsidplay Audio plugin' .endif +.ifndef(WITH_LIBSNDFILE) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_LIBSNDFILE to enable libsndfile Audio plugin' +.endif +.ifndef(WITH_LIBTHEORA) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_LIBTHEORA to enable libtheora Video plugin' +.endif .ifndef(WITH_MAD) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_MAD to enable mad Audio plugin' .endif -.ifndef(WITH_OPENQUICKTIME) +.ifndef(WITH_NAS) @${ECHO_MSG} '===>' - @${ECHO_MSG} '===> Define WITH_OPENQUICKTIME to enable openquicktime Video plugin' + @${ECHO_MSG} '===> Define WITH_NAS to enable nas Audio plugin' .endif .ifndef(WITHOUT_OSS) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITHOUT_OSS to disable OSS Audio plugin' .endif +.ifndef(WITH_PANGO) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_PANGO to enable pango textoverlay plugin' +.endif .ifndef(WITH_PNG) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_PNG to enable png Video plugin' @@ -746,6 +943,14 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_SDL to enable SDL Video plugin' .endif +.ifndef(WITH_SMOOTHWAVE) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_SMOOTHWAVE to enable Smoothwave Video plugin' +.endif +.ifndef(WITH_SPEEX) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_SPEEX to enable Speex Video plugin' +.endif .ifndef(WITH_SWFDEC) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_SWFDEC to enable Flash Video plugin' @@ -754,9 +959,17 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_VORBIS to enable vorbis Audio plugin' .endif -.ifndef(WITH_XMMS) +.ifndef(WITH_VORBISIDEC) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_VORBISIDEC to enable vorbisidec Audio plugin' +.endif +.ifndef(WITH_XINE) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_XINE to enable xine plugin' +.endif +.ifndef(WITH_XVID) @${ECHO_MSG} '===>' - @${ECHO_MSG} '===> Define WITH_XMMS to enable xmms Audio plugin' + @${ECHO_MSG} '===> Define WITH_XVID to enable xvid Video plugin' .endif .include <bsd.port.post.mk> diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo index 403d20d..75cdec2 100644 --- a/multimedia/gstreamer-plugins/distinfo +++ b/multimedia/gstreamer-plugins/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gst-plugins-0.6.4.tar.bz2) = d62e6cd3750863b6395e4c1030223690 -SIZE (gnome2/gst-plugins-0.6.4.tar.bz2) = 1900957 +MD5 (gnome2/gst-plugins-0.8.0.tar.bz2) = 3735f701a25a37ed0b1ec6f3d861a658 +SIZE (gnome2/gst-plugins-0.8.0.tar.bz2) = 1751685 diff --git a/multimedia/gstreamer-plugins/files/ia64-patch-ffmpeg::configure b/multimedia/gstreamer-plugins/files/ia64-patch-ffmpeg::configure deleted file mode 100644 index f4c1cb8..0000000 --- a/multimedia/gstreamer-plugins/files/ia64-patch-ffmpeg::configure +++ /dev/null @@ -1,10 +0,0 @@ ---- gst-libs/ext/ffmpeg/ffmpeg/configure.bak Sat Sep 27 18:39:42 2003 -+++ gst-libs/ext/ffmpeg/ffmpeg/configure Sat Sep 27 19:53:52 2003 -@@ -119,6 +119,7 @@ - v4l="no" - audio_oss="yes" - make="gmake" -+CFLAGS="$CFLAGS -fPIC -DPIC" - LDFLAGS="$LDFLAGS -export-dynamic" - ;; - BSD/OS) diff --git a/multimedia/gstreamer-plugins/files/patch-configure b/multimedia/gstreamer-plugins/files/patch-configure index 001d56f..e2987f9 100644 --- a/multimedia/gstreamer-plugins/files/patch-configure +++ b/multimedia/gstreamer-plugins/files/patch-configure @@ -1,10 +1,21 @@ ---- configure.orig Thu Jul 11 15:51:47 2002 -+++ configure Thu Jul 11 15:51:57 2002 -@@ -6731,6 +6731,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' +--- configure.orig Tue Mar 16 20:32:36 2004 ++++ configure Tue Mar 16 20:41:00 2004 +@@ -41192,7 +41192,8 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-laudio $X_LIBS $LIBS" ++#xxx fix the non x case is er niet... ++LIBS="-laudio -lm -lXt $X_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + /* confdefs.h. */ +@@ -44483,7 +44484,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ltheora $LIBS" ++LIBS="-ltheora -logg $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + /* confdefs.h. */ diff --git a/multimedia/gstreamer-plugins/files/patch-ext::ivorbis::vorbisenc.h b/multimedia/gstreamer-plugins/files/patch-ext::ivorbis::vorbisenc.h new file mode 100644 index 0000000..90d39a1 --- /dev/null +++ b/multimedia/gstreamer-plugins/files/patch-ext::ivorbis::vorbisenc.h @@ -0,0 +1,103 @@ +--- /dev/null Thu Feb 12 22:22:00 2004 ++++ ext/ivorbis/vorbisenc.h Thu Feb 12 22:24:08 2004 +@@ -0,0 +1,100 @@ ++/* GStreamer ++ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this library; if not, write to the ++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ */ ++ ++ ++#ifndef __VORBISENC_H__ ++#define __VORBISENC_H__ ++ ++ ++#include <gst/gst.h> ++ ++#include <tremor/ivorbiscodec.h> ++ ++#ifdef __cplusplus ++extern "C" { ++#endif /* __cplusplus */ ++ ++#define GST_TYPE_VORBISENC \ ++ (vorbisenc_get_type()) ++#define GST_VORBISENC(obj) \ ++ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VORBISENC,VorbisEnc)) ++#define GST_VORBISENC_CLASS(klass) \ ++ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VORBISENC,VorbisEncClass)) ++#define GST_IS_VORBISENC(obj) \ ++ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VORBISENC)) ++#define GST_IS_VORBISENC_CLASS(obj) \ ++ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VORBISENC)) ++ ++typedef struct _VorbisEnc VorbisEnc; ++typedef struct _VorbisEncClass VorbisEncClass; ++ ++struct _VorbisEnc { ++ GstElement element; ++ ++ GstPad *sinkpad, ++ *srcpad; ++ ++ ogg_stream_state os; /* take physical pages, weld into a logical ++ stream of packets */ ++ ogg_page og; /* one Ogg bitstream page. Vorbis packets are inside */ ++ ogg_packet op; /* one raw packet of data for decode */ ++ ++ vorbis_info vi; /* struct that stores all the static vorbis bitstream ++ settings */ ++ vorbis_comment vc; /* struct that stores all the user comments */ ++ ++ vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */ ++ vorbis_block vb; /* local working space for packet->PCM decode */ ++ ++ gboolean eos; ++ ++ gboolean managed; ++ gint bitrate; ++ gint min_bitrate; ++ gint max_bitrate; ++ gfloat quality; ++ gboolean quality_set; ++ gint serial; ++ ++ gint channels; ++ gint frequency; ++ ++ guint64 samples_in; ++ guint64 bytes_out; ++ ++ GstCaps *metadata; ++ ++ gboolean setup; ++ gboolean flush_header; ++ gchar *last_message; ++}; ++ ++struct _VorbisEncClass { ++ GstElementClass parent_class; ++}; ++ ++GType vorbisenc_get_type(void); ++ ++ ++#ifdef __cplusplus ++} ++#endif /* __cplusplus */ ++ ++ ++#endif /* __VORBISENC_H__ */ diff --git a/multimedia/gstreamer-plugins/files/patch-ext_a52dec_gsta52dec.c b/multimedia/gstreamer-plugins/files/patch-ext_a52dec_gsta52dec.c deleted file mode 100644 index 05c0e53..0000000 --- a/multimedia/gstreamer-plugins/files/patch-ext_a52dec_gsta52dec.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/a52dec/gsta52dec.c.orig Sun Apr 6 18:58:19 2003 -+++ ext/a52dec/gsta52dec.c Sun Apr 20 13:16:28 2003 -@@ -25,7 +25,7 @@ - - #include <stdlib.h> - --#ifdef HAVE_STDINT_H -+#if defined(HAVE_STDINT_H) || defined(__FreeBSD__) - #include <stdint.h> - #else - /* (Ronald) hacky... can't include stdint.h because it's not available diff --git a/multimedia/gstreamer-plugins/files/patch-ext_xvid_gstxvid.h b/multimedia/gstreamer-plugins/files/patch-ext_xvid_gstxvid.h new file mode 100644 index 0000000..970e99f --- /dev/null +++ b/multimedia/gstreamer-plugins/files/patch-ext_xvid_gstxvid.h @@ -0,0 +1,39 @@ +--- /dev/null Sun Nov 16 22:55:00 2003 ++++ ext/xvid/gstxvid.h Sun Nov 16 22:32:25 2003 +@@ -0,0 +1,36 @@ ++/* GStreamer xvid decoder plugin ++ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net> ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this library; if not, write to the ++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ */ ++ ++#ifndef __GST_XVID_H__ ++#define __GST_XVID_H__ ++ ++#include <gst/gst.h> ++ ++#ifdef __cplusplus ++extern "C" { ++#endif /* __cplusplus */ ++ ++extern gchar * gst_xvid_error (int errorcode); ++extern gboolean gst_xvid_init (void); ++ ++#ifdef __cplusplus ++} ++#endif /* __cplusplus */ ++ ++#endif /* __GST_XVID_H__ */ diff --git a/multimedia/gstreamer-plugins/files/patch-ffmpeg::simple_idct_alpha.c b/multimedia/gstreamer-plugins/files/patch-ffmpeg::simple_idct_alpha.c deleted file mode 100644 index 8149c39..0000000 --- a/multimedia/gstreamer-plugins/files/patch-ffmpeg::simple_idct_alpha.c +++ /dev/null @@ -1,17 +0,0 @@ ---- gst-libs/ext/ffmpeg/ffmpeg/libavcodec/alpha/simple_idct_alpha.c.orig Fri Apr 25 22:06:13 2003 -+++ gst-libs/ext/ffmpeg/ffmpeg/libavcodec/alpha/simple_idct_alpha.c Fri Apr 25 23:19:39 2003 -@@ -24,8 +24,14 @@ - * and Falk Hueffner <falk@debian.org> - */ - -+#include <sys/param.h> -+ - #include "asm.h" - #include "../dsputil.h" -+ -+#if defined(__FreeBSD__) && __FreeBSD_version < 500000 -+typedef __int32_t int_fast32_t; -+#endif - - extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels, - int line_size); diff --git a/multimedia/gstreamer-plugins/files/patch-gst_level_filter.func b/multimedia/gstreamer-plugins/files/patch-gst_level_filter.func deleted file mode 100644 index 3b154eb..0000000 --- a/multimedia/gstreamer-plugins/files/patch-gst_level_filter.func +++ /dev/null @@ -1,14 +0,0 @@ ---- gst/level/filter.func.orig Mon Oct 13 22:32:12 2003 -+++ gst/level/filter.func Mon Oct 13 22:32:21 2003 -@@ -10,9 +10,9 @@ - register double square = 0.0; /* Square */ - register double PSS = 0.0; /* Peak Square Sample */ - -- *CS = 0.0; /* Cumulative Square for this block */ -- - gdouble normalizer = (double) (1 << resolution); -+ -+ *CS = 0.0; /* Cumulative Square for this block */ - - /* - * process data here diff --git a/multimedia/gstreamer-plugins/files/patch-ltmain.sh b/multimedia/gstreamer-plugins/files/patch-ltmain.sh new file mode 100644 index 0000000..3d50310 --- /dev/null +++ b/multimedia/gstreamer-plugins/files/patch-ltmain.sh @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Mon Oct 20 15:20:54 2003 ++++ ltmain.sh Fri Nov 14 18:06:07 2003 +@@ -1278,7 +1278,7 @@ + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd4*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1288,8 +1288,16 @@ + continue + ;; + ++ -pthread) ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; ++ + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -3008,6 +3016,9 @@ + # problems, so we reset it completely + verstring= + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + verstring="0.0" + ;; +@@ -5457,10 +5468,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h b/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h new file mode 100644 index 0000000..daaefac --- /dev/null +++ b/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h @@ -0,0 +1,72 @@ +--- sys/cdrom/gstcdplayer_ioctl_bsd.h.orig Mon Mar 1 06:52:03 2004 ++++ sys/cdrom/gstcdplayer_ioctl_bsd.h Tue Mar 9 16:05:36 2004 +@@ -142,6 +142,7 @@ + { + struct ioc_toc_header toc_header; + struct ioc_read_toc_entry toc_entry; ++ struct cd_toc_entry toc_entry_data; + guint i; + + cd->fd = open(device,O_RDONLY | O_NONBLOCK); +@@ -151,7 +152,7 @@ + } + + /* get the toc header information */ +- if (ioctl(cd->fd,CDIOREADTOCHDR,&toc_header) != 0) { ++ if (ioctl(cd->fd,CDIOREADTOCHEADER,&toc_header) != 0) { + close(cd->fd); + cd->fd = -1; + return FALSE; +@@ -161,6 +162,8 @@ + for (i = 1; i <= toc_header.ending_track; i++) { + toc_entry.address_format = CD_MSF_FORMAT; + toc_entry.starting_track = i; ++ toc_entry.data = &toc_entry_data; ++ toc_entry.data_len = sizeof(toc_entry_data); + + if (ioctl(cd->fd,CDIOREADTOCENTRYS,&toc_entry) != 0) { + close(cd->fd); +@@ -168,9 +171,9 @@ + return FALSE; + } + +- cd->tracks[i].minute = toc_entry.entry.addr.msf.minute; +- cd->tracks[i].second = toc_entry.entry.addr.msf.second; +- cd->tracks[i].frame = toc_entry.entry.addr.msf.frame; ++ cd->tracks[i].minute = toc_entry.data->addr.msf.minute; ++ cd->tracks[i].second = toc_entry.data->addr.msf.second; ++ cd->tracks[i].frame = toc_entry.data->addr.msf.frame; + cd->tracks[i].data_track = (toc_entry.data->control & 4) == 4; + } + +@@ -186,9 +189,9 @@ + return FALSE; + } + +- cd->tracks[LEADOUT].minute = toc_entry.entry.addr.msf.minute; +- cd->tracks[LEADOUT].second = toc_entry.entry.addr.msf.second; +- cd->tracks[LEADOUT].frame = toc_entry.entry.addr.msf.frame; ++ cd->tracks[LEADOUT].minute = toc_entry.data->addr.msf.minute; ++ cd->tracks[LEADOUT].second = toc_entry.data->addr.msf.second; ++ cd->tracks[LEADOUT].frame = toc_entry.data->addr.msf.frame; + + cd->num_tracks = toc_header.ending_track; + +@@ -224,6 +227,8 @@ + return FALSE; + } + ++ /* lets return TRUE and lets see what happes (may not be correct)*/ ++ return TRUE; + } + + gboolean cd_pause(struct cd *cd) +@@ -321,7 +326,7 @@ + return -1; + } + +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) + return sub_channel.data->what.track_info.track_number; + #else + return sub_channel.data->track_number; diff --git a/multimedia/gstreamer-plugins/files/patch-sys_oss_gstosselement.h b/multimedia/gstreamer-plugins/files/patch-sys_oss_gstosselement.h new file mode 100644 index 0000000..30258ba --- /dev/null +++ b/multimedia/gstreamer-plugins/files/patch-sys_oss_gstosselement.h @@ -0,0 +1,10 @@ +--- sys/oss/gstosselement.h.orig Tue Mar 9 16:46:05 2004 ++++ sys/oss/gstosselement.h Tue Mar 9 16:46:14 2004 +@@ -23,6 +23,7 @@ + #ifndef __GST_OSS_ELEMENT_H__ + #define __GST_OSS_ELEMENT_H__ + ++#include <sys/types.h> + #include <gst/gst.h> + + /* debugging category */ diff --git a/multimedia/gstreamer-plugins/files/patch-sys_ximage_ximagesink.h b/multimedia/gstreamer-plugins/files/patch-sys_ximage_ximagesink.h new file mode 100644 index 0000000..07b125b --- /dev/null +++ b/multimedia/gstreamer-plugins/files/patch-sys_ximage_ximagesink.h @@ -0,0 +1,10 @@ +--- sys/ximage/ximagesink.h.orig Tue Mar 16 22:51:03 2004 ++++ sys/ximage/ximagesink.h Tue Mar 16 23:06:44 2004 +@@ -23,6 +23,7 @@ + #include <gst/video/videosink.h> + + #ifdef HAVE_XSHM ++#include <sys/types.h> + #include <sys/ipc.h> + #include <sys/shm.h> + #endif /* HAVE_XSHM */ diff --git a/multimedia/gstreamer-plugins/files/patch-sys_xvideo_gstxvimage.c b/multimedia/gstreamer-plugins/files/patch-sys_xvideo_gstxvimage.c deleted file mode 100644 index cb156ee..0000000 --- a/multimedia/gstreamer-plugins/files/patch-sys_xvideo_gstxvimage.c +++ /dev/null @@ -1,21 +0,0 @@ ---- sys/xvideo/gstxvimage.c.orig Sun Nov 23 20:17:00 2003 -+++ sys/xvideo/gstxvimage.c Sun Nov 23 20:25:19 2003 -@@ -20,6 +20,10 @@ - #include "config.h" - - #include <errno.h> -+#include <sys/types.h> -+#include <machine/param.h> -+#include <sys/types.h> -+#include <sys/ipc.h> - #include <sys/shm.h> /* for SHM symbols */ - #include <gst/gst.h> - /* gcc -ansi -pedantic on GNU/Linux causes warnings and errors -@@ -34,7 +38,6 @@ - - #include <stdio.h> - #include <stdlib.h> --#include <sys/types.h> - - #if defined (HAVE_IPC_H) && defined (HAVE_SHM_H) && defined (HAVE_XSHM_H) - #define USE_SHM diff --git a/multimedia/gstreamer-plugins/files/patch-sys_xvimage_xvimagesink.h b/multimedia/gstreamer-plugins/files/patch-sys_xvimage_xvimagesink.h new file mode 100644 index 0000000..ddb0d1f --- /dev/null +++ b/multimedia/gstreamer-plugins/files/patch-sys_xvimage_xvimagesink.h @@ -0,0 +1,10 @@ +--- sys/xvimage/xvimagesink.h.orig Tue Mar 16 22:51:04 2004 ++++ sys/xvimage/xvimagesink.h Tue Mar 16 23:07:39 2004 +@@ -23,6 +23,7 @@ + #include <gst/video/videosink.h> + + #ifdef HAVE_XSHM ++#include <sys/types.h> + #include <sys/ipc.h> + #include <sys/shm.h> + #endif /* HAVE_XSHM */ diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist index 96e4b3b..e35f5c9 100644 --- a/multimedia/gstreamer-plugins/pkg-plist +++ b/multimedia/gstreamer-plugins/pkg-plist @@ -1,32 +1,59 @@ -bin/gst-launch-ext -bin/gst-visualise +bin/gst-launch-ext-%%VERSION%% +bin/gst-visualise-%%VERSION%% 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/schemas/system/gstreamer/%%VERSION%%/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%%VERSION%%/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 +etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%%/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%%/default/%gconf.xml +etc/gconf/schemas/gstreamer-%%VERSION%%.schemas +include/gstreamer-%%VERSION%%/gst/audio/gstaudiofilter.h +include/gstreamer-%%VERSION%%/gst/audio/audioclock.h include/gstreamer-%%VERSION%%/gst/audio/audio.h +include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalance-enumtypes.h +include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalance.h +include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalancechannel.h include/gstreamer-%%VERSION%%/gst/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/mixer/mixer-enumtypes.h +include/gstreamer-%%VERSION%%/gst/mixer/mixer.h +include/gstreamer-%%VERSION%%/gst/mixer/mixertrack.h +include/gstreamer-%%VERSION%%/gst/navigation/navigation.h +include/gstreamer-%%VERSION%%/gst/play/play-enumtypes.h include/gstreamer-%%VERSION%%/gst/play/play.h +include/gstreamer-%%VERSION%%/gst/propertyprobe/propertyprobe.h include/gstreamer-%%VERSION%%/gst/resample/resample.h -include/gstreamer-%%VERSION%%/gst/riff/riff.h +include/gstreamer-%%VERSION%%/gst/riff/riff-ids.h +include/gstreamer-%%VERSION%%/gst/riff/riff-media.h +include/gstreamer-%%VERSION%%/gst/riff/riff-read.h +include/gstreamer-%%VERSION%%/gst/tag/tag.h +include/gstreamer-%%VERSION%%/gst/tuner/tuner-enumtypes.h +include/gstreamer-%%VERSION%%/gst/tuner/tuner.h +include/gstreamer-%%VERSION%%/gst/tuner/tunerchannel.h +include/gstreamer-%%VERSION%%/gst/tuner/tunernorm.h include/gstreamer-%%VERSION%%/gst/video/video.h +include/gstreamer-%%VERSION%%/gst/video/videosink.h +include/gstreamer-%%VERSION%%/gst/xoverlay/xoverlay.h +include/gstreamer-%%VERSION%%/gst/xwindowlistener/xwindowlistener.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%%/libgstasf.so +lib/gstreamer-%%VERSION%%/libgstaudioconvert.so +lib/gstreamer-%%VERSION%%/libgstaudiofilter.so lib/gstreamer-%%VERSION%%/libgstaudio.so %%LIBAUDIOFILE%%lib/gstreamer-%%VERSION%%/libgstaudiofile.so lib/gstreamer-%%VERSION%%/libgstaudioscale.so lib/gstreamer-%%VERSION%%/libgstauparse.so -lib/gstreamer-%%VERSION%%/libgstavidemux.so -lib/gstreamer-%%VERSION%%/libgstavimux.so +lib/gstreamer-%%VERSION%%/libgstavi.so +%%LIBCACA%%lib/gstreamer-%%VERSION%%/libgstcacasink.so %%CDPARANOIA%%lib/gstreamer-%%VERSION%%/libgstcdparanoia.so +lib/gstreamer-%%VERSION%%/libgstcdplayer.so lib/gstreamer-%%VERSION%%/libgstcdxaparse.so lib/gstreamer-%%VERSION%%/libgstchart.so %%HERMES%%lib/gstreamer-%%VERSION%%/libgstcolorspace.so @@ -35,115 +62,151 @@ 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%%/libgstefence.so lib/gstreamer-%%VERSION%%/libgsteffectv.so -%%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesdmon.so -%%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesdsink.so +%%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesd.so +%%FAAD%%lib/gstreamer-%%VERSION%%/libgstfaad.so lib/gstreamer-%%VERSION%%/libgstfestival.so -lib/gstreamer-%%VERSION%%/libgstffmpeg.so -lib/gstreamer-%%VERSION%%/libgstffmpegall.so +lib/gstreamer-%%VERSION%%/libgstffmpegcolorspace.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%%/libgstgamma.so +%%GDKPIXBUF%%lib/gstreamer-%%VERSION%%/libgstgdkpixbuf.so +%%GNOMEVFS%%lib/gstreamer-%%VERSION%%/libgstgnomevfs.so lib/gstreamer-%%VERSION%%/libgstgoom.so %%GSM%%lib/gstreamer-%%VERSION%%/libgstgsm.so +%%HERMES%%lib/gstreamer-%%VERSION%%/libgsthermescolorspace.so %%HTTP%%lib/gstreamer-%%VERSION%%/libgsthttpsrc.so lib/gstreamer-%%VERSION%%/libgstidct.so -lib/gstreamer-%%VERSION%%/libgstintfloat.so +lib/gstreamer-%%VERSION%%/libgstinterleave.so +%%IVORBIS%%lib/gstreamer-%%VERSION%%/libgstivorbis.so +%%JACK%%lib/gstreamer-%%VERSION%%/libgstjack.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%%/libgstmatroska.so lib/gstreamer-%%VERSION%%/libgstmedian.so %%LIBMIKMOD%%lib/gstreamer-%%VERSION%%/libgstmikmod.so +lib/gstreamer-%%VERSION%%/libgstmixmatrix.so +lib/gstreamer-%%VERSION%%/libgstmodplug.a lib/gstreamer-%%VERSION%%/libgstmodplug.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 +%%NAS%%lib/gstreamer-%%VERSION%%/libgstnassink.so +lib/gstreamer-%%VERSION%%/libgstnavigationtest.so +%%OGG%%lib/gstreamer-%%VERSION%%/libgstogg.so +lib/gstreamer-%%VERSION%%/libgstoverlay.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%%/libgstrmdemux.so lib/gstreamer-%%VERSION%%/libgstriff.so lib/gstreamer-%%VERSION%%/libgstrtjpeg.so +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 lib/gstreamer-%%VERSION%%/libgstsilence.so lib/gstreamer-%%VERSION%%/libgstsinesrc.so +%%SMOOTHWAVE%%lib/gstreamer-%%VERSION%%/libgstsmoothwave.so lib/gstreamer-%%VERSION%%/libgstsmooth.so lib/gstreamer-%%VERSION%%/libgstsmpte.so %%PNG%%lib/gstreamer-%%VERSION%%/libgstsnapshot.so +%%LIBSNDFILE%%lib/gstreamer-%%VERSION%%/libgstsndfile.so lib/gstreamer-%%VERSION%%/libgstspectrum.so lib/gstreamer-%%VERSION%%/libgstspeed.so +%%SPEEX%%lib/gstreamer-%%VERSION%%/libgstspeex.so lib/gstreamer-%%VERSION%%/libgststereo.so -lib/gstreamer-%%VERSION%%/libgststereo2mono.so -lib/gstreamer-%%VERSION%%/libgststereosplit.so %%SWFDEC%%lib/gstreamer-%%VERSION%%/libgstswfdec.so +lib/gstreamer-%%VERSION%%/libgstswitch.so lib/gstreamer-%%VERSION%%/libgstsynaesthesia.so +lib/gstreamer-%%VERSION%%/libgsttagedit.so +lib/gstreamer-%%VERSION%%/libgsttcp.so +lib/gstreamer-%%VERSION%%/libgsttextoverlay.so +%%LIBTHEORA%%lib/gstreamer-%%VERSION%%/libgsttheora.so +lib/gstreamer-%%VERSION%%/libgsttimeoverlay.so +%%LIBMUSICBRAINZ%%lib/gstreamer-%%VERSION%%/libgsttrm.so +lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.so lib/gstreamer-%%VERSION%%/libgstudp.so lib/gstreamer-%%VERSION%%/libgstvbidec.so lib/gstreamer-%%VERSION%%/libgstvideo.so +lib/gstreamer-%%VERSION%%/libgstvideobalance.so lib/gstreamer-%%VERSION%%/libgstvideocrop.so +lib/gstreamer-%%VERSION%%/libgstvideodrop.so +lib/gstreamer-%%VERSION%%/libgstvideofilter.so +lib/gstreamer-%%VERSION%%/libgstvideoflip.so lib/gstreamer-%%VERSION%%/libgstvideoscale.so -lib/gstreamer-%%VERSION%%/libgstvideosink.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%%/libgstxvideosink.so +lib/gstreamer-%%VERSION%%/libgstximagesink.so +%%XINE%%lib/gstreamer-%%VERSION%%/libgstxine.so +%%XVID%%lib/gstreamer-%%VERSION%%/libgstxvid.so +lib/gstreamer-%%VERSION%%/libgstxvimagesink.so +lib/gstreamer-%%VERSION%%/libgstxwindowlistener.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/libgstinterfaces-%%VERSION%%.a +lib/libgstinterfaces-%%VERSION%%.so +lib/libgstinterfaces-%%VERSION%%.so.%%SHLIB_VERSION%% lib/libgstmedia-info-%%VERSION%%.a lib/libgstmedia-info-%%VERSION%%.so -lib/libgstmedia-info-%%VERSION%%.so.0 +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-interfaces-%%VERSION%%.pc libdata/pkgconfig/gstreamer-libs-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-media-info-%%VERSION%%.pc libdata/pkgconfig/gstreamer-play-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-plugins-%%VERSION%%.pc +share/locale/nl/LC_MESSAGES/gst-plugins-%%VERSION%%.mo +share/locale/sr/LC_MESSAGES/gst-plugins-%%VERSION%%.mo @unexec rmdir %D/lib/gstreamer-%%VERSION%% 2>/dev/null || true +@dirrm include/gstreamer-%%VERSION%%/gst/xwindowlistener +@dirrm include/gstreamer-%%VERSION%%/gst/xoverlay @dirrm include/gstreamer-%%VERSION%%/gst/video +@dirrm include/gstreamer-%%VERSION%%/gst/tuner @dirrm include/gstreamer-%%VERSION%%/gst/riff @dirrm include/gstreamer-%%VERSION%%/gst/resample +@dirrm include/gstreamer-%%VERSION%%/gst/propertyprobe @dirrm include/gstreamer-%%VERSION%%/gst/play +@dirrm include/gstreamer-%%VERSION%%/gst/navigation +@dirrm include/gstreamer-%%VERSION%%/gst/mixer @dirrm include/gstreamer-%%VERSION%%/gst/media-info @dirrm include/gstreamer-%%VERSION%%/gst/idct @dirrm include/gstreamer-%%VERSION%%/gst/gconf @dirrm include/gstreamer-%%VERSION%%/gst/floatcast +@dirrm include/gstreamer-%%VERSION%%/gst/colorbalance @dirrm include/gstreamer-%%VERSION%%/gst/audio -@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/default +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%%/default +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%% @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/%%VERSION%%/default +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%%VERSION%% @dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer +@unexec rmdir %D/include/gstreamer-%%VERSION%%/gst 2>/dev/null || true @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 +@exec %%X11BASE%%/bin/gst-register-%%VERSION%% 2>/dev/null || true +@unexec %%X11BASE%%/bin/gst-register-%%VERSION%% 2>/dev/null || true diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile index 3bd7729..766898c 100644 --- a/multimedia/gstreamer-plugins80/Makefile +++ b/multimedia/gstreamer-plugins80/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gstreamer -PORTVERSION= 0.6.4 -PORTREVISION= 3 +PORTVERSION= 0.8.0 CATEGORIES= multimedia audio -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gst-plugins/0.6 +MASTER_SITES= ${MASTER_SITE_GNOME} \ + http://gstreamer.freedesktop.org/src/gst-plugins/ +MASTER_SITE_SUBDIR= sources/gst-plugins/0.8 PKGNAMESUFFIX= -plugins DISTNAME= gst-plugins-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,7 +18,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= lioux@FreeBSD.org COMMENT= GStreamer written collection of plugins handling several media types -LIB_DEPENDS= gstreamer-0.6.1:${PORTSDIR}/multimedia/gstreamer \ +LIB_DEPENDS= gstreamer-0.8.1:${PORTSDIR}/multimedia/gstreamer \ popt.0:${PORTSDIR}/devel/popt USE_X_PREFIX= yes @@ -29,38 +29,55 @@ USE_GNOME= gnomehack \ gnomeprefix \ pkgconfig \ gconf2 -USE_LIBTOOL_VER=13 USE_REINPLACE= yes -USE_SIZE= yes -WANT_SDL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-tests \ --disable-alsa \ - --disable-cdrom \ + --enable-cdrom \ --disable-mjpegtools \ + --disable-divx \ + --disable-dxr3 \ + --disable-http \ --disable-qcam \ + --disable-raw1394 \ --disable-v4l2 \ - --disable-v4l + --disable-v4l \ + --disable-vcd \ + --disable-dependency-tracking \ + --enable-xshm \ + --enable-static + +# list of plugins that need some work in one way or the other to work +# probable the lib needs to be ported, disable them for now. +CONFIGURE_ARGS+=--disable-mas \ + --disable-faac \ + --disable-tarkin \ + --disable-lcs \ + --disable-mplex \ + --disable-shout2 \ + --disable-librfb + CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \ CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib" CONFIGURE_TARGET= PLIST_SUB= \ - VERSION="${PORTVERSION:C/..$//}" \ + VERSION="${GST_VERSION}" \ SHLIB_VERSION="${SHLIB_VERSION}" INSTALLS_SHLIB= yes -# for esound detection +# for various GNOME-related component detection WANT_GNOME= yes -MAN1= gst-launch-ext.1 gst-visualise.1 +MAN1= gst-launch-ext-${GST_VERSION}.1 gst-visualise-${GST_VERSION}.1 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config" -XMMS_CONFIG?="${LOCALBASE}/bin/xmms-config" +SDL_CONFIG?="${LOCALBASE}/bin/sdl11-config" +GST_VERSION=${PORTVERSION:C/..$//} # library minor number -SHLIB_VERSION= 1 +SHLIB_VERSION= 1 post-patch: # as of this writing, FreeBSD does not support lrint* C99 math functions @@ -84,43 +101,26 @@ post-patch: # inttypes.h not stdint.h @${FIND} ${WRKSRC} -type f | \ ${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 + 's|malloc\.h|stdlib.h|; \ + s|stdint\.h|inttypes.h|' # 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 - -.include <bsd.port.pre.mk> - post-install: -.if ${ARCH} == "ia64" || ${ARCH} == "amd64" # register plugins - @-${X11BASE}/bin/gst-register 2>/dev/null -.else - @${X11BASE}/bin/gst-register 2>/dev/null -.endif + -@${X11BASE}/bin/gst-register-${GST_VERSION} 2>/dev/null -# Fix build on ia64. This patch breaks other archs, so include it -# conditionally -.if ${ARCH} == "ia64" || ${ARCH} == "amd64" -EXTRA_PATCHES= ${FILESDIR}/ia64-patch-ffmpeg::configure -.endif +.include <bsd.port.pre.mk> # hermes is required for gstreamer-player to work # since it is currently the only colorspace plugin available WITH_HERMES= yes # gnomevfs is required for gstreamer-player to work WITH_GNOMEVFS= yes +# Add default MAD support. This is required for rhythmbox to work. +WITH_MAD= yes ## ## auto detect possible plugins @@ -131,16 +131,11 @@ WITH_GNOMEVFS= yes WITH_AALIB=yes .endif -# aRts +# arts .if exists(${LOCALBASE}/lib/libartsc.so.0) && !defined(WITHOUT_ARTS) WITH_ARTS=yes .endif -# avifile -.if exists(${LOCALBASE}/lib/libaviplay.a) -WITH_AVIFILE=yes -.endif - # cdparanoia .if exists(${LOCALBASE}/lib/libcdda_paranoia.a) WITH_CDPARANOIA=yes @@ -151,6 +146,11 @@ WITH_CDPARANOIA=yes WITH_ESOUND=yes .endif +# faad +.if exists(${LOCALBASE}/lib/libfaad.a) +WITH_FAAD=yes +.endif + # flac .if exists(${LOCALBASE}/lib/libFLAC.a) WITH_FLAC=yes @@ -161,6 +161,11 @@ WITH_FLAC=yes WITH_FREETYPE=yes .endif +# gdkpixbuf +.if ${HAVE_GNOME:Mgtk20}!="" +WITH_GDKPIXBUF=yes +.endif + # lame .if exists(${LOCALBASE}/lib/libmp3lame.a) WITH_LAME=yes @@ -171,6 +176,16 @@ WITH_LAME=yes WITH_GNOMEVFS=yes .endif +# jack +.if exists(${LOCALBASE}/lib/libjack.so.0) +WITH_JACK=YES +.endif + +# libcaca +.if exists(${LOCALBASE}/lib/libcaca.a) +WITH_LIBCACA=yes +.endif + # gsm .if exists(${LOCALBASE}/lib/libgsm.a) WITH_GSM=yes @@ -207,7 +222,6 @@ WITH_LIBDV=yes .endif # libdvdnav -# XXX libdvdnav needs to be updated to 0.1.9 or higher .if exists(${LOCALBASE}/lib/libdvdnav.so) WITH_LIBDVDNAV=yes .endif @@ -232,8 +246,13 @@ WITH_LIBMIKMOD=yes WITH_LIBMPEG2=yes .endif +# libmusicbrainz +.if exists(${LOCALBASE}/lib/libmusicbrainz.a) +WITH_LIBMUSICBRAINZ=yes +.endif + # libshout -.if exists(${LOCALBASE}/lib/libshout.a) +.if exists(${LOCALBASE}/lib/libshout.so.2) WITH_LIBSHOUT=yes .endif @@ -242,14 +261,34 @@ WITH_LIBSHOUT=yes WITH_LIBSIDPLAY=yes .endif +# libsndfile +.if exists(${LOCALBASE}/lib/libsndfile.a) +WITH_LIBSNDFILE=yes +.endif + +# libtheora +.if exists(${LOCALBASE}/lib/libtheora.a) +WITH_LIBTHEORA=yes +.endif + # mad .if exists(${LOCALBASE}/lib/libmad.a) WITH_MAD=yes .endif -# openquicktime -.if exists(${LOCALBASE}/lib/libopenquicktime.so) -WITH_OPENQUICKTIME=yes +# nas +.if exists(${X11BASE}/lib/libaudio.a) +WITH_NAS=YES +.endif + +# ogg +.if exists(${LOCALBASE}/lib/libogg.a) +WITH_OGG=yes +.endif + +# pango +.if exists(${X11BASE}/lib/libpangoft2-1.0.a) +WITH_PANGO=yes .endif # png @@ -258,10 +297,20 @@ WITH_PNG=yes .endif # sdl -.if ${HAVE_SDL:Msdl} +.if exists(${LOCALBASE}/lib/libSDL-1.1.a) WITH_SDL=yes .endif +# smoothwave +.if exists(${X11BASE}/lib/libgtk-x11-2.0.a) +WITH_SMOOTHWAVE=yes +.endif + +# speex +.if exists(${LOCALBASE}/lib/libspeex.a) +WITH_SPEEX=yes +.endif + # swfdec .if exists(${X11BASE}/lib/libswfdec.a) WITH_SWFDEC=yes @@ -272,9 +321,20 @@ WITH_SWFDEC=yes WITH_VORBIS=yes .endif -# xmms -.if exists(${X11BASE}/lib/libxmms.a) -#WITH_XMMS=yes +# vorbisidec +.if exists(${LOCALBASE}/lib/libvorbisidec.a) +WITH_VORBISIDEC=yes +.endif + +# xine +# this plugins is meant to support plugins that gstreamer doesn't have (yet) +.if exists(${X11BASE}/lib/libxine.so.9) +WITH_XINE=yes +.endif + +# xvid +.if exists(${LOCALBASE}/lib/libxvidcore.so.2) +WITH_XVID=yes .endif ## @@ -294,8 +354,8 @@ CONFIGURE_ARGS+= --with-aalib-prefix=${LOCALBASE} \ PLIST_SUB+= AALIB="" .endif -# aRts -.if (!defined(WITH_ARTS) || defined(WITHOUT_ARTS)) +# arts +.ifndef(WITH_ARTS) CONFIGURE_ARGS+= --disable-arts \ --disable-artsc \ --disable-artstest @@ -308,16 +368,6 @@ CONFIGURE_ARGS+= --with-arts-prefix=${LOCALBASE} \ PLIST_SUB+= ARTS="" .endif -# avifile -.ifndef(WITH_AVIFILE) -CONFIGURE_ARGS+= --disable-avifile -PLIST_SUB+= AVIFILE="@comment " -.else -LIB_DEPENDS+= aviplay.0:${PORTSDIR}/multimedia/avifile - -PLIST_SUB+= AVIFILE="" -.endif - # cdparanoia .ifndef(WITH_CDPARANOIA) CONFIGURE_ARGS+= --disable-cdparanoia @@ -340,6 +390,15 @@ CONFIGURE_ARGS+= --with-esd-prefix=${LOCALBASE} \ PLIST_SUB+= ESOUND="" .endif +# faad +.ifndef(WITH_FAAD) +CONFIGURE_ARGS+= --disable-faad +PLIST_SUB+= FAAD="@comment " +.else +LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad +PLIST_SUB+= FAAD="" +.endif + # flac .ifndef(WITH_FLAC) CONFIGURE_ARGS+= --disable-flac @@ -362,6 +421,15 @@ CONFIGURE_ARGS+= --with-ft-prefix=${LOCALBASE} \ PLIST_SUB+= FREETYPE="" .endif +# gdkpixbuf +.ifndef(WITH_GDKPIXBUF) +CONFIGURE_ARGS+= --disable-gdk_pixbuf +PLIST_SUB+= GDKPIXBUF="@comment " +.else +USE_GNOME+= gtk20 +PLIST_SUB+= GDKPIXBUF="" +.endif + # gnomevfs .ifndef(WITH_GNOMEVFS) CONFIGURE_ARGS+= --disable-gnome_vfs @@ -381,6 +449,15 @@ LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm PLIST_SUB+= GSM="" .endif +# jack +.ifndef(WITH_JACK) +CONFIGURE_ARGS+= --disable-jack +PLIST_SUB+= JACK="@comment " +.else +LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack +PLIST_SUB+= JACK="" +.endif + # Hermes .ifndef(WITH_HERMES) CONFIGURE_ARGS+= --disable-hermes @@ -450,6 +527,15 @@ LIB_DEPENDS+= audiofile.0:${PORTSDIR}/audio/libaudiofile PLIST_SUB+= LIBAUDIOFILE="" .endif +# libcaca +.ifndef(WITH_LIBCACA) +CONFIGURE_ARGS+= --disable-libcaca +PLIST_SUB+= LIBCACA="@comment " +.else +BUILD_DEPENDS+= ${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca +PLIST_SUB+= LIBCACA="" +.endif + # libdv .ifndef(WITH_LIBDV) CONFIGURE_ARGS+= --disable-libdv @@ -517,12 +603,21 @@ CONFIGURE_ARGS+= --with-mpeg2dec-prefix=${LOCALBASE} PLIST_SUB+= LIBMPEG2="" .endif +# libmusicbrainz +.ifndef(WITH_LIBMUSICBRAINZ) +CONFIGURE_ARGS+= --disable-musicbrainz +PLIST_SUB+= LIBMUSICBRAINZ="@comment " +.else +LIB_DEPENDS+= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz +PLIST_SUB+= LIBMUSICBRAINZ="" +.endif + # libshout .ifndef(WITH_LIBSHOUT) CONFIGURE_ARGS+= --disable-shout PLIST_SUB+= LIBSHOUT="@comment " .else -LIB_DEPENDS+= shout.3:${PORTSDIR}/audio/libshout2 +LIB_DEPENDS+= shout.3:${PORTSDIR}/audio/libshout PLIST_SUB+= LIBSHOUT="" .endif @@ -537,6 +632,24 @@ LIB_DEPENDS+= sidplay.1:${PORTSDIR}/audio/libsidplay PLIST_SUB+= LIBSIDPLAY="" .endif +# libsndfile +.ifndef(WITH_LIBSNDFILE) +CONFIGURE_ARGS+= --disable-sndfile +PLIST_SUB+= LIBSNDFILE="@comment " +.else +LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile +PLIST_SUB+= LIBSNDFILE="" +.endif + +# libtheora +.ifndef(WITH_LIBTHEORA) +CONFIGURE_ARGS+= --disable-theora +PLIST_SUB+= LIBTHEORA="@comment " +.else +LIB_DEPENDS+= theora.0:${PORTSDIR}/graphics/libtheora +PLIST_SUB+= LIBTHEORA="" +.endif + # mad .ifndef(WITH_MAD) CONFIGURE_ARGS+= --disable-mad @@ -548,14 +661,24 @@ LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad \ PLIST_SUB+= LIBMAD="" .endif -# openquicktime -.ifndef(WITH_OPENQUICKTIME) -CONFIGURE_ARGS+= --disable-openquicktime -PLIST_SUB+= OPENQUICKTIME="@comment " +# nas +.ifndef(WITH_NAS) +CONFIGURE_ARGS+= --disable-nas +PLIST_SUB+= NAS="@comment " .else -LIB_DEPENDS+= openquicktime.0:${PORTSDIR}/multimedia/openquicktime +LIB_DEPENDS+= audio.2:${PORTSDIR}/audio/nas -PLIST_SUB+= OPENQUICKTIME="" +PLIST_SUB+= NAS="" +.endif + +# ogg +.ifndef(WITH_OGG) +CONFIGURE_ARGS+= --disable-ogg \ + --disable-oggtest +PLIST_SUB+= OGG="@comment " +.else +LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg +PLIST_SUB+= OGG="" .endif # oss @@ -566,6 +689,15 @@ PLIST_SUB+= OSS="@comment " PLIST_SUB+= OSS="" .endif +# pango +.ifndef(WITH_PANGO) +CONFIGURE_ARGS+= --disable-pango +PLIST_SUB+= PANGO="@comment " +.else +USE_GNOME+= pango +PLIST_SUB+= PANGO="" +.endif + # png .ifndef(WITH_PNG) CONFIGURE_ARGS+= --disable-libpng @@ -582,12 +714,32 @@ CONFIGURE_ARGS+= --disable-sdl \ --disable-sdltest PLIST_SUB+= SDL="@comment " .else -USE_SDL= sdl +LIB_DEPENDS+= SDL-1.1.7:${PORTSDIR}/devel/sdl12 + CONFIGURE_ARGS+= --with-sdl-prefix=${LOCALBASE} \ --with-sdl-exec-prefix=${LOCALBASE} +CONFIGURE_ENV+= SDL_CONFIG=${SDL_CONFIG} PLIST_SUB+= SDL="" .endif +# smoothwave +.ifndef(WITH_SMOOTHWAVE) +CONFIGURE_ARGS+= --disable-smoothwave +PLIST_SUB+= SMOOTHWAVE="@comment " +.else +USE_GNOME+= gtk20 +PLIST_SUB+= SMOOTHWAVE="" +.endif + +# speex +.ifndef(WITH_SPEEX) +CONFIGURE_ARGS+= --disable-speex +PLIST_SUB+= SPEEX="@comment " +.else +LIB_DEPENDS+= speex.2:${PORTSDIR}/audio/speex +PLIST_SUB+= SPEEX="" +.endif + # swfdec .ifndef(WITH_SWFDEC) CONFIGURE_ARGS+= --disable-swfdec @@ -613,17 +765,34 @@ CONFIGURE_ARGS+= --with-vorbis=${LOCALBASE} \ PLIST_SUB+= VORBIS="" .endif -# xmms -.ifndef(WITH_XMMS) -CONFIGURE_ARGS+= --disable-xmms -PLIST_SUB+= XMMS="@comment " +# vorbisidec +.ifndef(WITH_VORBISIDEC) +CONFIGURE_ARGS+= --disable-ivorbis +PLIST_SUB+= IVORBIS="@comment " +.else +LIB_DEPENDS+= vorbisidec.1:${PORTSDIR}/audio/libtremor +PLIST_SUB+= IVORBIS="" +.endif + +# xine +.ifndef(WITH_XINE) +CONFIGURE_ARGS+= --disable-xine +PLIST_SUB+= XINE="@comment " .else -LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms +CONFIGURE_ARGS+= --enable-xine +LIB_DEPENDS+= xine.9:${PORTSDIR}/multimedia/libxine + +PLIST_SUB+= XINE="" +.endif -CONFIGURE_ARGS+= --with-xmms-prefix=${X11BASE} \ - --with-xmms-exec-prefix=${X11BASE} -CONFIGURE_ENV+= XMMS_CONFIG=${XMMS_CONFIG} -PLIST_SUB+= XMMS="" +# xvid +.ifndef(WITH_XVID) +CONFIGURE_ARGS+= --disable-xvid +PLIST_SUB+= XVID="@comment " +.undef WITH_XVID +#.else +#LIB_DEPENDS+= xvidcore.2:${PORTSDIR}/multimedia/xvid +#PLIST_SUB+= XVID="" .endif pre-everything:: @@ -638,10 +807,6 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_ARTS to enable aRts Audio plugin' .endif -.ifndef(WITH_AVIFILE) - @${ECHO_MSG} '===>' - @${ECHO_MSG} '===> Define WITH_AVIFILE to enable avifile Video plugin' -.endif .ifndef(WITH_CDPARANOIA) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_CDPARANOIA to enable cdparanoia Audio plugin' @@ -650,6 +815,10 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_ESOUND to enable esound Audio plugin' .endif +.ifndef(WITH_FAAD) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_FAAD to enable faad Audio plugin' +.endif .ifndef(WITH_FLAC) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_FLAC to enable flac Audio plugin' @@ -658,6 +827,10 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_FREETYPE to enable freetype support' .endif +.ifndef(WITH_GDKPIXBUF) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_GDKPIXBUF to enable gdk-pixbuf plugin' +.endif .ifndef(WITH_GSM) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_GSM to enable gsm Audio plugin' @@ -666,6 +839,10 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_GNOMEVFS to enable gnomevfs Network plugin' .endif +.ifndef(WITH_JACK) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_JACK to enable jackd audio plugin' +.endif .ifndef(WITH_HERMES) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_HERMES to enable Hermes colorspace plugin' @@ -694,6 +871,10 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_LIBAUDIOFILE to enable libaudiofile Audio plugin' .endif +.ifndef(WITH_LIBCACA) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_LIBCACA to enable libcaca Video plugin' +.endif .ifndef(WITH_LIBDV) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_LIBDV to enable libdv Video plugin' @@ -718,6 +899,10 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_LIBMPEG2 to enable libmpeg2 Video plugin' .endif +.ifndef(WITH_LIBMUSICBRAINZ) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_LIBMUSICBRAINZ to enable libmusicbrainz Audio plugin' +.endif .ifndef(WITH_LIBSHOUT) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_LIBSHOUT to enable libshout Audio plugin' @@ -726,18 +911,30 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_LIBSIDPLAY to enable libsidplay Audio plugin' .endif +.ifndef(WITH_LIBSNDFILE) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_LIBSNDFILE to enable libsndfile Audio plugin' +.endif +.ifndef(WITH_LIBTHEORA) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_LIBTHEORA to enable libtheora Video plugin' +.endif .ifndef(WITH_MAD) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_MAD to enable mad Audio plugin' .endif -.ifndef(WITH_OPENQUICKTIME) +.ifndef(WITH_NAS) @${ECHO_MSG} '===>' - @${ECHO_MSG} '===> Define WITH_OPENQUICKTIME to enable openquicktime Video plugin' + @${ECHO_MSG} '===> Define WITH_NAS to enable nas Audio plugin' .endif .ifndef(WITHOUT_OSS) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITHOUT_OSS to disable OSS Audio plugin' .endif +.ifndef(WITH_PANGO) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_PANGO to enable pango textoverlay plugin' +.endif .ifndef(WITH_PNG) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_PNG to enable png Video plugin' @@ -746,6 +943,14 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_SDL to enable SDL Video plugin' .endif +.ifndef(WITH_SMOOTHWAVE) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_SMOOTHWAVE to enable Smoothwave Video plugin' +.endif +.ifndef(WITH_SPEEX) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_SPEEX to enable Speex Video plugin' +.endif .ifndef(WITH_SWFDEC) @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_SWFDEC to enable Flash Video plugin' @@ -754,9 +959,17 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_VORBIS to enable vorbis Audio plugin' .endif -.ifndef(WITH_XMMS) +.ifndef(WITH_VORBISIDEC) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_VORBISIDEC to enable vorbisidec Audio plugin' +.endif +.ifndef(WITH_XINE) + @${ECHO_MSG} '===>' + @${ECHO_MSG} '===> Define WITH_XINE to enable xine plugin' +.endif +.ifndef(WITH_XVID) @${ECHO_MSG} '===>' - @${ECHO_MSG} '===> Define WITH_XMMS to enable xmms Audio plugin' + @${ECHO_MSG} '===> Define WITH_XVID to enable xvid Video plugin' .endif .include <bsd.port.post.mk> diff --git a/multimedia/gstreamer-plugins80/distinfo b/multimedia/gstreamer-plugins80/distinfo index 403d20d..75cdec2 100644 --- a/multimedia/gstreamer-plugins80/distinfo +++ b/multimedia/gstreamer-plugins80/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gst-plugins-0.6.4.tar.bz2) = d62e6cd3750863b6395e4c1030223690 -SIZE (gnome2/gst-plugins-0.6.4.tar.bz2) = 1900957 +MD5 (gnome2/gst-plugins-0.8.0.tar.bz2) = 3735f701a25a37ed0b1ec6f3d861a658 +SIZE (gnome2/gst-plugins-0.8.0.tar.bz2) = 1751685 diff --git a/multimedia/gstreamer-plugins80/files/ia64-patch-ffmpeg::configure b/multimedia/gstreamer-plugins80/files/ia64-patch-ffmpeg::configure deleted file mode 100644 index f4c1cb8..0000000 --- a/multimedia/gstreamer-plugins80/files/ia64-patch-ffmpeg::configure +++ /dev/null @@ -1,10 +0,0 @@ ---- gst-libs/ext/ffmpeg/ffmpeg/configure.bak Sat Sep 27 18:39:42 2003 -+++ gst-libs/ext/ffmpeg/ffmpeg/configure Sat Sep 27 19:53:52 2003 -@@ -119,6 +119,7 @@ - v4l="no" - audio_oss="yes" - make="gmake" -+CFLAGS="$CFLAGS -fPIC -DPIC" - LDFLAGS="$LDFLAGS -export-dynamic" - ;; - BSD/OS) diff --git a/multimedia/gstreamer-plugins80/files/patch-configure b/multimedia/gstreamer-plugins80/files/patch-configure index 001d56f..e2987f9 100644 --- a/multimedia/gstreamer-plugins80/files/patch-configure +++ b/multimedia/gstreamer-plugins80/files/patch-configure @@ -1,10 +1,21 @@ ---- configure.orig Thu Jul 11 15:51:47 2002 -+++ configure Thu Jul 11 15:51:57 2002 -@@ -6731,6 +6731,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' +--- configure.orig Tue Mar 16 20:32:36 2004 ++++ configure Tue Mar 16 20:41:00 2004 +@@ -41192,7 +41192,8 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-laudio $X_LIBS $LIBS" ++#xxx fix the non x case is er niet... ++LIBS="-laudio -lm -lXt $X_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + /* confdefs.h. */ +@@ -44483,7 +44484,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ltheora $LIBS" ++LIBS="-ltheora -logg $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + /* confdefs.h. */ diff --git a/multimedia/gstreamer-plugins80/files/patch-ext::ivorbis::vorbisenc.h b/multimedia/gstreamer-plugins80/files/patch-ext::ivorbis::vorbisenc.h new file mode 100644 index 0000000..90d39a1 --- /dev/null +++ b/multimedia/gstreamer-plugins80/files/patch-ext::ivorbis::vorbisenc.h @@ -0,0 +1,103 @@ +--- /dev/null Thu Feb 12 22:22:00 2004 ++++ ext/ivorbis/vorbisenc.h Thu Feb 12 22:24:08 2004 +@@ -0,0 +1,100 @@ ++/* GStreamer ++ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this library; if not, write to the ++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ */ ++ ++ ++#ifndef __VORBISENC_H__ ++#define __VORBISENC_H__ ++ ++ ++#include <gst/gst.h> ++ ++#include <tremor/ivorbiscodec.h> ++ ++#ifdef __cplusplus ++extern "C" { ++#endif /* __cplusplus */ ++ ++#define GST_TYPE_VORBISENC \ ++ (vorbisenc_get_type()) ++#define GST_VORBISENC(obj) \ ++ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VORBISENC,VorbisEnc)) ++#define GST_VORBISENC_CLASS(klass) \ ++ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VORBISENC,VorbisEncClass)) ++#define GST_IS_VORBISENC(obj) \ ++ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VORBISENC)) ++#define GST_IS_VORBISENC_CLASS(obj) \ ++ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VORBISENC)) ++ ++typedef struct _VorbisEnc VorbisEnc; ++typedef struct _VorbisEncClass VorbisEncClass; ++ ++struct _VorbisEnc { ++ GstElement element; ++ ++ GstPad *sinkpad, ++ *srcpad; ++ ++ ogg_stream_state os; /* take physical pages, weld into a logical ++ stream of packets */ ++ ogg_page og; /* one Ogg bitstream page. Vorbis packets are inside */ ++ ogg_packet op; /* one raw packet of data for decode */ ++ ++ vorbis_info vi; /* struct that stores all the static vorbis bitstream ++ settings */ ++ vorbis_comment vc; /* struct that stores all the user comments */ ++ ++ vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */ ++ vorbis_block vb; /* local working space for packet->PCM decode */ ++ ++ gboolean eos; ++ ++ gboolean managed; ++ gint bitrate; ++ gint min_bitrate; ++ gint max_bitrate; ++ gfloat quality; ++ gboolean quality_set; ++ gint serial; ++ ++ gint channels; ++ gint frequency; ++ ++ guint64 samples_in; ++ guint64 bytes_out; ++ ++ GstCaps *metadata; ++ ++ gboolean setup; ++ gboolean flush_header; ++ gchar *last_message; ++}; ++ ++struct _VorbisEncClass { ++ GstElementClass parent_class; ++}; ++ ++GType vorbisenc_get_type(void); ++ ++ ++#ifdef __cplusplus ++} ++#endif /* __cplusplus */ ++ ++ ++#endif /* __VORBISENC_H__ */ diff --git a/multimedia/gstreamer-plugins80/files/patch-ext_a52dec_gsta52dec.c b/multimedia/gstreamer-plugins80/files/patch-ext_a52dec_gsta52dec.c deleted file mode 100644 index 05c0e53..0000000 --- a/multimedia/gstreamer-plugins80/files/patch-ext_a52dec_gsta52dec.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/a52dec/gsta52dec.c.orig Sun Apr 6 18:58:19 2003 -+++ ext/a52dec/gsta52dec.c Sun Apr 20 13:16:28 2003 -@@ -25,7 +25,7 @@ - - #include <stdlib.h> - --#ifdef HAVE_STDINT_H -+#if defined(HAVE_STDINT_H) || defined(__FreeBSD__) - #include <stdint.h> - #else - /* (Ronald) hacky... can't include stdint.h because it's not available diff --git a/multimedia/gstreamer-plugins80/files/patch-ext_xvid_gstxvid.h b/multimedia/gstreamer-plugins80/files/patch-ext_xvid_gstxvid.h new file mode 100644 index 0000000..970e99f --- /dev/null +++ b/multimedia/gstreamer-plugins80/files/patch-ext_xvid_gstxvid.h @@ -0,0 +1,39 @@ +--- /dev/null Sun Nov 16 22:55:00 2003 ++++ ext/xvid/gstxvid.h Sun Nov 16 22:32:25 2003 +@@ -0,0 +1,36 @@ ++/* GStreamer xvid decoder plugin ++ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net> ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this library; if not, write to the ++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ */ ++ ++#ifndef __GST_XVID_H__ ++#define __GST_XVID_H__ ++ ++#include <gst/gst.h> ++ ++#ifdef __cplusplus ++extern "C" { ++#endif /* __cplusplus */ ++ ++extern gchar * gst_xvid_error (int errorcode); ++extern gboolean gst_xvid_init (void); ++ ++#ifdef __cplusplus ++} ++#endif /* __cplusplus */ ++ ++#endif /* __GST_XVID_H__ */ diff --git a/multimedia/gstreamer-plugins80/files/patch-ffmpeg::simple_idct_alpha.c b/multimedia/gstreamer-plugins80/files/patch-ffmpeg::simple_idct_alpha.c deleted file mode 100644 index 8149c39..0000000 --- a/multimedia/gstreamer-plugins80/files/patch-ffmpeg::simple_idct_alpha.c +++ /dev/null @@ -1,17 +0,0 @@ ---- gst-libs/ext/ffmpeg/ffmpeg/libavcodec/alpha/simple_idct_alpha.c.orig Fri Apr 25 22:06:13 2003 -+++ gst-libs/ext/ffmpeg/ffmpeg/libavcodec/alpha/simple_idct_alpha.c Fri Apr 25 23:19:39 2003 -@@ -24,8 +24,14 @@ - * and Falk Hueffner <falk@debian.org> - */ - -+#include <sys/param.h> -+ - #include "asm.h" - #include "../dsputil.h" -+ -+#if defined(__FreeBSD__) && __FreeBSD_version < 500000 -+typedef __int32_t int_fast32_t; -+#endif - - extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels, - int line_size); diff --git a/multimedia/gstreamer-plugins80/files/patch-gst_level_filter.func b/multimedia/gstreamer-plugins80/files/patch-gst_level_filter.func deleted file mode 100644 index 3b154eb..0000000 --- a/multimedia/gstreamer-plugins80/files/patch-gst_level_filter.func +++ /dev/null @@ -1,14 +0,0 @@ ---- gst/level/filter.func.orig Mon Oct 13 22:32:12 2003 -+++ gst/level/filter.func Mon Oct 13 22:32:21 2003 -@@ -10,9 +10,9 @@ - register double square = 0.0; /* Square */ - register double PSS = 0.0; /* Peak Square Sample */ - -- *CS = 0.0; /* Cumulative Square for this block */ -- - gdouble normalizer = (double) (1 << resolution); -+ -+ *CS = 0.0; /* Cumulative Square for this block */ - - /* - * process data here diff --git a/multimedia/gstreamer-plugins80/files/patch-ltmain.sh b/multimedia/gstreamer-plugins80/files/patch-ltmain.sh new file mode 100644 index 0000000..3d50310 --- /dev/null +++ b/multimedia/gstreamer-plugins80/files/patch-ltmain.sh @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Mon Oct 20 15:20:54 2003 ++++ ltmain.sh Fri Nov 14 18:06:07 2003 +@@ -1278,7 +1278,7 @@ + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd4*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1288,8 +1288,16 @@ + continue + ;; + ++ -pthread) ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; ++ + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -3008,6 +3016,9 @@ + # problems, so we reset it completely + verstring= + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + verstring="0.0" + ;; +@@ -5457,10 +5468,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/multimedia/gstreamer-plugins80/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h b/multimedia/gstreamer-plugins80/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h new file mode 100644 index 0000000..daaefac --- /dev/null +++ b/multimedia/gstreamer-plugins80/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h @@ -0,0 +1,72 @@ +--- sys/cdrom/gstcdplayer_ioctl_bsd.h.orig Mon Mar 1 06:52:03 2004 ++++ sys/cdrom/gstcdplayer_ioctl_bsd.h Tue Mar 9 16:05:36 2004 +@@ -142,6 +142,7 @@ + { + struct ioc_toc_header toc_header; + struct ioc_read_toc_entry toc_entry; ++ struct cd_toc_entry toc_entry_data; + guint i; + + cd->fd = open(device,O_RDONLY | O_NONBLOCK); +@@ -151,7 +152,7 @@ + } + + /* get the toc header information */ +- if (ioctl(cd->fd,CDIOREADTOCHDR,&toc_header) != 0) { ++ if (ioctl(cd->fd,CDIOREADTOCHEADER,&toc_header) != 0) { + close(cd->fd); + cd->fd = -1; + return FALSE; +@@ -161,6 +162,8 @@ + for (i = 1; i <= toc_header.ending_track; i++) { + toc_entry.address_format = CD_MSF_FORMAT; + toc_entry.starting_track = i; ++ toc_entry.data = &toc_entry_data; ++ toc_entry.data_len = sizeof(toc_entry_data); + + if (ioctl(cd->fd,CDIOREADTOCENTRYS,&toc_entry) != 0) { + close(cd->fd); +@@ -168,9 +171,9 @@ + return FALSE; + } + +- cd->tracks[i].minute = toc_entry.entry.addr.msf.minute; +- cd->tracks[i].second = toc_entry.entry.addr.msf.second; +- cd->tracks[i].frame = toc_entry.entry.addr.msf.frame; ++ cd->tracks[i].minute = toc_entry.data->addr.msf.minute; ++ cd->tracks[i].second = toc_entry.data->addr.msf.second; ++ cd->tracks[i].frame = toc_entry.data->addr.msf.frame; + cd->tracks[i].data_track = (toc_entry.data->control & 4) == 4; + } + +@@ -186,9 +189,9 @@ + return FALSE; + } + +- cd->tracks[LEADOUT].minute = toc_entry.entry.addr.msf.minute; +- cd->tracks[LEADOUT].second = toc_entry.entry.addr.msf.second; +- cd->tracks[LEADOUT].frame = toc_entry.entry.addr.msf.frame; ++ cd->tracks[LEADOUT].minute = toc_entry.data->addr.msf.minute; ++ cd->tracks[LEADOUT].second = toc_entry.data->addr.msf.second; ++ cd->tracks[LEADOUT].frame = toc_entry.data->addr.msf.frame; + + cd->num_tracks = toc_header.ending_track; + +@@ -224,6 +227,8 @@ + return FALSE; + } + ++ /* lets return TRUE and lets see what happes (may not be correct)*/ ++ return TRUE; + } + + gboolean cd_pause(struct cd *cd) +@@ -321,7 +326,7 @@ + return -1; + } + +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) + return sub_channel.data->what.track_info.track_number; + #else + return sub_channel.data->track_number; diff --git a/multimedia/gstreamer-plugins80/files/patch-sys_oss_gstosselement.h b/multimedia/gstreamer-plugins80/files/patch-sys_oss_gstosselement.h new file mode 100644 index 0000000..30258ba --- /dev/null +++ b/multimedia/gstreamer-plugins80/files/patch-sys_oss_gstosselement.h @@ -0,0 +1,10 @@ +--- sys/oss/gstosselement.h.orig Tue Mar 9 16:46:05 2004 ++++ sys/oss/gstosselement.h Tue Mar 9 16:46:14 2004 +@@ -23,6 +23,7 @@ + #ifndef __GST_OSS_ELEMENT_H__ + #define __GST_OSS_ELEMENT_H__ + ++#include <sys/types.h> + #include <gst/gst.h> + + /* debugging category */ diff --git a/multimedia/gstreamer-plugins80/files/patch-sys_ximage_ximagesink.h b/multimedia/gstreamer-plugins80/files/patch-sys_ximage_ximagesink.h new file mode 100644 index 0000000..07b125b --- /dev/null +++ b/multimedia/gstreamer-plugins80/files/patch-sys_ximage_ximagesink.h @@ -0,0 +1,10 @@ +--- sys/ximage/ximagesink.h.orig Tue Mar 16 22:51:03 2004 ++++ sys/ximage/ximagesink.h Tue Mar 16 23:06:44 2004 +@@ -23,6 +23,7 @@ + #include <gst/video/videosink.h> + + #ifdef HAVE_XSHM ++#include <sys/types.h> + #include <sys/ipc.h> + #include <sys/shm.h> + #endif /* HAVE_XSHM */ diff --git a/multimedia/gstreamer-plugins80/files/patch-sys_xvideo_gstxvimage.c b/multimedia/gstreamer-plugins80/files/patch-sys_xvideo_gstxvimage.c deleted file mode 100644 index cb156ee..0000000 --- a/multimedia/gstreamer-plugins80/files/patch-sys_xvideo_gstxvimage.c +++ /dev/null @@ -1,21 +0,0 @@ ---- sys/xvideo/gstxvimage.c.orig Sun Nov 23 20:17:00 2003 -+++ sys/xvideo/gstxvimage.c Sun Nov 23 20:25:19 2003 -@@ -20,6 +20,10 @@ - #include "config.h" - - #include <errno.h> -+#include <sys/types.h> -+#include <machine/param.h> -+#include <sys/types.h> -+#include <sys/ipc.h> - #include <sys/shm.h> /* for SHM symbols */ - #include <gst/gst.h> - /* gcc -ansi -pedantic on GNU/Linux causes warnings and errors -@@ -34,7 +38,6 @@ - - #include <stdio.h> - #include <stdlib.h> --#include <sys/types.h> - - #if defined (HAVE_IPC_H) && defined (HAVE_SHM_H) && defined (HAVE_XSHM_H) - #define USE_SHM diff --git a/multimedia/gstreamer-plugins80/files/patch-sys_xvimage_xvimagesink.h b/multimedia/gstreamer-plugins80/files/patch-sys_xvimage_xvimagesink.h new file mode 100644 index 0000000..ddb0d1f --- /dev/null +++ b/multimedia/gstreamer-plugins80/files/patch-sys_xvimage_xvimagesink.h @@ -0,0 +1,10 @@ +--- sys/xvimage/xvimagesink.h.orig Tue Mar 16 22:51:04 2004 ++++ sys/xvimage/xvimagesink.h Tue Mar 16 23:07:39 2004 +@@ -23,6 +23,7 @@ + #include <gst/video/videosink.h> + + #ifdef HAVE_XSHM ++#include <sys/types.h> + #include <sys/ipc.h> + #include <sys/shm.h> + #endif /* HAVE_XSHM */ diff --git a/multimedia/gstreamer-plugins80/pkg-plist b/multimedia/gstreamer-plugins80/pkg-plist index 96e4b3b..e35f5c9 100644 --- a/multimedia/gstreamer-plugins80/pkg-plist +++ b/multimedia/gstreamer-plugins80/pkg-plist @@ -1,32 +1,59 @@ -bin/gst-launch-ext -bin/gst-visualise +bin/gst-launch-ext-%%VERSION%% +bin/gst-visualise-%%VERSION%% 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/schemas/system/gstreamer/%%VERSION%%/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%%VERSION%%/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 +etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%%/%gconf.xml +etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%%/default/%gconf.xml +etc/gconf/schemas/gstreamer-%%VERSION%%.schemas +include/gstreamer-%%VERSION%%/gst/audio/gstaudiofilter.h +include/gstreamer-%%VERSION%%/gst/audio/audioclock.h include/gstreamer-%%VERSION%%/gst/audio/audio.h +include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalance-enumtypes.h +include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalance.h +include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalancechannel.h include/gstreamer-%%VERSION%%/gst/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/mixer/mixer-enumtypes.h +include/gstreamer-%%VERSION%%/gst/mixer/mixer.h +include/gstreamer-%%VERSION%%/gst/mixer/mixertrack.h +include/gstreamer-%%VERSION%%/gst/navigation/navigation.h +include/gstreamer-%%VERSION%%/gst/play/play-enumtypes.h include/gstreamer-%%VERSION%%/gst/play/play.h +include/gstreamer-%%VERSION%%/gst/propertyprobe/propertyprobe.h include/gstreamer-%%VERSION%%/gst/resample/resample.h -include/gstreamer-%%VERSION%%/gst/riff/riff.h +include/gstreamer-%%VERSION%%/gst/riff/riff-ids.h +include/gstreamer-%%VERSION%%/gst/riff/riff-media.h +include/gstreamer-%%VERSION%%/gst/riff/riff-read.h +include/gstreamer-%%VERSION%%/gst/tag/tag.h +include/gstreamer-%%VERSION%%/gst/tuner/tuner-enumtypes.h +include/gstreamer-%%VERSION%%/gst/tuner/tuner.h +include/gstreamer-%%VERSION%%/gst/tuner/tunerchannel.h +include/gstreamer-%%VERSION%%/gst/tuner/tunernorm.h include/gstreamer-%%VERSION%%/gst/video/video.h +include/gstreamer-%%VERSION%%/gst/video/videosink.h +include/gstreamer-%%VERSION%%/gst/xoverlay/xoverlay.h +include/gstreamer-%%VERSION%%/gst/xwindowlistener/xwindowlistener.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%%/libgstasf.so +lib/gstreamer-%%VERSION%%/libgstaudioconvert.so +lib/gstreamer-%%VERSION%%/libgstaudiofilter.so lib/gstreamer-%%VERSION%%/libgstaudio.so %%LIBAUDIOFILE%%lib/gstreamer-%%VERSION%%/libgstaudiofile.so lib/gstreamer-%%VERSION%%/libgstaudioscale.so lib/gstreamer-%%VERSION%%/libgstauparse.so -lib/gstreamer-%%VERSION%%/libgstavidemux.so -lib/gstreamer-%%VERSION%%/libgstavimux.so +lib/gstreamer-%%VERSION%%/libgstavi.so +%%LIBCACA%%lib/gstreamer-%%VERSION%%/libgstcacasink.so %%CDPARANOIA%%lib/gstreamer-%%VERSION%%/libgstcdparanoia.so +lib/gstreamer-%%VERSION%%/libgstcdplayer.so lib/gstreamer-%%VERSION%%/libgstcdxaparse.so lib/gstreamer-%%VERSION%%/libgstchart.so %%HERMES%%lib/gstreamer-%%VERSION%%/libgstcolorspace.so @@ -35,115 +62,151 @@ 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%%/libgstefence.so lib/gstreamer-%%VERSION%%/libgsteffectv.so -%%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesdmon.so -%%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesdsink.so +%%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesd.so +%%FAAD%%lib/gstreamer-%%VERSION%%/libgstfaad.so lib/gstreamer-%%VERSION%%/libgstfestival.so -lib/gstreamer-%%VERSION%%/libgstffmpeg.so -lib/gstreamer-%%VERSION%%/libgstffmpegall.so +lib/gstreamer-%%VERSION%%/libgstffmpegcolorspace.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%%/libgstgamma.so +%%GDKPIXBUF%%lib/gstreamer-%%VERSION%%/libgstgdkpixbuf.so +%%GNOMEVFS%%lib/gstreamer-%%VERSION%%/libgstgnomevfs.so lib/gstreamer-%%VERSION%%/libgstgoom.so %%GSM%%lib/gstreamer-%%VERSION%%/libgstgsm.so +%%HERMES%%lib/gstreamer-%%VERSION%%/libgsthermescolorspace.so %%HTTP%%lib/gstreamer-%%VERSION%%/libgsthttpsrc.so lib/gstreamer-%%VERSION%%/libgstidct.so -lib/gstreamer-%%VERSION%%/libgstintfloat.so +lib/gstreamer-%%VERSION%%/libgstinterleave.so +%%IVORBIS%%lib/gstreamer-%%VERSION%%/libgstivorbis.so +%%JACK%%lib/gstreamer-%%VERSION%%/libgstjack.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%%/libgstmatroska.so lib/gstreamer-%%VERSION%%/libgstmedian.so %%LIBMIKMOD%%lib/gstreamer-%%VERSION%%/libgstmikmod.so +lib/gstreamer-%%VERSION%%/libgstmixmatrix.so +lib/gstreamer-%%VERSION%%/libgstmodplug.a lib/gstreamer-%%VERSION%%/libgstmodplug.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 +%%NAS%%lib/gstreamer-%%VERSION%%/libgstnassink.so +lib/gstreamer-%%VERSION%%/libgstnavigationtest.so +%%OGG%%lib/gstreamer-%%VERSION%%/libgstogg.so +lib/gstreamer-%%VERSION%%/libgstoverlay.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%%/libgstrmdemux.so lib/gstreamer-%%VERSION%%/libgstriff.so lib/gstreamer-%%VERSION%%/libgstrtjpeg.so +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 lib/gstreamer-%%VERSION%%/libgstsilence.so lib/gstreamer-%%VERSION%%/libgstsinesrc.so +%%SMOOTHWAVE%%lib/gstreamer-%%VERSION%%/libgstsmoothwave.so lib/gstreamer-%%VERSION%%/libgstsmooth.so lib/gstreamer-%%VERSION%%/libgstsmpte.so %%PNG%%lib/gstreamer-%%VERSION%%/libgstsnapshot.so +%%LIBSNDFILE%%lib/gstreamer-%%VERSION%%/libgstsndfile.so lib/gstreamer-%%VERSION%%/libgstspectrum.so lib/gstreamer-%%VERSION%%/libgstspeed.so +%%SPEEX%%lib/gstreamer-%%VERSION%%/libgstspeex.so lib/gstreamer-%%VERSION%%/libgststereo.so -lib/gstreamer-%%VERSION%%/libgststereo2mono.so -lib/gstreamer-%%VERSION%%/libgststereosplit.so %%SWFDEC%%lib/gstreamer-%%VERSION%%/libgstswfdec.so +lib/gstreamer-%%VERSION%%/libgstswitch.so lib/gstreamer-%%VERSION%%/libgstsynaesthesia.so +lib/gstreamer-%%VERSION%%/libgsttagedit.so +lib/gstreamer-%%VERSION%%/libgsttcp.so +lib/gstreamer-%%VERSION%%/libgsttextoverlay.so +%%LIBTHEORA%%lib/gstreamer-%%VERSION%%/libgsttheora.so +lib/gstreamer-%%VERSION%%/libgsttimeoverlay.so +%%LIBMUSICBRAINZ%%lib/gstreamer-%%VERSION%%/libgsttrm.so +lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.so lib/gstreamer-%%VERSION%%/libgstudp.so lib/gstreamer-%%VERSION%%/libgstvbidec.so lib/gstreamer-%%VERSION%%/libgstvideo.so +lib/gstreamer-%%VERSION%%/libgstvideobalance.so lib/gstreamer-%%VERSION%%/libgstvideocrop.so +lib/gstreamer-%%VERSION%%/libgstvideodrop.so +lib/gstreamer-%%VERSION%%/libgstvideofilter.so +lib/gstreamer-%%VERSION%%/libgstvideoflip.so lib/gstreamer-%%VERSION%%/libgstvideoscale.so -lib/gstreamer-%%VERSION%%/libgstvideosink.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%%/libgstxvideosink.so +lib/gstreamer-%%VERSION%%/libgstximagesink.so +%%XINE%%lib/gstreamer-%%VERSION%%/libgstxine.so +%%XVID%%lib/gstreamer-%%VERSION%%/libgstxvid.so +lib/gstreamer-%%VERSION%%/libgstxvimagesink.so +lib/gstreamer-%%VERSION%%/libgstxwindowlistener.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/libgstinterfaces-%%VERSION%%.a +lib/libgstinterfaces-%%VERSION%%.so +lib/libgstinterfaces-%%VERSION%%.so.%%SHLIB_VERSION%% lib/libgstmedia-info-%%VERSION%%.a lib/libgstmedia-info-%%VERSION%%.so -lib/libgstmedia-info-%%VERSION%%.so.0 +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-interfaces-%%VERSION%%.pc libdata/pkgconfig/gstreamer-libs-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-media-info-%%VERSION%%.pc libdata/pkgconfig/gstreamer-play-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-plugins-%%VERSION%%.pc +share/locale/nl/LC_MESSAGES/gst-plugins-%%VERSION%%.mo +share/locale/sr/LC_MESSAGES/gst-plugins-%%VERSION%%.mo @unexec rmdir %D/lib/gstreamer-%%VERSION%% 2>/dev/null || true +@dirrm include/gstreamer-%%VERSION%%/gst/xwindowlistener +@dirrm include/gstreamer-%%VERSION%%/gst/xoverlay @dirrm include/gstreamer-%%VERSION%%/gst/video +@dirrm include/gstreamer-%%VERSION%%/gst/tuner @dirrm include/gstreamer-%%VERSION%%/gst/riff @dirrm include/gstreamer-%%VERSION%%/gst/resample +@dirrm include/gstreamer-%%VERSION%%/gst/propertyprobe @dirrm include/gstreamer-%%VERSION%%/gst/play +@dirrm include/gstreamer-%%VERSION%%/gst/navigation +@dirrm include/gstreamer-%%VERSION%%/gst/mixer @dirrm include/gstreamer-%%VERSION%%/gst/media-info @dirrm include/gstreamer-%%VERSION%%/gst/idct @dirrm include/gstreamer-%%VERSION%%/gst/gconf @dirrm include/gstreamer-%%VERSION%%/gst/floatcast +@dirrm include/gstreamer-%%VERSION%%/gst/colorbalance @dirrm include/gstreamer-%%VERSION%%/gst/audio -@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/default +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%%/default +@dirrm etc/gconf/gconf.xml.defaults/system/gstreamer/%%VERSION%% @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/%%VERSION%%/default +@dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%%VERSION%% @dirrm etc/gconf/gconf.xml.defaults/schemas/system/gstreamer +@unexec rmdir %D/include/gstreamer-%%VERSION%%/gst 2>/dev/null || true @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 +@exec %%X11BASE%%/bin/gst-register-%%VERSION%% 2>/dev/null || true +@unexec %%X11BASE%%/bin/gst-register-%%VERSION%% 2>/dev/null || true diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile index 3f7a430..e523e02 100644 --- a/multimedia/gstreamer/Makefile +++ b/multimedia/gstreamer/Makefile @@ -6,11 +6,12 @@ # PORTNAME= gstreamer -PORTVERSION= 0.6.4 -PORTREVISION= 2 +PORTVERSION= 0.8.0 +PORTREVISION= 1 CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.6 +MASTER_SITES= ${MASTER_SITE_GNOME} \ + http://gstreamer.freedesktop.org/src/gstreamer/ +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.8 DIST_SUBDIR= gnome2 MAINTAINER= lioux@FreeBSD.org @@ -21,39 +22,41 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_X_PREFIX= yes USE_BISON= yes USE_BZIP2= yes +USE_PYTHON= yes USE_GMAKE= yes +USE_REINPLACE= yes WANT_GNOME= yes USE_GNOME= gnomehack \ gnomeprefix \ glib20 \ pkgconfig \ libxml2 -USE_SIZE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-tests \ --disable-failing-tests CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" -CONFIGURE_TARGET= PLIST_SUB= \ - VERSION="${PORTVERSION:C/..$//}" \ + VERSION="${GST_VERSION}" \ SHLIB_VERSION="${SHLIB_VERSION}" INSTALLS_SHLIB= yes -MAN1= gst-complete.1 gst-compprep.1 gst-inspect.1 gst-launch.1 \ - gst-feedback.1 gst-md5sum.1 \ - gst-typefind.1 \ - gst-register.1 gst-xmllaunch.1 +MAN1= gst-complete-${GST_VERSION}.1 gst-compprep-${GST_VERSION}.1 \ + gst-feedback-${GST_VERSION}.1 gst-inspect-${GST_VERSION}.1 \ + gst-launch-${GST_VERSION}.1 gst-md5sum-${GST_VERSION}.1 \ + gst-register-${GST_VERSION}.1 gst-typefind-${GST_VERSION}.1 \ + gst-xmllaunch-${GST_VERSION}.1 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config" +GST_VERSION=${PORTVERSION:C/..$//} # library minor number SHLIB_VERSION= 1 post-install: # register plugins - @${PREFIX}/bin/gst-register 2>/dev/null + -@${PREFIX}/bin/gst-register-${GST_VERSION} 2>/dev/null .include <bsd.port.pre.mk> diff --git a/multimedia/gstreamer/distinfo b/multimedia/gstreamer/distinfo index 2fd78bc..a0fd0e7 100644 --- a/multimedia/gstreamer/distinfo +++ b/multimedia/gstreamer/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gstreamer-0.6.4.tar.bz2) = d607f42d4a6de9e79d74ccaa6469ded6 -SIZE (gnome2/gstreamer-0.6.4.tar.bz2) = 1108361 +MD5 (gnome2/gstreamer-0.8.0.tar.bz2) = 275384c4001c6b934f159952f39e2f36 +SIZE (gnome2/gstreamer-0.8.0.tar.bz2) = 1120465 diff --git a/multimedia/gstreamer/files/patch-configure b/multimedia/gstreamer/files/patch-configure index 11e54cb..4dafb1dd 100644 --- a/multimedia/gstreamer/files/patch-configure +++ b/multimedia/gstreamer/files/patch-configure @@ -1,6 +1,15 @@ ---- configure.orig Sat Sep 27 14:13:57 2003 -+++ configure Sat Sep 27 14:18:37 2003 -@@ -8173,7 +8173,7 @@ +--- configure.orig Thu Feb 26 14:03:31 2004 ++++ configure Thu Feb 26 14:03:31 2004 +@@ -21858,7 +21858,7 @@ + + + EXP_VAR=LOCALEDIR +- FROM_VAR=$datadir/locale ++ FROM_VAR=$prefix/share/locale + + prefix_save=$prefix + exec_prefix_save=$exec_prefix +@@ -21961,7 +21961,7 @@ echo $ECHO_N "checking to see if compiler understands -Werror... $ECHO_C" >&6 save_CFLAGS="$CFLAGS" @@ -8,8 +17,8 @@ + CFLAGS="$CFLAGS" cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -8214,7 +8214,7 @@ + /* confdefs.h. */ +@@ -22011,7 +22011,7 @@ CFLAGS="$save_CFLAGS" if test "X$flag_ok" = Xyes ; then @@ -17,13 +26,4 @@ + GST_ERROR="$GST_ERROR" true else - -@@ -9607,7 +9607,7 @@ - : - fi - --if test "$ac_cv_check_mcsc" == "yes"; then -+if test "$ac_cv_check_mcsc" = "yes"; then - - cat >>confdefs.h <<_ACEOF - #define HAVE_MAKECONTEXT $HAVE_MAKECONTEXT + GST_ERROR="$GST_ERROR" diff --git a/multimedia/gstreamer/files/patch-gst::cothreads.c b/multimedia/gstreamer/files/patch-gst::cothreads.c index 3519fb0..b66b706 100644 --- a/multimedia/gstreamer/files/patch-gst::cothreads.c +++ b/multimedia/gstreamer/files/patch-gst::cothreads.c @@ -1,6 +1,6 @@ ---- 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 @@ +--- gst/cothreads.c.orig Mon Feb 2 06:56:53 2004 ++++ gst/cothreads.c Fri Feb 6 13:05:26 2004 +@@ -42,6 +42,10 @@ #include <ucontext.h> #endif @@ -8,9 +8,11 @@ +#include <ucontext.h> +#endif + - /* older glibc's have MAP_ANON instead of MAP_ANONYMOUS */ #ifndef MAP_ANONYMOUS - #define MAP_ANONYMOUS MAP_ANON + #ifdef MAP_ANON + /* older glibc's have MAP_ANON instead of MAP_ANONYMOUS */ +@@ -52,7 +56,7 @@ + #endif #endif -#define STACK_SIZE 0x200000 diff --git a/multimedia/gstreamer/files/patch-gst::gstthreaddummy.c b/multimedia/gstreamer/files/patch-gst::gstthreaddummy.c index 479a05b..71bace4 100644 --- a/multimedia/gstreamer/files/patch-gst::gstthreaddummy.c +++ b/multimedia/gstreamer/files/patch-gst::gstthreaddummy.c @@ -1,12 +1,10 @@ ---- gst/gstthreaddummy.c.orig Sat Aug 30 19:30:10 2003 -+++ gst/gstthreaddummy.c Sat Aug 30 19:30:34 2003 -@@ -17,7 +17,9 @@ +--- gst/gstthreaddummy.c.orig Mon Jun 30 14:31:13 2003 ++++ gst/gstthreaddummy.c Fri Nov 14 15:36:22 2003 +@@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ +#include <sys/types.h> + #include <unistd.h> #include <sys/time.h> -+#include <unistd.h> #include <glib.h> - #include "gstlog.h" - diff --git a/multimedia/gstreamer/files/patch-libs::ext::cothreads::cothreads::cothreads.c b/multimedia/gstreamer/files/patch-libs::ext::cothreads::cothreads::cothreads.c deleted file mode 100644 index e0e229f..0000000 --- a/multimedia/gstreamer/files/patch-libs::ext::cothreads::cothreads::cothreads.c +++ /dev/null @@ -1,19 +0,0 @@ ---- libs/ext/cothreads/cothreads/cothreads.c.orig Sat Feb 1 16:09:23 2003 -+++ libs/ext/cothreads/cothreads/cothreads.c Mon Mar 17 13:33:43 2003 -@@ -22,6 +22,7 @@ - - #include "pth_p.h" /* this pulls in everything */ - #include <sys/mman.h> -+#include <sys/time.h> - #include <sys/resource.h> - #include <stdlib.h> - -@@ -422,7 +423,7 @@ - *stack = malloc (_cothreads_chunk_size * (1.0 + 1.0/_cothreads_count)); - if (!stack) - return FALSE; -- *stack = (void*)((int)*stack &~ (int)(_cothreads_chunk_size / _cothreads_count - 1)); -+ *stack = (void*)((intptr_t)*stack &~ (intptr_t)(_cothreads_chunk_size / _cothreads_count - 1)); - *stack += 1; - #endif - diff --git a/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::Makefile.in b/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::Makefile.in deleted file mode 100644 index 4470b93..0000000 --- a/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/ext/cothreads/tests/Makefile.in.orig Mon Oct 13 15:10:38 2003 -+++ libs/ext/cothreads/tests/Makefile.in Mon Oct 13 15:11:13 2003 -@@ -83,7 +83,7 @@ - GLIB_CFLAGS = @GLIB_CFLAGS@ - GLIB_LIBS = @GLIB_LIBS@ - GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ --GTHREAD_LIBS = @GTHREAD_LIBS@ -+GTHREAD_LIBS = -lc @GTHREAD_LIBS@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ diff --git a/multimedia/gstreamer/files/patch-ltmain.sh b/multimedia/gstreamer/files/patch-ltmain.sh index 284a2d7..9b5b1ec 100644 --- a/multimedia/gstreamer/files/patch-ltmain.sh +++ b/multimedia/gstreamer/files/patch-ltmain.sh @@ -1,15 +1,15 @@ ---- ltmain.sh.orig Mon Oct 13 14:17:09 2003 -+++ ltmain.sh Sat Feb 21 15:44:32 2004 -@@ -1075,7 +1075,7 @@ +--- ltmain.sh.orig Tue Oct 28 09:26:50 2003 ++++ ltmain.sh Sat Feb 21 15:30:25 2004 +@@ -1280,7 +1280,7 @@ esac - elif test "X$arg" = "X-lc_r"; then - case $host in + elif test "X$arg" = "X-lc_r"; then + case $host in - *-*-openbsd* | *-*-freebsd*) + *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1085,8 +1085,16 @@ + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1290,8 +1290,16 @@ continue ;; @@ -26,17 +26,17 @@ continue ;; -@@ -2503,6 +2511,9 @@ - *-*-openbsd* | *-*-freebsd*) - # Do not include libc due to us having libc/libc_r. +@@ -3000,6 +3008,9 @@ + # problems, so we reset it completely + verstring= ;; + *-*-freebsd*) + # FreeBSD doesn't need this... + ;; *) - # Add libc to deplibs on all other systems if necessary. - if test $build_libtool_need_lc = "yes"; then -@@ -4330,10 +4341,12 @@ + verstring="0.0" + ;; +@@ -5428,10 +5439,12 @@ fi # Install the pseudo-library for information purposes. diff --git a/multimedia/gstreamer/pkg-plist b/multimedia/gstreamer/pkg-plist index bb84002..1e43cd5 100644 --- a/multimedia/gstreamer/pkg-plist +++ b/multimedia/gstreamer/pkg-plist @@ -1,13 +1,23 @@ -@unexec %D/bin/gst-register 2>/dev/null || true bin/gst-complete +bin/gst-complete-%%VERSION%% bin/gst-compprep +bin/gst-compprep-%%VERSION%% bin/gst-feedback +bin/gst-feedback-%%VERSION%% bin/gst-inspect +bin/gst-inspect-%%VERSION%% bin/gst-launch +bin/gst-launch-%%VERSION%% bin/gst-md5sum +bin/gst-md5sum-%%VERSION%% bin/gst-register +bin/gst-register-%%VERSION%% bin/gst-typefind +bin/gst-typefind-%%VERSION%% +bin/gst-xmlinspect +bin/gst-xmlinspect-%%VERSION%% bin/gst-xmllaunch +bin/gst-xmllaunch-%%VERSION%% include/gstreamer-%%VERSION%%/gst/bytestream/bytestream.h include/gstreamer-%%VERSION%%/gst/control/control.h include/gstreamer-%%VERSION%%/gst/control/dparam.h @@ -19,10 +29,8 @@ 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 @@ -31,11 +39,13 @@ 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/gsterror.h include/gstreamer-%%VERSION%%/gst/gstevent.h -include/gstreamer-%%VERSION%%/gst/gstextratypes.h +include/gstreamer-%%VERSION%%/gst/gstfilter.h include/gstreamer-%%VERSION%%/gst/gstformat.h include/gstreamer-%%VERSION%%/gst/gstindex.h include/gstreamer-%%VERSION%%/gst/gstinfo.h +include/gstreamer-%%VERSION%%/gst/gstinterface.h include/gstreamer-%%VERSION%%/gst/gstlog.h include/gstreamer-%%VERSION%%/gst/gstmacros.h include/gstreamer-%%VERSION%%/gst/gstmarshal.h @@ -47,28 +57,28 @@ 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/gstregistrypool.h include/gstreamer-%%VERSION%%/gst/gstscheduler.h +include/gstreamer-%%VERSION%%/gst/gststructure.h include/gstreamer-%%VERSION%%/gst/gstsystemclock.h +include/gstreamer-%%VERSION%%/gst/gsttag.h +include/gstreamer-%%VERSION%%/gst/gsttaginterface.h include/gstreamer-%%VERSION%%/gst/gstthread.h include/gstreamer-%%VERSION%%/gst/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/gsturitype.h include/gstreamer-%%VERSION%%/gst/gstutils.h +include/gstreamer-%%VERSION%%/gst/gstvalue.h include/gstreamer-%%VERSION%%/gst/gstversion.h include/gstreamer-%%VERSION%%/gst/gstxml.h -include/gstreamer-%%VERSION%%/gst/putbits/putbits.h -lib/gstreamer-%%VERSION%%/libgstautoplugcache.so -lib/gstreamer-%%VERSION%%/libgstautoplugger.so lib/gstreamer-%%VERSION%%/libgstbasicgthreadscheduler.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 @@ -76,12 +86,7 @@ lib/gstreamer-%%VERSION%%/libgstindexers.so lib/gstreamer-%%VERSION%%/libgstoptgthreadscheduler.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%% @@ -91,11 +96,18 @@ lib/libgstreamer-%%VERSION%%.so.%%SHLIB_VERSION%% libdata/pkgconfig/gstreamer-%%VERSION%%.pc libdata/pkgconfig/gstreamer-control-%%VERSION%%.pc share/aclocal/gst-element-check-%%VERSION%%.m4 +share/locale/fr/LC_MESSAGES/gstreamer-%%VERSION%%.mo +share/locale/nl/LC_MESSAGES/gstreamer-%%VERSION%%.mo +share/locale/sr/LC_MESSAGES/gstreamer-%%VERSION%%.mo @unexec rm %D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true +@dirrm share/gnome/doc/gstreamer-%%VERSION%%.0/pwg +@dirrm share/gnome/doc/gstreamer-%%VERSION%%.0/manual +@dirrm share/gnome/doc/gstreamer-%%VERSION%%.0/faq +@dirrm share/gnome/doc/gstreamer-%%VERSION%%.0 @dirrm share/gnome/cache/gstreamer-%%VERSION%% @unexec rmdir %D/share/gnome/cache 2>/dev/null || true @dirrm lib/gstreamer-%%VERSION%% -@dirrm include/gstreamer-%%VERSION%%/gst/putbits +@dirrm include/gstreamer-%%VERSION%%/gst/tag @dirrm include/gstreamer-%%VERSION%%/gst/getbits @dirrm include/gstreamer-%%VERSION%%/gst/control @dirrm include/gstreamer-%%VERSION%%/gst/bytestream diff --git a/multimedia/gstreamer80/Makefile b/multimedia/gstreamer80/Makefile index 3f7a430..e523e02 100644 --- a/multimedia/gstreamer80/Makefile +++ b/multimedia/gstreamer80/Makefile @@ -6,11 +6,12 @@ # PORTNAME= gstreamer -PORTVERSION= 0.6.4 -PORTREVISION= 2 +PORTVERSION= 0.8.0 +PORTREVISION= 1 CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.6 +MASTER_SITES= ${MASTER_SITE_GNOME} \ + http://gstreamer.freedesktop.org/src/gstreamer/ +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.8 DIST_SUBDIR= gnome2 MAINTAINER= lioux@FreeBSD.org @@ -21,39 +22,41 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_X_PREFIX= yes USE_BISON= yes USE_BZIP2= yes +USE_PYTHON= yes USE_GMAKE= yes +USE_REINPLACE= yes WANT_GNOME= yes USE_GNOME= gnomehack \ gnomeprefix \ glib20 \ pkgconfig \ libxml2 -USE_SIZE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-tests \ --disable-failing-tests CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" -CONFIGURE_TARGET= PLIST_SUB= \ - VERSION="${PORTVERSION:C/..$//}" \ + VERSION="${GST_VERSION}" \ SHLIB_VERSION="${SHLIB_VERSION}" INSTALLS_SHLIB= yes -MAN1= gst-complete.1 gst-compprep.1 gst-inspect.1 gst-launch.1 \ - gst-feedback.1 gst-md5sum.1 \ - gst-typefind.1 \ - gst-register.1 gst-xmllaunch.1 +MAN1= gst-complete-${GST_VERSION}.1 gst-compprep-${GST_VERSION}.1 \ + gst-feedback-${GST_VERSION}.1 gst-inspect-${GST_VERSION}.1 \ + gst-launch-${GST_VERSION}.1 gst-md5sum-${GST_VERSION}.1 \ + gst-register-${GST_VERSION}.1 gst-typefind-${GST_VERSION}.1 \ + gst-xmllaunch-${GST_VERSION}.1 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config" +GST_VERSION=${PORTVERSION:C/..$//} # library minor number SHLIB_VERSION= 1 post-install: # register plugins - @${PREFIX}/bin/gst-register 2>/dev/null + -@${PREFIX}/bin/gst-register-${GST_VERSION} 2>/dev/null .include <bsd.port.pre.mk> diff --git a/multimedia/gstreamer80/distinfo b/multimedia/gstreamer80/distinfo index 2fd78bc..a0fd0e7 100644 --- a/multimedia/gstreamer80/distinfo +++ b/multimedia/gstreamer80/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gstreamer-0.6.4.tar.bz2) = d607f42d4a6de9e79d74ccaa6469ded6 -SIZE (gnome2/gstreamer-0.6.4.tar.bz2) = 1108361 +MD5 (gnome2/gstreamer-0.8.0.tar.bz2) = 275384c4001c6b934f159952f39e2f36 +SIZE (gnome2/gstreamer-0.8.0.tar.bz2) = 1120465 diff --git a/multimedia/gstreamer80/files/patch-configure b/multimedia/gstreamer80/files/patch-configure index 11e54cb..4dafb1dd 100644 --- a/multimedia/gstreamer80/files/patch-configure +++ b/multimedia/gstreamer80/files/patch-configure @@ -1,6 +1,15 @@ ---- configure.orig Sat Sep 27 14:13:57 2003 -+++ configure Sat Sep 27 14:18:37 2003 -@@ -8173,7 +8173,7 @@ +--- configure.orig Thu Feb 26 14:03:31 2004 ++++ configure Thu Feb 26 14:03:31 2004 +@@ -21858,7 +21858,7 @@ + + + EXP_VAR=LOCALEDIR +- FROM_VAR=$datadir/locale ++ FROM_VAR=$prefix/share/locale + + prefix_save=$prefix + exec_prefix_save=$exec_prefix +@@ -21961,7 +21961,7 @@ echo $ECHO_N "checking to see if compiler understands -Werror... $ECHO_C" >&6 save_CFLAGS="$CFLAGS" @@ -8,8 +17,8 @@ + CFLAGS="$CFLAGS" cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" -@@ -8214,7 +8214,7 @@ + /* confdefs.h. */ +@@ -22011,7 +22011,7 @@ CFLAGS="$save_CFLAGS" if test "X$flag_ok" = Xyes ; then @@ -17,13 +26,4 @@ + GST_ERROR="$GST_ERROR" true else - -@@ -9607,7 +9607,7 @@ - : - fi - --if test "$ac_cv_check_mcsc" == "yes"; then -+if test "$ac_cv_check_mcsc" = "yes"; then - - cat >>confdefs.h <<_ACEOF - #define HAVE_MAKECONTEXT $HAVE_MAKECONTEXT + GST_ERROR="$GST_ERROR" diff --git a/multimedia/gstreamer80/files/patch-gst::cothreads.c b/multimedia/gstreamer80/files/patch-gst::cothreads.c index 3519fb0..b66b706 100644 --- a/multimedia/gstreamer80/files/patch-gst::cothreads.c +++ b/multimedia/gstreamer80/files/patch-gst::cothreads.c @@ -1,6 +1,6 @@ ---- 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 @@ +--- gst/cothreads.c.orig Mon Feb 2 06:56:53 2004 ++++ gst/cothreads.c Fri Feb 6 13:05:26 2004 +@@ -42,6 +42,10 @@ #include <ucontext.h> #endif @@ -8,9 +8,11 @@ +#include <ucontext.h> +#endif + - /* older glibc's have MAP_ANON instead of MAP_ANONYMOUS */ #ifndef MAP_ANONYMOUS - #define MAP_ANONYMOUS MAP_ANON + #ifdef MAP_ANON + /* older glibc's have MAP_ANON instead of MAP_ANONYMOUS */ +@@ -52,7 +56,7 @@ + #endif #endif -#define STACK_SIZE 0x200000 diff --git a/multimedia/gstreamer80/files/patch-gst::gstthreaddummy.c b/multimedia/gstreamer80/files/patch-gst::gstthreaddummy.c index 479a05b..71bace4 100644 --- a/multimedia/gstreamer80/files/patch-gst::gstthreaddummy.c +++ b/multimedia/gstreamer80/files/patch-gst::gstthreaddummy.c @@ -1,12 +1,10 @@ ---- gst/gstthreaddummy.c.orig Sat Aug 30 19:30:10 2003 -+++ gst/gstthreaddummy.c Sat Aug 30 19:30:34 2003 -@@ -17,7 +17,9 @@ +--- gst/gstthreaddummy.c.orig Mon Jun 30 14:31:13 2003 ++++ gst/gstthreaddummy.c Fri Nov 14 15:36:22 2003 +@@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ +#include <sys/types.h> + #include <unistd.h> #include <sys/time.h> -+#include <unistd.h> #include <glib.h> - #include "gstlog.h" - diff --git a/multimedia/gstreamer80/files/patch-libs::ext::cothreads::cothreads::cothreads.c b/multimedia/gstreamer80/files/patch-libs::ext::cothreads::cothreads::cothreads.c deleted file mode 100644 index e0e229f..0000000 --- a/multimedia/gstreamer80/files/patch-libs::ext::cothreads::cothreads::cothreads.c +++ /dev/null @@ -1,19 +0,0 @@ ---- libs/ext/cothreads/cothreads/cothreads.c.orig Sat Feb 1 16:09:23 2003 -+++ libs/ext/cothreads/cothreads/cothreads.c Mon Mar 17 13:33:43 2003 -@@ -22,6 +22,7 @@ - - #include "pth_p.h" /* this pulls in everything */ - #include <sys/mman.h> -+#include <sys/time.h> - #include <sys/resource.h> - #include <stdlib.h> - -@@ -422,7 +423,7 @@ - *stack = malloc (_cothreads_chunk_size * (1.0 + 1.0/_cothreads_count)); - if (!stack) - return FALSE; -- *stack = (void*)((int)*stack &~ (int)(_cothreads_chunk_size / _cothreads_count - 1)); -+ *stack = (void*)((intptr_t)*stack &~ (intptr_t)(_cothreads_chunk_size / _cothreads_count - 1)); - *stack += 1; - #endif - diff --git a/multimedia/gstreamer80/files/patch-libs::ext::cothreads::tests::Makefile.in b/multimedia/gstreamer80/files/patch-libs::ext::cothreads::tests::Makefile.in deleted file mode 100644 index 4470b93..0000000 --- a/multimedia/gstreamer80/files/patch-libs::ext::cothreads::tests::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/ext/cothreads/tests/Makefile.in.orig Mon Oct 13 15:10:38 2003 -+++ libs/ext/cothreads/tests/Makefile.in Mon Oct 13 15:11:13 2003 -@@ -83,7 +83,7 @@ - GLIB_CFLAGS = @GLIB_CFLAGS@ - GLIB_LIBS = @GLIB_LIBS@ - GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ --GTHREAD_LIBS = @GTHREAD_LIBS@ -+GTHREAD_LIBS = -lc @GTHREAD_LIBS@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ diff --git a/multimedia/gstreamer80/files/patch-ltmain.sh b/multimedia/gstreamer80/files/patch-ltmain.sh index 284a2d7..9b5b1ec 100644 --- a/multimedia/gstreamer80/files/patch-ltmain.sh +++ b/multimedia/gstreamer80/files/patch-ltmain.sh @@ -1,15 +1,15 @@ ---- ltmain.sh.orig Mon Oct 13 14:17:09 2003 -+++ ltmain.sh Sat Feb 21 15:44:32 2004 -@@ -1075,7 +1075,7 @@ +--- ltmain.sh.orig Tue Oct 28 09:26:50 2003 ++++ ltmain.sh Sat Feb 21 15:30:25 2004 +@@ -1280,7 +1280,7 @@ esac - elif test "X$arg" = "X-lc_r"; then - case $host in + elif test "X$arg" = "X-lc_r"; then + case $host in - *-*-openbsd* | *-*-freebsd*) + *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1085,8 +1085,16 @@ + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1290,8 +1290,16 @@ continue ;; @@ -26,17 +26,17 @@ continue ;; -@@ -2503,6 +2511,9 @@ - *-*-openbsd* | *-*-freebsd*) - # Do not include libc due to us having libc/libc_r. +@@ -3000,6 +3008,9 @@ + # problems, so we reset it completely + verstring= ;; + *-*-freebsd*) + # FreeBSD doesn't need this... + ;; *) - # Add libc to deplibs on all other systems if necessary. - if test $build_libtool_need_lc = "yes"; then -@@ -4330,10 +4341,12 @@ + verstring="0.0" + ;; +@@ -5428,10 +5439,12 @@ fi # Install the pseudo-library for information purposes. diff --git a/multimedia/gstreamer80/pkg-plist b/multimedia/gstreamer80/pkg-plist index bb84002..1e43cd5 100644 --- a/multimedia/gstreamer80/pkg-plist +++ b/multimedia/gstreamer80/pkg-plist @@ -1,13 +1,23 @@ -@unexec %D/bin/gst-register 2>/dev/null || true bin/gst-complete +bin/gst-complete-%%VERSION%% bin/gst-compprep +bin/gst-compprep-%%VERSION%% bin/gst-feedback +bin/gst-feedback-%%VERSION%% bin/gst-inspect +bin/gst-inspect-%%VERSION%% bin/gst-launch +bin/gst-launch-%%VERSION%% bin/gst-md5sum +bin/gst-md5sum-%%VERSION%% bin/gst-register +bin/gst-register-%%VERSION%% bin/gst-typefind +bin/gst-typefind-%%VERSION%% +bin/gst-xmlinspect +bin/gst-xmlinspect-%%VERSION%% bin/gst-xmllaunch +bin/gst-xmllaunch-%%VERSION%% include/gstreamer-%%VERSION%%/gst/bytestream/bytestream.h include/gstreamer-%%VERSION%%/gst/control/control.h include/gstreamer-%%VERSION%%/gst/control/dparam.h @@ -19,10 +29,8 @@ 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 @@ -31,11 +39,13 @@ 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/gsterror.h include/gstreamer-%%VERSION%%/gst/gstevent.h -include/gstreamer-%%VERSION%%/gst/gstextratypes.h +include/gstreamer-%%VERSION%%/gst/gstfilter.h include/gstreamer-%%VERSION%%/gst/gstformat.h include/gstreamer-%%VERSION%%/gst/gstindex.h include/gstreamer-%%VERSION%%/gst/gstinfo.h +include/gstreamer-%%VERSION%%/gst/gstinterface.h include/gstreamer-%%VERSION%%/gst/gstlog.h include/gstreamer-%%VERSION%%/gst/gstmacros.h include/gstreamer-%%VERSION%%/gst/gstmarshal.h @@ -47,28 +57,28 @@ 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/gstregistrypool.h include/gstreamer-%%VERSION%%/gst/gstscheduler.h +include/gstreamer-%%VERSION%%/gst/gststructure.h include/gstreamer-%%VERSION%%/gst/gstsystemclock.h +include/gstreamer-%%VERSION%%/gst/gsttag.h +include/gstreamer-%%VERSION%%/gst/gsttaginterface.h include/gstreamer-%%VERSION%%/gst/gstthread.h include/gstreamer-%%VERSION%%/gst/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/gsturitype.h include/gstreamer-%%VERSION%%/gst/gstutils.h +include/gstreamer-%%VERSION%%/gst/gstvalue.h include/gstreamer-%%VERSION%%/gst/gstversion.h include/gstreamer-%%VERSION%%/gst/gstxml.h -include/gstreamer-%%VERSION%%/gst/putbits/putbits.h -lib/gstreamer-%%VERSION%%/libgstautoplugcache.so -lib/gstreamer-%%VERSION%%/libgstautoplugger.so lib/gstreamer-%%VERSION%%/libgstbasicgthreadscheduler.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 @@ -76,12 +86,7 @@ lib/gstreamer-%%VERSION%%/libgstindexers.so lib/gstreamer-%%VERSION%%/libgstoptgthreadscheduler.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%% @@ -91,11 +96,18 @@ lib/libgstreamer-%%VERSION%%.so.%%SHLIB_VERSION%% libdata/pkgconfig/gstreamer-%%VERSION%%.pc libdata/pkgconfig/gstreamer-control-%%VERSION%%.pc share/aclocal/gst-element-check-%%VERSION%%.m4 +share/locale/fr/LC_MESSAGES/gstreamer-%%VERSION%%.mo +share/locale/nl/LC_MESSAGES/gstreamer-%%VERSION%%.mo +share/locale/sr/LC_MESSAGES/gstreamer-%%VERSION%%.mo @unexec rm %D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true +@dirrm share/gnome/doc/gstreamer-%%VERSION%%.0/pwg +@dirrm share/gnome/doc/gstreamer-%%VERSION%%.0/manual +@dirrm share/gnome/doc/gstreamer-%%VERSION%%.0/faq +@dirrm share/gnome/doc/gstreamer-%%VERSION%%.0 @dirrm share/gnome/cache/gstreamer-%%VERSION%% @unexec rmdir %D/share/gnome/cache 2>/dev/null || true @dirrm lib/gstreamer-%%VERSION%% -@dirrm include/gstreamer-%%VERSION%%/gst/putbits +@dirrm include/gstreamer-%%VERSION%%/gst/tag @dirrm include/gstreamer-%%VERSION%%/gst/getbits @dirrm include/gstreamer-%%VERSION%%/gst/control @dirrm include/gstreamer-%%VERSION%%/gst/bytestream diff --git a/multimedia/nautilus-media/Makefile b/multimedia/nautilus-media/Makefile index 429f587..5d2c4f9 100644 --- a/multimedia/nautilus-media/Makefile +++ b/multimedia/nautilus-media/Makefile @@ -6,10 +6,11 @@ # PORTNAME= nautilus-media -PORTVERSION= 0.3.4 +PORTVERSION= 0.8.0 +PORTREVISION= 1 CATEGORIES= multimedia gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.3 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.8 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -19,7 +20,7 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack lthack intlhack nautilus2 gstreamerplugins +USE_GNOME= gnomeprefix gnomehack intlhack lthack nautilus2 gstreamerplugins USE_LIBTOOL_VER=13 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/multimedia/nautilus-media/distinfo b/multimedia/nautilus-media/distinfo index 8227812..c22a3f7 100644 --- a/multimedia/nautilus-media/distinfo +++ b/multimedia/nautilus-media/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/nautilus-media-0.3.4.tar.bz2) = da00eaa7c47bb1685b7c320f8d9afeba -SIZE (gnome2/nautilus-media-0.3.4.tar.bz2) = 383338 +MD5 (gnome2/nautilus-media-0.8.0.tar.bz2) = 78b2cdc9146af482cac52a549440e1ca +SIZE (gnome2/nautilus-media-0.8.0.tar.bz2) = 411161 diff --git a/multimedia/nautilus-media/pkg-descr b/multimedia/nautilus-media/pkg-descr index c751c58..c8ad326 100644 --- a/multimedia/nautilus-media/pkg-descr +++ b/multimedia/nautilus-media/pkg-descr @@ -1,2 +1,2 @@ -Nautilus-media is a GStreamer-based multimedia support for Nautilus, including -an awesome new music view and video thumbnailing. +Nautilus-media provides GStreamer-based multimedia support within +Nautilus, including music previewing and video thumbnailing. diff --git a/multimedia/nautilus-media/pkg-plist b/multimedia/nautilus-media/pkg-plist index 1a32de5..907b600 100644 --- a/multimedia/nautilus-media/pkg-plist +++ b/multimedia/nautilus-media/pkg-plist @@ -1,10 +1,20 @@ bin/gst-thumbnail +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-shockwave-flash/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@mpeg/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@quicktime/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-avi/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-fli/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-ms-asf/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-ms-wmv/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-msvideo/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-shockwave-flash/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@mpeg/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@quicktime/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-avi/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-fli/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-ms-asf/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-ms-wmv/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-msvideo/%gconf.xml etc/gconf/schemas/gst-thumbnail.schemas lib/bonobo/libnautilus-audio-properties-view.so libdata/bonobo/servers/Nautilus_View_audio.server @@ -19,6 +29,7 @@ share/gnome/pixmaps/nautilus-media/prev.png share/gnome/pixmaps/nautilus-media/scan.png share/gnome/pixmaps/nautilus-media/stop.png share/locale/am/LC_MESSAGES/nautilus-media.mo +share/locale/ar/LC_MESSAGES/nautilus-media.mo share/locale/az/LC_MESSAGES/nautilus-media.mo share/locale/be/LC_MESSAGES/nautilus-media.mo share/locale/bg/LC_MESSAGES/nautilus-media.mo @@ -26,9 +37,10 @@ share/locale/bn/LC_MESSAGES/nautilus-media.mo share/locale/ca/LC_MESSAGES/nautilus-media.mo share/locale/cs/LC_MESSAGES/nautilus-media.mo share/locale/cy/LC_MESSAGES/nautilus-media.mo -share/locale/de/LC_MESSAGES/nautilus-media.mo share/locale/da/LC_MESSAGES/nautilus-media.mo +share/locale/de/LC_MESSAGES/nautilus-media.mo share/locale/el/LC_MESSAGES/nautilus-media.mo +share/locale/en_GB/LC_MESSAGES/nautilus-media.mo share/locale/es/LC_MESSAGES/nautilus-media.mo share/locale/et/LC_MESSAGES/nautilus-media.mo share/locale/eu/LC_MESSAGES/nautilus-media.mo @@ -38,6 +50,7 @@ share/locale/fr/LC_MESSAGES/nautilus-media.mo share/locale/ga/LC_MESSAGES/nautilus-media.mo share/locale/he/LC_MESSAGES/nautilus-media.mo share/locale/hi/LC_MESSAGES/nautilus-media.mo +share/locale/hr/LC_MESSAGES/nautilus-media.mo share/locale/hu/LC_MESSAGES/nautilus-media.mo share/locale/id/LC_MESSAGES/nautilus-media.mo share/locale/is/LC_MESSAGES/nautilus-media.mo @@ -52,7 +65,9 @@ share/locale/ml/LC_MESSAGES/nautilus-media.mo share/locale/mn/LC_MESSAGES/nautilus-media.mo share/locale/ms/LC_MESSAGES/nautilus-media.mo share/locale/nl/LC_MESSAGES/nautilus-media.mo +share/locale/nn/LC_MESSAGES/nautilus-media.mo share/locale/no/LC_MESSAGES/nautilus-media.mo +share/locale/pa/LC_MESSAGES/nautilus-media.mo share/locale/pl/LC_MESSAGES/nautilus-media.mo share/locale/pt/LC_MESSAGES/nautilus-media.mo share/locale/pt_BR/LC_MESSAGES/nautilus-media.mo @@ -72,9 +87,19 @@ share/locale/vi/LC_MESSAGES/nautilus-media.mo share/locale/zh_CN/LC_MESSAGES/nautilus-media.mo share/locale/zh_TW/LC_MESSAGES/nautilus-media.mo @dirrm share/gnome/pixmaps/nautilus-media +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-msvideo +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-ms-wmv +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-ms-asf @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-fli @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-avi +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@quicktime @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@mpeg +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-shockwave-flash +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-msvideo +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-ms-wmv +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-ms-asf @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-fli @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@x-avi +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@quicktime @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/video@mpeg +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-shockwave-flash |