Date: Mon, 24 May 2004 16:35:21 -0400 (EDT) From: michael johnson <ahze@ahze.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: dinoex@FreeBSD.org Subject: ports/67138: [PATCH] multimedia/vlc: update to 0.7.2 Message-ID: <20040524203521.DE48268D8@ahze.ahze.net> Resent-Message-ID: <200405242040.i4OKeHTn097653@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 67138 >Category: ports >Synopsis: [PATCH] multimedia/vlc: update to 0.7.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon May 24 13:40:16 PDT 2004 >Closed-Date: >Last-Modified: >Originator: michael johnson >Release: FreeBSD 5.2-CURRENT i386 >Organization: >Environment: System: FreeBSD gentoo.ahze.net 5.2-CURRENT FreeBSD 5.2-CURRENT #45: Mon May 3 05:09:04 EDT >Description: - Update to 0.7.2 - New knobs I think WITH_XVID and WITH_LIBMPEG2 should not be options and should be installed default because xvid and mpeg2 formats are extremely popular. I left them as knobs because they *ARE* optional and it will be easier to remove the knobs than add them. There are still a few knobs that we can add that are not included yet. ie. WITH_MOZILLA -- mozilla-plugin WITH_KDE -- kde frontend WITH_QT -- qt frontend WITHOUT_GTK -- disable gtk frontend WITHOUT_WXWINDOWS -- disable WXWINDOWS frontend WITH_LIRC -- remote control support from lirc Port maintainer (dinoex@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.50 >How-To-Repeat: >Fix: --- vlc-0.7.2.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/multimedia/vlc/Makefile,v retrieving revision 1.49 diff -u -r1.49 Makefile --- Makefile 5 Apr 2004 03:30:16 -0000 1.49 +++ Makefile 24 May 2004 20:20:34 -0000 @@ -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 @@ 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 @@ 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_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 @@ --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 @@ .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_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_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_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 @@ 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+=--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 @@ .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 @@ 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 @@ 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 @@ -247,9 +318,6 @@ lib/vlc/libmemcpymmxext.a .endif -.if ${OSVERSION} >= 502010 -BROKEN= "conflicts with new threads architecture" -.endif .if ${ARCH} == "alpha" && ${OSVERSION} < 500000 # libstdc++.a(eh_terminate.o): gp-relative relocation against dynamic symbol __cxxabiv1::__terminate_handler BROKEN= "gp-relative relocation against dynamic symbol" @@ -266,6 +334,9 @@ -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/ Index: distinfo =================================================================== RCS file: /home/ncvs/ports/multimedia/vlc/distinfo,v retrieving revision 1.13 diff -u -r1.13 distinfo --- distinfo 21 Mar 2004 06:42:15 -0000 1.13 +++ distinfo 21 May 2004 23:25:19 -0000 @@ -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 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/multimedia/vlc/pkg-plist,v retrieving revision 1.16 diff -u -r1.16 pkg-plist --- pkg-plist 21 Mar 2004 06:42:15 -0000 1.16 +++ pkg-plist 24 May 2004 20:20:55 -0000 @@ -18,6 +18,7 @@ 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/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/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/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/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/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_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/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/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/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 @@ @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 --- vlc-0.7.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040524203521.DE48268D8>