Attachment #184620 for bug #220931




# $FreeBSD$

PORTNAME=	openal-soft
PORTVERSION=	1.18.0
PORTREVISION=	2
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=OFF \
		-DALSOFT_REQUIRE_JACK:BOOL=OFF \
		-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_WAVE:BOOL=ON \
		-DALSOFT_UTILS:BOOL=ON
		-DALSOFT_EXAMPLES:BOOL=OFF

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


FLUIDSYNTH_CMAKE_ON=	-DALSOFT_REQUIRE_FLUIDSYNTH:BOOL=ON
FLUIDSYNTH_CMAKE_OFF=	-DALSOFT_MIDI_FLUIDSYNTH:BOOL=OFF
FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
OSS_CMAKE_ON=		-DALSOFT_REQUIRE_OSS:BOOL=ON
OSS_CMAKE_OFF=		-DALSOFT_BACKEND_OSS:BOOL=OFF
JACK_CMAKE_ON=		-DALSOFT_REQUIRE_JACK:BOOL=ON
JACK_CMAKE_OFF=		-DALSOFT_BACKEND_JACK:BOOL=OFF
JACK_LIB_DEPENDS=	libjack.so:audio/jack

SNDIO_CMAKE_ON=		-DALSOFT_REQUIRE_SNDIO:BOOL=ON
SNDIO_CMAKE_OFF=	-DALSOFT_BACKEND_SNDIO:BOOL=OFF
SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
EXAMPLES_CMAKE_ON=	-DALSOFT_EXAMPLES:BOOL=ON
EXAMPLES_CMAKE_OFF=	-DALSOFT_EXAMPLES:BOOL=OFF
EXAMPLES_USE=		SDL=sdl2,sound
EXAMPLES_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg

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

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)audio/openal-soft/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1474007361	1	TIMESTAMP = 1500783565
2	SHA256 (openal-soft-1.17.2.tar.bz2) = a341f8542f1f0b8c65241a17da13d073f18ec06658e1a1606a8ecc8bbc2b3314	2	SHA256 (openal-soft-1.18.0.tar.bz2) = 4433b1391c61a7ca36d82c946c8f0ffe410569d6437e4ce72b3547aaf966ecde
3	SIZE (openal-soft-1.17.2.tar.bz2) = 486934	3	SIZE (openal-soft-1.18.0.tar.bz2) = 627614




--- CMakeLists.txt.orig	2017-06-04 14:31:22 UTC
+++ CMakeLists.txt
@@ -643,10 +643,6 @@ int main()
 
     CHECK_SYMBOL_EXISTS(pthread_mutex_timedlock pthread.h HAVE_PTHREAD_MUTEX_TIMEDLOCK)
 

 ENDIF()
 
 # Check for a 64-bit type
@@ -1299,7 +1295,7 @@ IF(ALSOFT_INSTALL)
             DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/AL
     )
     INSTALL(FILES "${OpenAL_BINARY_DIR}/openal.pc"
-            DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+            DESTINATION "libdata/pkgconfig")
 ENDIF()
 

Line 0 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"

Lines 6-11 Link Here

(-)audio/openal-soft/pkg-plist (-1 / +15 lines)
6	%%ETCDIR%%/alsoftrc.sample	6	%%ETCDIR%%/alsoftrc.sample
7	%%ETCDIR%%/hrtf/default-44100.mhr	7	%%ETCDIR%%/hrtf/default-44100.mhr
8	%%ETCDIR%%/hrtf/default-48000.mhr	8	%%ETCDIR%%/hrtf/default-48000.mhr
		9	%%ETCDIR%%/presets/3D7.1.ambdec
		10	%%ETCDIR%%/presets/hexagon.ambdec
		11	%%ETCDIR%%/presets/itu5.1.ambdec
		12	%%ETCDIR%%/presets/presets.txt
		13	%%ETCDIR%%/presets/rectangle.ambdec
		14	%%ETCDIR%%/presets/square.ambdec
9	include/AL/al.h	15	include/AL/al.h
10	include/AL/alc.h	16	include/AL/alc.h
11	include/AL/alext.h	17	include/AL/alext.h
Lines 12-18 Link Here
12	include/AL/efx.h	18	include/AL/efx.h
13	include/AL/efx-creative.h	19	include/AL/efx-creative.h
14	include/AL/efx-presets.h	20	include/AL/efx-presets.h
15	lib/libopenal.so.1.17.2	21	lib/cmake/OpenAL/OpenALConfig-%%CMAKE_BUILD_TYPE%%.cmake
		22	lib/cmake/OpenAL/OpenALConfig.cmake
		23	lib/libopenal.so.1.18.0
16	lib/libopenal.so.1	24	lib/libopenal.so.1
17	lib/libopenal.so	25	lib/libopenal.so
18	libdata/pkgconfig/openal.pc	26	libdata/pkgconfig/openal.pc
		27	%%EXAMPLES%%bin/alffplay
		28	%%EXAMPLES%%bin/alhrtf
		29	%%EXAMPLES%%bin/allatency
		30	%%EXAMPLES%%bin/alloopback
		31	%%EXAMPLES%%bin/alreverb
		32	%%EXAMPLES%%bin/alstream

Return to bug 220931

Lines 1-8 Link Here

(-)audio/openal-soft/Makefile (-7 / +12 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= openal-soft	3	PORTNAME= openal-soft
4	PORTVERSION= 1.17.2	4	PORTVERSION= 1.18.0
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 17-33 Link Here
17	USES= tar:bzip2 cmake compiler:c11	16	USES= tar:bzip2 cmake compiler:c11
18	USE_LDCONFIG= yes	17	USE_LDCONFIG= yes
19	CMAKE_ARGS= -DSHARE_INSTALL_DIR:STRING=${ETCDIR} \	18	CMAKE_ARGS= -DSHARE_INSTALL_DIR:STRING=${ETCDIR} \
		19	-DALSOFT_REQUIRE_OSS:BOOL=OFF \
20	-DALSOFT_REQUIRE_JACK:BOOL=OFF \	20	-DALSOFT_REQUIRE_JACK:BOOL=OFF \
21	-DALSOFT_REQUIRE_OSS:BOOL=ON \
22	-DALSOFT_REQUIRE_SOLARIS:BOOL=OFF \	21	-DALSOFT_REQUIRE_SOLARIS:BOOL=OFF \
23	-DALSOFT_REQUIRE_SNDIO:BOOL=OFF \	22	-DALSOFT_REQUIRE_SNDIO:BOOL=OFF \
24	-DALSOFT_REQUIRE_QSA:BOOL=OFF \	23	-DALSOFT_REQUIRE_QSA:BOOL=OFF \
25	-DALSOFT_BACKEND_ALSA:BOOL=OFF \	24	-DALSOFT_BACKEND_ALSA:BOOL=OFF \
26	-DALSOFT_BACKEND_WAVE:BOOL=ON \	25	-DALSOFT_BACKEND_WAVE:BOOL=ON \
27	-DALSOFT_UTILS:BOOL=ON \	26	-DALSOFT_UTILS:BOOL=ON
28	-DALSOFT_EXAMPLES:BOOL=OFF
29		27
30	OPTIONS_DEFINE= FLUIDSYNTH CONFIG JACK PORTAUDIO PULSEAUDIO SNDIO	28	OPTIONS_DEFINE= FLUIDSYNTH CONFIG OSS JACK PORTAUDIO PULSEAUDIO SNDIO EXAMPLES
		29	OPTIONS_DEFAULT= OSS
31	OPTIONS_SUB= yes	30	OPTIONS_SUB= yes
32	CONFIG_DESC= Install configuration utility (needs Qt 4.x)	31	CONFIG_DESC= Install configuration utility (needs Qt 4.x)
33		32
Lines 40-45 Link Here
40	FLUIDSYNTH_CMAKE_ON= -DALSOFT_REQUIRE_FLUIDSYNTH:BOOL=ON	39	FLUIDSYNTH_CMAKE_ON= -DALSOFT_REQUIRE_FLUIDSYNTH:BOOL=ON
41	FLUIDSYNTH_CMAKE_OFF= -DALSOFT_MIDI_FLUIDSYNTH:BOOL=OFF	40	FLUIDSYNTH_CMAKE_OFF= -DALSOFT_MIDI_FLUIDSYNTH:BOOL=OFF
42	FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth	41	FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth
		42	OSS_CMAKE_ON= -DALSOFT_REQUIRE_OSS:BOOL=ON
		43	OSS_CMAKE_OFF= -DALSOFT_BACKEND_OSS:BOOL=OFF
43	JACK_CMAKE_ON= -DALSOFT_REQUIRE_JACK:BOOL=ON	44	JACK_CMAKE_ON= -DALSOFT_REQUIRE_JACK:BOOL=ON
44	JACK_CMAKE_OFF= -DALSOFT_BACKEND_JACK:BOOL=OFF	45	JACK_CMAKE_OFF= -DALSOFT_BACKEND_JACK:BOOL=OFF
45	JACK_LIB_DEPENDS= libjack.so:audio/jack	46	JACK_LIB_DEPENDS= libjack.so:audio/jack
Lines 52-62 Link Here
52	SNDIO_CMAKE_ON= -DALSOFT_REQUIRE_SNDIO:BOOL=ON	53	SNDIO_CMAKE_ON= -DALSOFT_REQUIRE_SNDIO:BOOL=ON
53	SNDIO_CMAKE_OFF= -DALSOFT_BACKEND_SNDIO:BOOL=OFF	54	SNDIO_CMAKE_OFF= -DALSOFT_BACKEND_SNDIO:BOOL=OFF
54	SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio	55	SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
		56	EXAMPLES_CMAKE_ON= -DALSOFT_EXAMPLES:BOOL=ON
		57	EXAMPLES_CMAKE_OFF= -DALSOFT_EXAMPLES:BOOL=OFF
		58	EXAMPLES_USE= SDL=sdl2,sound
		59	EXAMPLES_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg
55		60
56	post-patch:	61	post-patch:
57	@${REINPLACE_CMD} 's\|/etc/openal\|${ETCDIR}\|' \	62	@${REINPLACE_CMD} 's\|/etc/openal\|${ETCDIR}\|' \
58	${WRKSRC}/Alc/alcConfig.c	63	${WRKSRC}/Alc/alcConfig.c
59	@${REINPLACE_CMD} 's\|$${SHARE_INSTALL_DIR}/openal\|${ETCDIR}\|' \	64	@${REINPLACE_CMD} 's\|$${CMAKE_INSTALL_DATADIR}/openal\|${ETCDIR}\|' \
60	${WRKSRC}/CMakeLists.txt	65	${WRKSRC}/CMakeLists.txt
61		66
62	.include <bsd.port.mk>	67	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)audio/openal-soft/files/patch-CMakeLists.txt (-5 / +5 lines)
1	--- CMakeLists.txt.orig 2016-01-25 03:12:39 UTC	1	--- CMakeLists.txt.orig 2017-06-04 14:31:22 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -582,10 +582,6 @@ int main()	3	@@ -643,10 +643,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-21 Link Here
11	ENDIF()	11	ENDIF()
12		12
13	# Check for a 64-bit type	13	# Check for a 64-bit type
14	@@ -1184,7 +1180,7 @@ IF(ALSOFT_INSTALL)	14	@@ -1299,7 +1295,7 @@ IF(ALSOFT_INSTALL)
15	DESTINATION include/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 "lib${LIB_SUFFIX}/pkgconfig")	18	- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
19	+ DESTINATION "libdata/pkgconfig")	19	+ DESTINATION "libdata/pkgconfig")
20	ENDIF()	20	ENDIF()
21		21