diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2004-01-03 16:30:48 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2004-01-03 16:30:48 +0000 |
| commit | 1b6e25e93a9911f162e5805930d63da7e77bd2e8 (patch) | |
| tree | 4d410da0d27df802029da174f8096fe2569a1b30 /multimedia | |
| parent | b552881a54aced9b879a29f78da0d0ba7b861fac (diff) | |
Notes
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/vlc-devel/Makefile | 24 | ||||
| -rw-r--r-- | multimedia/vlc-devel/pkg-plist | 2 | ||||
| -rw-r--r-- | multimedia/vlc/Makefile | 24 | ||||
| -rw-r--r-- | multimedia/vlc/pkg-plist | 2 |
4 files changed, 44 insertions, 8 deletions
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile index 4d4fefbddcbd..6be3d552e493 100644 --- a/multimedia/vlc-devel/Makefile +++ b/multimedia/vlc-devel/Makefile @@ -7,9 +7,9 @@ PORTNAME= vlc PORTVERSION= 0.6.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia -MASTER_SITES= http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/ +MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ MAINTAINER= dinoex@FreeBSD.org COMMENT= An X11 video streaming client/server solution @@ -26,6 +26,9 @@ LIB_DEPENDS= dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \ faad.0:${PORTSDIR}/audio/faad \ wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \ slp.1:${PORTSDIR}/net/openslp +.if defined(WITH_LIBDVBPSI) +LIB_DEPENDS+= dvbpsi.3:${PORTSDIR}/multimedia/libdvbpsi +.endif # After libmpeg2 release 0.3.2 # mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \ @@ -46,7 +49,6 @@ CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \ --with-dvdread=${LOCALBASE} \ --with-mad=${LOCALBASE} \ --with-faad=${LOCALBASE} \ - --disable-dvbpsi \ --with-a52=${LOCALBASE} \ --enable-ffmpeg \ --with-ffmpeg=${LOCALBASE} \ @@ -55,7 +57,21 @@ CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \ --without-libintl-prefix \ --without-libiconv-prefix \ +.if defined(WITH_LIBDVBPSI) +CONFIGURE_ARGS+= --with-dvbpsi=${LOCALBASE} +PLIST_SUB+= LIBDVBPSI="" +.else +CONFIGURE_ARGS+= --disable-dvbpsi +PLIST_SUB+= LIBDVBPSI="@comment " +.endif + post-patch: @${REINPLACE_CMD} -e 's/-lc_r/${PTHREAD_LIBS}/' ${WRKSRC}/configure -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 500000 +CONFIGURE_ENV+= LIBS="-L/usr/lib -lcipher" +.endif + +.include <bsd.port.post.mk> diff --git a/multimedia/vlc-devel/pkg-plist b/multimedia/vlc-devel/pkg-plist index 713dc928e654..cbade432ae91 100644 --- a/multimedia/vlc-devel/pkg-plist +++ b/multimedia/vlc-devel/pkg-plist @@ -85,6 +85,7 @@ lib/vlc/demux/libmpga_plugin.so lib/vlc/demux/libogg_plugin.so lib/vlc/demux/libps_plugin.so lib/vlc/demux/librawdv_plugin.so +%%LIBDVBPSI%%lib/vlc/demux/libts_dvbpsi_plugin.so lib/vlc/demux/libts_plugin.so lib/vlc/demux/libwav_plugin.so lib/vlc/gui/libgtk_plugin.so @@ -113,6 +114,7 @@ lib/vlc/mux/libmux_dummy_plugin.so lib/vlc/mux/libmux_mp4_plugin.so lib/vlc/mux/libmux_ogg_plugin.so lib/vlc/mux/libmux_ps_plugin.so +%%LIBDVBPSI%%lib/vlc/mux/libmux_ts_dvbpsi_plugin.so lib/vlc/mux/libmux_ts_plugin.so lib/vlc/packetizer/libpacketizer_a52_plugin.so lib/vlc/packetizer/libpacketizer_copy_plugin.so diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 4d4fefbddcbd..6be3d552e493 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -7,9 +7,9 @@ PORTNAME= vlc PORTVERSION= 0.6.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia -MASTER_SITES= http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/ +MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ MAINTAINER= dinoex@FreeBSD.org COMMENT= An X11 video streaming client/server solution @@ -26,6 +26,9 @@ LIB_DEPENDS= dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \ faad.0:${PORTSDIR}/audio/faad \ wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \ slp.1:${PORTSDIR}/net/openslp +.if defined(WITH_LIBDVBPSI) +LIB_DEPENDS+= dvbpsi.3:${PORTSDIR}/multimedia/libdvbpsi +.endif # After libmpeg2 release 0.3.2 # mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \ @@ -46,7 +49,6 @@ CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \ --with-dvdread=${LOCALBASE} \ --with-mad=${LOCALBASE} \ --with-faad=${LOCALBASE} \ - --disable-dvbpsi \ --with-a52=${LOCALBASE} \ --enable-ffmpeg \ --with-ffmpeg=${LOCALBASE} \ @@ -55,7 +57,21 @@ CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \ --without-libintl-prefix \ --without-libiconv-prefix \ +.if defined(WITH_LIBDVBPSI) +CONFIGURE_ARGS+= --with-dvbpsi=${LOCALBASE} +PLIST_SUB+= LIBDVBPSI="" +.else +CONFIGURE_ARGS+= --disable-dvbpsi +PLIST_SUB+= LIBDVBPSI="@comment " +.endif + post-patch: @${REINPLACE_CMD} -e 's/-lc_r/${PTHREAD_LIBS}/' ${WRKSRC}/configure -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 500000 +CONFIGURE_ENV+= LIBS="-L/usr/lib -lcipher" +.endif + +.include <bsd.port.post.mk> diff --git a/multimedia/vlc/pkg-plist b/multimedia/vlc/pkg-plist index 713dc928e654..cbade432ae91 100644 --- a/multimedia/vlc/pkg-plist +++ b/multimedia/vlc/pkg-plist @@ -85,6 +85,7 @@ lib/vlc/demux/libmpga_plugin.so lib/vlc/demux/libogg_plugin.so lib/vlc/demux/libps_plugin.so lib/vlc/demux/librawdv_plugin.so +%%LIBDVBPSI%%lib/vlc/demux/libts_dvbpsi_plugin.so lib/vlc/demux/libts_plugin.so lib/vlc/demux/libwav_plugin.so lib/vlc/gui/libgtk_plugin.so @@ -113,6 +114,7 @@ lib/vlc/mux/libmux_dummy_plugin.so lib/vlc/mux/libmux_mp4_plugin.so lib/vlc/mux/libmux_ogg_plugin.so lib/vlc/mux/libmux_ps_plugin.so +%%LIBDVBPSI%%lib/vlc/mux/libmux_ts_dvbpsi_plugin.so lib/vlc/mux/libmux_ts_plugin.so lib/vlc/packetizer/libpacketizer_a52_plugin.so lib/vlc/packetizer/libpacketizer_copy_plugin.so |