CVS commit: pkgsrc/audio

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/audio
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Sun, 30 Mar 2025 09:32:08 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Mar 30 09:32:08 UTC 2025

Modified Files:
        pkgsrc/audio: Makefile
Added Files:
        pkgsrc/audio/openal-soft-c: DESCR Makefile PLIST buildlink3.mk distinfo
            options.mk
        pkgsrc/audio/openal-soft-c/patches: patch-Alc_alconfig.c
            patch-Alc_backends_alsa.c patch-include_AL_al.h

Log Message:
Import audio/openal-soft-c, the last version not requiring C++.

This is intended for systems with compilers that are new enough
to build CMake but not new enough for C++20 (of which there are many).


To generate a diff of this commit:
cvs rdiff -u -r1.706 -r1.707 pkgsrc/audio/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/openal-soft-c/DESCR \
    pkgsrc/audio/openal-soft-c/Makefile pkgsrc/audio/openal-soft-c/PLIST \
    pkgsrc/audio/openal-soft-c/buildlink3.mk \
    pkgsrc/audio/openal-soft-c/distinfo pkgsrc/audio/openal-soft-c/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/openal-soft-c/patches/patch-Alc_alconfig.c \
    pkgsrc/audio/openal-soft-c/patches/patch-Alc_backends_alsa.c \
    pkgsrc/audio/openal-soft-c/patches/patch-include_AL_al.h

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

Modified files:

Index: pkgsrc/audio/Makefile
diff -u pkgsrc/audio/Makefile:1.706 pkgsrc/audio/Makefile:1.707
--- pkgsrc/audio/Makefile:1.706 Wed Feb  5 08:07:46 2025
+++ pkgsrc/audio/Makefile       Sun Mar 30 09:32:07 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.706 2025/02/05 08:07:46 adam Exp $
+# $NetBSD: Makefile,v 1.707 2025/03/30 09:32:07 nia Exp $
 #
 
 COMMENT=       Audio tools, players, and libraries
@@ -340,6 +340,7 @@ SUBDIR+=    open_jtalk
 SUBDIR+=       open_jtalk-HTS_voice
 SUBDIR+=       open_jtalk-MMDAgent_voice
 SUBDIR+=       openal-soft
+SUBDIR+=       openal-soft-c
 SUBDIR+=       opencore-amr
 SUBDIR+=       opus-tools
 SUBDIR+=       opusfile

Added files:

Index: pkgsrc/audio/openal-soft-c/DESCR
diff -u /dev/null pkgsrc/audio/openal-soft-c/DESCR:1.1
--- /dev/null   Sun Mar 30 09:32:08 2025
+++ pkgsrc/audio/openal-soft-c/DESCR    Sun Mar 30 09:32:07 2025
@@ -0,0 +1,9 @@
+OpenAL Soft is an LGPL-licensed, cross-platform, software implementation
+of the OpenAL 3D audio API.
+
+OpenAL provides capabilities for playing audio in a virtual 3D environment.
+Distance attenuation, doppler shift, and directional sound emitters are
+among the features handled by the API.
+
+This is the last version written primarily in C, kept around for
+systems with older compiler versions.
Index: pkgsrc/audio/openal-soft-c/Makefile
diff -u /dev/null pkgsrc/audio/openal-soft-c/Makefile:1.1
--- /dev/null   Sun Mar 30 09:32:08 2025
+++ pkgsrc/audio/openal-soft-c/Makefile Sun Mar 30 09:32:07 2025
@@ -0,0 +1,56 @@
+# $NetBSD: Makefile,v 1.1 2025/03/30 09:32:07 nia Exp $
+
+DISTNAME=      openal-soft-1.19.1
+CATEGORIES=    audio
+MASTER_SITES=  https://openal-soft.org/openal-releases/
+EXTRACT_SUFX=  .tar.bz2
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://openal-soft.org/
+COMMENT=       Software implementation of the OpenAL 3D audio API
+LICENSE=       gnu-lgpl-v2
+
+USE_LANGUAGES=         c c++
+USE_TOOLS+=            gmake pkg-config
+
+PKGCONFIG_OVERRIDE+=   openal.pc.in
+PKG_SYSCONFSUBDIR=     openal
+
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_EXAMPLES=OFF
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_UTILS=ON
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_NO_CONFIG_UTIL=ON
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_RTKIT=OFF
+
+CFLAGS+=       -DSYS_CONF_DIR="\"${PKG_SYSCONFDIR}\""
+CFLAGS.NetBSD+=        -D_NETBSD_SOURCE
+CFLAGS.SunOS+= -D__EXTENSIONS__
+
+BUILDLINK_TRANSFORM+=          rm:-Wall
+BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--version-script=${WRKSRC}/libopenal.version
+
+CONF_FILES+=   ${PREFIX}/share/openal/alsoftrc.sample ${PKG_SYSCONFDIR}/alsoft.conf
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "NetBSD"
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_BACKEND_SOLARIS=ON
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_REQUIRE_SOLARIS=ON
+.endif
+
+.include "../../mk/oss.buildlink3.mk"
+
+.if ${OSS_TYPE} != "none"
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_BACKEND_OSS=ON
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_REQUIRE_OSS=ON
+SUBST_CLASSES+=                oss
+SUBST_STAGE.oss=       pre-configure
+SUBST_MESSAGE.oss=     Fixing default OSS device references.
+SUBST_FILES.oss=       Alc/backends/oss.c
+SUBST_SED.oss=         -e 's,/dev/dsp,${DEVOSSAUDIO},'
+.endif
+
+.include "options.mk"
+.include "../../devel/cmake/build.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/openal-soft-c/PLIST
diff -u /dev/null pkgsrc/audio/openal-soft-c/PLIST:1.1
--- /dev/null   Sun Mar 30 09:32:08 2025
+++ pkgsrc/audio/openal-soft-c/PLIST    Sun Mar 30 09:32:07 2025
@@ -0,0 +1,26 @@
+@comment $NetBSD: PLIST,v 1.1 2025/03/30 09:32:07 nia Exp $
+bin/altonegen
+bin/makehrtf
+bin/openal-info
+include/AL/al.h
+include/AL/alc.h
+include/AL/alext.h
+include/AL/efx-creative.h
+include/AL/efx-presets.h
+include/AL/efx.h
+lib/cmake/OpenAL/OpenALConfig-relwithdebinfo.cmake
+lib/cmake/OpenAL/OpenALConfig.cmake
+lib/libopenal.so
+lib/libopenal.so.1
+lib/libopenal.so.${PKGVERSION}
+lib/pkgconfig/openal.pc
+share/openal/alsoftrc.sample
+share/openal/hrtf/default-44100.mhr
+share/openal/hrtf/default-48000.mhr
+share/openal/presets/3D7.1.ambdec
+share/openal/presets/hexagon.ambdec
+share/openal/presets/itu5.1-nocenter.ambdec
+share/openal/presets/itu5.1.ambdec
+share/openal/presets/presets.txt
+share/openal/presets/rectangle.ambdec
+share/openal/presets/square.ambdec
Index: pkgsrc/audio/openal-soft-c/buildlink3.mk
diff -u /dev/null pkgsrc/audio/openal-soft-c/buildlink3.mk:1.1
--- /dev/null   Sun Mar 30 09:32:08 2025
+++ pkgsrc/audio/openal-soft-c/buildlink3.mk    Sun Mar 30 09:32:07 2025
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.1 2025/03/30 09:32:07 nia Exp $
+
+BUILDLINK_TREE+=       openal-soft
+
+.if !defined(OPENAL_SOFT_BUILDLINK3_MK)
+OPENAL_SOFT_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.openal-soft+=    openal-soft>=1.5.304<1.20.0
+BUILDLINK_PKGSRCDIR.openal-soft?=      ../../audio/openal-soft-c
+.endif # OPENAL_SOFT_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -openal-soft
Index: pkgsrc/audio/openal-soft-c/distinfo
diff -u /dev/null pkgsrc/audio/openal-soft-c/distinfo:1.1
--- /dev/null   Sun Mar 30 09:32:08 2025
+++ pkgsrc/audio/openal-soft-c/distinfo Sun Mar 30 09:32:07 2025
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1 2025/03/30 09:32:07 nia Exp $
+
+BLAKE2s (openal-soft-1.19.1.tar.bz2) = 835d14839cd46fe21e17f8e82395a0045ccd66318a79d11c767be6a78fac0879
+SHA512 (openal-soft-1.19.1.tar.bz2) = 356a3f12bbe284bfac71f4f2a9f83d084083a832012222e73743042ac27812cf051c12b0ddcf53c010ff77e44ae2e9033cea9b9324d316a22a59a154307a64a4
+Size (openal-soft-1.19.1.tar.bz2) = 577310 bytes
+SHA1 (patch-Alc_alconfig.c) = 1fed04f447464823c35dca1f4ed3e40556134c5e
+SHA1 (patch-Alc_backends_alsa.c) = abe18174fae4b836a2b11ca6c3cf23ba96701c87
+SHA1 (patch-include_AL_al.h) = dc26f40fa4eca3d02c21099d375e7d9956241028
Index: pkgsrc/audio/openal-soft-c/options.mk
diff -u /dev/null pkgsrc/audio/openal-soft-c/options.mk:1.1
--- /dev/null   Sun Mar 30 09:32:08 2025
+++ pkgsrc/audio/openal-soft-c/options.mk       Sun Mar 30 09:32:07 2025
@@ -0,0 +1,29 @@
+# $NetBSD: options.mk,v 1.1 2025/03/30 09:32:07 nia Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.openal-soft
+PKG_SUPPORTED_OPTIONS=         jack pulseaudio
+PKG_SUPPORTED_OPTIONS.Linux+=  alsa
+PKG_SUGGESTED_OPTIONS.Linux+=  alsa
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Malsa)
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_BACKEND_ALSA=ON
+.  include "../../audio/alsa-lib/buildlink3.mk"
+.else
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_BACKEND_ALSA=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mjack)
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_BACKEND_JACK=ON
+.  include "../../audio/jack/buildlink3.mk"
+.else
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_BACKEND_JACK=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_BACKEND_PULSEAUDIO=ON
+.  include "../../audio/pulseaudio/buildlink3.mk"
+.else
+CMAKE_CONFIGURE_ARGS+= -DALSOFT_BACKEND_PULSEAUDIO=OFF
+.endif

Index: pkgsrc/audio/openal-soft-c/patches/patch-Alc_alconfig.c
diff -u /dev/null pkgsrc/audio/openal-soft-c/patches/patch-Alc_alconfig.c:1.1
--- /dev/null   Sun Mar 30 09:32:08 2025
+++ pkgsrc/audio/openal-soft-c/patches/patch-Alc_alconfig.c     Sun Mar 30 09:32:07 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-Alc_alconfig.c,v 1.1 2025/03/30 09:32:07 nia Exp $
+
+Allow the Makefile to specify the default config file path.
+
+--- Alc/alconfig.c.orig        2025-03-24 15:38:04.295146953 +0000
++++ Alc/alconfig.c
+@@ -428,7 +428,7 @@ void ReadALConfig(void)
+     const char *str;
+     FILE *f;
+ 
+-    str = "/etc/openal/alsoft.conf";
++    str = SYS_CONF_DIR "/openal/alsoft.conf";
+ 
+     TRACE("Loading config %s...\n", str);
+     f = al_fopen(str, "r");
+@@ -439,7 +439,7 @@ void ReadALConfig(void)
+     }
+ 
+     if(!(str=getenv("XDG_CONFIG_DIRS")) || str[0] == 0)
+-        str = "/etc/xdg";
++        str = SYS_CONF_DIR "/xdg";
+     alstr_copy_cstr(&confpaths, str);
+     /* Go through the list in reverse, since "the order of base directories
+      * denotes their importance; the first directory listed is the most
Index: pkgsrc/audio/openal-soft-c/patches/patch-Alc_backends_alsa.c
diff -u /dev/null pkgsrc/audio/openal-soft-c/patches/patch-Alc_backends_alsa.c:1.1
--- /dev/null   Sun Mar 30 09:32:08 2025
+++ pkgsrc/audio/openal-soft-c/patches/patch-Alc_backends_alsa.c        Sun Mar 30 09:32:07 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-Alc_backends_alsa.c,v 1.1 2025/03/30 09:32:07 nia Exp $
+
+Support building on non-Linux.
+
+--- Alc/backends/alsa.c.orig   2025-03-24 15:38:32.096309021 +0000
++++ Alc/backends/alsa.c
+@@ -35,6 +35,9 @@
+ 
+ #include <alsa/asoundlib.h>
+ 
++#ifndef ESTRPIPE
++#define ESTRPIPE EPIPE
++#endif
+ 
+ static const ALCchar alsaDevice[] = "ALSA Default";
+ 
Index: pkgsrc/audio/openal-soft-c/patches/patch-include_AL_al.h
diff -u /dev/null pkgsrc/audio/openal-soft-c/patches/patch-include_AL_al.h:1.1
--- /dev/null   Sun Mar 30 09:32:08 2025
+++ pkgsrc/audio/openal-soft-c/patches/patch-include_AL_al.h    Sun Mar 30 09:32:08 2025
@@ -0,0 +1,19 @@
+$NetBSD: patch-include_AL_al.h,v 1.1 2025/03/30 09:32:08 nia Exp $
+
+Fix SunOS build, int8_t is not always the same as signed char.
+
+--- include/AL/al.h.orig       2025-03-24 15:39:07.740729073 +0000
++++ include/AL/al.h
+@@ -41,7 +41,12 @@ typedef char ALboolean;
+ typedef char ALchar;
+ 
+ /** signed 8-bit 2's complement integer */
++#ifdef __sun
++#include <inttypes.h>
++typedef int8_t ALbyte;
++#else
+ typedef signed char ALbyte;
++#endif
+ 
+ /** unsigned 8-bit integer */
+ typedef unsigned char ALubyte;

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/audio/openal-soft-cxx14
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/audio/openal-soft-cxx14
Indexes:

Home | Main Index | Thread Index | Old Index