diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-03-17 14:27:36 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-03-17 14:27:36 +0800 |
commit | 2cbca25c996139f79fbca6f1b731fb76b3eccbb2 (patch) | |
tree | 6cf9cf896b6220a934c33ba636a2c3383ec8ea48 /multimedia | |
parent | be5ecbe2358e7dfb46c58279b52ba84d0d7e75c8 (diff) | |
download | marcuscom-ports-2cbca25c996139f79fbca6f1b731fb76b3eccbb2.tar marcuscom-ports-2cbca25c996139f79fbca6f1b731fb76b3eccbb2.tar.gz marcuscom-ports-2cbca25c996139f79fbca6f1b731fb76b3eccbb2.tar.bz2 marcuscom-ports-2cbca25c996139f79fbca6f1b731fb76b3eccbb2.tar.lz marcuscom-ports-2cbca25c996139f79fbca6f1b731fb76b3eccbb2.tar.xz marcuscom-ports-2cbca25c996139f79fbca6f1b731fb76b3eccbb2.tar.zst marcuscom-ports-2cbca25c996139f79fbca6f1b731fb76b3eccbb2.zip |
Update to 0.8.0.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2110 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/gstreamer-plugins/Makefile | 94 | ||||
-rw-r--r-- | multimedia/gstreamer-plugins/distinfo | 4 | ||||
-rw-r--r-- | multimedia/gstreamer-plugins/files/patch-configure | 16 | ||||
-rw-r--r-- | multimedia/gstreamer-plugins/files/patch-sys_ximage_ximagesink.h | 10 | ||||
-rw-r--r-- | multimedia/gstreamer-plugins/files/patch-sys_xvimage_xvimagesink.h | 10 | ||||
-rw-r--r-- | multimedia/gstreamer-plugins/pkg-plist | 19 | ||||
-rw-r--r-- | multimedia/gstreamer-plugins80/Makefile | 94 | ||||
-rw-r--r-- | multimedia/gstreamer-plugins80/distinfo | 4 | ||||
-rw-r--r-- | multimedia/gstreamer-plugins80/files/patch-configure | 16 | ||||
-rw-r--r-- | multimedia/gstreamer-plugins80/files/patch-sys_ximage_ximagesink.h | 10 | ||||
-rw-r--r-- | multimedia/gstreamer-plugins80/files/patch-sys_xvimage_xvimagesink.h | 10 | ||||
-rw-r--r-- | multimedia/gstreamer-plugins80/pkg-plist | 19 |
12 files changed, 246 insertions, 60 deletions
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index 647c56aaf..1a53fd2a0 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -6,10 +6,11 @@ # PORTNAME= gstreamer -PORTVERSION= 0.7.6 +PORTVERSION= 0.8.0 CATEGORIES= multimedia audio -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gst-plugins/0.7 +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 @@ -17,7 +18,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= lioux@FreeBSD.org COMMENT= GStreamer written collection of plugins handling several media types -LIB_DEPENDS= gstreamer-0.8.0:${PORTSDIR}/multimedia/gstreamer \ +LIB_DEPENDS= gstreamer-0.8.1:${PORTSDIR}/multimedia/gstreamer \ popt.0:${PORTSDIR}/devel/popt USE_X_PREFIX= yes @@ -50,8 +51,6 @@ CONFIGURE_ARGS= --disable-tests \ # probable the lib needs to be ported, disable them for now. CONFIGURE_ARGS+=--disable-mas \ --disable-faac \ - --disable-jack \ - --disable-nas \ --disable-tarkin \ --disable-lcs \ --disable-mplex \ @@ -71,15 +70,14 @@ INSTALLS_SHLIB= yes # for various GNOME-related component detection WANT_GNOME= yes -MAN1= gst-launch-ext-0.7.1 gst-visualise-0.7.1 +MAN1= gst-launch-ext-${GST_VERSION}.1 gst-visualise-${GST_VERSION}.1 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config" SDL_CONFIG?="${LOCALBASE}/bin/sdl11-config" -VERSION=0.8.0 -GST_VERSION=${VERSION:C/..$//} +GST_VERSION=${PORTVERSION:C/..$//} # library minor number -SHLIB_VERSION= 0 +SHLIB_VERSION= 1 post-patch: # as of this writing, FreeBSD does not support lrint* C99 math functions @@ -178,6 +176,11 @@ 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 @@ -273,6 +276,11 @@ WITH_LIBTHEORA=yes WITH_MAD=yes .endif +# nas +.if exists(${X11BASE}/lib/libaudio.a) +WITH_NAS=YES +.endif + # ogg .if exists(${LOCALBASE}/lib/libogg.a) WITH_OGG=yes @@ -318,6 +326,12 @@ WITH_VORBIS=yes 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 @@ -435,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 @@ -581,15 +604,13 @@ PLIST_SUB+= LIBMPEG2="" .endif # libmusicbrainz -# the musicbrainz people need to release a new version to get this to work -# .ifndef(WITH_LIBMUSICBRAINZ) +.ifndef(WITH_LIBMUSICBRAINZ) CONFIGURE_ARGS+= --disable-musicbrainz -.undef WITH_LIBMUSICBRAINZ -#PLIST_SUB+= LIBMUSICBRAINZ="@comment " -#.else -#LIB_DEPENDS+= libmusicbrainz.3:${PORTSDIR}/audio/libmusicbrainz -#PLIST_SUB+= LIBMUSICBRAINZ="" -#.endif +PLIST_SUB+= LIBMUSICBRAINZ="@comment " +.else +LIB_DEPENDS+= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz +PLIST_SUB+= LIBMUSICBRAINZ="" +.endif # libshout .ifndef(WITH_LIBSHOUT) @@ -640,6 +661,16 @@ LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad \ PLIST_SUB+= LIBMAD="" .endif +# nas +.ifndef(WITH_NAS) +CONFIGURE_ARGS+= --disable-nas +PLIST_SUB+= NAS="@comment " +.else +LIB_DEPENDS+= audio.2:${PORTSDIR}/audio/nas + +PLIST_SUB+= NAS="" +.endif + # ogg .ifndef(WITH_OGG) CONFIGURE_ARGS+= --disable-ogg \ @@ -683,7 +714,7 @@ CONFIGURE_ARGS+= --disable-sdl \ --disable-sdltest PLIST_SUB+= SDL="@comment " .else -LIB_DEPENDS+= SDL-1.1.5:${PORTSDIR}/devel/sdl12 +LIB_DEPENDS+= SDL-1.1.7:${PORTSDIR}/devel/sdl12 CONFIGURE_ARGS+= --with-sdl-prefix=${LOCALBASE} \ --with-sdl-exec-prefix=${LOCALBASE} @@ -743,6 +774,17 @@ LIB_DEPENDS+= vorbisidec.1:${PORTSDIR}/audio/libtremor PLIST_SUB+= IVORBIS="" .endif +# xine +.ifndef(WITH_XINE) +CONFIGURE_ARGS+= --disable-xine +PLIST_SUB+= XINE="@comment " +.else +CONFIGURE_ARGS+= --enable-xine +LIB_DEPENDS+= xine.9:${PORTSDIR}/multimedia/libxine + +PLIST_SUB+= XINE="" +.endif + # xvid .ifndef(WITH_XVID) CONFIGURE_ARGS+= --disable-xvid @@ -797,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' @@ -877,6 +923,10 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_MAD to enable mad Audio plugin' .endif +.ifndef(WITH_NAS) + @${ECHO_MSG} '===>' + @${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' @@ -913,9 +963,13 @@ pre-everything:: @${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_XVID to enable xvid Video plgin' + @${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 722a263c2..75cdec26d 100644 --- a/multimedia/gstreamer-plugins/distinfo +++ b/multimedia/gstreamer-plugins/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gst-plugins-0.7.6.tar.bz2) = e1ef1d326e644d85e3a3a125cd06fec9 -SIZE (gnome2/gst-plugins-0.7.6.tar.bz2) = 1740592 +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/patch-configure b/multimedia/gstreamer-plugins/files/patch-configure index de19ee0c6..e2987f982 100644 --- a/multimedia/gstreamer-plugins/files/patch-configure +++ b/multimedia/gstreamer-plugins/files/patch-configure @@ -1,6 +1,16 @@ ---- configure.orig Wed Feb 11 19:13:23 2004 -+++ configure Wed Feb 11 19:13:58 2004 -@@ -44295,7 +44295,7 @@ +--- 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 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 000000000..07b125bfe --- /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_xvimage_xvimagesink.h b/multimedia/gstreamer-plugins/files/patch-sys_xvimage_xvimagesink.h new file mode 100644 index 000000000..ddb0d1f00 --- /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 3b863fbe2..e35f5c93b 100644 --- a/multimedia/gstreamer-plugins/pkg-plist +++ b/multimedia/gstreamer-plugins/pkg-plist @@ -1,5 +1,5 @@ -bin/gst-launch-ext-0.7 -bin/gst-visualise-0.7 +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/%%VERSION%%/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%%VERSION%%/default/%gconf.xml @@ -67,6 +67,7 @@ lib/gstreamer-%%VERSION%%/libgsteffectv.so %%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesd.so %%FAAD%%lib/gstreamer-%%VERSION%%/libgstfaad.so lib/gstreamer-%%VERSION%%/libgstfestival.so +lib/gstreamer-%%VERSION%%/libgstffmpegcolorspace.so lib/gstreamer-%%VERSION%%/libgstfilter.so %%FLAC%%lib/gstreamer-%%VERSION%%/libgstflac.so lib/gstreamer-%%VERSION%%/libgstflxdec.so @@ -79,7 +80,8 @@ lib/gstreamer-%%VERSION%%/libgstgoom.so %%HTTP%%lib/gstreamer-%%VERSION%%/libgsthttpsrc.so lib/gstreamer-%%VERSION%%/libgstidct.so lib/gstreamer-%%VERSION%%/libgstinterleave.so -%%IVORBIS%%lib/gstreamer-0.7/libgstivorbis.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 @@ -101,6 +103,7 @@ lib/gstreamer-%%VERSION%%/libgstmpegaudio.so lib/gstreamer-%%VERSION%%/libgstmpegaudioparse.so lib/gstreamer-%%VERSION%%/libgstmpegstream.so lib/gstreamer-%%VERSION%%/libgstmulaw.so +%%NAS%%lib/gstreamer-%%VERSION%%/libgstnassink.so lib/gstreamer-%%VERSION%%/libgstnavigationtest.so %%OGG%%lib/gstreamer-%%VERSION%%/libgstogg.so lib/gstreamer-%%VERSION%%/libgstoverlay.so @@ -116,6 +119,7 @@ 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 @@ -123,7 +127,7 @@ lib/gstreamer-%%VERSION%%/libgstsinesrc.so lib/gstreamer-%%VERSION%%/libgstsmooth.so lib/gstreamer-%%VERSION%%/libgstsmpte.so %%PNG%%lib/gstreamer-%%VERSION%%/libgstsnapshot.so -%%LIBSNDFILE%%lib/gstreamer-0.7/libgstsndfile.so +%%LIBSNDFILE%%lib/gstreamer-%%VERSION%%/libgstsndfile.so lib/gstreamer-%%VERSION%%/libgstspectrum.so lib/gstreamer-%%VERSION%%/libgstspeed.so %%SPEEX%%lib/gstreamer-%%VERSION%%/libgstspeex.so @@ -136,6 +140,7 @@ 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 @@ -153,6 +158,7 @@ lib/gstreamer-%%VERSION%%/libgstvolume.so lib/gstreamer-%%VERSION%%/libgstwavenc.so lib/gstreamer-%%VERSION%%/libgstwavparse.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 @@ -165,15 +171,18 @@ 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 diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile index 647c56aaf..1a53fd2a0 100644 --- a/multimedia/gstreamer-plugins80/Makefile +++ b/multimedia/gstreamer-plugins80/Makefile @@ -6,10 +6,11 @@ # PORTNAME= gstreamer -PORTVERSION= 0.7.6 +PORTVERSION= 0.8.0 CATEGORIES= multimedia audio -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gst-plugins/0.7 +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 @@ -17,7 +18,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= lioux@FreeBSD.org COMMENT= GStreamer written collection of plugins handling several media types -LIB_DEPENDS= gstreamer-0.8.0:${PORTSDIR}/multimedia/gstreamer \ +LIB_DEPENDS= gstreamer-0.8.1:${PORTSDIR}/multimedia/gstreamer \ popt.0:${PORTSDIR}/devel/popt USE_X_PREFIX= yes @@ -50,8 +51,6 @@ CONFIGURE_ARGS= --disable-tests \ # probable the lib needs to be ported, disable them for now. CONFIGURE_ARGS+=--disable-mas \ --disable-faac \ - --disable-jack \ - --disable-nas \ --disable-tarkin \ --disable-lcs \ --disable-mplex \ @@ -71,15 +70,14 @@ INSTALLS_SHLIB= yes # for various GNOME-related component detection WANT_GNOME= yes -MAN1= gst-launch-ext-0.7.1 gst-visualise-0.7.1 +MAN1= gst-launch-ext-${GST_VERSION}.1 gst-visualise-${GST_VERSION}.1 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config" SDL_CONFIG?="${LOCALBASE}/bin/sdl11-config" -VERSION=0.8.0 -GST_VERSION=${VERSION:C/..$//} +GST_VERSION=${PORTVERSION:C/..$//} # library minor number -SHLIB_VERSION= 0 +SHLIB_VERSION= 1 post-patch: # as of this writing, FreeBSD does not support lrint* C99 math functions @@ -178,6 +176,11 @@ 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 @@ -273,6 +276,11 @@ WITH_LIBTHEORA=yes WITH_MAD=yes .endif +# nas +.if exists(${X11BASE}/lib/libaudio.a) +WITH_NAS=YES +.endif + # ogg .if exists(${LOCALBASE}/lib/libogg.a) WITH_OGG=yes @@ -318,6 +326,12 @@ WITH_VORBIS=yes 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 @@ -435,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 @@ -581,15 +604,13 @@ PLIST_SUB+= LIBMPEG2="" .endif # libmusicbrainz -# the musicbrainz people need to release a new version to get this to work -# .ifndef(WITH_LIBMUSICBRAINZ) +.ifndef(WITH_LIBMUSICBRAINZ) CONFIGURE_ARGS+= --disable-musicbrainz -.undef WITH_LIBMUSICBRAINZ -#PLIST_SUB+= LIBMUSICBRAINZ="@comment " -#.else -#LIB_DEPENDS+= libmusicbrainz.3:${PORTSDIR}/audio/libmusicbrainz -#PLIST_SUB+= LIBMUSICBRAINZ="" -#.endif +PLIST_SUB+= LIBMUSICBRAINZ="@comment " +.else +LIB_DEPENDS+= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz +PLIST_SUB+= LIBMUSICBRAINZ="" +.endif # libshout .ifndef(WITH_LIBSHOUT) @@ -640,6 +661,16 @@ LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad \ PLIST_SUB+= LIBMAD="" .endif +# nas +.ifndef(WITH_NAS) +CONFIGURE_ARGS+= --disable-nas +PLIST_SUB+= NAS="@comment " +.else +LIB_DEPENDS+= audio.2:${PORTSDIR}/audio/nas + +PLIST_SUB+= NAS="" +.endif + # ogg .ifndef(WITH_OGG) CONFIGURE_ARGS+= --disable-ogg \ @@ -683,7 +714,7 @@ CONFIGURE_ARGS+= --disable-sdl \ --disable-sdltest PLIST_SUB+= SDL="@comment " .else -LIB_DEPENDS+= SDL-1.1.5:${PORTSDIR}/devel/sdl12 +LIB_DEPENDS+= SDL-1.1.7:${PORTSDIR}/devel/sdl12 CONFIGURE_ARGS+= --with-sdl-prefix=${LOCALBASE} \ --with-sdl-exec-prefix=${LOCALBASE} @@ -743,6 +774,17 @@ LIB_DEPENDS+= vorbisidec.1:${PORTSDIR}/audio/libtremor PLIST_SUB+= IVORBIS="" .endif +# xine +.ifndef(WITH_XINE) +CONFIGURE_ARGS+= --disable-xine +PLIST_SUB+= XINE="@comment " +.else +CONFIGURE_ARGS+= --enable-xine +LIB_DEPENDS+= xine.9:${PORTSDIR}/multimedia/libxine + +PLIST_SUB+= XINE="" +.endif + # xvid .ifndef(WITH_XVID) CONFIGURE_ARGS+= --disable-xvid @@ -797,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' @@ -877,6 +923,10 @@ pre-everything:: @${ECHO_MSG} '===>' @${ECHO_MSG} '===> Define WITH_MAD to enable mad Audio plugin' .endif +.ifndef(WITH_NAS) + @${ECHO_MSG} '===>' + @${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' @@ -913,9 +963,13 @@ pre-everything:: @${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_XVID to enable xvid Video plgin' + @${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 722a263c2..75cdec26d 100644 --- a/multimedia/gstreamer-plugins80/distinfo +++ b/multimedia/gstreamer-plugins80/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gst-plugins-0.7.6.tar.bz2) = e1ef1d326e644d85e3a3a125cd06fec9 -SIZE (gnome2/gst-plugins-0.7.6.tar.bz2) = 1740592 +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/patch-configure b/multimedia/gstreamer-plugins80/files/patch-configure index de19ee0c6..e2987f982 100644 --- a/multimedia/gstreamer-plugins80/files/patch-configure +++ b/multimedia/gstreamer-plugins80/files/patch-configure @@ -1,6 +1,16 @@ ---- configure.orig Wed Feb 11 19:13:23 2004 -+++ configure Wed Feb 11 19:13:58 2004 -@@ -44295,7 +44295,7 @@ +--- 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 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 000000000..07b125bfe --- /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_xvimage_xvimagesink.h b/multimedia/gstreamer-plugins80/files/patch-sys_xvimage_xvimagesink.h new file mode 100644 index 000000000..ddb0d1f00 --- /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 3b863fbe2..e35f5c93b 100644 --- a/multimedia/gstreamer-plugins80/pkg-plist +++ b/multimedia/gstreamer-plugins80/pkg-plist @@ -1,5 +1,5 @@ -bin/gst-launch-ext-0.7 -bin/gst-visualise-0.7 +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/%%VERSION%%/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/system/gstreamer/%%VERSION%%/default/%gconf.xml @@ -67,6 +67,7 @@ lib/gstreamer-%%VERSION%%/libgsteffectv.so %%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesd.so %%FAAD%%lib/gstreamer-%%VERSION%%/libgstfaad.so lib/gstreamer-%%VERSION%%/libgstfestival.so +lib/gstreamer-%%VERSION%%/libgstffmpegcolorspace.so lib/gstreamer-%%VERSION%%/libgstfilter.so %%FLAC%%lib/gstreamer-%%VERSION%%/libgstflac.so lib/gstreamer-%%VERSION%%/libgstflxdec.so @@ -79,7 +80,8 @@ lib/gstreamer-%%VERSION%%/libgstgoom.so %%HTTP%%lib/gstreamer-%%VERSION%%/libgsthttpsrc.so lib/gstreamer-%%VERSION%%/libgstidct.so lib/gstreamer-%%VERSION%%/libgstinterleave.so -%%IVORBIS%%lib/gstreamer-0.7/libgstivorbis.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 @@ -101,6 +103,7 @@ lib/gstreamer-%%VERSION%%/libgstmpegaudio.so lib/gstreamer-%%VERSION%%/libgstmpegaudioparse.so lib/gstreamer-%%VERSION%%/libgstmpegstream.so lib/gstreamer-%%VERSION%%/libgstmulaw.so +%%NAS%%lib/gstreamer-%%VERSION%%/libgstnassink.so lib/gstreamer-%%VERSION%%/libgstnavigationtest.so %%OGG%%lib/gstreamer-%%VERSION%%/libgstogg.so lib/gstreamer-%%VERSION%%/libgstoverlay.so @@ -116,6 +119,7 @@ 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 @@ -123,7 +127,7 @@ lib/gstreamer-%%VERSION%%/libgstsinesrc.so lib/gstreamer-%%VERSION%%/libgstsmooth.so lib/gstreamer-%%VERSION%%/libgstsmpte.so %%PNG%%lib/gstreamer-%%VERSION%%/libgstsnapshot.so -%%LIBSNDFILE%%lib/gstreamer-0.7/libgstsndfile.so +%%LIBSNDFILE%%lib/gstreamer-%%VERSION%%/libgstsndfile.so lib/gstreamer-%%VERSION%%/libgstspectrum.so lib/gstreamer-%%VERSION%%/libgstspeed.so %%SPEEX%%lib/gstreamer-%%VERSION%%/libgstspeex.so @@ -136,6 +140,7 @@ 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 @@ -153,6 +158,7 @@ lib/gstreamer-%%VERSION%%/libgstvolume.so lib/gstreamer-%%VERSION%%/libgstwavenc.so lib/gstreamer-%%VERSION%%/libgstwavparse.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 @@ -165,15 +171,18 @@ 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 |