Index: Makefile
===================================================================
--- Makefile	(revision 331242)
+++ Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	vlc
-DISTVERSION=	2.0.8a
-PORTREVISION=	1
+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,13 +13,12 @@
 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}
+BUILD_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
+RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
 
 OPTIONS_DEFINE=	A52 AALIB ASS AVAHI CACA DBUS DIRAC DOCS DTS DVDREAD \
 		DVDNAV FAAD FLAC FLUID FRIBIDI GLX GNOMEVFS GNUTLS GOOM \
@@ -72,24 +70,13 @@
 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} \
+CPPFLAGS+=	-I${WRKSRC}/include \
 		${PTHREAD_CFLAGS}
 CONFIGURE_ENV=	LIBS="-lc"
-LDFLAGS+=	-L${FAKEDIR}/lib \
+LDFLAGS+=	-L${LOCALBASE}/lib/gnutls3 \
 		${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 \
@@ -107,11 +94,6 @@
 			--disable-udev \
 			--disable-update-check
 
-MAN1=		vlc.1 \
-		vlc-wrapper.1
-
-NO_STAGE=	yes
-
 .include <bsd.port.options.mk>
 
 # Macro section
@@ -294,7 +276,7 @@
 .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
@@ -741,7 +723,7 @@
 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
@@ -748,12 +730,11 @@
 	@${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" \
+	@${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
+	@${RM} -rf ${WRKSRC}/modules/access/v4l2/linux
 
 pre-configure:
 .if ${PORT_OPTIONS:MPLUGIN}
@@ -762,88 +743,4 @@
 		${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}
-	${ECHO_CMD} "@dirrmtry share/applications" >> ${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
-
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 331242)
+++ distinfo	(working copy)
@@ -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
Index: files/patch-modules-gui-qt4-util-pictureflow.hpp
===================================================================
--- files/patch-modules-gui-qt4-util-pictureflow.hpp	(revision 331242)
+++ files/patch-modules-gui-qt4-util-pictureflow.hpp	(working copy)
@@ -1,11 +0,0 @@
---- modules/gui/qt4/util/pictureflow.hpp.orig
-+++ modules/gui/qt4/util/pictureflow.hpp
-@@ -28,7 +28,7 @@
- #ifndef PICTUREFLOW_H
- #define PICTUREFLOW_H
- 
--#include <qwidget.h>
-+#include <qt4/QtGui/qwidget.h>
- #include "../components/playlist/playlist_model.hpp" /* getArtPixmap etc */
- 
- class PictureFlowPrivate;
Index: files/patch-share-Makefile.in
===================================================================
--- files/patch-share-Makefile.in	(revision 331242)
+++ files/patch-share-Makefile.in	(working copy)
@@ -1,25 +0,0 @@
---- share/Makefile.in.orig
-+++ share/Makefile.in
-@@ -1734,19 +1734,19 @@ uninstall-am: uninstall-appdataDATA unin
- 
- 
- vlc.desktop: vlc.desktop.in $(top_builddir)/config.status
--	$(AM_V_GEN)sed -e 's,\@bindir\@,$(bindir),g' < "$<" > tmp-$@
-+	$(AM_V_GEN)sed -e 's,\@bindir\@,$(bindir),g' < vlc.desktop.in > tmp-$@
- 	$(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 | \
- 		LC_ALL=C sort -z | \
--		tar cvv --exclude .svn --no-recursion --null -T -) | \
-+		tar cvvf - --exclude .svn --no-recursion --null -T -) | \
- 	gzip -n > skins2/default.vlt
- 
- .lua.luac:
Index: files/patch-v4l
===================================================================
--- files/patch-v4l	(revision 0)
+++ files/patch-v4l	(working copy)
@@ -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);

Property changes on: files/patch-v4l
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: files/patch-vlc-2.0.8-Fix-live555-breakage-in-last-update
===================================================================
--- files/patch-vlc-2.0.8-Fix-live555-breakage-in-last-update	(revision 331242)
+++ files/patch-vlc-2.0.8-Fix-live555-breakage-in-last-update	(working copy)
@@ -1,29 +0,0 @@
-From ea444abae1d09b751314b24f6352e55be335621d Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Kempf <jb@videolan.org>
-Date: Thu, 25 Jul 2013 01:14:32 +0200
-Subject: [PATCH] Fix live555 breakage in last update
-
----
- modules/demux/live555.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
-index 9e02630..7a1ab16 100644
---- modules/demux/live555.cpp
-+++ modules/demux/live555.cpp
-@@ -243,7 +243,11 @@ public:
-                    char const* applicationName, portNumBits tunnelOverHTTPPortNum,
-                    demux_sys_t *p_sys) :
-                    RTSPClient( env, rtspURL, verbosityLevel, applicationName,
--                   tunnelOverHTTPPortNum )
-+                   tunnelOverHTTPPortNum
-+#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1373932800
-+                   , -1
-+#endif
-+                   )
-     {
-         this->p_sys = p_sys;
-     }
--- 
-1.8.3.4
-