8 files changed, 30 insertions, 10 deletions

diff --git a/audio/gstreamer-plugins-opus/Makefile b/audio/gstreamer-plugins-opus/Makefile
index 21385bbd7679..c67f07340103 100644
--- a/audio/gstreamer-plugins-opus/Makefile
+++ b/audio/gstreamer-plugins-opus/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer Opus audio encoder/decoder plugin
diff --git a/audio/gstreamer1-plugins-opus/Makefile b/audio/gstreamer1-plugins-opus/Makefile
index f8080177e474..a08d9426effc 100644
--- a/audio/gstreamer1-plugins-opus/Makefile
+++ b/audio/gstreamer1-plugins-opus/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer Opus audio encoder/decoder plugin
diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
index ecd02b0e59e2..0fa90173ee3c 100644
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mumble
 PORTVERSION=	1.2.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/Mumble/${PORTVERSION}
 
diff --git a/audio/opus/Makefile b/audio/opus/Makefile
index 2748d069ac39..7e0bff0efa72 100644
--- a/audio/opus/Makefile
+++ b/audio/opus/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	opus
-PORTVERSION=	1.0.3
+PORTVERSION=	1.1
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/opus/ \
 		https://ftp.mozilla.org/pub/mozilla.org/opus/
@@ -9,7 +9,7 @@ MASTER_SITES=	http://downloads.xiph.org/releases/opus/ \
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	IETF audio codec
 
-USES=		pathfix
+USES=		gmake pathfix
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
@@ -19,7 +19,7 @@ CONFIGURE_ARGS=	--enable-custom-modes \
 		--disable-doc   # requires doxygen
 
 regression-test: build
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.options.mk>
 
diff --git a/audio/opus/distinfo b/audio/opus/distinfo
index c3339d47fd31..1fd102cd635f 100644
--- a/audio/opus/distinfo
+++ b/audio/opus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opus-1.0.3.tar.gz) = 191a089c92dbc403de6980463dd3604b65beb12d283c607e246c8076363cb49c
-SIZE (opus-1.0.3.tar.gz) = 781049
+SHA256 (opus-1.1.tar.gz) = b9727015a58affcf3db527322bf8c4d2fcf39f5f6b8f15dbceca20206cbe1d95
+SIZE (opus-1.1.tar.gz) = 850208
diff --git a/audio/opus/files/patch-configure b/audio/opus/files/patch-configure
new file mode 100644
index 000000000000..4e78a15d5c71
--- /dev/null
+++ b/audio/opus/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig	2013-12-17 16:51:41.000000000 +0100
++++ configure	2013-12-17 16:52:02.000000000 +0100
+@@ -12807,7 +12807,7 @@ else
+   CPU_ARM_FALSE=
+ fi
+ 
+- if test x"${inline_optimization:0:3}" = x"ARM"; then
++ if expr x"${inline_optimization}" : x"ARM" >/dev/null; then
+   OPUS_ARM_INLINE_ASM_TRUE=
+   OPUS_ARM_INLINE_ASM_FALSE='#'
+ else
+@@ -12815,7 +12815,7 @@ else
+   OPUS_ARM_INLINE_ASM_FALSE=
+ fi
+ 
+- if test x"${asm_optimization:0:3}" = x"ARM"; then
++ if expr x"${asm_optimization}" : x"ARM" >/dev/null; then
+   OPUS_ARM_EXTERNAL_ASM_TRUE=
+   OPUS_ARM_EXTERNAL_ASM_FALSE='#'
+ else
diff --git a/audio/opus/pkg-plist b/audio/opus/pkg-plist
index 1dd881f2d924..d6df3ab3d1f5 100644
--- a/audio/opus/pkg-plist
+++ b/audio/opus/pkg-plist
@@ -6,7 +6,7 @@ include/opus/opus_types.h
 lib/libopus.a
 lib/libopus.la
 lib/libopus.so
-lib/libopus.so.4
+lib/libopus.so.5
 libdata/pkgconfig/opus.pc
 share/aclocal/opus.m4
 @dirrm include/opus
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index f0154aca9e83..b4557b6cad7c 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	2.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \