Date: Sat, 26 Oct 2013 23:46:10 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331741 - in head/multimedia/vlc: . files Message-ID: <201310262346.r9QNkAUe000205@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Sat Oct 26 23:46:09 2013 New Revision: 331741 URL: http://svnweb.freebsd.org/changeset/ports/331741 Log: multimedia/vlc: update to 2.1.0 - Update to 2.1.0 - Convert lib depends to new format - Allow staging - Remove deprecated PORT_OPTIONS usage Added: head/multimedia/vlc/files/patch-include-vlc_threads.h (contents, props changed) head/multimedia/vlc/files/patch-modules-misc-Makefile.in (contents, props changed) head/multimedia/vlc/files/patch-v4l (contents, props changed) Deleted: head/multimedia/vlc/files/patch-modules-gui-qt4-util-pictureflow.hpp head/multimedia/vlc/files/patch-vlc-2.0.8-Fix-live555-breakage-in-last-update Modified: head/multimedia/vlc/Makefile head/multimedia/vlc/distinfo head/multimedia/vlc/files/patch-share-Makefile.in Modified: head/multimedia/vlc/Makefile ============================================================================== --- head/multimedia/vlc/Makefile Sat Oct 26 23:00:15 2013 (r331740) +++ head/multimedia/vlc/Makefile Sat Oct 26 23:46:09 2013 (r331741) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= vlc -DISTVERSION= 2.0.8a -PORTREVISION= 2 +DISTVERSION= 2.1.0 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ @@ -14,19 +13,18 @@ MAINTAINER= multimedia@FreeBSD.org COMMENT= Qt4 based multimedia player and streaming server LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt \ - proxy:${PORTSDIR}/net/libproxy \ - dvbpsi:${PORTSDIR}/multimedia/libdvbpsi -BUILD_DEPENDS= ffmpeg${FFMPEG_SUFFIX}>=1.0:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} -RUN_DEPENDS= ffmpeg${FFMPEG_SUFFIX}>=1.0:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} +LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ + libproxy.so:${PORTSDIR}/net/libproxy \ + libdvbpsi.so:${PORTSDIR}/multimedia/libdvbpsi +BUILD_DEPENDS= ffmpeg>=2.0:${PORTSDIR}/multimedia/ffmpeg +RUN_DEPENDS= ffmpeg>=2.0:${PORTSDIR}/multimedia/ffmpeg OPTIONS_DEFINE= A52 AALIB ASS AVAHI CACA DBUS DIRAC DOCS DTS DVDREAD \ DVDNAV FAAD FLAC FLUID FRIBIDI GLX GNOMEVFS GNUTLS GOOM \ HTTPD JACK LIBSSH2 LIRC LIVEMEDIA LUA MAD MATROSKA MODPLUG \ MPEG2 MTP MUSEPACK NCURSES NLS NOTIFY OPTIMIZED_CFLAGS OGG \ - OPUS PNG PORTAUDIO PROJM PULSEAUDIO QT4 REALAUDIO RUNROOT \ + OPUS PNG PULSEAUDIO QT4 REALAUDIO RUNROOT \ SAMBA SCHROED SDL SHOUTCAST SKINS STREAM SPEEX SQLITE SVG \ TAGLIB THEORA TWOLAME UPNP V4L VAAPI VCD VORBIS \ X11 X264 XCB XOSD XVIDEO ZVBI SERVER_ONLY DEBUG \ @@ -46,7 +44,6 @@ GOOM_DESC= the Goom visual effect librar LIBSSH2_DESC= SCP/SFTP support via libssh2 NCURSES_DESC= ncurses (console) interface OPUS_DESC= Opus audio format -PROJM_DESC= ProjectM visualizations REALAUDIO_DESC= Real Audio(R) support RUNROOT_DESC= Enable running as root SAMBA_DESC= SAMBA Access module @@ -61,35 +58,22 @@ XCB_DESC= Use X C Bindings for X11 outpu XOSD_DESC= X11 On Screen Display support ZVBI_DESC= VBI decoding support SERVER_ONLY_DESC= Only build server parts -UNSAFE_PLUGINS_DESC= Install unsafe, unsupported plugins NO_DVD_DESC= disable DVD specific features USE_XZ= yes -USES= iconv perl5 gmake pkgconfig +USES= desktop-file-utils iconv perl5 gmake pkgconfig USE_PERL5= build USE_GL= yes USE_CSTD= gnu99 WANT_GNOME= yes WRKSRC= ${WRKDIR}/${DISTNAME:S/a$//} -FAKEDIR= ${WRKDIR}/fake${PREFIX} -PLIST= ${WRKDIR}/plist - USE_LDCONFIG= yes GNU_CONFIGURE= yes -FFMPEG_SUFFIX= 1 -FFMPEG_INCDIR= ${LOCALBASE}/include/ffmpeg${FFMPEG_SUFFIX} -FFMPEG_LIBDIR= ${LOCALBASE}/lib/ffmpeg${FFMPEG_SUFFIX} -CPPFLAGS+= -I${FAKEDIR}/include -I${WRKSRC}/include \ - -I${FFMPEG_INCDIR} \ - ${PTHREAD_CFLAGS} +CPPFLAGS+= -I${WRKSRC}/include CONFIGURE_ENV= LIBS="-lc" -LDFLAGS+= -L${FAKEDIR}/lib \ +LDFLAGS+= -L${STAGEDIR}${PREFIX}/lib \ ${PTHREAD_LIBS} -lc -CONFIGURE_ENV+= AVCODEC_CFLAGS="-I${FFMPEG_INCDIR}" AVCODEC_LIBS="-L${FFMPEG_LIBDIR} -Wl,-rpath -Wl,${FFMPEG_LIBDIR} -lavcodec${FFMPEG_SUFFIX}" -CONFIGURE_ENV+= AVFORMAT_CFLAGS="-I${FFMPEG_INCDIR}" AVFORMAT_LIBS="-L${FFMPEG_LIBDIR} -Wl,-rpath -Wl,${FFMPEG_LIBDIR} -lavformat${FFMPEG_SUFFIX}" -CONFIGURE_ENV+= POSTPROC_CFLAGS="-I${FFMPEG_INCDIR}" POSTPROC_LIBS="-L${FFMPEG_LIBDIR} -Wl,-rpath -Wl,${FFMPEG_LIBDIR} -lpostproc${FFMPEG_SUFFIX}" -CONFIGURE_ENV+= SWSCALE_CFLAGS="-I${FFMPEG_INCDIR}" SWSCALE_LIBS="-L${FFMPEG_LIBDIR} -Wl,-rpath -Wl,${FFMPEG_LIBDIR} -lswscale${FFMPEG_SUFFIX}" CONFIGURE_ARGS+= --enable-vlc \ --enable-avcodec \ @@ -103,15 +87,12 @@ CONFIGURE_ARGS+= --enable-vlc \ --disable-directfb \ --disable-dv \ --disable-loader \ + --disable-projectm \ --disable-telx \ + --disable-tremor \ --disable-udev \ --disable-update-check -MAN1= vlc.1 \ - vlc-wrapper.1 - -NO_STAGE= yes - .include <bsd.port.options.mk> # Macro section @@ -140,11 +121,6 @@ PORT_OPTIONS:= ${PORT_OPTIONS:O:u} .endif .endif -# WITH_UNSAFE_PLUGINS -# This knob allows installation of misbehaving plugins that do not function as -# intended on FreeBSD. They are considered unsupported. Use if you would like to -# help fix them. - # This was the pre-1.1.0 DEBUG option. It differs in function than bsd.port.mk's # knob and is not needed by most users. Put here for those who need/want it. .if ${PORT_OPTIONS:MDEBUG} @@ -168,27 +144,27 @@ CONFIGURE_ARGS+=--disable-qt4 .if ${PORT_OPTIONS:MA52} CONFIGURE_ARGS+=--enable-a52 -LIB_DEPENDS+= a52:${PORTSDIR}/audio/liba52 +LIB_DEPENDS+= liba52.so:${PORTSDIR}/audio/liba52 .else CONFIGURE_ARGS+=--disable-a52 .endif .if ${PORT_OPTIONS:MAALIB} -LIB_DEPENDS+= aa:${PORTSDIR}/graphics/aalib +LIB_DEPENDS+= libaa.so:${PORTSDIR}/graphics/aalib CONFIGURE_ARGS+=--enable-aa .else CONFIGURE_ARGS+=--disable-aa .endif .if ${PORT_OPTIONS:MASS} -LIB_DEPENDS+= ass:${PORTSDIR}/multimedia/libass +LIB_DEPENDS+= libass.so:${PORTSDIR}/multimedia/libass CONFIGURE_ARGS+=--enable-libass .else CONFIGURE_ARGS+=--disable-libass .endif .if ${PORT_OPTIONS:MAVAHI} -LIB_DEPENDS+= avahi-common:${PORTSDIR}/net/avahi-app +LIB_DEPENDS+= libavahi-common.so:${PORTSDIR}/net/avahi-app CONFIGURE_ARGS+=--enable-bonjour .else CONFIGURE_ARGS+=--disable-bonjour @@ -196,7 +172,7 @@ CONFIGURE_ARGS+=--disable-bonjour .if ${PORT_OPTIONS:MCACA} .if ${PORT_OPTIONS:MAALIB} -LIB_DEPENDS+= caca:${PORTSDIR}/graphics/libcaca +LIB_DEPENDS+= libcaca.so:${PORTSDIR}/graphics/libcaca CONFIGURE_ARGS+=--enable-caca .else IGNORE= CACA option requires AALIB option @@ -206,14 +182,14 @@ CONFIGURE_ARGS+=--disable-caca .endif .if ${PORT_OPTIONS:MDBUS} -LIB_DEPENDS+= dbus-1:${PORTSDIR}/devel/dbus +LIB_DEPENDS+= libdbus-1.so:${PORTSDIR}/devel/dbus CONFIGURE_ARGS+=--enable-dbus .else CONFIGURE_ARGS+=--disable-dbus .endif .if ${PORT_OPTIONS:MDIRAC} -LIB_DEPENDS+= dirac_decoder:${PORTSDIR}/multimedia/dirac +LIB_DEPENDS+= libdirac_decoder.so:${PORTSDIR}/multimedia/dirac CONFIGURE_ARGS+=--enable-dirac CPPFLAGS+= -I${LOCALBASE}/include/dirac .else @@ -221,49 +197,49 @@ CONFIGURE_ARGS+=--disable-dirac .endif .if ${PORT_OPTIONS:MDTS} -LIB_DEPENDS+= dca:${PORTSDIR}/multimedia/libdca +LIB_DEPENDS+= libdca.so:${PORTSDIR}/multimedia/libdca CONFIGURE_ARGS+=--enable-dca .else CONFIGURE_ARGS+=--disable-dca .endif .if ${PORT_OPTIONS:MDVDREAD} -LIB_DEPENDS+= dvdread:${PORTSDIR}/multimedia/libdvdread +LIB_DEPENDS+= libdvdread.so:${PORTSDIR}/multimedia/libdvdread CONFIGURE_ARGS+=--enable-dvdread .else CONFIGURE_ARGS+=--disable-dvdread .endif .if ${PORT_OPTIONS:MDVDNAV} -LIB_DEPENDS+= dvdnav:${PORTSDIR}/multimedia/libdvdnav +LIB_DEPENDS+= libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav CONFIGURE_ARGS+=--enable-dvdnav .else CONFIGURE_ARGS+=--disable-dvdnav .endif .if ${PORT_OPTIONS:MFAAD} -LIB_DEPENDS+= faad:${PORTSDIR}/audio/faad +LIB_DEPENDS+= libfaad.so:${PORTSDIR}/audio/faad CONFIGURE_ARGS+=--enable-faad .else CONFIGURE_ARGS+=--disable-faad .endif .if ${PORT_OPTIONS:MFLAC} -LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac +LIB_DEPENDS+= libFLAC.so:${PORTSDIR}/audio/flac CONFIGURE_ARGS+=--enable-flac .else CONFIGURE_ARGS+=--disable-flac .endif .if ${PORT_OPTIONS:MFLUID} -LIB_DEPENDS+= fluidsynth:${PORTSDIR}/audio/fluidsynth +LIB_DEPENDS+= libfluidsynth.so:${PORTSDIR}/audio/fluidsynth CONFIGURE_ARGS+=--enable-fluidsynth .else CONFIGURE_ARGS+=--disable-fluidsynth .endif .if ${PORT_OPTIONS:MFRIBIDI} -LIB_DEPENDS+= fribidi:${PORTSDIR}/converters/fribidi +LIB_DEPENDS+= libfribidi.so:${PORTSDIR}/converters/fribidi CONFIGURE_ARGS+=--enable-fribidi .else CONFIGURE_ARGS+=--disable-fribidi @@ -280,7 +256,7 @@ CONFIGURE_ARGS+=--disable-glx .endif .if ${PORT_OPTIONS:MGME} -LIB_DEPENDS+= gme:${PORTSDIR}/audio/libgme +LIB_DEPENDS+= libgme.so:${PORTSDIR}/audio/libgme CONFIGURE_ARGS+=--enable-gme .else CONFIGURE_ARGS+=--disable-gme @@ -294,14 +270,14 @@ CONFIGURE_ARGS+=--disable-gnomevfs .endif .if ${PORT_OPTIONS:MGNUTLS} -LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls +LIB_DEPENDS+= libgnutls.so.28:${PORTSDIR}/security/gnutls3 CONFIGURE_ARGS+=--enable-gnutls .else CONFIGURE_ARGS+=--disable-gnutls .endif .if ${PORT_OPTIONS:MGOOM} -LIB_DEPENDS+= goom2:${PORTSDIR}/graphics/goom +LIB_DEPENDS+= libgoom2.so:${PORTSDIR}/graphics/goom CONFIGURE_ARGS+=--enable-goom .else CONFIGURE_ARGS+=--disable-goom @@ -314,21 +290,21 @@ CONFIGURE_ARGS+=--disable-httpd .endif .if ${PORT_OPTIONS:MJACK} -LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack +LIB_DEPENDS+= libjack.so:${PORTSDIR}/audio/jack CONFIGURE_ARGS+=--enable-jack .else CONFIGURE_ARGS+=--disable-jack .endif .if ${PORT_OPTIONS:MLIBBLURAY} -LIB_DEPENDS+= bluray:${PORTSDIR}/multimedia/libbluray +LIB_DEPENDS+= libbluray.so:${PORTSDIR}/multimedia/libbluray CONFIGURE_ARGS+=--enable-bluray .else CONFIGURE_ARGS+=--disable-bluray .endif .if ${PORT_OPTIONS:MLIBSSH2} -LIB_DEPENDS+= ssh2:${PORTSDIR}/security/libssh2 +LIB_DEPENDS+= libssh2.so:${PORTSDIR}/security/libssh2 CONFIGURE_ARGS+=--enable-sftp .else CONFIGURE_ARGS+=--disable-sftp @@ -336,7 +312,7 @@ CONFIGURE_ARGS+=--disable-sftp .if ${PORT_OPTIONS:MLIRC} CONFIGURE_ARGS+=--enable-lirc -LIB_DEPENDS+= lirc_client:${PORTSDIR}/comms/lirc +LIB_DEPENDS+= liblirc_client.so:${PORTSDIR}/comms/lirc .else CONFIGURE_ARGS+=--disable-lirc .endif @@ -367,43 +343,43 @@ CONFIGURE_ARGS+=--disable-lua .endif .if ${PORT_OPTIONS:MMAD} -LIB_DEPENDS+= id3tag:${PORTSDIR}/audio/libid3tag \ - mad:${PORTSDIR}/audio/libmad +LIB_DEPENDS+= libid3tag.so:${PORTSDIR}/audio/libid3tag \ + libmad.so:${PORTSDIR}/audio/libmad CONFIGURE_ARGS+=--enable-mad --with-mad=${LOCALBASE} .else CONFIGURE_ARGS+=--disable-mad .endif .if ${PORT_OPTIONS:MMATROSKA} -LIB_DEPENDS+= matroska:${PORTSDIR}/multimedia/libmatroska +LIB_DEPENDS+= libmatroska.so:${PORTSDIR}/multimedia/libmatroska CONFIGURE_ARGS+=--enable-mkv .else CONFIGURE_ARGS+=--disable-mkv .endif .if ${PORT_OPTIONS:MMODPLUG} -LIB_DEPENDS+= modplug:${PORTSDIR}/audio/libmodplug +LIB_DEPENDS+= libmodplug.so:${PORTSDIR}/audio/libmodplug CONFIGURE_ARGS+=--enable-mod .else CONFIGURE_ARGS+=--disable-mod .endif .if ${PORT_OPTIONS:MMPEG2} -LIB_DEPENDS+= mpeg2:${PORTSDIR}/multimedia/libmpeg2 +LIB_DEPENDS+= libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 CONFIGURE_ARGS+=--enable-libmpeg2 .else CONFIGURE_ARGS+=--disable-libmpeg2 .endif .if ${PORT_OPTIONS:MMTP} -LIB_DEPENDS+= mtp:${PORTSDIR}/audio/libmtp +LIB_DEPENDS+= libmtp.so:${PORTSDIR}/audio/libmtp CONFIGURE_ARGS+=--enable-mtp .else CONFIGURE_ARGS+=--disable-mtp .endif .if ${PORT_OPTIONS:MMUSEPACK} -LIB_DEPENDS+= mpcdec:${PORTSDIR}/audio/musepack +LIB_DEPENDS+= libmpcdec.so:${PORTSDIR}/audio/musepack CONFIGURE_ARGS+=--enable-mpc .else CONFIGURE_ARGS+=--disable-mpc @@ -424,7 +400,7 @@ CONFIGURE_ARGS+=--disable-nls .if ${PORT_OPTIONS:MNOTIFY} CONFIGURE_ARGS+=--enable-notify -LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= libnotify.so:${PORTSDIR}/devel/libnotify .else CONFIGURE_ARGS+=--disable-notify .endif @@ -435,8 +411,8 @@ CONFIGURE_ARGS+=--enable-optimizations .endif .if ${PORT_OPTIONS:MOGG} -LIB_DEPENDS+= ogg:${PORTSDIR}/audio/libogg \ - kate:${PORTSDIR}/multimedia/libkate +LIB_DEPENDS+= libogg.so:${PORTSDIR}/audio/libogg \ + libkate.so:${PORTSDIR}/multimedia/libkate CONFIGURE_ARGS+=--enable-ogg --enable-kate .else PORT_OPTIONS:= ${PORT_OPTIONS:NVORBIS} @@ -444,35 +420,21 @@ CONFIGURE_ARGS+=--disable-ogg --disable- .endif .if ${PORT_OPTIONS:MOPUS} -LIB_DEPENDS+= opus:${PORTSDIR}/audio/opus +LIB_DEPENDS+= libopus.so:${PORTSDIR}/audio/opus CONFIGURE_ARGS+=--enable-opus .else CONFIGURE_ARGS+=--disable-opus .endif .if ${PORT_OPTIONS:MPNG} -LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png +LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png CONFIGURE_ARGS+=--enable-png .else CONFIGURE_ARGS+=--disable-png .endif -.if ${PORT_OPTIONS:MPORTAUDIO} -LIB_DEPENDS+= portaudio.2:${PORTSDIR}/audio/portaudio2 -CONFIGURE_ARGS+=--enable-portaudio -.else -CONFIGURE_ARGS+=--disable-portaudio -.endif - -.if ${PORT_OPTIONS:MPROJM} -LIB_DEPENDS+= projectM:${PORTSDIR}/graphics/libprojectm -CONFIGURE_ARGS+=--enable-projectm -.else -CONFIGURE_ARGS+=--disable-projectm -.endif - .if ${PORT_OPTIONS:MPULSEAUDIO} -LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio +LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio CONFIGURE_ARGS+=--enable-pulse .else CONFIGURE_ARGS+=--enable-pulse=no @@ -492,28 +454,28 @@ CONFIGURE_ARGS+=--enable-run-as-root .endif .if ${PORT_OPTIONS:MSAMPLERATE} -LIB_DEPENDS+= samplerate:${PORTSDIR}/audio/libsamplerate +LIB_DEPENDS+= libsamplerate.so:${PORTSDIR}/audio/libsamplerate CONFIGURE_ARGS+=--enable-samplerate .else CONFIGURE_ARGS+=--disable-samplerate .endif .if ${PORT_OPTIONS:MSAMBA} -LIB_DEPENDS+= smbclient:${PORTSDIR}/net/samba-libsmbclient +LIB_DEPENDS+= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient CONFIGURE_ARGS+=--enable-smb .else CONFIGURE_ARGS+=--disable-smb .endif .if ${PORT_OPTIONS:MSCHROED} -LIB_DEPENDS+= schroedinger-1:${PORTSDIR}/multimedia/schroedinger +LIB_DEPENDS+= libschroedinger-1.so:${PORTSDIR}/multimedia/schroedinger CONFIGURE_ARGS+=--enable-schroedinger .else CONFIGURE_ARGS+=--disable-schroedinger .endif .if ${PORT_OPTIONS:MSIDPLAY} -LIB_DEPENDS+= sidplay2:${PORTSDIR}/audio/libsidplay2 +LIB_DEPENDS+= libsidplay2.so:${PORTSDIR}/audio/libsidplay2 LDFLAGS+= -L${LOCALBASE}/lib/sidplay/builders CONFIGURE_ARGS+=--enable-sid .else @@ -529,7 +491,7 @@ CONFIGURE_ARGS+=--disable-sdl --disable- .endif .if ${PORT_OPTIONS:MSHOUTCAST} -LIB_DEPENDS+= shout:${PORTSDIR}/audio/libshout2 +LIB_DEPENDS+= libshout.so:${PORTSDIR}/audio/libshout2 CONFIGURE_ARGS+=--enable-shout .else CONFIGURE_ARGS+=--disable-shout @@ -537,7 +499,7 @@ CONFIGURE_ARGS+=--disable-shout .if ${PORT_OPTIONS:MSKINS} .if ${PORT_OPTIONS:MQT4} -LIB_DEPENDS+= tar:${PORTSDIR}/devel/libtar +LIB_DEPENDS+= libtar.so:${PORTSDIR}/devel/libtar CONFIGURE_ARGS+=--enable-skins2 --enable-libtar .else IGNORE= SKINS option requires QT4 option @@ -553,7 +515,7 @@ CONFIGURE_ARGS+=--disable-sout .endif .if ${PORT_OPTIONS:MSPEEX} -LIB_DEPENDS+= speex:${PORTSDIR}/audio/speex +LIB_DEPENDS+= libspeex.so:${PORTSDIR}/audio/speex CONFIGURE_ARGS+=--enable-speex CPPFLAGS+=-I${LOCALBASE}/include/speex .else @@ -561,7 +523,7 @@ CONFIGURE_ARGS+=--disable-speex .endif .if ${PORT_OPTIONS:MSQLITE} -LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3 +LIB_DEPENDS+= libsqlite3.so:${PORTSDIR}/databases/sqlite3 CONFIGURE_ARGS+=--enable-sqlite .else CONFIGURE_ARGS+=--disable-sqlite @@ -575,65 +537,56 @@ CONFIGURE_ARGS+=--disable-svg .endif .if ${PORT_OPTIONS:MTAGLIB} -LIB_DEPENDS+= tag:${PORTSDIR}/audio/taglib +LIB_DEPENDS+= libtag.so:${PORTSDIR}/audio/taglib CONFIGURE_ARGS+=--enable-taglib .else CONFIGURE_ARGS+=--disable-taglib .endif .if ${PORT_OPTIONS:MTHEORA} -LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora +LIB_DEPENDS+= libtheora.so:${PORTSDIR}/multimedia/libtheora CONFIGURE_ARGS+=--enable-theora .else CONFIGURE_ARGS+=--disable-theora .endif -# XXX Tremor support no longer builds with 2.0.3 -#.if ${PORT_OPTIONS:MTREMOR} -# Tremor is integer based Vorbis subset, using both is redundant -#LIB_DEPENDS+= vorbisidec:${PORTSDIR}/audio/libtremor -#CONFIGURE_ARGS+=--enable-tremor -#.else -CONFIGURE_ARGS+=--disable-tremor -#.endif - .if ${PORT_OPTIONS:MTWOLAME} -LIB_DEPENDS+= twolame:${PORTSDIR}/audio/twolame +LIB_DEPENDS+= libtwolame.so:${PORTSDIR}/audio/twolame CONFIGURE_ARGS+= --enable-twolame .else CONFIGURE_ARGS+= --disable-twolame .endif .if ${PORT_OPTIONS:MUPNP} -LIB_DEPENDS+= upnp:${PORTSDIR}/devel/upnp +LIB_DEPENDS+= libupnp.so:${PORTSDIR}/devel/upnp CONFIGURE_ARGS+=--enable-upnp .else CONFIGURE_ARGS+=--disable-upnp .endif .if ${PORT_OPTIONS:MV4L} || ${PORT_OPTIONS:MDVB} -LIB_DEPENDS+= v4l1:${PORTSDIR}/multimedia/libv4l +LIB_DEPENDS+= libv4l1.so:${PORTSDIR}/multimedia/libv4l CONFIGURE_ARGS+=--enable-v4l2 .else CONFIGURE_ARGS+=--disable-v4l2 .endif .if ${PORT_OPTIONS:MVAAPI} -LIB_DEPENDS+= va:${PORTSDIR}/multimedia/libva +LIB_DEPENDS+= libva.so:${PORTSDIR}/multimedia/libva CONFIGURE_ARGS+=--enable-libva .else CONFIGURE_ARGS+=--disable-libva .endif .if ${PORT_OPTIONS:MVCD} -LIB_DEPENDS+= cddb:${PORTSDIR}/audio/libcddb +LIB_DEPENDS+= libcddb.so:${PORTSDIR}/audio/libcddb CONFIGURE_ARGS+=--enable-vcd --enable-libcddb .else CONFIGURE_ARGS+=--disable-vcd --disable-libcddb .endif .if ${PORT_OPTIONS:MVORBIS} -LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis +LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+=--enable-vorbis .else CONFIGURE_ARGS+=--disable-vorbis @@ -647,21 +600,21 @@ CONFIGURE_ARGS+=--without-x .if ${PORT_OPTIONS:MX264} CONFIGURE_ARGS+=--enable-x264 -LIB_DEPENDS+= x264:${PORTSDIR}/multimedia/x264 +LIB_DEPENDS+= libx264.so:${PORTSDIR}/multimedia/x264 .else CONFIGURE_ARGS+=--disable-x264 .endif .if ${PORT_OPTIONS:MXCB} USE_XORG= xcb xpm -LIB_DEPENDS+= xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms +LIB_DEPENDS+= libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms CONFIGURE_ARGS+=--enable-xcb --with-x .else CONFIGURE_ARGS+=--disable-xcb --without-x .endif .if ${PORT_OPTIONS:MXOSD} -LIB_DEPENDS+= xosd:${PORTSDIR}/misc/xosd +LIB_DEPENDS+= libxosd.so:${PORTSDIR}/misc/xosd CONFIGURE_ARGS+=--enable-xosd .else CONFIGURE_ARGS+=--disable-xosd @@ -678,7 +631,7 @@ CONFIGURE_ARGS+=--disable-xvideo .endif .if ${PORT_OPTIONS:MZVBI} -LIB_DEPENDS+= zvbi:${PORTSDIR}/devel/libzvbi +LIB_DEPENDS+= libzvbi.so:${PORTSDIR}/devel/libzvbi CONFIGURE_ARGS+=--enable-zvbi .else CONFIGURE_ARGS+=--disable-zvbi @@ -741,108 +694,36 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ -e '\|LIBS|s|-lrt||' \ - -e '/PKG_CONFIG.*lib.*</s|libavcodec <|libavcodec${FFMPEG_SUFFIX} <|' \ + -e 's|gnutls |gnutls3 |g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf|${WITH_VLC_DEFAULT_FONT}|' \ ${WRKSRC}/modules/text_renderer/freetype.c @${REINPLACE_CMD} -e 's|/dev/cdrom|${WITH_CDROM_DEVICE}|g' \ -e 's|/dev/dvd|${WITH_DVD_DEVICE}|g' \ ${WRKSRC}/include/vlc_config.h - ${REINPLACE_CMD} -e 's|portaudio\.h|portaudio2/&|g' \ - ${WRKSRC}/modules/audio_output/portaudio.c - ${REINPLACE_CMD} -e "s|/usr/share/projectM|${LOCALBASE}/share/projectM|g" \ - -e "s|/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf|${WITH_VLC_DEFAULT_FONT}|g" \ - -e "s|/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf|${WITH_VLC_DEFAULT_MONO_FONT}|g" \ - ${WRKSRC}/modules/visualization/projectm.cpp - -pre-configure: -.if ${PORT_OPTIONS:MPLUGIN} - ${REINPLACE_CMD} -e 's|npvlcdir = $$(libdir)/mozilla/plugins|npvlcdir = ${WEBPLUGINS_DIR}|g' \ - ${WRKSRC}/projects/mozilla/Makefile.am \ - ${WRKSRC}/projects/mozilla/Makefile.in -.endif - -pre-install: - ${RM} -rf ${PLIST} ${FAKEDIR} - ${MKDIR} ${FAKEDIR} - ${TOUCH} -f ${PLIST} - ${ECHO_CMD} "share/pixmaps/vlc.png" >> ${PLIST} - ${ECHO_CMD} "share/applications/vlc.desktop" >> ${PLIST} - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ - ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} prefix=${FAKEDIR} - ${RM} -f ${FAKEDIR}/share/locale/locale.alias - cd ${FAKEDIR}/bin && ${FIND} -s * | \ - ${SED} -e 's|^|bin/|' >> ${PLIST} - cd ${FAKEDIR}/include && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|include/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrmtry include/|' >> ${PLIST} -.if ${PORT_OPTIONS:MUNSAFE_PLUGINS} - ${RM} -f ${FAKEDIR}/lib/vlc/plugins/services_discovery/libsap_plugin.la - ${RM} -f ${FAKEDIR}/lib/vlc/plugins/services_discovery/libsap_plugin.so -.endif -.if ${PORT_OPTIONS:MPLUGIN} -. for ext in so la - ${ECHO_CMD} "${WEBPLUGINS_DIR}/libvlcplugin.${ext}" | \ - ${SED} -e 's|${PREFIX}/||' >> ${PLIST} -. endfor - ${ECHO_CMD} "@dirrmtry ${WEBPLUGINS_DIR}" | \ - ${SED} -e 's|${PREFIX}/||' >> ${PLIST} -.endif - ${MKDIR} ${FAKEDIR}/libdata - ${MV} ${FAKEDIR}/lib/pkgconfig ${FAKEDIR}/libdata/pkgconfig - cd ${FAKEDIR}/lib && ${FIND} -s * -type f -o -type l| \ - ${SED} -e 's|^|lib/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrmtry lib/|' >> ${PLIST} - cd ${FAKEDIR}/libdata && ${FIND} -s * -type f -o -type l| \ - ${SED} -e 's|^|libdata/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrmtry libdata/|' >> ${PLIST} -.for dir in icons kde4 vlc - if [ -d ${FAKEDIR}/share/${dir} ]; then \ - cd ${FAKEDIR}/share/${dir} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|share/${dir}/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrmtry share/${dir}/|' >> ${PLIST} \ - && ${ECHO_CMD} "@dirrmtry share/${dir}" >> ${PLIST} ; \ - fi -.endfor -.if ${PORT_OPTIONS:MDOCS} - cd ${FAKEDIR}/share/doc && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|share/doc/|' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrmtry share/doc/|' >> ${PLIST} -.else - ${RM} -rf ${FAKEDIR}/share/doc -.endif -.if ${PORT_OPTIONS:MNLS} - cd ${FAKEDIR}/share/locale && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|share/locale/|' >> ${PLIST} -.for locale in ach an az cgg bn_IN ckb co ff fur gd ia kk km kmr kn ky lg my oc or_IN ps tet tl zu - ${ECHO_CMD} "@dirrmtry share/locale/${locale}/LC_MESSAGES" >> ${PLIST} - ${ECHO_CMD} "@dirrmtry share/locale/${locale}" >> ${PLIST} -.endfor -.endif - -do-install: - cd ${FAKEDIR}/bin && ${FIND} . | \ - ${CPIO} -vpdm -R ${BINOWN}:${BINGRP} ${PREFIX}/bin - cd ${FAKEDIR}/include && ${FIND} . | \ - ${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include - cd ${FAKEDIR}/lib && ${FIND} . | \ - ${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib - ${INSTALL_DATA} ${FAKEDIR}/share/icons/hicolor/48x48/apps/vlc.png \ - ${PREFIX}/share/pixmaps/vlc.png - if [ -d ${FAKEDIR}/libdata ]; then \ - cd ${FAKEDIR}/libdata && ${FIND} . | \ - ${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/libdata ; \ - fi - cd ${FAKEDIR}/share && ${FIND} . | \ - ${CPIO} -vpdm -L -R ${SHAREOWN} ${PREFIX}/share - ${INSTALL_MAN} ${WRKSRC}/doc/vlc.1 ${MANPREFIX}/man/man1/ - if [ ! -d ${PREFIX}/share/applications ]; then \ - ${MKDIR} ${PREFIX}/share/applications ; \ - fi + @${RM} -rf ${WRKSRC}/modules/access/v4l2/linux + +post-install: + @if [ -n "${MTREE_FILE}" ]; then \ + { ${ECHO_CMD} "#mtree"; ${CAT} ${MTREE_FILE}; } | ${TAR} tf - | \ + awk '{ sub(/^\.$$/, "", $$1); \ + if ($$1 == "") print "${PREFIX}"; else print "${PREFIX}/"$$1; }' ; \ + fi > ${WRKDIR}/.mtree + @a=${PREFIX}; \ + while :; do \ + a=$${a%/*} ; \ + [ -z "$${a}" ] && break ; \ + ${ECHO_CMD} $${a} >> ${WRKDIR}/.mtree ; \ + done + @${FIND} ${STAGEDIR} -type f -o -type l | ${SORT} | ${SED} -E -e "s,${STAGEDIR},,g" \ + -e "s,${PREFIX}/,,g" -e "s,(.*man/.*\.[0-9])$$,\1.gz,g"| ${GREP} -v "^share/licenses" >> ${TMPPLIST} || ${TRUE} + @${FIND} ${STAGEDIR} -type d | ${SED} -e "s,${STAGEDIR},,g" \ + | while read line; do \ + ${GREP} -qw "^$${line}$$" ${WRKDIR}/.mtree || { \ + [ -n "$${line}" ] && ${ECHO_CMD} "@dirrmtry $${line}"; \ + }; \ + done | ${SORT} -r | ${SED} \ + -e "s,${PREFIX}/,,g" | ${GREP} -v "^@dirrmtry share/licenses" >> ${TMPPLIST} || ${TRUE} + .include <bsd.port.post.mk> Modified: head/multimedia/vlc/distinfo ============================================================================== --- head/multimedia/vlc/distinfo Sat Oct 26 23:00:15 2013 (r331740) +++ head/multimedia/vlc/distinfo Sat Oct 26 23:46:09 2013 (r331741) @@ -1,2 +1,2 @@ -SHA256 (vlc-2.0.8a.tar.xz) = 05215f34c487723c84ebb54ab43b836fc70fb466326f7c601847141a499034d2 -SIZE (vlc-2.0.8a.tar.xz) = 18859964 +SHA256 (vlc-2.1.0.tar.xz) = d2177daa31786acf1e961b2f63429797a8c62c090e5359bcc7929a1ba5fe41f7 +SIZE (vlc-2.1.0.tar.xz) = 19571224 Added: head/multimedia/vlc/files/patch-include-vlc_threads.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vlc/files/patch-include-vlc_threads.h Sat Oct 26 23:46:09 2013 (r331741) @@ -0,0 +1,18 @@ +--- include/vlc_threads.h.orig 2013-10-22 15:47:18.000000000 +0200 ++++ include/vlc_threads.h 2013-10-22 15:48:00.000000000 +0200 +@@ -342,13 +342,13 @@ + * Removes a cleanup procedure that was previously registered with + * vlc_cleanup_push(). + */ +-# define vlc_cleanup_pop( ) pthread_cleanup_pop (0) ++# define vlc_cleanup_pop( ) ; pthread_cleanup_pop (0) + + /** + * Removes a cleanup procedure that was previously registered with + * vlc_cleanup_push(), and executes it. + */ +-# define vlc_cleanup_run( ) pthread_cleanup_pop (1) ++# define vlc_cleanup_run( ) ; pthread_cleanup_pop (1) + + #else + enum Added: head/multimedia/vlc/files/patch-modules-misc-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vlc/files/patch-modules-misc-Makefile.in Sat Oct 26 23:46:09 2013 (r331741) @@ -0,0 +1,11 @@ +--- modules/misc/Makefile.in.orig 2013-10-22 11:39:59.422985616 -0200 ++++ modules/misc/Makefile.in 2013-10-22 11:40:23.945984594 -0200 +@@ -1463,7 +1463,7 @@ + @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfingerprinter_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libfingerprinter_plugin_la_CFLAGS) $(CFLAGS) -c -o libfingerprinter_plugin_la-json.lo `test -f 'webservices/json.c' || echo '$(srcdir)/'`webservices/json.c + + libgnutls_plugin_la-gnutls.lo: gnutls.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnutls_plugin_la_CFLAGS) $(CFLAGS) -MT libgnutls_plugin_la-gnutls.lo -MD -MP -MF $(DEPDIR)/libgnutls_plugin_la-gnutls.Tpo -c -o libgnutls_plugin_la-gnutls.lo `test -f 'gnutls.c' || echo '$(srcdir)/'`gnutls.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(libgnutls_plugin_la_CFLAGS) $(CPPFLAGS) $(CFLAGS) -MT libgnutls_plugin_la-gnutls.lo -MD -MP -MF $(DEPDIR)/libgnutls_plugin_la-gnutls.Tpo -c -o libgnutls_plugin_la-gnutls.lo `test -f 'gnutls.c' || echo '$(srcdir)/'`gnutls.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnutls_plugin_la-gnutls.Tpo $(DEPDIR)/libgnutls_plugin_la-gnutls.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gnutls.c' object='libgnutls_plugin_la-gnutls.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ Modified: head/multimedia/vlc/files/patch-share-Makefile.in ============================================================================== --- head/multimedia/vlc/files/patch-share-Makefile.in Sat Oct 26 23:00:15 2013 (r331740) +++ head/multimedia/vlc/files/patch-share-Makefile.in Sat Oct 26 23:46:09 2013 (r331741) @@ -1,6 +1,6 @@ --- share/Makefile.in.orig +++ share/Makefile.in -@@ -1734,19 +1734,19 @@ uninstall-am: uninstall-appdataDATA unin +@@ -1734,15 +1734,15 @@ uninstall-am: uninstall-appdataDATA unin vlc.desktop: vlc.desktop.in $(top_builddir)/config.status @@ -9,11 +9,6 @@ $(AM_V_at)$(DESKTOP_FILE_VALIDATE) tmp-$@ $(AM_V_at)mv -f tmp-$@ $@ - osdmenu/default.cfg: osdmenu/default.cfg.in $(top_builddir)/config.status - $(AM_V_GEN)mkdir -p osdmenu; \ -- sed -e 's,\@vlcdatadir\@,$(vlcdatadir),g' < "$<" > $@ -+ sed -e 's,\@vlcdatadir\@,$(vlcdatadir),g' < osdmenu/default.cfg.in > $@ - skins2/default.vlt: $(skins2_default_vlt_FILES) mkdir -p skins2 (cd "$(srcdir)/skins2"; find default -print0 | \ Added: head/multimedia/vlc/files/patch-v4l ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vlc/files/patch-v4l Sat Oct 26 23:46:09 2013 (r331741) @@ -0,0 +1,15 @@ +--- modules/access/v4l2/v4l2.h.orig 2013-10-22 10:17:30.534986266 -0200 ++++ modules/access/v4l2/v4l2.h 2013-10-22 10:17:39.613985219 -0200 +@@ -20,6 +20,12 @@ + + #include <linux/videodev2.h> + ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++#define V4L2_BUF_FLAG_TIMESTAMP_MASK 0xe000 ++#define V4L2_BUF_FLAG_TIMESTAMP_UNKNOWN 0x0000 ++#define V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC 0x2000 ++#endif ++ + /* libv4l2 functions */ + extern int v4l2_fd_open (int, int); + extern int (*v4l2_close) (int);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310262346.r9QNkAUe000205>