CVS commit: pkgsrc/audio/openal-soft

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed May  4 16:31:30 UTC 2022

Modified Files:
        pkgsrc/audio/openal-soft: Makefile distinfo
        pkgsrc/audio/openal-soft/patches: patch-CMakeLists.txt

Log Message:
openal-soft: fix some fallout

- remove -Wall (-Winline max-inline-insns-single fails)
- set -DALSOFT_UTILS=ON explictly
- disable libsndfile check with a patch
  If CMake finds libsndfile it tries (and fails) to build some examples
  which do not get installed anyway.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/audio/openal-soft/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/audio/openal-soft/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/audio/openal-soft/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/openal-soft/Makefile
diff -u pkgsrc/audio/openal-soft/Makefile:1.24 pkgsrc/audio/openal-soft/Makefile:1.25
--- pkgsrc/audio/openal-soft/Makefile:1.24      Wed May  4 06:53:06 2022
+++ pkgsrc/audio/openal-soft/Makefile   Wed May  4 16:31:30 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2022/05/04 06:53:06 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2022/05/04 16:31:30 tnn Exp $
 
 DISTNAME=      openal-soft-1.22.0
 CATEGORIES=    audio
@@ -21,12 +21,15 @@ PKGCONFIG_OVERRIDE+=        openal.pc.in
 PKG_SYSCONFSUBDIR=     openal
 
 CMAKE_ARGS+=   -DALSOFT_EXAMPLES=OFF
+CMAKE_ARGS+=   -DALSOFT_UTILS=ON
 CMAKE_ARGS+=   -DALSOFT_NO_CONFIG_UTIL=ON
 
 CFLAGS+=       -DSYS_CONF_DIR="\"${PKG_SYSCONFDIR}\""
 CFLAGS.NetBSD+=        -D_NETBSD_SOURCE
 CFLAGS.SunOS+= -D__EXTENSIONS__
 
+BUILDLINK_TRANSFORM+=  rm:-Wall
+
 CONF_FILES+=   ${PREFIX}/share/openal/alsoftrc.sample ${PKG_SYSCONFDIR}/alsoft.conf
 
 .include "../../mk/bsd.prefs.mk"

Index: pkgsrc/audio/openal-soft/distinfo
diff -u pkgsrc/audio/openal-soft/distinfo:1.12 pkgsrc/audio/openal-soft/distinfo:1.13
--- pkgsrc/audio/openal-soft/distinfo:1.12      Wed May  4 06:53:06 2022
+++ pkgsrc/audio/openal-soft/distinfo   Wed May  4 16:31:30 2022
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2022/05/04 06:53:06 wiz Exp $
+$NetBSD: distinfo,v 1.13 2022/05/04 16:31:30 tnn Exp $
 
 BLAKE2s (openal-soft-1.22.0.tar.bz2) = 3c0deba1498ec857a3f0bbca856723796caf356db40af4ea55a9cbd72b81a727
 SHA512 (openal-soft-1.22.0.tar.bz2) = 1e3df371d126e19e369dd01e3c5e95d6a32b664adf54ee37836d51ca7bc829f275d945388d8a40a3ac92c1151380bd68bbab4f8a08f59ea67dd1bd9b9a1d0cbd
 Size (openal-soft-1.22.0.tar.bz2) = 606420 bytes
-SHA1 (patch-CMakeLists.txt) = 5469748347d548838b8e4650e1ecbabacae1f30a
+SHA1 (patch-CMakeLists.txt) = 62bbd974a85717112d026e3fc71806c56ae9ca23
 SHA1 (patch-alc_alconfig.cpp) = 0539016dadf1827e5a86700c2db5a96479a8b70d
 SHA1 (patch-alc_backends_alsa.cpp) = 3ee7f86e544d9b33ccbe9422eb87b9540623053a
 SHA1 (patch-alc_backends_solaris.cpp) = 62e7a5bddb5c4ed7f7e4c4889b2234dd778be960

Index: pkgsrc/audio/openal-soft/patches/patch-CMakeLists.txt
diff -u pkgsrc/audio/openal-soft/patches/patch-CMakeLists.txt:1.3 pkgsrc/audio/openal-soft/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/audio/openal-soft/patches/patch-CMakeLists.txt:1.3   Sun Mar 21 20:05:17 2021
+++ pkgsrc/audio/openal-soft/patches/patch-CMakeLists.txt       Wed May  4 16:31:30 2022
@@ -1,10 +1,19 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2021/03/21 20:05:17 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2022/05/04 16:31:30 tnn Exp $
 
 Fix building.
 
---- CMakeLists.txt.orig        2021-03-21 19:49:33.000000000 +0000
+--- CMakeLists.txt.orig        2022-04-23 01:46:14.000000000 +0000
 +++ CMakeLists.txt
-@@ -1136,9 +1136,9 @@ if(ALSOFT_EMBED_HRTF_DATA)
+@@ -60,7 +60,7 @@ if(NOT CMAKE_DEBUG_POSTFIX)
+         FORCE)
+ endif()
+ 
+-set(CMAKE_MODULE_PATH "${OpenAL_SOURCE_DIR}/cmake")
++set (CMAKE_MODULE_PATH "/tmp/pkgsrc-obj/audio/openal-soft/work/.buildlink/cmake-Modules" "${OpenAL_SOURCE_DIR}/cmake")
+ 
+ include(CheckFunctionExists)
+ include(CheckLibraryExists)
+@@ -1206,9 +1206,9 @@ if(ALSOFT_EMBED_HRTF_DATA)
  
          add_custom_command(OUTPUT "${outfile}"
              COMMAND ${CMAKE_COMMAND} -D "INPUT_FILE=${infile}" -D "OUTPUT_FILE=${outfile}"
@@ -16,3 +25,21 @@ Fix building.
              VERBATIM
          )
          set(ALC_OBJS  ${ALC_OBJS} "${outfile}")
+@@ -1522,7 +1522,7 @@ if(ALSOFT_UTILS)
+         set(EXTRA_INSTALLS ${EXTRA_INSTALLS} openal-info)
+     endif()
+ 
+-    if(SNDFILE_FOUND)
++    if(SNDFILE_FOUND AND False)
+         add_executable(uhjdecoder utils/uhjdecoder.cpp)
+         target_compile_definitions(uhjdecoder PRIVATE ${CPP_DEFS})
+         target_include_directories(uhjdecoder
+@@ -1608,7 +1608,7 @@ if(ALSOFT_EXAMPLES)
+ 
+     message(STATUS "Building example programs")
+ 
+-    if(SNDFILE_FOUND)
++    if(SNDFILE_FOUND AND False)
+         add_executable(alplay examples/alplay.c)
+         target_link_libraries(alplay PRIVATE ${LINKER_FLAGS} SndFile::SndFile ex-common
+             ${UNICODE_FLAG})