Updated libopenmpt to 0.2.6611.

Add pulseaudio option, default on to follow upstream.

libopenmpt 0.2-beta18 (2016-07-11)

[Change] openmpt123: Add PulseAudio output support. Autotools and
  Makefile build systems now depend on libpulse and libpulse-simple
  by default. Disable with --without-pulseaudio or NO_PULSEAUDIO=1
  respectively. When enabled, PulseAudio will be the default output
  driver,
[Change] xmp-openmpt: Settings are now stored in xmplay.ini like
  with every other plugin.
[Regression] openmpt123: Support for FLAC < 1.3.0 has been removed.
  FLAC before 1.3.0 is broken beyond repair as it provides assert.h
  in the include path.
[Bug] Generated pkg-config file libopenmpt.pc by both Makefile and
  Autotools build systems was totally broken.
[Bug] libopenmpt no longer uses the non-thread-safe global std::rand()
  function.
[Bug] Sample loops in GDM modules did not work when using Emscripten.
[Bug] XM and MO3 loaders could crash due to unaligned memory accesses.
[Bug] Fixed incorrect handling of custom MPTM tunings on big endian
  platforms.
[Bug] Fixed various problems found with clang 3.8 static analyzer,
  address sanitizer and undefined behaviour sanitizer.
[Bug] File header probing functionality was broken for most formats.
[Bug] With non-seekable streams, the entire file was almost always
  cached even if it was not of any supported module type.
  Seeking in allsubsongs-mode now works correctly.
openmpt123: Added subsong support.
Various playback fixes for 669, IT, MT2 and MTM files.
Some MOD files with more than 128 patterns (e.g. NIETNU.MOD) were
  not loaded correctly.
A new example libopenmpt_example_c_probe has been added which
  demonstrates the usage and flexibility of openmpt_could_open_propability()
  in the C API under various constraints.

4 files changed, 18 insertions, 11 deletions

diff --git a/audio/libopenmpt/Makefile b/audio/libopenmpt/Makefile
index eef8f774695..91a37c77276 100644
--- a/audio/libopenmpt/Makefile
+++ b/audio/libopenmpt/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2016/05/22 17:32:04 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2016/07/21 12:49:41 wiz Exp $
 
-DISTNAME=	libopenmpt-0.2.6401-beta17-autotools
+DISTNAME=	libopenmpt-0.2.6611-beta18-autotools
 PKGNAME=	${DISTNAME:C/-beta.*//}
 CATEGORIES=	audio
 MASTER_SITES=	http://lib.openmpt.org/files/libopenmpt/src/
diff --git a/audio/libopenmpt/PLIST b/audio/libopenmpt/PLIST
index 09aa82b247a..54989adbb1c 100644
--- a/audio/libopenmpt/PLIST
+++ b/audio/libopenmpt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2015/09/30 20:09:51 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2016/07/21 12:49:41 wiz Exp $
 bin/openmpt123
 include/libopenmpt/libopenmpt.h
 include/libopenmpt/libopenmpt.hpp
@@ -15,6 +15,7 @@ share/doc/libopenmpt/README.md
 share/doc/libopenmpt/TODO
 share/doc/libopenmpt/examples/libopenmpt_example_c.c
 share/doc/libopenmpt/examples/libopenmpt_example_c_mem.c
+share/doc/libopenmpt/examples/libopenmpt_example_c_probe.c
 share/doc/libopenmpt/examples/libopenmpt_example_c_stdout.c
 share/doc/libopenmpt/examples/libopenmpt_example_c_unsafe.c
 share/doc/libopenmpt/examples/libopenmpt_example_cxx.cpp
diff --git a/audio/libopenmpt/distinfo b/audio/libopenmpt/distinfo
index 31556e88f14..ef593ea49c8 100644
--- a/audio/libopenmpt/distinfo
+++ b/audio/libopenmpt/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2016/05/22 17:32:04 wiz Exp $
+$NetBSD: distinfo,v 1.12 2016/07/21 12:49:41 wiz Exp $
 
-SHA1 (libopenmpt-0.2.6401-beta17-autotools.tar.gz) = f2537e26b74eb2e6c4fd631583447e86d61d717f
-RMD160 (libopenmpt-0.2.6401-beta17-autotools.tar.gz) = c61bc92cecb1f2947b98fca36e081bb6d8884038
-SHA512 (libopenmpt-0.2.6401-beta17-autotools.tar.gz) = 6b706acbc4af8dbf6f1b9ca02a543a43dd15729386535bd49f6efd65ae54dd1c908e12aaca91ec55aedd2a2e945e2f49339d1bb3b524135f560cc8062fe38be0
-Size (libopenmpt-0.2.6401-beta17-autotools.tar.gz) = 1231967 bytes
+SHA1 (libopenmpt-0.2.6611-beta18-autotools.tar.gz) = 04c841b838cbd6ee251afaf593ff945ab15cd46c
+RMD160 (libopenmpt-0.2.6611-beta18-autotools.tar.gz) = 297d95a376ede0547f1a2b3a9fe36528cec520a9
+SHA512 (libopenmpt-0.2.6611-beta18-autotools.tar.gz) = c4da178dfdeab8268fc2ff9ee66b56f1a7d14a83e0e006187954f67e1ab574edc73d7714a5e9a0bfed39abb618522eb6def7adf947a1a37995bfe419d59700b7
+Size (libopenmpt-0.2.6611-beta18-autotools.tar.gz) = 1255020 bytes
diff --git a/audio/libopenmpt/options.mk b/audio/libopenmpt/options.mk
index 292aa4c78f1..843b6b80125 100644
--- a/audio/libopenmpt/options.mk
+++ b/audio/libopenmpt/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2014/08/26 10:44:15 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2016/07/21 12:49:41 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libopenmpt
-PKG_SUPPORTED_OPTIONS=	flac sndfile wavpack
-PKG_SUGGESTED_OPTIONS=	sndfile
+PKG_SUPPORTED_OPTIONS=	flac pulseaudio sndfile wavpack
+PKG_SUGGESTED_OPTIONS=	pulseaudio sndfile
 
 .include "../../mk/bsd.options.mk"
 
@@ -10,6 +10,12 @@ PKG_SUGGESTED_OPTIONS=	sndfile
 .include "../../audio/flac/buildlink3.mk"
 .endif
 
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+.include "../../audio/pulseaudio/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-pulseaudio
+.endif
+
 .if !empty(PKG_OPTIONS:Msndfile)
 .include "../../audio/libsndfile/buildlink3.mk"
 .endif