Attachment #221863 for bug #252961

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

Lines 1-8 Link Here

(-)audio/openal-soft/Makefile (-3 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= openal-soft	3	PORTNAME= openal-soft
4	PORTVERSION= 1.20.1	4	PORTVERSION= 1.21.0
5	PORTREVISION= 2
6	CATEGORIES= audio	5	CATEGORIES= audio
7	MASTER_SITES= https://openal-soft.org/openal-releases/	6	MASTER_SITES= https://openal-soft.org/openal-releases/
8		7
Lines 14-20 Link Here
14		13
15	LIB_DEPENDS= libmysofa.so:audio/libmysofa	14	LIB_DEPENDS= libmysofa.so:audio/libmysofa
16		15
17	USES= cmake compiler:c++11-lang tar:bzip2	16	USES= cmake compiler:c++14-lang tar:bzip2
18	USE_LDCONFIG= yes	17	USE_LDCONFIG= yes
19		18
20	CMAKE_ARGS= -DCMAKE_INSTALL_DATADIR:STRING="${PREFIX}/etc"	19	CMAKE_ARGS= -DCMAKE_INSTALL_DATADIR:STRING="${PREFIX}/etc"

Lines 1-3 Link Here

(-)audio/openal-soft/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1579899553	1	TIMESTAMP = 1611467857
2	SHA256 (openal-soft-1.20.1.tar.bz2) = b6ceb051325732c23f5c8b6d37dbd89534517e6439a87e970882b447c3025d6d	2	SHA256 (openal-soft-1.21.0.tar.bz2) = 2916b4fc24e23b0271ce0b3468832ad8b6d8441b1830215b28cc4fee6cc89297
3	SIZE (openal-soft-1.20.1.tar.bz2) = 512971	3	SIZE (openal-soft-1.21.0.tar.bz2) = 525483




--- CMakeLists.txt.orig	2020-11-04 10:00:35 UTC
+++ CMakeLists.txt
@@ -1394,19 +1394,19 @@ endif()
 
 if(ALSOFT_INSTALL_CONFIG)
     install(FILES alsoftrc.sample
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/openal)
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft)
     message(STATUS "Installing sample configuration")
 endif()
 
 if(ALSOFT_INSTALL_HRTF_DATA)
     install(DIRECTORY hrtf
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/openal)
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft)
     message(STATUS "Installing HRTF data files")
 endif()
 
 if(ALSOFT_INSTALL_AMBDEC_PRESETS)
     install(DIRECTORY presets
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/openal)
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft)
     message(STATUS "Installing AmbDec presets")
 endif()
 message(STATUS "")
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft/presets)
     MESSAGE(STATUS "Installing AmbDec presets")
     MESSAGE(STATUS "")
 ENDIF()

Lines 1-5 Link Here

(-)audio/openal-soft/pkg-plist (-1 / +2 lines)
1	%%CONFIG%%bin/alsoft-config	1	%%CONFIG%%bin/alsoft-config
2	bin/altonegen
3	bin/makemhr	2	bin/makemhr
4	bin/openal-info	3	bin/openal-info
5	%%ETCDIR%%/alsoftrc.sample	4	%%ETCDIR%%/alsoftrc.sample
Lines 23-28 Link Here
23	lib/libopenal.so.1	22	lib/libopenal.so.1
24	lib/libopenal.so.%%SOVERSION%%	23	lib/libopenal.so.%%SOVERSION%%
25	libdata/pkgconfig/openal.pc	24	libdata/pkgconfig/openal.pc
		25	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alconvolve.c
		26	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alstreamcb.cpp
26	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alffplay.cpp	27	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alffplay.cpp
27	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alhrtf.c	28	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alhrtf.c
28	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/allatency.c	29	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/allatency.c

Return to bug 252961

Lines 1-29 Link Here

(-)audio/openal-soft/files/patch-CMakeLists.txt (-26 / +22 lines)
1	--- CMakeLists.txt.orig 2020-01-24 07:28:45 UTC	1	--- CMakeLists.txt.orig 2020-11-04 10:00:35 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -1347,7 +1347,7 @@ endif()	3	@@ -1394,19 +1394,19 @@ endif()
4	# Install alsoft.conf configuration file	4
5	IF(ALSOFT_CONFIG)	5	if(ALSOFT_INSTALL_CONFIG)
6	INSTALL(FILES alsoftrc.sample	6	install(FILES alsoftrc.sample
7	- DESTINATION ${CMAKE_INSTALL_DATADIR}/openal)	7	- DESTINATION ${CMAKE_INSTALL_DATADIR}/openal)
8	+ DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft)	8	+ DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft)
9	MESSAGE(STATUS "Installing sample configuration")	9	message(STATUS "Installing sample configuration")
10	MESSAGE(STATUS "")	10	endif()
11	ENDIF()	11
12	@@ -1355,7 +1355,7 @@ ENDIF()	12	if(ALSOFT_INSTALL_HRTF_DATA)
13	# Install HRTF definitions	13	install(DIRECTORY hrtf
14	IF(ALSOFT_HRTF_DEFS)	14	- DESTINATION ${CMAKE_INSTALL_DATADIR}/openal)
15	INSTALL(FILES "hrtf/Default HRTF.mhr"	15	+ DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft)
16	- DESTINATION ${CMAKE_INSTALL_DATADIR}/openal/hrtf)	16	message(STATUS "Installing HRTF data files")
17	+ DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft/hrtf)	17	endif()
18	MESSAGE(STATUS "Installing HRTF definitions")	18
19	MESSAGE(STATUS "")	19	if(ALSOFT_INSTALL_AMBDEC_PRESETS)
20	ENDIF()	20	install(DIRECTORY presets
21	@@ -1370,7 +1370,7 @@ IF(ALSOFT_AMBDEC_PRESETS)	21	- DESTINATION ${CMAKE_INSTALL_DATADIR}/openal)
22	presets/rectangle.ambdec	22	+ DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft)
23	presets/square.ambdec	23	message(STATUS "Installing AmbDec presets")
24	presets/presets.txt	24	endif()
25	- DESTINATION ${CMAKE_INSTALL_DATADIR}/openal/presets)	25	message(STATUS "")
26	+ DESTINATION ${CMAKE_INSTALL_DATADIR}/openal-soft/presets)
27	MESSAGE(STATUS "Installing AmbDec presets")
28	MESSAGE(STATUS "")
29	ENDIF()