Attachment #175638 for bug #213392

View | Details | Raw Unified | Return to bug 213392
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	openal-soft
PORTVERSION=	1.17.2
PORTREVISION=	0
CATEGORIES=	audio
MASTER_SITES=	http://kcat.strangesoft.net/openal-releases/



USES=		tar:bzip2 cmake compiler:c11
USE_LDCONFIG=	yes
CMAKE_ARGS+=	-DSHARE_INSTALL_DIR:STRING=${ETCDIR} \
		-DALSOFT_REQUIRE_OSS:BOOL=ON \
		-DALSOFT_REQUIRE_SOLARIS:BOOL=OFF \
		-DALSOFT_REQUIRE_SNDIO:BOOL=OFF \
		-DALSOFT_REQUIRE_QSA:BOOL=OFF \
		-DALSOFT_BACKEND_ALSA:BOOL=OFF \
		-DALSOFT_BACKEND_JACK:BOOL=OFF \
		-DALSOFT_BACKEND_WAVE:BOOL=ON \
		-DALSOFT_UTILS:BOOL=ON \
		-DALSOFT_EXAMPLES:BOOL=OFF

OPTIONS_DEFINE=		FLUIDSYNTH CONFIG PORTAUDIO PULSEAUDIO SNDIO JACK
OPTIONS_SUB=		yes
CONFIG_DESC=		Install configuration utility (needs Qt 4.x)


SNDIO_CMAKE_ON=	-DALSOFT_REQUIRE_SNDIO:BOOL=ON
SNDIO_CMAKE_OFF=	-DALSOFT_BACKEND_SNDIO:BOOL=OFF
SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
JACK_CMAKE_ON=	-DALSOFT_REQUIRE_JACK:BOOL=ON
JACK_CMAKE_OFF=	-DALSOFT_BACKEND_JACK:BOOL=OFF
JACK_LIB_DEPENDS=	libjack.so:audio/jack

post-patch:
	@${REINPLACE_CMD} 's|/etc/openal|${ETCDIR}|' \
		${WRKSRC}/Alc/alcConfig.c
	@${REINPLACE_CMD} 's|$${SHARE_INSTALL_DIR}/openal|${ETCDIR}|' \
		${WRKSRC}/CMakeLists.txt
	@${REINPLACE_CMD} 's|share/openal|${ETCDIR}|' \
		${WRKSRC}/CMakeLists.txt

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)audio/openal-soft/distinfo (-2 / +2 lines)
1	SHA256 (openal-soft-1.16.0.tar.bz2) = 2f3dcd313fe26391284fbf8596863723f99c65d6c6846dccb48e79cadaf40d5f	1	SHA256 (openal-soft-1.17.2.tar.bz2) = a341f8542f1f0b8c65241a17da13d073f18ec06658e1a1606a8ecc8bbc2b3314
2	SIZE (openal-soft-1.16.0.tar.bz2) = 393280	2	SIZE (openal-soft-1.17.2.tar.bz2) = 486934




--- CMakeLists.txt.orig	2016-01-25 03:12:39 UTC
+++ CMakeLists.txt
@@ -582,10 +582,6 @@ int main()
     SET(LIBNAME openal)
 
     # These are needed on non-Windows systems for extra features
-    ADD_DEFINITIONS(-D_GNU_SOURCE=1 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700)
-    SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -D_GNU_SOURCE=1 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700")
+    ADD_DEFINITIONS(-D_GNU_SOURCE=1)
+    SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -D_GNU_SOURCE=1")
 ENDIF()
 
 # Set defines for large file support
@@ -186,7 +186,7 @@ HAVE_C11_ALIGNAS)
 # Check if we have C11 _Atomic
 CHECK_C_SOURCE_COMPILES(
 "#include <stdatomic.h>
- int _Atomic foo;
+ const int _Atomic foo = ATOMIC_VAR_INIT(~0);
  int main()
  {
      return atomic_load(&foo);
@@ -523,10 +523,6 @@ IF(NOT HAVE_WINDOWS_H)
 
     CHECK_SYMBOL_EXISTS(pthread_mutex_timedlock pthread.h HAVE_PTHREAD_MUTEX_TIMEDLOCK)
 
-    CHECK_LIBRARY_EXISTS(rt clock_gettime "" HAVE_LIBRT)

 ENDIF()
 
 # Check for a 64-bit type
@@ -1184,7 +1180,7 @@ IF(ALSOFT_INSTALL)
             DESTINATION include/AL
     )
     INSTALL(FILES "${OpenAL_BINARY_DIR}/openal.pc"
-            DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
+            DESTINATION "libdata/pkgconfig")
 ENDIF()
 
 
@@ -1207,7 +1203,7 @@ ENDIF()
 # Install alsoft.conf configuration file
 IF(ALSOFT_CONFIG)
     INSTALL(FILES alsoftrc.sample
-            DESTINATION ${SHARE_INSTALL_DIR}/openal
+            DESTINATION /usr/local/etc/openal-soft
     )
     MESSAGE(STATUS "Installing sample configuration")
     MESSAGE(STATUS "")
@@ -1217,7 +1213,7 @@ ENDIF()
 IF(ALSOFT_HRTF_DEFS)
     INSTALL(FILES hrtf/default-44100.mhr
                   hrtf/default-48000.mhr
-            DESTINATION ${SHARE_INSTALL_DIR}/openal/hrtf
+            DESTINATION /usr/local/etc/openal-soft/hrtf
     )
     MESSAGE(STATUS "Installing HRTF definitions")
     MESSAGE(STATUS "")

Lines 1-8 Link Here

(-)audio/openal-soft/files/patch-OpenAL32_alBuffer.c (-4 / +4 lines)
1	--- OpenAL32/alBuffer.c.orig 2014-08-15 07:06:59 UTC	1	--- OpenAL32/alBuffer.c.orig 2016-01-25 03:12:39 UTC
2	+++ OpenAL32/alBuffer.c	2	+++ OpenAL32/alBuffer.c
3	@@ -1179,7 +1179,7 @@ static ALboolean DecomposeFormat(ALenum	3	@@ -1209,7 +1209,7 @@ static ALboolean DecomposeFormat(ALenum
4	{ AL_7POINT1_16_SOFT, FmtX71, FmtShort },	4	{ AL_FORMAT_BFORMAT3D_16, FmtBFormat3D, FmtShort },
5	{ AL_7POINT1_32F_SOFT, FmtX71, FmtFloat },	5	{ AL_FORMAT_BFORMAT3D_FLOAT32, FmtBFormat3D, FmtFloat },
6	};	6	};
7	- ALuint i;	7	- ALuint i;
8	+ volatile ALuint i;	8	+ volatile ALuint i;

Lines 10-16 Link Here

(-)audio/openal-soft/pkg-plist (-1 / +1 lines)
10	include/AL/efx.h	10	include/AL/efx.h
11	include/AL/efx-creative.h	11	include/AL/efx-creative.h
12	include/AL/efx-presets.h	12	include/AL/efx-presets.h
13	lib/libopenal.so.1.16.0	13	lib/libopenal.so.1.17.2
14	lib/libopenal.so.1	14	lib/libopenal.so.1
15	lib/libopenal.so	15	lib/libopenal.so
16	libdata/pkgconfig/openal.pc	16	libdata/pkgconfig/openal.pc

Return to bug 213392

Lines 1-8 Link Here

(-)audio/openal-soft/Makefile (-7 / +11 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= openal-soft	3	PORTNAME= openal-soft
4	PORTVERSION= 1.16.0	4	PORTVERSION= 1.17.2
5	PORTREVISION= 4	5	PORTREVISION= 0
6	CATEGORIES= audio	6	CATEGORIES= audio
7	MASTER_SITES= http://kcat.strangesoft.net/openal-releases/	7	MASTER_SITES= http://kcat.strangesoft.net/openal-releases/
8		8
Lines 15-30 Link Here
15		15
16	USES= tar:bzip2 cmake compiler:c11	16	USES= tar:bzip2 cmake compiler:c11
17	USE_LDCONFIG= yes	17	USE_LDCONFIG= yes
18	CMAKE_ARGS+= -DALSOFT_REQUIRE_OSS:BOOL=ON \	18	CMAKE_ARGS+= -DSHARE_INSTALL_DIR:STRING=${ETCDIR} \
		19	-DALSOFT_REQUIRE_OSS:BOOL=ON \
19	-DALSOFT_REQUIRE_SOLARIS:BOOL=OFF \	20	-DALSOFT_REQUIRE_SOLARIS:BOOL=OFF \
20	-DALSOFT_REQUIRE_SNDIO:BOOL=OFF \	21	-DALSOFT_REQUIRE_SNDIO:BOOL=OFF \
21	-DALSOFT_REQUIRE_QSA:BOOL=OFF \	22	-DALSOFT_REQUIRE_QSA:BOOL=OFF \
22	-DALSOFT_BACKEND_ALSA:BOOL=OFF \	23	-DALSOFT_BACKEND_ALSA:BOOL=OFF \
		24	-DALSOFT_BACKEND_JACK:BOOL=OFF \
23	-DALSOFT_BACKEND_WAVE:BOOL=ON \	25	-DALSOFT_BACKEND_WAVE:BOOL=ON \
24	-DALSOFT_UTILS:BOOL=ON \	26	-DALSOFT_UTILS:BOOL=ON \
25	-DALSOFT_EXAMPLES:BOOL=OFF	27	-DALSOFT_EXAMPLES:BOOL=OFF
26		28
27	OPTIONS_DEFINE= FLUIDSYNTH CONFIG PORTAUDIO PULSEAUDIO SNDIO	29	OPTIONS_DEFINE= FLUIDSYNTH CONFIG PORTAUDIO PULSEAUDIO SNDIO JACK
28	OPTIONS_SUB= yes	30	OPTIONS_SUB= yes
29	CONFIG_DESC= Install configuration utility (needs Qt 4.x)	31	CONFIG_DESC= Install configuration utility (needs Qt 4.x)
30		32
Lines 46-57 Link Here
46	SNDIO_CMAKE_ON= -DALSOFT_REQUIRE_SNDIO:BOOL=ON	48	SNDIO_CMAKE_ON= -DALSOFT_REQUIRE_SNDIO:BOOL=ON
47	SNDIO_CMAKE_OFF= -DALSOFT_BACKEND_SNDIO:BOOL=OFF	49	SNDIO_CMAKE_OFF= -DALSOFT_BACKEND_SNDIO:BOOL=OFF
48	SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio	50	SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
		51	JACK_CMAKE_ON= -DALSOFT_REQUIRE_JACK:BOOL=ON
		52	JACK_CMAKE_OFF= -DALSOFT_BACKEND_JACK:BOOL=OFF
		53	JACK_LIB_DEPENDS= libjack.so:audio/jack
49		54
50	post-patch:	55	post-patch:
51	@${REINPLACE_CMD} 's\|/etc/openal\|${ETCDIR}\|' \	56	@${REINPLACE_CMD} 's\|/etc/openal\|${ETCDIR}\|' \
52	${WRKSRC}/Alc/alcConfig.c \	57	${WRKSRC}/Alc/alcConfig.c
		58	@${REINPLACE_CMD} 's\|$${SHARE_INSTALL_DIR}/openal\|${ETCDIR}\|' \
53	${WRKSRC}/CMakeLists.txt	59	${WRKSRC}/CMakeLists.txt
54	@${REINPLACE_CMD} 's\|share/openal\|${ETCDIR}\|' \
55	${WRKSRC}/CMakeLists.txt
56		60
57	.include <bsd.port.mk>	61	.include <bsd.port.mk>

Lines 1-27 Link Here

(-)audio/openal-soft/files/patch-CMakeLists.txt (-29 / +27 lines)
1	--- CMakeLists.txt.orig 2014-08-15 07:06:59 UTC	1	--- CMakeLists.txt.orig 2016-01-25 03:12:39 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -62,8 +62,8 @@ ELSE()	3	@@ -582,10 +582,6 @@ int main()
4	SET(LIBNAME openal)
5		4
6	# These are needed on non-Windows systems for extra features
7	- ADD_DEFINITIONS(-D_GNU_SOURCE=1 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700)
8	- SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -D_GNU_SOURCE=1 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700")
9	+ ADD_DEFINITIONS(-D_GNU_SOURCE=1)
10	+ SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -D_GNU_SOURCE=1")
11	ENDIF()
12
13	# Set defines for large file support
14	@@ -186,7 +186,7 @@ HAVE_C11_ALIGNAS)
15	# Check if we have C11 _Atomic
16	CHECK_C_SOURCE_COMPILES(
17	"#include <stdatomic.h>
18	- int _Atomic foo;
19	+ const int _Atomic foo = ATOMIC_VAR_INIT(~0);
20	int main()
21	{
22	return atomic_load(&foo);
23	@@ -523,10 +523,6 @@ IF(NOT HAVE_WINDOWS_H)
24
25	CHECK_SYMBOL_EXISTS(pthread_mutex_timedlock pthread.h HAVE_PTHREAD_MUTEX_TIMEDLOCK)	5	CHECK_SYMBOL_EXISTS(pthread_mutex_timedlock pthread.h HAVE_PTHREAD_MUTEX_TIMEDLOCK)
26		6
27	- CHECK_LIBRARY_EXISTS(rt clock_gettime "" HAVE_LIBRT)	7	- CHECK_LIBRARY_EXISTS(rt clock_gettime "" HAVE_LIBRT)
Lines 31-42 Link Here
31	ENDIF()	11	ENDIF()
32		12
33	# Check for a 64-bit type	13	# Check for a 64-bit type
34	@@ -1108,7 +1104,7 @@ INSTALL(FILES include/AL/al.h	14	@@ -1184,7 +1180,7 @@ IF(ALSOFT_INSTALL)
35	DESTINATION include/AL	15	DESTINATION include/AL
36	)	16	)
37	INSTALL(FILES "${OpenAL_BINARY_DIR}/openal.pc"	17	INSTALL(FILES "${OpenAL_BINARY_DIR}/openal.pc"
38	- DESTINATION "lib${LIB_SUFFIX}/pkgconfig")	18	- DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
39	+ DESTINATION "libdata/pkgconfig")	19	+ DESTINATION "libdata/pkgconfig")
		20	ENDIF()
40		21
41		22
42	MESSAGE(STATUS "")	23	@@ -1207,7 +1203,7 @@ ENDIF()
		24	# Install alsoft.conf configuration file
		25	IF(ALSOFT_CONFIG)
		26	INSTALL(FILES alsoftrc.sample
		27	- DESTINATION ${SHARE_INSTALL_DIR}/openal
		28	+ DESTINATION /usr/local/etc/openal-soft
		29	)
		30	MESSAGE(STATUS "Installing sample configuration")
		31	MESSAGE(STATUS "")
		32	@@ -1217,7 +1213,7 @@ ENDIF()
		33	IF(ALSOFT_HRTF_DEFS)
		34	INSTALL(FILES hrtf/default-44100.mhr
		35	hrtf/default-48000.mhr
		36	- DESTINATION ${SHARE_INSTALL_DIR}/openal/hrtf
		37	+ DESTINATION /usr/local/etc/openal-soft/hrtf
		38	)
		39	MESSAGE(STATUS "Installing HRTF definitions")
		40	MESSAGE(STATUS "")