Wed May 4 17:23:35 2022 UTC ()
remove patch hunk that belongs to SUBST


(tnn)
diff -r1.13 -r1.14 pkgsrc/audio/openal-soft/distinfo
diff -r1.4 -r1.5 pkgsrc/audio/openal-soft/patches/patch-CMakeLists.txt
cvs diff -r1.13 -r1.14 pkgsrc/audio/openal-soft/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/openal-soft/distinfo 2022/05/04 16:31:30 1.13
+++ pkgsrc/audio/openal-soft/distinfo 2022/05/04 17:23:35 1.14
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.13 2022/05/04 16:31:30 tnn Exp $ 1$NetBSD: distinfo,v 1.14 2022/05/04 17:23:35 tnn Exp $
2 2
3BLAKE2s (openal-soft-1.22.0.tar.bz2) = 3c0deba1498ec857a3f0bbca856723796caf356db40af4ea55a9cbd72b81a727 3BLAKE2s (openal-soft-1.22.0.tar.bz2) = 3c0deba1498ec857a3f0bbca856723796caf356db40af4ea55a9cbd72b81a727
4SHA512 (openal-soft-1.22.0.tar.bz2) = 1e3df371d126e19e369dd01e3c5e95d6a32b664adf54ee37836d51ca7bc829f275d945388d8a40a3ac92c1151380bd68bbab4f8a08f59ea67dd1bd9b9a1d0cbd 4SHA512 (openal-soft-1.22.0.tar.bz2) = 1e3df371d126e19e369dd01e3c5e95d6a32b664adf54ee37836d51ca7bc829f275d945388d8a40a3ac92c1151380bd68bbab4f8a08f59ea67dd1bd9b9a1d0cbd
5Size (openal-soft-1.22.0.tar.bz2) = 606420 bytes 5Size (openal-soft-1.22.0.tar.bz2) = 606420 bytes
6SHA1 (patch-CMakeLists.txt) = 62bbd974a85717112d026e3fc71806c56ae9ca23 6SHA1 (patch-CMakeLists.txt) = 906d46ec5a71dc93a05a94985568b22ab67e60a2
7SHA1 (patch-alc_alconfig.cpp) = 0539016dadf1827e5a86700c2db5a96479a8b70d 7SHA1 (patch-alc_alconfig.cpp) = 0539016dadf1827e5a86700c2db5a96479a8b70d
8SHA1 (patch-alc_backends_alsa.cpp) = 3ee7f86e544d9b33ccbe9422eb87b9540623053a 8SHA1 (patch-alc_backends_alsa.cpp) = 3ee7f86e544d9b33ccbe9422eb87b9540623053a
9SHA1 (patch-alc_backends_solaris.cpp) = 62e7a5bddb5c4ed7f7e4c4889b2234dd778be960 9SHA1 (patch-alc_backends_solaris.cpp) = 62e7a5bddb5c4ed7f7e4c4889b2234dd778be960
10SHA1 (patch-include_AL_al.h) = 5545de5f606320b64ddd713569c9a86c8552eb46 10SHA1 (patch-include_AL_al.h) = 5545de5f606320b64ddd713569c9a86c8552eb46
cvs diff -r1.4 -r1.5 pkgsrc/audio/openal-soft/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/audio/openal-soft/patches/patch-CMakeLists.txt 2022/05/04 16:31:30 1.4
+++ pkgsrc/audio/openal-soft/patches/patch-CMakeLists.txt 2022/05/04 17:23:35 1.5
@@ -1,28 +1,19 @@ @@ -1,28 +1,19 @@
1$NetBSD: patch-CMakeLists.txt,v 1.4 2022/05/04 16:31:30 tnn Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.5 2022/05/04 17:23:35 tnn Exp $
2 2
3Fix building. 3Fix building.
4 4
5--- CMakeLists.txt.orig 2022-04-23 01:46:14.000000000 +0000 5--- CMakeLists.txt.orig 2022-04-23 01:46:14.000000000 +0000
6+++ CMakeLists.txt 6+++ CMakeLists.txt
7@@ -60,7 +60,7 @@ if(NOT CMAKE_DEBUG_POSTFIX) 
8 FORCE) 
9 endif() 
10  
11-set(CMAKE_MODULE_PATH "${OpenAL_SOURCE_DIR}/cmake") 
12+set (CMAKE_MODULE_PATH "/tmp/pkgsrc-obj/audio/openal-soft/work/.buildlink/cmake-Modules" "${OpenAL_SOURCE_DIR}/cmake") 
13  
14 include(CheckFunctionExists) 
15 include(CheckLibraryExists) 
16@@ -1206,9 +1206,9 @@ if(ALSOFT_EMBED_HRTF_DATA) 7@@ -1206,9 +1206,9 @@ if(ALSOFT_EMBED_HRTF_DATA)
17  8
18 add_custom_command(OUTPUT "${outfile}" 9 add_custom_command(OUTPUT "${outfile}"
19 COMMAND ${CMAKE_COMMAND} -D "INPUT_FILE=${infile}" -D "OUTPUT_FILE=${outfile}" 10 COMMAND ${CMAKE_COMMAND} -D "INPUT_FILE=${infile}" -D "OUTPUT_FILE=${outfile}"
20- -D "VARIABLE_NAME=${VARNAME}" -P "${CMAKE_MODULE_PATH}/bin2h.script.cmake" 11- -D "VARIABLE_NAME=${VARNAME}" -P "${CMAKE_MODULE_PATH}/bin2h.script.cmake"
21+ -D "VARIABLE_NAME=${VARNAME}" -P "${OpenAL_SOURCE_DIR}/cmake/bin2h.script.cmake" 12+ -D "VARIABLE_NAME=${VARNAME}" -P "${OpenAL_SOURCE_DIR}/cmake/bin2h.script.cmake"
22 WORKING_DIRECTORY "${OpenAL_SOURCE_DIR}" 13 WORKING_DIRECTORY "${OpenAL_SOURCE_DIR}"
23- DEPENDS "${infile}" "${CMAKE_MODULE_PATH}/bin2h.script.cmake" 14- DEPENDS "${infile}" "${CMAKE_MODULE_PATH}/bin2h.script.cmake"
24+ DEPENDS "${infile}" "${OpenAL_SOURCE_DIR}/cmake/bin2h.script.cmake" 15+ DEPENDS "${infile}" "${OpenAL_SOURCE_DIR}/cmake/bin2h.script.cmake"
25 VERBATIM 16 VERBATIM
26 ) 17 )
27 set(ALC_OBJS ${ALC_OBJS} "${outfile}") 18 set(ALC_OBJS ${ALC_OBJS} "${outfile}")
28@@ -1522,7 +1522,7 @@ if(ALSOFT_UTILS) 19@@ -1522,7 +1522,7 @@ if(ALSOFT_UTILS)