openal-soft: Update to 1.17.2, fix config file path, fix OSS device path substitution.

[asie <asiekierka%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	asie <asiekierka%gmail.com@localhost>
Pushed By:	asie
Date:		Fri Jan 29 19:25:05 2016 +0100
Changeset:	4d9b1ddfc521e83af3aec791f81549f9e2946a5d

Modified Files:
	openal-soft/Makefile
	openal-soft/distinfo
	openal-soft/patches/patch-common_threads.c
Added Files:
	openal-soft/patches/patch-alc_alcconfig.c

Log Message:
openal-soft: Update to 1.17.2, fix config file path, fix OSS device path substitution.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4d9b1ddfc521e83af3aec791f81549f9e2946a5d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 openal-soft/Makefile                       | 11 ++++++++---
 openal-soft/distinfo                       | 11 ++++++-----
 openal-soft/patches/patch-alc_alcconfig.c  | 15 +++++++++++++++
 openal-soft/patches/patch-common_threads.c | 22 ++++++++++++----------
 4 files changed, 41 insertions(+), 18 deletions(-)

diffs:
diff --git a/openal-soft/Makefile b/openal-soft/Makefile
index efcad17..52d85d4 100644
--- a/openal-soft/Makefile
+++ b/openal-soft/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.5 2012/10/03 21:32:46 asau Exp $
 #
 
-DISTNAME=	openal-soft-1.17.1
+DISTNAME=	openal-soft-1.17.2
 CATEGORIES=	audio
 MASTER_SITES=	http://kcat.strangesoft.net/openal-releases/
 EXTRACT_SUFX=	.tar.bz2
@@ -15,6 +15,8 @@ USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
 
+PKG_SYSCONFSUBDIR=openal
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} != "Linux"
@@ -40,12 +42,15 @@ CMAKE_ARGS+=	-DALSOFT_BACKEND_PULSEAUDIO:BOOL=OFF
 CMAKE_ARGS+=	-DEXTRA_LIBS=${LIBOSSAUDIO:Q}
 .endif
 
+CFLAGS+= -DSYS_CONF_DIR="\"${PKG_SYSCONFDIR}\""
 CFLAGS.NetBSD+=	-D_NETBSD_SOURCE
 
+CONF_FILES+= ${PREFIX}/share/openal/alsoftrc.sample ${PKG_SYSCONFDIR}/alsoft.conf
+
 SUBST_CLASSES+=			fix-oss
 SUBST_STAGE.fix-oss=		pre-configure
-SUBST_MESSAGE.fix-oss=		Fixing OSS device references.
-SUBST_FILES.fix-oss=		Alc/oss.c
+SUBST_MESSAGE.fix-oss=		Fixing default OSS device references.
+SUBST_FILES.fix-oss=		Alc/backends/oss.c
 SUBST_SED.fix-oss=		-e 's,/dev/dsp,${DEVOSSSOUND},'
 
 .include "../../mk/dlopen.buildlink3.mk"
diff --git a/openal-soft/distinfo b/openal-soft/distinfo
index ae7a87a..25f43cf 100644
--- a/openal-soft/distinfo
+++ b/openal-soft/distinfo
@@ -1,7 +1,8 @@
 $NetBSD: distinfo,v 1.2 2008/08/02 20:20:20 asau Exp $
 
-SHA1 (openal-soft-1.17.1.tar.bz2) = 92b8dbba07674e11538934fc7a89dcd64ecafd40
-RMD160 (openal-soft-1.17.1.tar.bz2) = d8292b39bf88f0f6f2d3200e034fa368589ca84c
-SHA512 (openal-soft-1.17.1.tar.bz2) = f0b14e9fdcc22bb18d9c3278392fd94959cd3d85d83ad0472dcac24122fe1f8c818ef8c47197424f6d9789524d0aff64965ce502965f5d6541a772fc8dc3286d
-Size (openal-soft-1.17.1.tar.bz2) = 485178 bytes
-SHA1 (patch-common_threads.c) = aca201b6649e1b5b083aeb90c6fcde71e66c66cd
+SHA1 (openal-soft-1.17.2.tar.bz2) = 5d6151b544caaf53a15b798a495308e421044b0d
+RMD160 (openal-soft-1.17.2.tar.bz2) = 9b384c3bff9e65ec96f4ae7af2754b52871dabfc
+SHA512 (openal-soft-1.17.2.tar.bz2) = 50c20cd3ddada55d91643a79c2894d5a14315d5fc1ed8e870e3d8d3f410e8b7d8da29b838226e7fce37fbeca719ff919b51806f72e4cd529a18fbe8bd68860e3
+Size (openal-soft-1.17.2.tar.bz2) = 486934 bytes
+SHA1 (patch-alc_alcconfig.c) = a137776f204bb75bfa199b0802d985ebe030c10e
+SHA1 (patch-common_threads.c) = 87593018c95c146bc4f51e2e8caa0cf6f769d74b
diff --git a/openal-soft/patches/patch-alc_alcconfig.c b/openal-soft/patches/patch-alc_alcconfig.c
new file mode 100644
index 0000000..796833a
--- /dev/null
+++ b/openal-soft/patches/patch-alc_alcconfig.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Allow the Makefile to specify the default config file path.
+
+--- Alc/alcConfig.c.orig	2016-01-29 11:04:27.000000000 +0100
++++ Alc/alcConfig.c	2016-01-29 11:04:41.000000000 +0100
+@@ -353,7 +353,7 @@
+     const char *str;
+     FILE *f;
+ 
+-    str = "/etc/openal/alsoft.conf";
++    str = SYS_CONF_DIR "/alsoft.conf";
+ 
+     TRACE("Loading config %s...\n", str);
+     f = al_fopen(str, "r");
diff --git a/openal-soft/patches/patch-common_threads.c b/openal-soft/patches/patch-common_threads.c
index b2228a6..01e929b 100644
--- a/openal-soft/patches/patch-common_threads.c
+++ b/openal-soft/patches/patch-common_threads.c
@@ -2,16 +2,18 @@ $NetBSD$
 
 Adjust usage of pthread_setname_np(3).
 
---- common/threads.c.orig	2015-12-10 12:45:30.000000000 +0000
-+++ common/threads.c
-@@ -497,7 +497,9 @@ extern inline void alcall_once(alonce_fl
- void althrd_setname(althrd_t thr, const char *name)
- {
- #if defined(HAVE_PTHREAD_SETNAME_NP)
--#if defined(__GNUC__)
+--- common/threads.c.orig	2016-01-25 04:12:39.000000000 +0100
++++ common/threads.c	2016-01-29 18:13:41.000000000 +0100
+@@ -501,8 +501,12 @@
+     if(althrd_equal(thr, althrd_current()))
+         pthread_setname_np(name);
+ #else
 +#if defined(__NetBSD__)
 +    pthread_setname_np(thr, "%s", name);
-+#elif defined(__GNUC__)
++#else
      pthread_setname_np(thr, name);
- #elif defined(__APPLE__)
-     if(althrd_equal(thr, althrd_current())
+ #endif
++#endif
+ #elif defined(HAVE_PTHREAD_SET_NAME_NP)
+     pthread_set_name_np(thr, name);
+ #else