[Midnightbsd-cvs] mports [16871] trunk/audio/openal-soft: openal-soft 1.15.1

[laffer1 at midnightbsd.org]

Revision: 16871
          http://svnweb.midnightbsd.org/mports/?rev=16871
Author:   laffer1
Date:     2014-09-07 00:16:44 -0400 (Sun, 07 Sep 2014)
Log Message:
-----------
openal-soft 1.15.1

Modified Paths:
--------------
    trunk/audio/openal-soft/Makefile
    trunk/audio/openal-soft/distinfo
    trunk/audio/openal-soft/pkg-plist

Added Paths:
-----------
    trunk/audio/openal-soft/files/patch-Alc-ALu.c

Modified: trunk/audio/openal-soft/Makefile
===================================================================
--- trunk/audio/openal-soft/Makefile	2014-09-07 04:15:12 UTC (rev 16870)
+++ trunk/audio/openal-soft/Makefile	2014-09-07 04:16:44 UTC (rev 16871)
@@ -2,31 +2,33 @@
 # $FreeBSD: ports/audio/openal-soft/Makefile,v 1.13 2011/04/03 07:33:37 mva Exp $
 
 PORTNAME=	openal-soft
-PORTVERSION=	1.13
+PORTVERSION=	1.15.1
 CATEGORIES=	audio
 MASTER_SITES=	http://kcat.strangesoft.net/openal-releases/
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	A software implementation of the OpenAL specification
+COMMENT=	Software implementation of the OpenAL specification
+
 LICENSE=	lgpl
 
 CONFLICTS=	openal-200[0-9]*
 
-USE_BZIP2=	yes
-USE_CMAKE=	yes
+USES=		tar:bzip2 cmake
 USE_LDCONFIG=	yes
-CMAKE_USE_PTHREAD=	yes
 CMAKE_ARGS+=	-DALSA:BOOL=OFF -DPORTAUDIO:BOOL=OFF -DSOLARIS:BOOL=OFF \
-		-DDSOUND:BOOL=OFF -DALSOFT_CONFIG:BOOL=ON
+		-DDSOUND:BOOL=OFF -DSNDIO:BOOL=OFF -DEXAMPLES:BOOL=OFF \
+		-DMMDEVAPI:BOOL=OFF -DWINMM:BOOL=OFF -DCOREAUDIO:BOOL=OFF \
+		-DOPENSL:BOOL=OFF -DALSOFT_CONFIG:BOOL=ON
 
-OPTIONS=	PULSEAUDIO	"Enable sound streaming using PulseAudio" off
+OPTIONS_DEFINE=		PULSEAUDIO
+PULSEAUDIO_DESC=	Enable sound streaming using PulseAudio
 
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
 
-.if defined(WITH_PULSEAUDIO)
-LIB_DEPENDS+=	pulse-simple.0:${PORTSDIR}/audio/pulseaudio
+.if ${PORT_OPTIONS:MPULSEAUDIO}
+LIB_DEPENDS+=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
 CFLAGS+=	-Iinclude -I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+LDFLAGS+=	-L${LOCALBASE}/lib
 CMAKE_ARGS+=	-DPULSEAUDIO:BOOL=ON
 .else
 CMAKE_ARGS+=	-DPULSEAUDIO:BOOL=OFF
@@ -36,7 +38,7 @@
 	@${REINPLACE_CMD} 's|/etc/openal|${ETCDIR}|' \
 		${WRKSRC}/Alc/alcConfig.c \
 		${WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} 's|alsoft.conf|alsoft.conf.sample|' \
+	@${REINPLACE_CMD} 's|share/openal|${ETCDIR}|' \
 		${WRKSRC}/CMakeLists.txt
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/audio/openal-soft/distinfo
===================================================================
--- trunk/audio/openal-soft/distinfo	2014-09-07 04:15:12 UTC (rev 16870)
+++ trunk/audio/openal-soft/distinfo	2014-09-07 04:16:44 UTC (rev 16871)
@@ -1,3 +1,2 @@
-SHA256 (openal-soft-1.13.tar.bz2) = dc735b8b2ab21f6ec54b4262f150a7e0527ae42aa975a1965b9342df1520443c
-RMD160 (openal-soft-1.13.tar.bz2) = 30cde50ae088f687b63bfd742518fef4ce213629
-SIZE (openal-soft-1.13.tar.bz2) = 113770
+SHA256 (openal-soft-1.15.1.tar.bz2) = 0e29a162f0841ccb4135ce76e92e8a704589b680a85eddf76f898de5236eb056
+SIZE (openal-soft-1.15.1.tar.bz2) = 253006

Added: trunk/audio/openal-soft/files/patch-Alc-ALu.c
===================================================================
--- trunk/audio/openal-soft/files/patch-Alc-ALu.c	                        (rev 0)
+++ trunk/audio/openal-soft/files/patch-Alc-ALu.c	2014-09-07 04:16:44 UTC (rev 16871)
@@ -0,0 +1,37 @@
+--- Alc/ALu.c.orig	2013-05-23 08:00:01.000000000 +0200
++++ Alc/ALu.c	2013-05-23 08:01:20.000000000 +0200
+@@ -912,24 +912,27 @@
+ }
+ 
+ 
+-static __inline ALfloat aluF2F(ALfloat val)
+-{ return val; }
+-static __inline ALint aluF2I(ALfloat val)
++static __inline ALint aluF2I25(ALfloat val)
+ {
+     /* Clamp the value between -1 and +1. This handles that without branching. */
+     val = val+1.0f - fabsf(val-1.0f);
+     val = (val-2.0f + fabsf(val+2.0f)) * 0.25f;
+-    /* Convert to a signed integer, between -2147483647 and +2147483647. */
+-    return fastf2i((ALfloat)(val*2147483647.0));
++    /* Convert to a signed integer, between -16777215 and +16777215. */
++    return fastf2i(val*16777215.0f);
+ }
++
++static __inline ALfloat aluF2F(ALfloat val)
++{ return val; }
++static __inline ALint aluF2I(ALfloat val)
++{ return aluF2I25(val)<<7; }
+ static __inline ALuint aluF2UI(ALfloat val)
+ { return aluF2I(val)+2147483648u; }
+ static __inline ALshort aluF2S(ALfloat val)
+-{ return aluF2I(val)>>16; }
++{ return aluF2I25(val)>>9; }
+ static __inline ALushort aluF2US(ALfloat val)
+ { return aluF2S(val)+32768; }
+ static __inline ALbyte aluF2B(ALfloat val)
+-{ return aluF2I(val)>>24; }
++{ return aluF2I25(val)>>17; }
+ static __inline ALubyte aluF2UB(ALfloat val)
+ { return aluF2B(val)+128; }
+ 

Modified: trunk/audio/openal-soft/pkg-plist
===================================================================
--- trunk/audio/openal-soft/pkg-plist	2014-09-07 04:15:12 UTC (rev 16870)
+++ trunk/audio/openal-soft/pkg-plist	2014-09-07 04:16:44 UTC (rev 16871)
@@ -1,11 +1,13 @@
+bin/makehrtf
 bin/openal-info
-%%ETCDIR%%/alsoft.conf.sample
+%%ETCDIR%%/alsoftrc.sample
 include/AL/al.h
 include/AL/alc.h
 include/AL/alext.h
 include/AL/efx.h
 include/AL/efx-creative.h
-lib/libopenal.so.1.13.0
+include/AL/efx-presets.h
+lib/libopenal.so.1.15.1
 lib/libopenal.so.1
 lib/libopenal.so
 libdata/pkgconfig/openal.pc