diff options
-rw-r--r-- | multimedia/vlc-devel/Makefile | 94 | ||||
-rw-r--r-- | multimedia/vlc-devel/distinfo | 4 | ||||
-rw-r--r-- | multimedia/vlc-devel/pkg-plist | 93 | ||||
-rw-r--r-- | multimedia/vlc/Makefile | 94 | ||||
-rw-r--r-- | multimedia/vlc/distinfo | 4 | ||||
-rw-r--r-- | multimedia/vlc/pkg-plist | 93 |
6 files changed, 354 insertions, 28 deletions
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile index 2e2f20b80816..0c73411b6ac1 100644 --- a/multimedia/vlc-devel/Makefile +++ b/multimedia/vlc-devel/Makefile @@ -10,6 +10,8 @@ # WITH_ESOUND=yes # WITH_AALIB=yes # WITH_CDDB=yes +# WITH_DTS=yes +# WITH_FRIBIDI=yes # WITH_GGI=yes # WITH_LIBDVBPSI=yes # WITH_LIBID3TAG=yes @@ -17,15 +19,18 @@ # WITH_LIBMPEG2=yes # WITH_LIBTHEORA=yes # WITH_LIVEMEDIA=yes +# WITH_NCURSES=yes (ncurses interface) # WITH_SPEEX=yes # WITH_SVGALIB=yes # WITH_XOSD=yes +# WITH_XVID=yes # WITH_OPTIMIZED_CFLAGS=yes +# WITH_DVD_DEVICE=/dev/somedevice (5.x: default is acd0, 4:x default is acd0c) +# WITH_CDROM_DEVICE=/dev/somedevice # WITHOUT_LIBID3TAG=yes PORTNAME= vlc -PORTVERSION= 0.7.1 -PORTREVISION= 1 +PORTVERSION= 0.7.2 CATEGORIES= multimedia MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ PKGNAMESUFFIX?= ${GNOME_SUFFIX}${ESOUND_SUFFIX}${PKGNAMESUFFIX2} @@ -33,8 +38,7 @@ PKGNAMESUFFIX?= ${GNOME_SUFFIX}${ESOUND_SUFFIX}${PKGNAMESUFFIX2} MAINTAINER= dinoex@FreeBSD.org COMMENT= An X11 video streaming client/server solution -LIB_DEPENDS= dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \ - dvdread.3:${PORTSDIR}/multimedia/libdvdread \ +LIB_DEPENDS= dvdnav.3:${PORTSDIR}/multimedia/libdvdnav \ mad.2:${PORTSDIR}/audio/libmad \ avcodec.0:${PORTSDIR}/${FFMPEG_PORT} \ a52.0:${PORTSDIR}/audio/liba52 \ @@ -42,8 +46,10 @@ LIB_DEPENDS= dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \ FLAC.5:${PORTSDIR}/audio/flac \ faad.0:${PORTSDIR}/audio/faad \ wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \ - slp.1:${PORTSDIR}/net/openslp + slp.1:${PORTSDIR}/net/openslp \ + vcdinfo.0:${PORTSDIR}/multimedia/vcdimager +USE_BZIP2= yes USE_GETOPT_LONG=yes USE_GETTEXT= yes USE_GMAKE= yes @@ -52,7 +58,7 @@ USE_ICONV= yes USE_REINPLACE= yes USE_SDL= sdl USE_XLIB= yes -USE_GCC= 3.2 +USE_ICONV= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes @@ -68,10 +74,8 @@ CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \ --with-ffmpeg=${LOCALBASE} \ --disable-libcdio \ --disable-skins2 \ - --program-prefix="" \ - --without-libintl-prefix \ - --without-libiconv-prefix - + --without-libintl-prefix +CONFIGURE_TARGET+=-build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= vlc.1 \ vlc-config.1 @@ -82,6 +86,10 @@ LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> +.if ${OSVERSION} < 500000 +USE_GCC= 3.3 +.endif + .if defined(WITH_AUTODETECT) && !defined(BATCH) .if ${HAVE_GNOME:Mgnomelibs}!="" && !defined(WITHOUT_GNOME) @@ -100,6 +108,14 @@ WITH_AALIB= yes WITH_CDDB= yes .endif +.if exists(${LOCALBASE}/lib/libdts.a) && !defined(WITHOUT_DTS) +WITH_DTS= yes +.endif + +.if exists(${LOCALBASE}/bin/fribidi-config) && !defined(WITHOUT_FRIBIDI) +WITH_FRIBIDI= yes +.endif + .if exists(${LOCALBASE}/lib/libggi.so.2) && !defined(WITHOUT_GGI) WITH_GGI= yes .endif @@ -116,6 +132,10 @@ WITH_LIBTHEORA= yes WITH_LIVEMEDIA= yes .endif +.if exists(${LOCALBASE}/lib/libmatroska.a) && !defined(WITHOUT_LIBMATROSKA) +WITH_LIBMATROSKA=yes +.endif + .if exists(${LOCALBASE}/lib/libspeex.so.2) && !defined(WITHOUT_SPEEX) WITH_SPEEX= yes .endif @@ -128,6 +148,30 @@ WITH_SVGALIB= yes WITH_XOSD= yes .endif +.if exists(${LOCALBASE}/libxvidcore.so.2) && !defined(WITHOUT_XVID) +WITH_XVID= yes +.endif + +.endif + +.if defined(WITH_DVD_DEVICE) +DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE} +.else +.if ${OSVERSION} < 500000 +DEFAULT_DVD_DEVICE=/dev/acd0c +.else +DEFAULT_DVD_DEVICE=/dev/acd0 +.endif +.endif + +.if defined(WITH_CDROM_DEVICE) +DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE} +.else +.if ${OSVERSION} < 500000 +DEFAULT_CDROM_DEVICE=/dev/acd0c +.else +DEFAULT_CDROM_DEVICE=/dev/acd0 +.endif .endif .if defined(WITH_GNOME) && !defined(WITHOUT_GNOME) @@ -148,6 +192,11 @@ CONFIGURE_ARGS+=--enable-esd PLIST_FILES+= lib/vlc/audio_output/libesd_plugin.so .endif +.if defined(WITH_FRIBIDI) && !defined(WITHOUT_FRIBIDI) +LIB_DEPENDS+= fribidi.0:${PORTSDIR}/converters/fribidi +CONFIGURE_ARGS+=--enable-fribidi +.endif + .if !defined(WITHOUT_LIBID3TAG) LIB_DEPENDS+= id3tag.2:${PORTSDIR}/audio/libid3tag PLIST_FILES+= lib/vlc/demux/libid3tag_plugin.so @@ -165,6 +214,14 @@ CONFIGURE_ARGS+=--enable-libcddb CONFIGURE_ARGS+=--disable-libcddb .endif +.if defined(WITH_DTS) && !defined(WITHOUT_DTS) +BUILD_DEPENDS+= ${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts +CONFIGURE_ARGS+=--enable-dts +PLIST_FILES+= lib/vlc/audio_filter/libdtstofloat32_plugin.so +.else +CONFIGURE_ARGS+=--disable-dts +.endif + .if defined(WITH_GGI) && !defined(WITHOUT_GCI) LIB_DEPENDS+= ggi.2:${PORTSDIR}/graphics/libggi CONFIGURE_ARGS+=--enable-ggi @@ -189,6 +246,7 @@ PLIST_FILES+= lib/vlc/demux/libmkv_plugin.so .if defined(WITH_LIBMPEG2) && !defined(WITHOUT_LIBMPEG2) LIB_DEPENDS+= mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 CONFIGURE_ARGS+=--enable-libmpeg2 +PLIST_FILES+= lib/vlc/codec/liblibmpeg2_plugin.so .else CONFIGURE_ARGS+=--disable-libmpeg2 .endif @@ -207,6 +265,11 @@ CONFIGURE_ARGS+=--enable-livedotcom \ PLIST_FILES+= lib/vlc/liblivedotcom.a .endif +.if defined(WITH_NCURSES) && !defined(WITHOUT_NCURSES) +CONFIGURE_ARGS+=--enable-ncurses +PLIST_FILES+= lib/vlc/gui/libncurses_plugin.so +.endif + .if defined(WITH_SPEEX) && !defined(WITHOUT_SPEEX) LIB_DEPENDS+= speex.2:${PORTSDIR}/audio/speex CONFIGURE_ARGS+=--enable-speex @@ -226,6 +289,14 @@ LIB_DEPENDS+= xosd.4:${PORTSDIR}/misc/xosd CONFIGURE_ARGS+=--enable-xosd .endif +.if defined(WITH_XVID) && !defined(WITHOUT_XVID) +LIB_DEPENDS+= xvidcore.2:${PORTSDIR}/multimedia/xvid +CONFIGURE_ARGS+=--enable-xvideo +PLIST_FILES+= lib/vlc/video_output/libxvideo_plugin.so +.else +CONFIGURE_ARGS+=--disable-xvideo +.endif + .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O3 -ffast-math -fomit-frame-pointer .else @@ -266,6 +337,9 @@ post-patch: -e 's/-lc_r/${PTHREAD_LIBS}/' \ -e 's|postproc/postprocess.h|ffmpeg/postproc/postprocess.h|' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|; \ + s|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \ + ${WRKSRC}/include/vlc_config.h post-install: ${INSTALL_MAN} ${WRKSRC}/doc/vlc.1 ${MANPREFIX}/man/man1/ diff --git a/multimedia/vlc-devel/distinfo b/multimedia/vlc-devel/distinfo index a3211dbb3e2f..1639ad58b7fe 100644 --- a/multimedia/vlc-devel/distinfo +++ b/multimedia/vlc-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (vlc-0.7.1.tar.gz) = faa5e3162a3e9b3a3d8c3dcc06f70911 -SIZE (vlc-0.7.1.tar.gz) = 6102502 +MD5 (vlc-0.7.2.tar.bz2) = 3749fb3a0aed1372d4975a5b962e72cc +SIZE (vlc-0.7.2.tar.bz2) = 4516835 diff --git a/multimedia/vlc-devel/pkg-plist b/multimedia/vlc-devel/pkg-plist index d1cdb35218bc..a92b692da016 100644 --- a/multimedia/vlc-devel/pkg-plist +++ b/multimedia/vlc-devel/pkg-plist @@ -18,6 +18,7 @@ lib/vlc/access/libaccess_mms_plugin.so lib/vlc/access/libaccess_tcp_plugin.so lib/vlc/access/libaccess_udp_plugin.so lib/vlc/access/libcdda_plugin.so +lib/vlc/access/libcddax_plugin.so lib/vlc/access/libdvd_plugin.so lib/vlc/access/libdvdread_plugin.so lib/vlc/access/libslp_plugin.so @@ -58,6 +59,7 @@ lib/vlc/codec/liba52_plugin.so lib/vlc/codec/libadpcm_plugin.so lib/vlc/codec/libaraw_plugin.so lib/vlc/codec/libcinepak_plugin.so +lib/vlc/codec/libcmml_plugin.so lib/vlc/codec/libcvdsub_plugin.so lib/vlc/codec/libdts_plugin.so lib/vlc/codec/libdvbsub_plugin.so @@ -72,6 +74,7 @@ lib/vlc/control/libgestures_plugin.so lib/vlc/control/libhotkeys_plugin.so lib/vlc/control/libhttp_plugin.so lib/vlc/control/librc_plugin.so +lib/vlc/control/libtelnet_plugin.so lib/vlc/demux/libaiff_plugin.so lib/vlc/demux/liba52sys_plugin.so lib/vlc/demux/libaac_plugin.so @@ -82,6 +85,8 @@ lib/vlc/demux/libdemux2_plugin.so lib/vlc/demux/libdemuxdump_plugin.so lib/vlc/demux/libdemuxsub_plugin.so lib/vlc/demux/libdtssys_plugin.so +lib/vlc/demux/libdvdnav_plugin.so +lib/vlc/demux/libh264_plugin.so lib/vlc/demux/libid3_plugin.so lib/vlc/demux/libm3u_plugin.so lib/vlc/demux/libm4v_plugin.so @@ -97,6 +102,7 @@ lib/vlc/demux/libps2_plugin.so lib/vlc/demux/libpva_plugin.so lib/vlc/demux/librawdv_plugin.so lib/vlc/demux/libreal_plugin.so +lib/vlc/demux/libsgimb_plugin.so lib/vlc/demux/libts_plugin.so lib/vlc/demux/libwav_plugin.so lib/vlc/gui/libgtk_plugin.so @@ -107,7 +113,6 @@ lib/vlc/misc/libdummy_plugin.so lib/vlc/misc/libexport_plugin.so lib/vlc/misc/libfreetype_plugin.so lib/vlc/misc/libgtk_main_plugin.so -lib/vlc/misc/libhttpd_plugin.so lib/vlc/misc/libipv4_plugin.so lib/vlc/misc/libipv6_plugin.so lib/vlc/misc/liblogger_plugin.so @@ -122,6 +127,7 @@ lib/vlc/mux/libmux_ogg_plugin.so lib/vlc/mux/libmux_ps_plugin.so lib/vlc/mux/libmux_ts_plugin.so lib/vlc/packetizer/libpacketizer_copy_plugin.so +lib/vlc/packetizer/libpacketizer_h264_plugin.so lib/vlc/packetizer/libpacketizer_mpeg4audio_plugin.so lib/vlc/packetizer/libpacketizer_mpeg4video_plugin.so lib/vlc/packetizer/libpacketizer_mpegvideo_plugin.so @@ -148,7 +154,6 @@ lib/vlc/video_filter/libtransform_plugin.so lib/vlc/video_filter/libwall_plugin.so lib/vlc/video_output/libvout_sdl_plugin.so lib/vlc/video_output/libx11_plugin.so -lib/vlc/video_output/libxvideo_plugin.so lib/vlc/visualization/libvisual_plugin.so share/doc/vlc/bugreport-howto.txt share/doc/vlc/fortunes.txt @@ -193,6 +198,9 @@ share/vlc/http/admin/.access share/vlc/http/index.html share/vlc/http/info.html share/vlc/http/style.css +share/vlc/http/vlm/edit.html +share/vlc/http/vlm/index.html +share/vlc/http/vlm/new.html share/vlc/kvlc16x16.png share/vlc/kvlc32x32.png share/vlc/kvlc32x32.xpm @@ -252,6 +260,83 @@ share/vlc/skins/default/stop2.bmp share/vlc/skins/default/stop3.bmp share/vlc/skins/default/stop4.bmp share/vlc/skins/default/theme.xml +share/vlc/skins2/default/FreeSansBold.ttf +share/vlc/skins2/default/add_item.png +share/vlc/skins2/default/add_item_onclick.png +share/vlc/skins2/default/body.png +share/vlc/skins2/default/close.png +share/vlc/skins2/default/close_mouseover.png +share/vlc/skins2/default/close_onclick.png +share/vlc/skins2/default/delete_item.png +share/vlc/skins2/default/delete_item_onclick.png +share/vlc/skins2/default/disabled.png +share/vlc/skins2/default/fast.png +share/vlc/skins2/default/fast_disabled.png +share/vlc/skins2/default/fast_onclick.png +share/vlc/skins2/default/next.png +share/vlc/skins2/default/next_disabled.png +share/vlc/skins2/default/next_onclick.png +share/vlc/skins2/default/pause.png +share/vlc/skins2/default/pause_onclick.png +share/vlc/skins2/default/play.png +share/vlc/skins2/default/play_onclick.png +share/vlc/skins2/default/playlist.png +share/vlc/skins2/default/playlist_body1.png +share/vlc/skins2/default/playlist_body2.png +share/vlc/skins2/default/playlist_body3.png +share/vlc/skins2/default/playlist_body4.png +share/vlc/skins2/default/playlist_body6.png +share/vlc/skins2/default/playlist_body7.png +share/vlc/skins2/default/playlist_body8.png +share/vlc/skins2/default/playlist_body9.png +share/vlc/skins2/default/playlist_button.png +share/vlc/skins2/default/playlist_button2.png +share/vlc/skins2/default/playlist_button_onclick.png +share/vlc/skins2/default/playlist_button_onclick2.png +share/vlc/skins2/default/preferences.png +share/vlc/skins2/default/preferences_onclick.png +share/vlc/skins2/default/previous.png +share/vlc/skins2/default/previous_disabled.png +share/vlc/skins2/default/previous_onclick.png +share/vlc/skins2/default/reduce.png +share/vlc/skins2/default/reduce_disabled.png +share/vlc/skins2/default/reduce_onclick.png +share/vlc/skins2/default/resize.png +share/vlc/skins2/default/rev.png +share/vlc/skins2/default/rev_disabled.png +share/vlc/skins2/default/rev_onclick.png +share/vlc/skins2/default/slider.png +share/vlc/skins2/default/slider2.png +share/vlc/skins2/default/slider_onclick.png +share/vlc/skins2/default/slider_playlist.png +share/vlc/skins2/default/slider_volume.png +share/vlc/skins2/default/slider_volume_onclick.png +share/vlc/skins2/default/slow.png +share/vlc/skins2/default/slow_disabled.png +share/vlc/skins2/default/slow_onclick.png +share/vlc/skins2/default/sort.png +share/vlc/skins2/default/sort_onclick.png +share/vlc/skins2/default/stop.png +share/vlc/skins2/default/stop_disabled.png +share/vlc/skins2/default/stop_onclick.png +share/vlc/skins2/default/theme.xml +share/vlc/skins2/default/volume.png +share/vlc/skins2/default/vout.png +share/vlc/skins2/default/vout2.png +share/vlc/skins2/default/vout_body.png +share/vlc/skins2/default/vout_body1.png +share/vlc/skins2/default/vout_bottom.png +share/vlc/skins2/default/vout_bottom_left.png +share/vlc/skins2/default/vout_bottom_right.png +share/vlc/skins2/default/vout_left.png +share/vlc/skins2/default/vout_onclick.png +share/vlc/skins2/default/vout_right.png +share/vlc/skins2/default/vout_top.png +share/vlc/skins2/default/vout_top_left.png +share/vlc/skins2/default/vout_top_right.png +share/vlc/skins2/fonts/FreeSans.ttf +share/vlc/skins2/skin.catalog +share/vlc/skins2/skin.dtd share/vlc/ui.rc share/vlc/vlc16x16.png share/vlc/vlc16x16.xpm @@ -262,7 +347,11 @@ share/vlc/vlc48x48.png @dirrm share/doc/vlc @dirrm share/vlc/skins/default @dirrm share/vlc/skins +@dirrm share/vlc/skins2/default +@dirrm share/vlc/skins2/fonts +@dirrm share/vlc/skins2 @dirrm share/vlc/http/admin +@dirrm share/vlc/http/vlm @dirrm share/vlc/http @dirrm share/vlc @dirrm lib/vlc/visualization diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 2e2f20b80816..0c73411b6ac1 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -10,6 +10,8 @@ # WITH_ESOUND=yes # WITH_AALIB=yes # WITH_CDDB=yes +# WITH_DTS=yes +# WITH_FRIBIDI=yes # WITH_GGI=yes # WITH_LIBDVBPSI=yes # WITH_LIBID3TAG=yes @@ -17,15 +19,18 @@ # WITH_LIBMPEG2=yes # WITH_LIBTHEORA=yes # WITH_LIVEMEDIA=yes +# WITH_NCURSES=yes (ncurses interface) # WITH_SPEEX=yes # WITH_SVGALIB=yes # WITH_XOSD=yes +# WITH_XVID=yes # WITH_OPTIMIZED_CFLAGS=yes +# WITH_DVD_DEVICE=/dev/somedevice (5.x: default is acd0, 4:x default is acd0c) +# WITH_CDROM_DEVICE=/dev/somedevice # WITHOUT_LIBID3TAG=yes PORTNAME= vlc -PORTVERSION= 0.7.1 -PORTREVISION= 1 +PORTVERSION= 0.7.2 CATEGORIES= multimedia MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ PKGNAMESUFFIX?= ${GNOME_SUFFIX}${ESOUND_SUFFIX}${PKGNAMESUFFIX2} @@ -33,8 +38,7 @@ PKGNAMESUFFIX?= ${GNOME_SUFFIX}${ESOUND_SUFFIX}${PKGNAMESUFFIX2} MAINTAINER= dinoex@FreeBSD.org COMMENT= An X11 video streaming client/server solution -LIB_DEPENDS= dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \ - dvdread.3:${PORTSDIR}/multimedia/libdvdread \ +LIB_DEPENDS= dvdnav.3:${PORTSDIR}/multimedia/libdvdnav \ mad.2:${PORTSDIR}/audio/libmad \ avcodec.0:${PORTSDIR}/${FFMPEG_PORT} \ a52.0:${PORTSDIR}/audio/liba52 \ @@ -42,8 +46,10 @@ LIB_DEPENDS= dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \ FLAC.5:${PORTSDIR}/audio/flac \ faad.0:${PORTSDIR}/audio/faad \ wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \ - slp.1:${PORTSDIR}/net/openslp + slp.1:${PORTSDIR}/net/openslp \ + vcdinfo.0:${PORTSDIR}/multimedia/vcdimager +USE_BZIP2= yes USE_GETOPT_LONG=yes USE_GETTEXT= yes USE_GMAKE= yes @@ -52,7 +58,7 @@ USE_ICONV= yes USE_REINPLACE= yes USE_SDL= sdl USE_XLIB= yes -USE_GCC= 3.2 +USE_ICONV= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes @@ -68,10 +74,8 @@ CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \ --with-ffmpeg=${LOCALBASE} \ --disable-libcdio \ --disable-skins2 \ - --program-prefix="" \ - --without-libintl-prefix \ - --without-libiconv-prefix - + --without-libintl-prefix +CONFIGURE_TARGET+=-build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= vlc.1 \ vlc-config.1 @@ -82,6 +86,10 @@ LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> +.if ${OSVERSION} < 500000 +USE_GCC= 3.3 +.endif + .if defined(WITH_AUTODETECT) && !defined(BATCH) .if ${HAVE_GNOME:Mgnomelibs}!="" && !defined(WITHOUT_GNOME) @@ -100,6 +108,14 @@ WITH_AALIB= yes WITH_CDDB= yes .endif +.if exists(${LOCALBASE}/lib/libdts.a) && !defined(WITHOUT_DTS) +WITH_DTS= yes +.endif + +.if exists(${LOCALBASE}/bin/fribidi-config) && !defined(WITHOUT_FRIBIDI) +WITH_FRIBIDI= yes +.endif + .if exists(${LOCALBASE}/lib/libggi.so.2) && !defined(WITHOUT_GGI) WITH_GGI= yes .endif @@ -116,6 +132,10 @@ WITH_LIBTHEORA= yes WITH_LIVEMEDIA= yes .endif +.if exists(${LOCALBASE}/lib/libmatroska.a) && !defined(WITHOUT_LIBMATROSKA) +WITH_LIBMATROSKA=yes +.endif + .if exists(${LOCALBASE}/lib/libspeex.so.2) && !defined(WITHOUT_SPEEX) WITH_SPEEX= yes .endif @@ -128,6 +148,30 @@ WITH_SVGALIB= yes WITH_XOSD= yes .endif +.if exists(${LOCALBASE}/libxvidcore.so.2) && !defined(WITHOUT_XVID) +WITH_XVID= yes +.endif + +.endif + +.if defined(WITH_DVD_DEVICE) +DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE} +.else +.if ${OSVERSION} < 500000 +DEFAULT_DVD_DEVICE=/dev/acd0c +.else +DEFAULT_DVD_DEVICE=/dev/acd0 +.endif +.endif + +.if defined(WITH_CDROM_DEVICE) +DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE} +.else +.if ${OSVERSION} < 500000 +DEFAULT_CDROM_DEVICE=/dev/acd0c +.else +DEFAULT_CDROM_DEVICE=/dev/acd0 +.endif .endif .if defined(WITH_GNOME) && !defined(WITHOUT_GNOME) @@ -148,6 +192,11 @@ CONFIGURE_ARGS+=--enable-esd PLIST_FILES+= lib/vlc/audio_output/libesd_plugin.so .endif +.if defined(WITH_FRIBIDI) && !defined(WITHOUT_FRIBIDI) +LIB_DEPENDS+= fribidi.0:${PORTSDIR}/converters/fribidi +CONFIGURE_ARGS+=--enable-fribidi +.endif + .if !defined(WITHOUT_LIBID3TAG) LIB_DEPENDS+= id3tag.2:${PORTSDIR}/audio/libid3tag PLIST_FILES+= lib/vlc/demux/libid3tag_plugin.so @@ -165,6 +214,14 @@ CONFIGURE_ARGS+=--enable-libcddb CONFIGURE_ARGS+=--disable-libcddb .endif +.if defined(WITH_DTS) && !defined(WITHOUT_DTS) +BUILD_DEPENDS+= ${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts +CONFIGURE_ARGS+=--enable-dts +PLIST_FILES+= lib/vlc/audio_filter/libdtstofloat32_plugin.so +.else +CONFIGURE_ARGS+=--disable-dts +.endif + .if defined(WITH_GGI) && !defined(WITHOUT_GCI) LIB_DEPENDS+= ggi.2:${PORTSDIR}/graphics/libggi CONFIGURE_ARGS+=--enable-ggi @@ -189,6 +246,7 @@ PLIST_FILES+= lib/vlc/demux/libmkv_plugin.so .if defined(WITH_LIBMPEG2) && !defined(WITHOUT_LIBMPEG2) LIB_DEPENDS+= mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 CONFIGURE_ARGS+=--enable-libmpeg2 +PLIST_FILES+= lib/vlc/codec/liblibmpeg2_plugin.so .else CONFIGURE_ARGS+=--disable-libmpeg2 .endif @@ -207,6 +265,11 @@ CONFIGURE_ARGS+=--enable-livedotcom \ PLIST_FILES+= lib/vlc/liblivedotcom.a .endif +.if defined(WITH_NCURSES) && !defined(WITHOUT_NCURSES) +CONFIGURE_ARGS+=--enable-ncurses +PLIST_FILES+= lib/vlc/gui/libncurses_plugin.so +.endif + .if defined(WITH_SPEEX) && !defined(WITHOUT_SPEEX) LIB_DEPENDS+= speex.2:${PORTSDIR}/audio/speex CONFIGURE_ARGS+=--enable-speex @@ -226,6 +289,14 @@ LIB_DEPENDS+= xosd.4:${PORTSDIR}/misc/xosd CONFIGURE_ARGS+=--enable-xosd .endif +.if defined(WITH_XVID) && !defined(WITHOUT_XVID) +LIB_DEPENDS+= xvidcore.2:${PORTSDIR}/multimedia/xvid +CONFIGURE_ARGS+=--enable-xvideo +PLIST_FILES+= lib/vlc/video_output/libxvideo_plugin.so +.else +CONFIGURE_ARGS+=--disable-xvideo +.endif + .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O3 -ffast-math -fomit-frame-pointer .else @@ -266,6 +337,9 @@ post-patch: -e 's/-lc_r/${PTHREAD_LIBS}/' \ -e 's|postproc/postprocess.h|ffmpeg/postproc/postprocess.h|' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|; \ + s|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \ + ${WRKSRC}/include/vlc_config.h post-install: ${INSTALL_MAN} ${WRKSRC}/doc/vlc.1 ${MANPREFIX}/man/man1/ diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo index a3211dbb3e2f..1639ad58b7fe 100644 --- a/multimedia/vlc/distinfo +++ b/multimedia/vlc/distinfo @@ -1,2 +1,2 @@ -MD5 (vlc-0.7.1.tar.gz) = faa5e3162a3e9b3a3d8c3dcc06f70911 -SIZE (vlc-0.7.1.tar.gz) = 6102502 +MD5 (vlc-0.7.2.tar.bz2) = 3749fb3a0aed1372d4975a5b962e72cc +SIZE (vlc-0.7.2.tar.bz2) = 4516835 diff --git a/multimedia/vlc/pkg-plist b/multimedia/vlc/pkg-plist index d1cdb35218bc..a92b692da016 100644 --- a/multimedia/vlc/pkg-plist +++ b/multimedia/vlc/pkg-plist @@ -18,6 +18,7 @@ lib/vlc/access/libaccess_mms_plugin.so lib/vlc/access/libaccess_tcp_plugin.so lib/vlc/access/libaccess_udp_plugin.so lib/vlc/access/libcdda_plugin.so +lib/vlc/access/libcddax_plugin.so lib/vlc/access/libdvd_plugin.so lib/vlc/access/libdvdread_plugin.so lib/vlc/access/libslp_plugin.so @@ -58,6 +59,7 @@ lib/vlc/codec/liba52_plugin.so lib/vlc/codec/libadpcm_plugin.so lib/vlc/codec/libaraw_plugin.so lib/vlc/codec/libcinepak_plugin.so +lib/vlc/codec/libcmml_plugin.so lib/vlc/codec/libcvdsub_plugin.so lib/vlc/codec/libdts_plugin.so lib/vlc/codec/libdvbsub_plugin.so @@ -72,6 +74,7 @@ lib/vlc/control/libgestures_plugin.so lib/vlc/control/libhotkeys_plugin.so lib/vlc/control/libhttp_plugin.so lib/vlc/control/librc_plugin.so +lib/vlc/control/libtelnet_plugin.so lib/vlc/demux/libaiff_plugin.so lib/vlc/demux/liba52sys_plugin.so lib/vlc/demux/libaac_plugin.so @@ -82,6 +85,8 @@ lib/vlc/demux/libdemux2_plugin.so lib/vlc/demux/libdemuxdump_plugin.so lib/vlc/demux/libdemuxsub_plugin.so lib/vlc/demux/libdtssys_plugin.so +lib/vlc/demux/libdvdnav_plugin.so +lib/vlc/demux/libh264_plugin.so lib/vlc/demux/libid3_plugin.so lib/vlc/demux/libm3u_plugin.so lib/vlc/demux/libm4v_plugin.so @@ -97,6 +102,7 @@ lib/vlc/demux/libps2_plugin.so lib/vlc/demux/libpva_plugin.so lib/vlc/demux/librawdv_plugin.so lib/vlc/demux/libreal_plugin.so +lib/vlc/demux/libsgimb_plugin.so lib/vlc/demux/libts_plugin.so lib/vlc/demux/libwav_plugin.so lib/vlc/gui/libgtk_plugin.so @@ -107,7 +113,6 @@ lib/vlc/misc/libdummy_plugin.so lib/vlc/misc/libexport_plugin.so lib/vlc/misc/libfreetype_plugin.so lib/vlc/misc/libgtk_main_plugin.so -lib/vlc/misc/libhttpd_plugin.so lib/vlc/misc/libipv4_plugin.so lib/vlc/misc/libipv6_plugin.so lib/vlc/misc/liblogger_plugin.so @@ -122,6 +127,7 @@ lib/vlc/mux/libmux_ogg_plugin.so lib/vlc/mux/libmux_ps_plugin.so lib/vlc/mux/libmux_ts_plugin.so lib/vlc/packetizer/libpacketizer_copy_plugin.so +lib/vlc/packetizer/libpacketizer_h264_plugin.so lib/vlc/packetizer/libpacketizer_mpeg4audio_plugin.so lib/vlc/packetizer/libpacketizer_mpeg4video_plugin.so lib/vlc/packetizer/libpacketizer_mpegvideo_plugin.so @@ -148,7 +154,6 @@ lib/vlc/video_filter/libtransform_plugin.so lib/vlc/video_filter/libwall_plugin.so lib/vlc/video_output/libvout_sdl_plugin.so lib/vlc/video_output/libx11_plugin.so -lib/vlc/video_output/libxvideo_plugin.so lib/vlc/visualization/libvisual_plugin.so share/doc/vlc/bugreport-howto.txt share/doc/vlc/fortunes.txt @@ -193,6 +198,9 @@ share/vlc/http/admin/.access share/vlc/http/index.html share/vlc/http/info.html share/vlc/http/style.css +share/vlc/http/vlm/edit.html +share/vlc/http/vlm/index.html +share/vlc/http/vlm/new.html share/vlc/kvlc16x16.png share/vlc/kvlc32x32.png share/vlc/kvlc32x32.xpm @@ -252,6 +260,83 @@ share/vlc/skins/default/stop2.bmp share/vlc/skins/default/stop3.bmp share/vlc/skins/default/stop4.bmp share/vlc/skins/default/theme.xml +share/vlc/skins2/default/FreeSansBold.ttf +share/vlc/skins2/default/add_item.png +share/vlc/skins2/default/add_item_onclick.png +share/vlc/skins2/default/body.png +share/vlc/skins2/default/close.png +share/vlc/skins2/default/close_mouseover.png +share/vlc/skins2/default/close_onclick.png +share/vlc/skins2/default/delete_item.png +share/vlc/skins2/default/delete_item_onclick.png +share/vlc/skins2/default/disabled.png +share/vlc/skins2/default/fast.png +share/vlc/skins2/default/fast_disabled.png +share/vlc/skins2/default/fast_onclick.png +share/vlc/skins2/default/next.png +share/vlc/skins2/default/next_disabled.png +share/vlc/skins2/default/next_onclick.png +share/vlc/skins2/default/pause.png +share/vlc/skins2/default/pause_onclick.png +share/vlc/skins2/default/play.png +share/vlc/skins2/default/play_onclick.png +share/vlc/skins2/default/playlist.png +share/vlc/skins2/default/playlist_body1.png +share/vlc/skins2/default/playlist_body2.png +share/vlc/skins2/default/playlist_body3.png +share/vlc/skins2/default/playlist_body4.png +share/vlc/skins2/default/playlist_body6.png +share/vlc/skins2/default/playlist_body7.png +share/vlc/skins2/default/playlist_body8.png +share/vlc/skins2/default/playlist_body9.png +share/vlc/skins2/default/playlist_button.png +share/vlc/skins2/default/playlist_button2.png +share/vlc/skins2/default/playlist_button_onclick.png +share/vlc/skins2/default/playlist_button_onclick2.png +share/vlc/skins2/default/preferences.png +share/vlc/skins2/default/preferences_onclick.png +share/vlc/skins2/default/previous.png +share/vlc/skins2/default/previous_disabled.png +share/vlc/skins2/default/previous_onclick.png +share/vlc/skins2/default/reduce.png +share/vlc/skins2/default/reduce_disabled.png +share/vlc/skins2/default/reduce_onclick.png +share/vlc/skins2/default/resize.png +share/vlc/skins2/default/rev.png +share/vlc/skins2/default/rev_disabled.png +share/vlc/skins2/default/rev_onclick.png +share/vlc/skins2/default/slider.png +share/vlc/skins2/default/slider2.png +share/vlc/skins2/default/slider_onclick.png +share/vlc/skins2/default/slider_playlist.png +share/vlc/skins2/default/slider_volume.png +share/vlc/skins2/default/slider_volume_onclick.png +share/vlc/skins2/default/slow.png +share/vlc/skins2/default/slow_disabled.png +share/vlc/skins2/default/slow_onclick.png +share/vlc/skins2/default/sort.png +share/vlc/skins2/default/sort_onclick.png +share/vlc/skins2/default/stop.png +share/vlc/skins2/default/stop_disabled.png +share/vlc/skins2/default/stop_onclick.png +share/vlc/skins2/default/theme.xml +share/vlc/skins2/default/volume.png +share/vlc/skins2/default/vout.png +share/vlc/skins2/default/vout2.png +share/vlc/skins2/default/vout_body.png +share/vlc/skins2/default/vout_body1.png +share/vlc/skins2/default/vout_bottom.png +share/vlc/skins2/default/vout_bottom_left.png +share/vlc/skins2/default/vout_bottom_right.png +share/vlc/skins2/default/vout_left.png +share/vlc/skins2/default/vout_onclick.png +share/vlc/skins2/default/vout_right.png +share/vlc/skins2/default/vout_top.png +share/vlc/skins2/default/vout_top_left.png +share/vlc/skins2/default/vout_top_right.png +share/vlc/skins2/fonts/FreeSans.ttf +share/vlc/skins2/skin.catalog +share/vlc/skins2/skin.dtd share/vlc/ui.rc share/vlc/vlc16x16.png share/vlc/vlc16x16.xpm @@ -262,7 +347,11 @@ share/vlc/vlc48x48.png @dirrm share/doc/vlc @dirrm share/vlc/skins/default @dirrm share/vlc/skins +@dirrm share/vlc/skins2/default +@dirrm share/vlc/skins2/fonts +@dirrm share/vlc/skins2 @dirrm share/vlc/http/admin +@dirrm share/vlc/http/vlm @dirrm share/vlc/http @dirrm share/vlc @dirrm lib/vlc/visualization |