diff -ruN --exclude=CVS vlc.orig/Makefile vlc/Makefile --- vlc.orig/Makefile Thu Apr 21 21:00:51 2005 +++ vlc/Makefile Thu May 5 18:14:21 2005 @@ -2,7 +2,7 @@ # Date created: 3rd August 2001 # Whom: Brian Somers # -# $FreeBSD: ports/multimedia/vlc/Makefile,v 1.87 2005/04/21 13:08:27 ahze Exp $ +# $FreeBSD$ # # NOTES about VLC Knobs: # Below you will see a number of knobs, if it starts with WITHOUT_ it is @@ -14,9 +14,8 @@ # # Interface Knobs: # -# WITHOUT_HTTPD=yes -# Web interface to control streaming media -# * recommended if you want to stream media +# WITH_CORBA +# Enable a Corba interface via orbit2 # # WITH_NCURSES=yes # Ncurses (console) interface @@ -35,6 +34,9 @@ # WITH_ARTS=yes # Arts Support # +# WITH_DAAP=yes +# Enable libopendaap to connect to iTunes(R) music shares. +# # WITHOUT_DTS=yes # DTS decoder Support # useful for many dvds @@ -43,16 +45,18 @@ # Esound Support # # WITH_FAAC=yes -# Faac audio encoder (mp4/aac) Support +# Faac audio encoder (mp4/aac) Support +# ** Only enable this if you compiled multimedia/ffmpeg with WITH_FAAC knob ** # -# WITHOUT_FAAD=yes +# WITH_FAAD=yes # Faad audio decoder (mp4/aac) Support # # WITHOUT_FLAC=yes # Flac Support # -# WITH_LAME=yes +# WITHOUT_LAME=yes # Mp3 encoder Support +# ** NOT DEFINED if PACKAGE_BUILDING is defined ** # # WITHOUT_LIBA52=yes # liba52 audio Support @@ -64,6 +68,9 @@ # WITHOUT_MAD=yes # Mad mp3 audio decoder Support # +# WITHOUT_OGG=yes +# Ogg audio decoder Support +# # WITH_SPEEX=yes # Speex voice codec Support # Note: you need audio/speex-devel @@ -71,8 +78,11 @@ # WITH_TOOLAME=yes # Toolame Support # +# WITH_TWOLAME=yes +# Twolame Mpeg layer 2 audio Support +# # WITHOUT_VORBIS=yes -# Ogg/Vorbis Support +# Vorbis Support # # Graphics Knobs: # @@ -98,22 +108,39 @@ # # Multimedia Knobs: # -# WITH_H264 +# WITH_DIRAC +# Enable dirac general-purpose video codec +# +# WITH_X264 # Enable H.264/AVC Video Support # # WITHOUT_LIBMATROSKA=yes # Matroska Container Format Support # # WITHOUT_LIBMPEG2=yes +# Mpeg-2 A/V Decoder Support # # WITH_LIBTHEORA=yes +# Video codec for OGG/Vorbis Support # -# WITHOUT_TRANSCODE=yes +# WITH_TRANSCODE=yes # Disable transcode of multimedia via transcode (multimedia/transcode). # This option allows you to convert a media file, dvd, A/V stream, etc # in to another format. This also allows you to transcode multimedia # on-the-fly and stream to a network and/or local playback. # +# Streaming Knobs: +# +# WITHOUT_HTTPD=yes +# Web interface to control streaming media +# +# WITHOUT_LIVEMEDIA=yes +# Support for rstp/rtp/sdp protocols +# Only versions 2004.11.11 and higher are supported. +# +# WITHOUT_STREAM_PLUGINS=yes +# Disable build and install of Streaming plugins +# # Other Knobs: # # DEBUG=yes @@ -123,18 +150,20 @@ # Disable cddb and vcd support # and other cdrom support # +# WITHOUT_CDPARANOIA=yes +# Disable Cdparanoia support +# # WITHOUT_DVBPSI=yes # TS MUX and DEMUX support # -# WITHOUT_DVD=yes -# Disable all dvd support +# WITHOUT_DVDNAV=yes +# Disable DVD (dvd menus) support # -# WITHOUT_LIVEMEDIA=yes -# Support for rstp/rtp/sdp protocols -# Only versions 2004.11.11 and higher are supported. -# * recommended if you want to stream media. +# WITH_DVDREAD=yes +# Enable Regular DVD support (non-menu) # -# WITH_MOZILLA_PLUGIN= [mozilla|mozilla-devel|firefox] +# WITH_MOZILLA= [mozilla|mozilla-devel|firefox] +# WITH_MOZILLA_PLUGIN= yes # Enable A mozilla plugin for VLC # See http://www.videolan.org/doc/vlc-user-guide/en/ch07.html#id2529837 # for more info on using this plugin. @@ -175,18 +204,18 @@ # PORTNAME= vlc -PORTVERSION= 0.8.1 -PORTREVISION= 11 +PORTVERSION= 0.8.1.20050505 CATEGORIES= multimedia audio ipv6 net www -MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \ +MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/snapshots/ \ + http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \ http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${PORTVERSION}/ \ ftp://ftp.crans.org/pub/videolan/vlc/${PORTVERSION}/ \ ftp://videolan.cs.pu.edu.tw/Windows/VideoLAN/vlc/${PORTVERSION}/ \ ${MASTER_SITE_LOCAL:S|$|:mozilla|} MASTER_SITE_SUBDIR= ahze/:mozilla PKGNAMESUFFIX?= ${ESOUND_SUFFIX}${MOZILLA_SUFFIX}${PKGNAMESUFFIX2} -DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ - vlc-intf-mozilla-plugin${EXTRACT_SUFX}:mozilla +DISTFILES= ${PORTNAME}-snapshot-${PORTVERSION:S/0.8.1.//}${EXTRACT_SUFX} \ + vlc-intf-mozilla-plugin-0.1.tar.bz2:mozilla MAINTAINER= ahze@FreeBSD.org COMMENT= Multimedia streaming server and player for various audio/video formats @@ -194,19 +223,20 @@ RUN_DEPEDNS= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera LIB_DEPENDS= avcodec.1:${PORTSDIR}/multimedia/ffmpeg +WRKSRC= ${WRKDIR}/${PORTNAME}-snapshot-${PORTVERSION:S/0.8.1.//} ### BROKEN -- Needs newer verision of toolame ### WITHOUT_TOOLAME= yes ### BROKEN ### WITH_VLC_DEFAULT_FONT?= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf -USE_BZIP2= yes +#USE_BZIP2= yes USE_X_PREFIX= yes USE_GETOPT_LONG=yes USE_GETTEXT= yes USE_GMAKE= yes WANT_GNOME= yes -USE_GNOME= gnometarget +USE_GNOME= gnometarget libxml2 USE_REINPLACE= yes WANT_SDL= yes USE_XLIB= yes @@ -218,8 +248,8 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= PATH_GTKCONFIG="${GTK_CONFIG}" CFLAGS="${CFLAGS}" \ - CPPFLAGS="-I${WRKSRC}/include/vlc/ -I${LOCALBASE}/ffmpeg ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" + CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include -I${LOCALBASE}/include/ffmpeg ${PTHREAD_CFLAGS}" \ + LDFLAGS="-L${LOCALBASE}/lib -la52 ${LDFLAGS} -L${X11BASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS+= --enable-ffmpeg \ --with-ffmpeg=${LOCALBASE} \ @@ -232,7 +262,7 @@ vlc-config.1 .if defined(WITH_MOZILLA_PLUGIN) -.if ${WITH_MOZILLA_PLUGIN}=="firefox" +.if ${WITH_MOZILLA}=="firefox" BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox @@ -245,13 +275,53 @@ .endif MOZILLA_SUFFIX=-mozilla CONFIGURE_ARGS+=--enable-mozilla -.if ${WITH_MOZILLA_PLUGIN}=="mozilla-devel" +.if ${WITH_MOZILLA}=="mozilla-devel" HEADERS_SUFX= -devel .else HEADERS_SUFX= .endif .endif +OPTIONS= AALIB "Console graphics support" Off \ + ARTS "Arts audio support" Off \ + CDROM "Cddb and vcd support" On \ + COBRA "Corba interface via orbit2" Off \ + DAAP "iTunes(R) music shares support" Off \ + DIRAC "Dirac audio/video codec" Off \ + DTS "DTS audio decoder support" On \ + DVBPSI "TS MUX and DEMUX support" On \ + DVDNAV "DVD (dvd menus) support" On \ + DVDREAD "Regular dvd support (no menus)" Off \ + ESOUND "Esound audio support" Off \ + FAAC "Faac audio encoder (mp4/aac) support" Off \ + FAAD "Faad audio decoder (mp4/aac) support" On \ + FLAC "Flac audio codec support" On \ + HTTPD "Web Interface to control streaming media" On \ + LAME "Mp3 encoder support" On \ + LIBA52 "Liba52 (dolby) audio decoder support" On \ + LIBCACA "Console graphics support" Off \ + LIBMATROSKA "Matroska container format support" On \ + LIBMPEG2 "Mpeg-2 A/V decoder support" On \ + LIBTHEORA "OGG/Vorbis video codec support" Off \ + LIVEMEDIA "Support for rstp/rtp/sdp protocols" On \ + MAD "Mp3 decoder support" On \ + MOZILLA_PLUGIN "Enable mozilla plugin" Off \ + NCURSES "Ncurses (console) interface" Off \ + OGG "Ogg audio decoder support" On \ + OPENGL "OpenGL visual plugin" Off \ + OPTIMIZED_CFLAGS "Complie with -O2 -ffast-math" Off \ + SDL "SDL video output support" On \ + SKINS "Skinned gtk2.0 interface" Off \ + SLP "SLP service discovery support" On \ + SPEEX "Voice codec support" Off \ + SSL "TLS/SSL support for httpd interface" Off \ + SVG "SVG graphics support" Off \ + SVGALIB "SVGAlib video out support" On \ + TRANSCODE "Depends on multimedia/transcode" Off \ + VORBIS "Vorbis support (implies WITH_OGG)" On \ + WXWINDOWS "WxGtk+ Interface (default)" On \ + X264 "H.264 AVC video codec" Off + .include .if ${OSVERSION} < 500000 && defined(WITH_MOZILLA_PLUGIN) @@ -274,23 +344,35 @@ WITH_AALIB= yes .endif +.if exists(${LOCALBASE}/lib/libopendaap.a) && !defined(WITHOUT_DAAP) +WITH_DAAP= yes +.endif + +.if exists(${LOCALBASE}/lib/libdirac_decoder.a) && !defined(WITHOUT_DIRAC) +WITH_DIRAC= yes +.endif + +.if exists(${LOCALBASE}/lib/libfaad.a) && !defined(WITHOUT_FAAD) +WITH_FAAD= 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) +.if exists(${LOCALBASE}/lib/libggi.a) && !defined(WITHOUT_GGI) WITH_GGI= yes .endif -.if exists(${LOCALBASE}/lib/libx264.a) && !defined(WITHOUT_H264) -WITH_H264= yes +.if exists(${LOCALBASE}/lib/libx264.a) && !defined(WITHOUT_X264) +WITH_X264= yes .endif .if exists(${LOCALBASE}/lib/libmp3lame.a) && !defined(WITHOUT_LAME) WITH_LAME= yes .endif -.if exists(${LOCALBASE}/lib/libtheora.so.1) && !defined(WITHOUT_LIBTHEORA) +.if exists(${LOCALBASE}/lib/libtheora.a) && !defined(WITHOUT_LIBTHEORA) WITH_LIBTHEORA= yes .endif @@ -310,10 +392,14 @@ WITH_SVG= yes .endif -.if exists(${LOCALBASE}/lib/lib/vga.so.1) && !defined(WITHOUT_SVGALIB) +.if exists(${LOCALBASE}/lib/lib/vga.a) && !defined(WITHOUT_SVGALIB) WITH_SVGALIB= yes .endif +.if exists(${LOCALBASE}/bin/transcode) +WITH_TRANSCODE= yes +.endif + .if exists(${LOCALBASE}/lib/libvorbisidec.a) WITH_LIBTREMOR= yes .endif @@ -322,7 +408,11 @@ WITH_TOOLAME= yes .endif -.if exists(${LOCALBASE}/lib/libxosd.so.4) && !defined(WITHOUT_XOSD) +.if exists(${LOCALBASE}/lib/libtwolame.a) && !defined(WITHOUT_TWOLAME) +WITH_TWOLAME= yes +.endif + +.if exists(${LOCALBASE}/lib/libxosd.a) && !defined(WITHOUT_XOSD) WITH_XOSD= yes .endif @@ -366,7 +456,9 @@ .if defined(WITH_SKINS) && !defined(WITHOUT_SKINS) LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +USE_GNOME+= gnomehier CONFIGURE_ARGS+=--enable-skins2 --enable-skins +CONFIGURE_ENV+= WX_CONFIG=${X11BASE}/bin/wxgtk2-2.4-config .else CONFIGURE_ARGS+=--disable-skins2 .endif @@ -392,11 +484,29 @@ cdio.5:${PORTSDIR}/sysutils/libcdio CONFIGURE_ARGS+=--enable-vcd \ --enable-libcddb \ - --enable-libcdio + --enable-libcdio \ + --enable-cddax .else CONFIGURE_ARGS+=--disable-vcd \ --disable-libcddb \ - --disable-libcdio + --disable-libcdio \ + --disable-cddax +.endif + +.if !defined(WITHOUT_CDPARANOIA) && !defined(WITHOUT_CDROM) +LIB_DEPENDS+= cdda_interface.0:${PORTSDIR}/audio/cdparanoia +CONFIGURE_ARGS+=--enable-cdda \ + --enable-cddax +.else +CONFIGURE_ARGS+=--disable-cdda \ + --disable-cddax +.endif + +.if defined(WITH_CORBA) && !defined(WITHOUT_CORBA) +USE_GNOME+= orbit2 +CONFIGURE_ARGS+=--enable-corba +.else +CONFIGURE_ARGS+=--disable-corba .endif .if !defined(WITHOUT_DVBPSI) @@ -407,21 +517,26 @@ CONFIGURE_ARGS+=--disable-dvbpsi .endif -.if !defined(WITHOUT_DVD) +.if !defined(WITHOUT_DVDNAV) LIB_DEPENDS+= dvdnav.3:${PORTSDIR}/multimedia/libdvdnav -CONFIGURE_ARGS+=--enable-dvdnav \ - --enable-dvdread \ - --with-dvdcss=${LOCALBASE} \ - --with-dvdread=${LOCALBASE} +CONFIGURE_ARGS+=--enable-dvdnav +.else +CONFIGURE_ARGS+=--disable-dvdnav +.endif + +.if defined(WITH_DVDREAD) && !defined(WITHOUT_DVDREAD) +LIB_DEPENDS+= dvdread.3:${PORTSDIR}/multimedia/libdvdread +CONFIGURE_ARGS+=--enable-dvdread .else -CONFIGURE_ARGS+=--disable-dvdnav \ - --disable-dvdread +CONFIGURE_ARGS+=--disable-dvdread .endif .if defined(WITH_ESOUND) && !defined(WITHOUT_ESOUND) ESOUND_SUFFIX= -esound USE_GNOME+= esound CONFIGURE_ARGS+=--enable-esd +.else +CONFIGURE_ARGS+=--disable-esd .endif .if defined(WITH_FAAC) && !defined(WITHOUT_FAAC) @@ -429,7 +544,7 @@ LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac .endif -.if !defined(WITHOUT_FAAD) +.if defined(WITH_FAAD) && !defined(WITHOUT_FAAD) LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad CONFIGURE_ARGS+=--enable-faad .else @@ -446,14 +561,25 @@ .if defined(WITH_FRIBIDI) && !defined(WITHOUT_FRIBIDI) LIB_DEPENDS+= fribidi.0:${PORTSDIR}/converters/fribidi CONFIGURE_ARGS+=--enable-fribidi +.else +CONFIGURE_ARGS+=--disable-fribidi .endif .if defined(WITH_AALIB) && !defined(WITHOUT_AALIB) LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib CONFIGURE_ARGS+=--enable-aa +.else +CONFIGURE_ARGS+=--disable-aa +.endif + +.if defined(WITH_DIRAC) && !defined(WITHOUT_DIRAC) +LIB_DEPENDS+= dirac_encoder.0:${PORTSDIR}/multimedia/dirac +CONFIGURE_ARGS+=--enable-dirac +.else +CONFIGURE_ARGS+=--disable-dirac .endif -.if defined(WITH_H264) && !defined(WITHOUT_H264) +.if (defined(WITH_H264) || defined(WITH_X264)) && !defined(WITHOUT_X264) CONFIGURE_ARGS+=--enable-x264 LIB_DEPENDS+= x264.1:${PORTSDIR}/multimedia/x264 .else @@ -472,6 +598,13 @@ CONFIGURE_ARGS+=--disable-caca .endif +.if defined(WITH_DAAP) && !defined(WITHOUT_DAAP) +LIB_DEPENDS+= opendaap.0:${PORTSDIR}/devel/libopendaap +CONFIGURE_ARGS+=--enable-daap +.else +CONFIGURE_ARGS+=--disable-daap +.endif + .if !defined(WITHOUT_DTS) BUILD_DEPENDS+= ${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts CONFIGURE_ARGS+=--enable-dts @@ -490,7 +623,9 @@ CONFIGURE_ARGS+=--disable-ggi .endif -.if defined(WITH_LAME) && !defined(WITHOUT_LAME) +# Do not use lame if PACKAGE_BUILDING is defined. since +# lame can NOT be packaged. +.if !defined(WITHOUT_LAME) && !defined(PACKAGE_BUILDING) LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame CONFIGURE_ARGS+=--enable-mp3lame .else @@ -499,6 +634,9 @@ .if !defined(WITHOUT_LIBMATROSKA) BUILD_DEPENDS+= ${LOCALBASE}/lib/libmatroska.a:${PORTSDIR}/multimedia/libmatroska +CONFIGURE_ARGS+=--enable-mkv +.else +CONFIGURE_ARGS+=--disable-mkv .endif .if !defined(WITHOUT_LIBA52) @@ -539,6 +677,14 @@ CONFIGURE_ARGS+=--disable-mad .endif +.if !defined(WITHOUT_OGG) +LIB_DEPENDS+= ogg.5:${PORTSDIR}/audio/libogg +CONFIGURE_ARGS+=--enable-ogg +.else +CONFIGURE_ARGS+=--disable-ogg +WITHOUT_VORBIS= yes +.endif + .if defined(WITH_NCURSES) && !defined(WITHOUT_NCURSES) CONFIGURE_ARGS+=--enable-ncurses .endif @@ -557,7 +703,7 @@ CONFIGURE_ARGS+=--disable-sdl .endif -.if !defined(WITHOUT_TRANSCODE) +.if defined(WITH_TRANSCODE) RUN_DEPENDS+= transcode:${PORTSDIR}/multimedia/transcode .endif @@ -582,6 +728,10 @@ CONFIGURE_ARGS+=--disable-speex .endif +.if defined(WITHOUT_STREAM_PLUGING) +CONFIGURE_ARGS+=--disable-sout +.endif + .if defined(WITH_SVG) && !defined(WITHOUT_SVG) USE_GNOME+= librsvg2 CONFIGURE_ARGS+=--enable-svg @@ -610,6 +760,13 @@ CONFIGURE_ARGS+= --disable-toolame .endif +.if defined(WITH_TWOLAME) && !defined(WITHOUT_TWOLAME) +LIB_DEPENDS+= twolame.0:${PORTSDIR}/audio/twolame +CONFIGURE_ARGS+= --enable-twolame +.else +CONFIGURE_ARGS+= --disable-twolame +.endif + .if !defined(WITHOUT_VORBIS) LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+=--enable-vorbis @@ -632,7 +789,8 @@ .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O2 -ffast-math -fomit-frame-pointer -CONFIGURE_ARGS+=--enable-release +CONFIGURE_ARGS+=--enable-release \ + --enable-optimizations .else CONFIGURE_ARGS+=--disable-optimizations .endif @@ -645,7 +803,7 @@ @${ECHO_MSG} "" @${ECHO_MSG} "Take a careful look at the beginning of the Makefile in order" @${ECHO_MSG} "to learn how to tune VLC towards you personal preferences!" - @${ECHO_MSG} "For example, make WITH_MOZILLA_PLUGIN=firefox" + @${ECHO_MSG} "" .if defined(WITH_SPEEX) && exists(${LOCALBASE}/include/speex.h) @${ECHO_MSG} "" @${ECHO_MSG} "**** WARNING ****" @@ -667,7 +825,7 @@ s|$$(libdir)/mozilla/components|${FAKEDIR}/mozilla|' \ ${WRKSRC}/mozilla/Makefile.in .endif -# skins2 interface +# skins2 interface, no lrint on < 504000 .if ${OSVERSION} < 504000 @${REINPLACE_CMD} -e 's|lrint|rint|' \ ${WRKSRC}/modules/gui/skins2/controls/ctrl_list.cpp @@ -684,8 +842,6 @@ -e 's|-mcpu=pentiumpro||' \ -e 's|postproc/postprocess.h|ffmpeg/postproc/postprocess.h|' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|cflags_tuning=|# cflags_tuning=|' \ - ${WRKSRC}/vlc-config.in # cdrom/dvd support @${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|; \ s|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \ @@ -695,9 +851,13 @@ ${RM} -rf ${PLIST} ${FAKEDIR} ${MKDIR} ${FAKEDIR} ${TOUCH} -f ${PLIST} +.if defined(WITH_SKINS) + ${ECHO_CMD} "share/gnome/pixmaps/gvlc.png" >> ${PLIST} + ${ECHO_CMD} "share/gnome/applications/svlc.desktop" >> ${PLIST} +.endif .if !defined(WITHOUT_WXWINDOWS) - ${ECHO_CMD} "share/gnome/applications/vlc.desktop" >> ${PLIST} ${ECHO_CMD} "share/gnome/pixmaps/vlc.png" >> ${PLIST} + ${ECHO_CMD} "share/gnome/applications/wxvlc.desktop" >> ${PLIST} .endif cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} prefix=${FAKEDIR} @@ -734,32 +894,38 @@ .endif do-install: -.if !defined(WITHOUT_WXWINDOWS) - if [ ! -d ${PREFIX}/share/gnome/applications ]; then \ - ${MKDIR} ${PREFIX}/share/gnome/applications ; \ - fi - ${INSTALL_DATA} ${FILESDIR}/vlc.desktop ${PREFIX}/share/gnome/applications - if [ ! -d ${PREFIX}/share/gnome/pixmaps ]; then \ - ${MKDIR} ${PREFIX}/share/gnome/pixmaps ; \ - fi - ${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/gnome/pixmaps/vlc.png -.endif @${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|' \ ${FAKEDIR}/bin/vlc-config @${RM} -f ${FAKEDIR}/bin/*.bak cd ${FAKEDIR}/bin && ${FIND} . | \ - ${CPIO} -pdm -R ${BINOWN}:${BINGRP} ${PREFIX}/bin + ${CPIO} -vpdm -R ${BINOWN}:${BINGRP} ${PREFIX}/bin cd ${FAKEDIR}/include && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include + ${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include cd ${FAKEDIR}/lib && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib + ${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib cd ${FAKEDIR}/share && ${FIND} . | \ - ${CPIO} -pdm -L -R ${SHAREOWN} ${PREFIX}/share + ${CPIO} -vpdm -L -R ${SHAREOWN} ${PREFIX}/share .if defined(WITH_MOZILLA_PLUGIN) @${MKDIR} ${PREFIX}/lib/browser_plugins ${INSTALL_DATA} ${FAKEDIR}/mozilla/* ${PREFIX}/lib/browser_plugins .endif ${INSTALL_MAN} ${WRKSRC}/doc/vlc.1 ${MANPREFIX}/man/man1/ ${INSTALL_MAN} ${WRKSRC}/doc/vlc-config.1 ${MANPREFIX}/man/man1/ +.if defined(WITH_SKINS) || !defined(WITHOUT_WXWINDOWS) + if [ ! -d ${PREFIX}/share/gnome/applications ]; then \ + ${MKDIR} ${PREFIX}/share/gnome/applications ; \ + fi + if [ ! -d ${PREFIX}/share/gnome/pixmaps ]; then \ + ${MKDIR} ${PREFIX}/share/gnome/pixmaps ; \ + fi +.if defined(WITH_SKINS) + ${INSTALL_DATA} ${FILESDIR}/svlc.desktop ${PREFIX}/share/gnome/applications + ${INSTALL_DATA} ${FAKEDIR}/share/vlc/gvlc48x48.png ${PREFIX}/share/gnome/pixmaps/gvlc.png +.endif +.if !defined(WITHOUT_WXWINDOWS) + ${INSTALL_DATA} ${FILESDIR}/wxvlc.desktop ${PREFIX}/share/gnome/applications + ${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/gnome/pixmaps/vlc.png +.endif +.endif .include diff -ruN --exclude=CVS vlc.orig/distinfo vlc/distinfo --- vlc.orig/distinfo Tue Apr 19 19:07:51 2005 +++ vlc/distinfo Thu May 5 18:14:50 2005 @@ -1,6 +1,4 @@ -MD5 (vlc-0.8.1.tar.bz2) = 9cdf6d70d51dad30d198edfa96047529 -SIZE (vlc-0.8.1.tar.bz2) = 4877791 -MD5 (ffmpeg-20041113.tar.bz2) = 245bbbb766f43722826358a938afd9a9 -SIZE (ffmpeg-20041113.tar.bz2) = 1472726 -MD5 (vlc-intf-mozilla-plugin.tar.bz2) = cd4697606b8a188a92d8cc77adf857d2 -SIZE (vlc-intf-mozilla-plugin.tar.bz2) = 2493 +MD5 (vlc-snapshot-20050505.tar.gz) = c485725777e2e8399bbf7e0603d258e1 +SIZE (vlc-snapshot-20050505.tar.gz) = 9234499 +MD5 (vlc-intf-mozilla-plugin-0.1.tar.bz2) = e64ee857a300968890188c26468a2945 +SIZE (vlc-intf-mozilla-plugin-0.1.tar.bz2) = 2418 diff -ruN --exclude=CVS vlc.orig/files/patch-modules_codec_x264.c vlc/files/patch-modules_codec_x264.c --- vlc.orig/files/patch-modules_codec_x264.c Thu Apr 21 21:00:51 2005 +++ vlc/files/patch-modules_codec_x264.c Wed Dec 31 19:00:00 1969 @@ -1,112 +0,0 @@ ---- modules/codec/x264.c.orig Thu Nov 11 13:50:16 2004 -+++ modules/codec/x264.c Thu Apr 21 08:45:37 2005 -@@ -2,7 +2,7 @@ - * x264.c: h264 video encoder - ***************************************************************************** - * Copyright (C) 2004 VideoLAN -- * $Id: x264.c 9280 2004-11-11 12:31:27Z zorglub $ -+ * $Id: x264.c 10206 2005-03-08 13:15:56Z gbazin $ - * - * Authors: Laurent Aimar - * -@@ -62,17 +62,19 @@ - #define ANALYSE_TEXT N_("Analyse mode") - #define ANALYSE_LONGTEXT N_( "This selects the analysing mode.") - --#define KEYINT_TEXT N_("Sets maximum interval between I frames") -+#define KEYINT_TEXT N_("Sets maximum interval between IDR-frames") - #define KEYINT_LONGTEXT N_( "Larger values save bits, thus improve quality "\ - "for a given bitrate, at the cost of seeking precision." ) - --#define IDRINT_TEXT N_("IDR frames") --#define IDRINT_LONGTEXT N_("In H.264, I-Frames do not necessarily bound a " \ -- "closed GOP because it is allowable for a P-frame to be predicted from " \ -+#define KEYINT_MIN_TEXT N_("Sets minimum interval between IDR-frames") -+#define KEYINT_MIN_LONGTEXT N_("In H.264, I-Frames do not necessarily bound " \ -+ "a closed GOP because it is allowable for a P-frame to be predicted from "\ - "more frames than just the one frame before it (also see frameref). " \ - "Therefore, I-frames are not necessarily seekable. " \ - "IDR-Frames restrict subsequent P-frames from referring to any frame " \ -- "prior to the IDR-Frame." ) -+ "prior to the IDR-Frame. \n" \ -+ "If scenecuts appear within this interval, they are still encoded as " \ -+ "I-frames, but do not start a new GOP. Default value is keyint * 0.4." ) - - #define BFRAMES_TEXT N_("B frames") - #define BFRAMES_LONGTEXT N_( "Number of consecutive B-Frames between I and " \ -@@ -125,8 +129,8 @@ - add_integer( SOUT_CFG_PREFIX "keyint", 250, NULL, KEYINT_TEXT, - KEYINT_LONGTEXT, VLC_FALSE ); - -- add_integer( SOUT_CFG_PREFIX "idrint", 2, NULL, IDRINT_TEXT, -- IDRINT_LONGTEXT, VLC_FALSE ); -+ add_integer( SOUT_CFG_PREFIX "keyint-min", 0, NULL, KEYINT_MIN_TEXT, -+ KEYINT_MIN_LONGTEXT, VLC_FALSE ); - - add_integer( SOUT_CFG_PREFIX "bframes", 0, NULL, BFRAMES_TEXT, - BFRAMES_LONGTEXT, VLC_FALSE ); -@@ -147,7 +151,7 @@ - *****************************************************************************/ - static const char *ppsz_sout_options[] = { - "qp", "qp-min", "qp-max", "cabac", "loopfilter", "analyse", -- "keyint", "idrint", "bframes", "frameref", "scenecut", NULL -+ "keyint", "keyint-min", "bframes", "frameref", "scenecut", NULL - }; - - static block_t *Encode( encoder_t *, picture_t * ); -@@ -236,10 +240,19 @@ - p_sys->param.b_deblocking_filter = val.b_bool; - - var_Get( p_enc, SOUT_CFG_PREFIX "keyint", &val ); -+#if X264_BUILD >= 0x000e -+ if( val.i_int > 0 ) p_sys->param.i_keyint_max = val.i_int; -+ if( val.i_int > 0 ) p_sys->param.i_keyint_min = val.i_int * 0.4; -+#else - if( val.i_int > 0 ) p_sys->param.i_iframe = val.i_int; -+#endif - -- var_Get( p_enc, SOUT_CFG_PREFIX "idrint", &val ); -+ var_Get( p_enc, SOUT_CFG_PREFIX "keyint-min", &val ); -+#if X264_BUILD >= 0x000e -+ if( val.i_int > 0 ) p_sys->param.i_keyint_min = val.i_int; -+#else - if( val.i_int > 0 ) p_sys->param.i_idrframe = val.i_int; -+#endif - - var_Get( p_enc, SOUT_CFG_PREFIX "bframes", &val ); - if( val.i_int >= 0 && val.i_int <= 16 ) p_sys->param.i_bframe = val.i_int; -@@ -273,6 +286,7 @@ - p_sys->param.analyse.inter = - X264_ANALYSE_I4x4 | X264_ANALYSE_PSUB16x16 | X264_ANALYSE_PSUB8x8; - } -+ if( val.psz_string ) free( val.psz_string ); - - if( p_enc->fmt_in.video.i_aspect > 0 ) - { -@@ -347,12 +361,10 @@ - static block_t *Encode( encoder_t *p_enc, picture_t *p_pict ) - { - encoder_sys_t *p_sys = p_enc->p_sys; -- x264_picture_t pic; -- int i_nal; -+ x264_picture_t pic; - x264_nal_t *nal; - block_t *p_block; -- int i_out; -- int i; -+ int i_nal, i_out, i; - - /* init pic */ - memset( &pic, 0, sizeof( x264_picture_t ) ); -@@ -364,7 +376,11 @@ - pic.img.i_stride[i] = p_pict->p[i].i_pitch; - } - -+#if X264_BUILD >= 0x0013 -+ x264_encoder_encode( p_sys->h, &nal, &i_nal, &pic, &pic ); -+#else - x264_encoder_encode( p_sys->h, &nal, &i_nal, &pic ); -+#endif - for( i = 0, i_out = 0; i < i_nal; i++ ) - { - int i_size = p_sys->i_buffer - i_out; diff -ruN --exclude=CVS vlc.orig/files/patch-modules_gui_ncurses.c vlc/files/patch-modules_gui_ncurses.c --- vlc.orig/files/patch-modules_gui_ncurses.c Tue Apr 19 19:07:51 2005 +++ vlc/files/patch-modules_gui_ncurses.c Wed Dec 31 19:00:00 1969 @@ -1,29 +0,0 @@ ---- modules/gui/ncurses.c.orig Wed Nov 3 18:12:49 2004 -+++ modules/gui/ncurses.c Wed Nov 3 18:14:27 2004 -@@ -875,7 +875,7 @@ - - static void SearchPlaylist( intf_thread_t *p_intf, char *psz_searchstring ) - { -- bool b_ok = false; -+ bool b_ok = 0; - int i_current; - int i_first = 0 ; - int i_item = -1; -@@ -900,7 +900,7 @@ - psz_searchstring ) != NULL ) - { - i_item = i_current; -- b_ok = true; -+ b_ok = 1; - break; - } - } -@@ -914,7 +914,7 @@ - psz_searchstring ) != NULL ) - { - i_item = i_current; -- b_ok = true; -+ b_ok = 1; - break; - } - } diff -ruN --exclude=CVS vlc.orig/files/patch-modules_stream_out_switcher.c vlc/files/patch-modules_stream_out_switcher.c --- vlc.orig/files/patch-modules_stream_out_switcher.c Wed Dec 31 19:00:00 1969 +++ vlc/files/patch-modules_stream_out_switcher.c Wed Mar 23 03:58:17 2005 @@ -0,0 +1,11 @@ +--- modules/stream_out/switcher.c.orig Wed Mar 23 03:57:15 2005 ++++ modules/stream_out/switcher.c Wed Mar 23 03:57:50 2005 +@@ -44,7 +44,7 @@ + #ifdef HAVE_POSTPROC_POSTPROCESS_H + # include + #else +-# include ++# include + #endif + + #define SOUT_CFG_PREFIX "sout-switcher-" diff -ruN --exclude=CVS vlc.orig/files/svlc.desktop vlc/files/svlc.desktop --- vlc.orig/files/svlc.desktop Wed Dec 31 19:00:00 1969 +++ vlc/files/svlc.desktop Mon Feb 14 01:16:59 2005 @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=VideoLAN Media Player +Comment=Video and Audio player and server +Icon=gvlc.png +Exec=vlc --intf skins2 +Terminal=false +Type=Application +Categories=Application;AudioVideo; diff -ruN --exclude=CVS vlc.orig/files/vlc.desktop vlc/files/vlc.desktop --- vlc.orig/files/vlc.desktop Tue Apr 19 19:07:51 2005 +++ vlc/files/vlc.desktop Wed Dec 31 19:00:00 1969 @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=VideoLAN Media Player -Comment=Video and Audio player and server -Icon=vlc.png -Exec=vlc -Terminal=false -Type=Application -Categories=Application;AudioVideo; diff -ruN --exclude=CVS vlc.orig/files/wxvlc.desktop vlc/files/wxvlc.desktop --- vlc.orig/files/wxvlc.desktop Wed Dec 31 19:00:00 1969 +++ vlc/files/wxvlc.desktop Mon Feb 14 01:16:59 2005 @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=VideoLAN Media Player +Comment=Video and Audio player and server +Icon=vlc.png +Exec=vlc +Terminal=false +Type=Application +Categories=Application;AudioVideo;