Change PKGNAME to libopus from opus, follow directory name,

and update to 1.1

Changelog:
Opus 1.1 includes:

    new analysis code and tuning that significantly improves encoding quality, especially for variable-bitrate (VBR),
    automatic detection of speech or music to decide which encoding mode to use,
    surround with good quality at 128 kbps for 5.1 and usable down to 48 kbps, and
    speed improvements on all architectures, especially ARM, where decoding uses around 40% less CPU and encoding uses around 30% less CPU.

5 files changed, 183 insertions, 16 deletions

diff --git a/audio/libopus/Makefile b/audio/libopus/Makefile
index d5ae7c152eb..7940cc87045 100644
--- a/audio/libopus/Makefile
+++ b/audio/libopus/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2012/12/11 10:26:56 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2014/01/02 14:43:21 ryoon Exp $
 #
 
-DISTNAME=	opus-1.0.2
+DISTNAME=	opus-1.1
+PKGNAME=	lib${DISTNAME}
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/opus/
 
@@ -10,6 +11,9 @@ HOMEPAGE=	http://opus-codec.org/
 COMMENT=	Totally open, royalty-free, highly versatile audio codec library
 LICENSE=	modified-bsd
 
+CONFLICTS=	opus<=1.0.2
+SUPERSEDES=	opus<=1.0.2
+
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
diff --git a/audio/libopus/PLIST b/audio/libopus/PLIST
index 1aa29fc9942..1bfd48920c2 100644
--- a/audio/libopus/PLIST
+++ b/audio/libopus/PLIST
@@ -1,8 +1,135 @@
-@comment $NetBSD: PLIST,v 1.1 2012/09/16 14:17:20 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/01/02 14:43:21 ryoon Exp $
 include/opus/opus.h
 include/opus/opus_defines.h
 include/opus/opus_multistream.h
 include/opus/opus_types.h
 lib/libopus.la
 lib/pkgconfig/opus.pc
+man/man3/opus_ctlvalues.3
+man/man3/opus_custom.3
+man/man3/opus_custom.h.3
+man/man3/opus_decoder.3
+man/man3/opus_decoderctls.3
+man/man3/opus_defines.h.3
+man/man3/opus_encoder.3
+man/man3/opus_encoderctls.3
+man/man3/opus_errorcodes.3
+man/man3/opus_genericctls.3
+man/man3/opus_libinfo.3
+man/man3/opus_multistream.3
+man/man3/opus_multistream.h.3
+man/man3/opus_multistream_ctls.3
+man/man3/opus_repacketizer.3
+man/man3/opus_types.h.3
 share/aclocal/opus.m4
+share/doc/opus/html/bc_s.png
+share/doc/opus/html/bdwn.png
+share/doc/opus/html/closed.png
+share/doc/opus/html/customdoxygen.css
+share/doc/opus/html/dir_000000.html
+share/doc/opus/html/doxygen.png
+share/doc/opus/html/dynsections.js
+share/doc/opus/html/files.html
+share/doc/opus/html/ftv2blank.png
+share/doc/opus/html/ftv2cl.png
+share/doc/opus/html/ftv2doc.png
+share/doc/opus/html/ftv2folderclosed.png
+share/doc/opus/html/ftv2folderopen.png
+share/doc/opus/html/ftv2lastnode.png
+share/doc/opus/html/ftv2link.png
+share/doc/opus/html/ftv2mlastnode.png
+share/doc/opus/html/ftv2mnode.png
+share/doc/opus/html/ftv2mo.png
+share/doc/opus/html/ftv2node.png
+share/doc/opus/html/ftv2ns.png
+share/doc/opus/html/ftv2plastnode.png
+share/doc/opus/html/ftv2pnode.png
+share/doc/opus/html/ftv2splitbar.png
+share/doc/opus/html/ftv2vertline.png
+share/doc/opus/html/globals.html
+share/doc/opus/html/globals_defs.html
+share/doc/opus/html/globals_func.html
+share/doc/opus/html/globals_type.html
+share/doc/opus/html/group__opus__ctlvalues.html
+share/doc/opus/html/group__opus__custom.html
+share/doc/opus/html/group__opus__decoder.html
+share/doc/opus/html/group__opus__decoderctls.html
+share/doc/opus/html/group__opus__encoder.html
+share/doc/opus/html/group__opus__encoderctls.html
+share/doc/opus/html/group__opus__errorcodes.html
+share/doc/opus/html/group__opus__genericctls.html
+share/doc/opus/html/group__opus__libinfo.html
+share/doc/opus/html/group__opus__multistream.html
+share/doc/opus/html/group__opus__multistream__ctls.html
+share/doc/opus/html/group__opus__repacketizer.html
+share/doc/opus/html/index.html
+share/doc/opus/html/jquery.js
+share/doc/opus/html/modules.html
+share/doc/opus/html/nav_f.png
+share/doc/opus/html/nav_g.png
+share/doc/opus/html/nav_h.png
+share/doc/opus/html/open.png
+share/doc/opus/html/opus_8h.html
+share/doc/opus/html/opus_8h_source.html
+share/doc/opus/html/opus__custom_8h.html
+share/doc/opus/html/opus__custom_8h_source.html
+share/doc/opus/html/opus__defines_8h.html
+share/doc/opus/html/opus__defines_8h_source.html
+share/doc/opus/html/opus__multistream_8h.html
+share/doc/opus/html/opus__multistream_8h_source.html
+share/doc/opus/html/opus__types_8h.html
+share/doc/opus/html/opus__types_8h_source.html
+share/doc/opus/html/opus_logo.svg
+share/doc/opus/html/search/all_64.html
+share/doc/opus/html/search/all_64.js
+share/doc/opus/html/search/all_65.html
+share/doc/opus/html/search/all_65.js
+share/doc/opus/html/search/all_67.html
+share/doc/opus/html/search/all_67.js
+share/doc/opus/html/search/all_6d.html
+share/doc/opus/html/search/all_6d.js
+share/doc/opus/html/search/all_6f.html
+share/doc/opus/html/search/all_6f.js
+share/doc/opus/html/search/all_70.html
+share/doc/opus/html/search/all_70.js
+share/doc/opus/html/search/all_72.html
+share/doc/opus/html/search/all_72.js
+share/doc/opus/html/search/close.png
+share/doc/opus/html/search/defines_6f.html
+share/doc/opus/html/search/defines_6f.js
+share/doc/opus/html/search/files_6f.html
+share/doc/opus/html/search/files_6f.js
+share/doc/opus/html/search/functions_6f.html
+share/doc/opus/html/search/functions_6f.js
+share/doc/opus/html/search/groups_64.html
+share/doc/opus/html/search/groups_64.js
+share/doc/opus/html/search/groups_65.html
+share/doc/opus/html/search/groups_65.js
+share/doc/opus/html/search/groups_67.html
+share/doc/opus/html/search/groups_67.js
+share/doc/opus/html/search/groups_6d.html
+share/doc/opus/html/search/groups_6d.js
+share/doc/opus/html/search/groups_6f.html
+share/doc/opus/html/search/groups_6f.js
+share/doc/opus/html/search/groups_70.html
+share/doc/opus/html/search/groups_70.js
+share/doc/opus/html/search/groups_72.html
+share/doc/opus/html/search/groups_72.js
+share/doc/opus/html/search/mag_sel.png
+share/doc/opus/html/search/nomatches.html
+share/doc/opus/html/search/pages_6f.html
+share/doc/opus/html/search/pages_6f.js
+share/doc/opus/html/search/search.css
+share/doc/opus/html/search/search.js
+share/doc/opus/html/search/search_l.png
+share/doc/opus/html/search/search_m.png
+share/doc/opus/html/search/search_r.png
+share/doc/opus/html/search/typedefs_6f.html
+share/doc/opus/html/search/typedefs_6f.js
+share/doc/opus/html/sync_off.png
+share/doc/opus/html/sync_on.png
+share/doc/opus/html/tab_a.png
+share/doc/opus/html/tab_b.png
+share/doc/opus/html/tab_h.png
+share/doc/opus/html/tab_s.png
+share/doc/opus/html/tabs.css
diff --git a/audio/libopus/buildlink3.mk b/audio/libopus/buildlink3.mk
index 9a501bcd622..e7459e65808 100644
--- a/audio/libopus/buildlink3.mk
+++ b/audio/libopus/buildlink3.mk
@@ -1,13 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2012/12/11 10:29:00 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2014/01/02 14:43:21 ryoon Exp $
 
-BUILDLINK_TREE+=	opus
+BUILDLINK_TREE+=	libopus
 
-.if !defined(OPUS_BUILDLINK3_MK)
-OPUS_BUILDLINK3_MK:=
+.if !defined(LIBOPUS_BUILDLINK3_MK)
+LIBOPUS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.opus+=	opus>=1.0.1
-BUILDLINK_ABI_DEPENDS.opus+=	opus>=1.0.2
-BUILDLINK_PKGSRCDIR.opus?=	../../audio/libopus
-.endif	# OPUS_BUILDLINK3_MK
+BUILDLINK_API_DEPENDS.libopus+=	libopus>=1.1
+BUILDLINK_PKGSRCDIR.libopus?=	../../audio/libopus
+.endif	# LIBOPUS_BUILDLINK3_MK
 
-BUILDLINK_TREE+=	-opus
+BUILDLINK_TREE+=	-libopus
diff --git a/audio/libopus/distinfo b/audio/libopus/distinfo
index 7a81141ee04..d9de67733ad 100644
--- a/audio/libopus/distinfo
+++ b/audio/libopus/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2012/12/11 10:26:56 ryoon Exp $
+$NetBSD: distinfo,v 1.3 2014/01/02 14:43:21 ryoon Exp $
 
-SHA1 (opus-1.0.2.tar.gz) = 37dd3d69b10612cd513ccf26675ef6d61eda24b4
-RMD160 (opus-1.0.2.tar.gz) = d1aa4c534cd7dc629e3ac155866bba810bb6ce42
-Size (opus-1.0.2.tar.gz) = 777306 bytes
+SHA1 (opus-1.1.tar.gz) = 35005f5549e2583f5770590135984dcfce6f3d58
+RMD160 (opus-1.1.tar.gz) = 01945dc82b7573f1d8b706bd82a4cb3fda57da35
+Size (opus-1.1.tar.gz) = 850208 bytes
+SHA1 (patch-configure) = 707ab1c9e5a9ad404b822fa7931d57a54568ead9
diff --git a/audio/libopus/patches/patch-configure b/audio/libopus/patches/patch-configure
new file mode 100644
index 00000000000..3a6aa539c83
--- /dev/null
+++ b/audio/libopus/patches/patch-configure
@@ -0,0 +1,36 @@
+$NetBSD: patch-configure,v 1.1 2014/01/02 14:43:21 ryoon Exp $
+
+* Fix "Syntax error: Bad substitution" error on NetBSD
+  From http://svnweb.freebsd.org/ports/head/audio/opus/files/patch-configure?revision=336843&view=co 
+--- configure.orig	2014-01-02 13:28:21.000000000 +0000
++++ configure
+@@ -12774,9 +12774,9 @@ fi
+ fi
+ 
+                                                 if test x"$rtcd_support" != x""; then :
+-  rtcd_support=ARM"$rtcd_support"
++  rtcd_support=ARM"$rtcd_support" ;
+ else
+-  rtcd_support="no"
++  rtcd_support="no" ;
+ 
+ fi
+ 
+@@ -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