Attachment #186522 for bug #222437

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




# $FreeBSD$

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


		-DALSOFT_REQUIRE_QSA:BOOL=OFF \
		-DALSOFT_BACKEND_ALSA:BOOL=OFF \
		-DALSOFT_BACKEND_WAVE:BOOL=ON \
		-DALSOFT_EXAMPLES:BOOL=OFF \
		-DALSOFT_UTILS:BOOL=ON

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

	@${REINPLACE_CMD} 's|$${CMAKE_INSTALL_DATADIR}/openal|${ETCDIR}|' \
		${WRKSRC}/CMakeLists.txt

post-install-EXAMPLES-on:
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/common
	${INSTALL_DATA} -m 444 ${WRKSRC}/examples/*.c \
	    ${STAGEDIR}${EXAMPLESDIR}
	${INSTALL_DATA} -m 444 ${WRKSRC}/examples/*.cpp \
	    ${STAGEDIR}${EXAMPLESDIR}
	${INSTALL_DATA} -m 444 ${WRKSRC}/examples/common/* \
	    ${STAGEDIR}${EXAMPLESDIR}/common

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)audio/openal-soft/distinfo (-3 / +2 lines)
1	TIMESTAMP = 1500783565	1	SHA256 (openal-soft-1.18.1.tar.bz2) = 2d51a6529526ef22484f51567e31a5c346a599767991a3dc9d4dcd9d9cec71dd
2	SHA256 (openal-soft-1.18.0.tar.bz2) = 4433b1391c61a7ca36d82c946c8f0ffe410569d6437e4ce72b3547aaf966ecde	2	SIZE (openal-soft-1.18.1.tar.bz2) = 638913
3	SIZE (openal-soft-1.18.0.tar.bz2) = 627614




--- Alc/backends/jack.c.orig	2017-07-30 05:09:21 UTC
+++ Alc/backends/jack.c
@@ -35,11 +35,13 @@
 #include <jack/ringbuffer.h>
 
 
+extern void default_jack_error_callback(const char *msg) JACK_OPTIONAL_WEAK_EXPORT;
+
 static const ALCchar jackDevice[] = "JACK Default";
 
-
 #ifdef HAVE_DYNLOAD
 #define JACK_FUNCS(MAGIC)          \
+    MAGIC(default_jack_error_callback); \
     MAGIC(jack_client_open);       \
     MAGIC(jack_client_close);      \
     MAGIC(jack_client_name_size);  \
@@ -65,6 +67,7 @@ static void *jack_handle;
 JACK_FUNCS(MAKE_FUNC);
 #undef MAKE_FUNC
 
+#define default_jack_error_callback (*pdefault_jack_error_callback)
 #define jack_client_open pjack_client_open
 #define jack_client_close pjack_client_close
 #define jack_client_name_size pjack_client_name_size
@@ -567,7 +570,7 @@ static ALCboolean ALCjackBackendFactory_init(ALCjackBa
 
     jack_set_error_function(jack_msg_handler);
     client = jack_client_open("alsoft", ClientOptions, &status, NULL);
-    jack_set_error_function(NULL);
+    jack_set_error_function(default_jack_error_callback);
     if(client == NULL)
     {
         WARN("jack_client_open() failed, 0x%02x\n", status);




--- CMakeLists.txt.orig	2017-07-30 05:09:21 UTC
+++ CMakeLists.txt
@@ -646,10 +646,6 @@ int main()
 
     CHECK_SYMBOL_EXISTS(pthread_mutex_timedlock pthread.h HAVE_PTHREAD_MUTEX_TIMEDLOCK)
 

 ENDIF()
 
 # Check for a 64-bit type
@@ -1322,7 +1318,7 @@ IF(ALSOFT_INSTALL)
             DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/AL
     )
     INSTALL(FILES "${OpenAL_BINARY_DIR}/openal.pc"
-            DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+            DESTINATION "libdata/pkgconfig")
     IF(TARGET soft_oal)
         INSTALL(TARGETS soft_oal
                 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

Lines 1-8 Link Here

(-)audio/openal-soft/files/patch-OpenAL32_alBuffer.c (-4 / +4 lines)
1	--- OpenAL32/alBuffer.c.orig 2016-01-25 03:12:39 UTC	1	--- OpenAL32/alBuffer.c.orig 2017-07-30 05:09:21 UTC
2	+++ OpenAL32/alBuffer.c	2	+++ OpenAL32/alBuffer.c
3	@@ -1209,7 +1209,7 @@ static ALboolean DecomposeFormat(ALenum	3	@@ -1171,7 +1171,7 @@ static ALboolean DecomposeUserFormat(ALenum format, en
4	{ AL_FORMAT_BFORMAT3D_16, FmtBFormat3D, FmtShort },	4	{ AL_FORMAT_BFORMAT3D_FLOAT32, UserFmtBFormat3D, UserFmtFloat },
5	{ AL_FORMAT_BFORMAT3D_FLOAT32, FmtBFormat3D, FmtFloat },	5	{ AL_FORMAT_BFORMAT3D_MULAW, UserFmtBFormat3D, UserFmtMulaw },
6	};	6	};
7	- ALuint i;	7	- ALuint i;
8	+ volatile ALuint i;	8	+ volatile ALuint i;

Lines 1-10 Link Here

(-)audio/openal-soft/files/patch-examples_alffplay.cpp (-10 lines)
1	--- examples/alffplay.cpp.orig 2017-07-23 04:34:58 UTC
2	+++ examples/alffplay.cpp
3	@@ -16,6 +16,7 @@
4	#include <atomic>
5	#include <mutex>
6	#include <deque>
7	+#include <array>
8
9	extern "C" {
10	#include "libavcodec/avcodec.h"




include/AL/efx-presets.h
lib/cmake/OpenAL/OpenALConfig-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/OpenAL/OpenALConfig.cmake
lib/libopenal.so.1.18.1
lib/libopenal.so.1
lib/libopenal.so
libdata/pkgconfig/openal.pc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alffplay.cpp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alhrtf.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/allatency.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alloopback.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alrecord.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alreverb.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alstream.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/altonegen.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/common/alhelpers.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/common/alhelpers.h

Return to bug 222437

Lines 1-8 Link Here

(-)audio/openal-soft/Makefile (-3 / +14 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= openal-soft	3	PORTNAME= openal-soft
4	PORTVERSION= 1.18.0	4	PORTVERSION= 1.18.1
5	PORTREVISION= 2
6	CATEGORIES= audio	5	CATEGORIES= audio
7	MASTER_SITES= http://kcat.strangesoft.net/openal-releases/	6	MASTER_SITES= http://kcat.strangesoft.net/openal-releases/
8		7
Lines 25-33 Link Here
25	-DALSOFT_REQUIRE_QSA:BOOL=OFF \	24	-DALSOFT_REQUIRE_QSA:BOOL=OFF \
26	-DALSOFT_BACKEND_ALSA:BOOL=OFF \	25	-DALSOFT_BACKEND_ALSA:BOOL=OFF \
27	-DALSOFT_BACKEND_WAVE:BOOL=ON \	26	-DALSOFT_BACKEND_WAVE:BOOL=ON \
		27	-DALSOFT_EXAMPLES:BOOL=OFF \
28	-DALSOFT_UTILS:BOOL=ON	28	-DALSOFT_UTILS:BOOL=ON
29		29
30	OPTIONS_DEFINE= FLUIDSYNTH CONFIG OSS JACK PORTAUDIO PULSEAUDIO SNDIO	30	OPTIONS_DEFINE= EXAMPLES FLUIDSYNTH CONFIG OSS JACK PORTAUDIO \
		31	PULSEAUDIO SNDIO
31	OPTIONS_DEFAULT= OSS	32	OPTIONS_DEFAULT= OSS
32	OPTIONS_SUB= yes	33	OPTIONS_SUB= yes
33	CONFIG_DESC= Install configuration utility (needs Qt 4.x)	34	CONFIG_DESC= Install configuration utility (needs Qt 4.x)
Lines 62-65 Link Here
62	@${REINPLACE_CMD} 's\|$${CMAKE_INSTALL_DATADIR}/openal\|${ETCDIR}\|' \	63	@${REINPLACE_CMD} 's\|$${CMAKE_INSTALL_DATADIR}/openal\|${ETCDIR}\|' \
63	${WRKSRC}/CMakeLists.txt	64	${WRKSRC}/CMakeLists.txt
64		65
		66	post-install-EXAMPLES-on:
		67	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
		68	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/common
		69	${INSTALL_DATA} -m 444 ${WRKSRC}/examples/*.c \
		70	${STAGEDIR}${EXAMPLESDIR}
		71	${INSTALL_DATA} -m 444 ${WRKSRC}/examples/*.cpp \
		72	${STAGEDIR}${EXAMPLESDIR}
		73	${INSTALL_DATA} -m 444 ${WRKSRC}/examples/common/* \
		74	${STAGEDIR}${EXAMPLESDIR}/common
		75
65	.include <bsd.port.mk>	76	.include <bsd.port.mk>

Line 0 Link Here

(-)audio/openal-soft/files/patch-Alc_backends_jack.c (+34 lines)
	1	--- Alc/backends/jack.c.orig 2017-07-30 05:09:21 UTC
	2	+++ Alc/backends/jack.c
	3	@@ -35,11 +35,13 @@
	4	#include <jack/ringbuffer.h>
	5
	6
	7	+extern void default_jack_error_callback(const char *msg) JACK_OPTIONAL_WEAK_EXPORT;
	8	+
	9	static const ALCchar jackDevice[] = "JACK Default";
	10
	11	-
	12	#ifdef HAVE_DYNLOAD
	13	#define JACK_FUNCS(MAGIC) \
	14	+ MAGIC(default_jack_error_callback); \
	15	MAGIC(jack_client_open); \
	16	MAGIC(jack_client_close); \
	17	MAGIC(jack_client_name_size); \
	18	@@ -65,6 +67,7 @@ static void *jack_handle;
	19	JACK_FUNCS(MAKE_FUNC);
	20	#undef MAKE_FUNC
	21
	22	+#define default_jack_error_callback (*pdefault_jack_error_callback)
	23	#define jack_client_open pjack_client_open
	24	#define jack_client_close pjack_client_close
	25	#define jack_client_name_size pjack_client_name_size
	26	@@ -567,7 +570,7 @@ static ALCboolean ALCjackBackendFactory_init(ALCjackBa
	27
	28	jack_set_error_function(jack_msg_handler);
	29	client = jack_client_open("alsoft", ClientOptions, &status, NULL);
	30	- jack_set_error_function(NULL);
	31	+ jack_set_error_function(default_jack_error_callback);
	32	if(client == NULL)
	33	{
	34	WARN("jack_client_open() failed, 0x%02x\n", status);

Lines 1-6 Link Here

(-)audio/openal-soft/files/patch-CMakeLists.txt (-6 / +6 lines)
1	--- CMakeLists.txt.orig 2017-06-04 14:31:22 UTC	1	--- CMakeLists.txt.orig 2017-07-30 05:09:21 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -643,10 +643,6 @@ int main()	3	@@ -646,10 +646,6 @@ int main()
4		4
5	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)
6		6
Lines 11-22 Link Here
11	ENDIF()	11	ENDIF()
12		12
13	# Check for a 64-bit type	13	# Check for a 64-bit type
14	@@ -1299,7 +1295,7 @@ IF(ALSOFT_INSTALL)	14	@@ -1322,7 +1318,7 @@ IF(ALSOFT_INSTALL)
15	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/AL	15	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/AL
16	)	16	)
17	INSTALL(FILES "${OpenAL_BINARY_DIR}/openal.pc"	17	INSTALL(FILES "${OpenAL_BINARY_DIR}/openal.pc"
18	- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")	18	- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
19	+ DESTINATION "libdata/pkgconfig")	19	+ DESTINATION "libdata/pkgconfig")
20	ENDIF()	20	IF(TARGET soft_oal)
21		21	INSTALL(TARGETS soft_oal
22		22	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

Lines 20-26 Link Here

(-)audio/openal-soft/pkg-plist (-1 / +11 lines)
20	include/AL/efx-presets.h	20	include/AL/efx-presets.h
21	lib/cmake/OpenAL/OpenALConfig-%%CMAKE_BUILD_TYPE%%.cmake	21	lib/cmake/OpenAL/OpenALConfig-%%CMAKE_BUILD_TYPE%%.cmake
22	lib/cmake/OpenAL/OpenALConfig.cmake	22	lib/cmake/OpenAL/OpenALConfig.cmake
23	lib/libopenal.so.1.18.0	23	lib/libopenal.so.1.18.1
24	lib/libopenal.so.1	24	lib/libopenal.so.1
25	lib/libopenal.so	25	lib/libopenal.so
26	libdata/pkgconfig/openal.pc	26	libdata/pkgconfig/openal.pc
		27	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alffplay.cpp
		28	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alhrtf.c
		29	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/allatency.c
		30	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alloopback.c
		31	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alrecord.c
		32	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alreverb.c
		33	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alstream.c
		34	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/altonegen.c
		35	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/common/alhelpers.c
		36	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/common/alhelpers.h