diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile index e4f3ceec6dbf..f92cdb551931 100644 --- a/audio/alsa-lib/Makefile +++ b/audio/alsa-lib/Makefile @@ -1,49 +1,43 @@ PORTNAME= alsa-lib -PORTVERSION= 1.2.2 -PORTREVISION= 1 -DISTVERSIONPREFIX= v +PORTVERSION= 1.2.10 CATEGORIES= audio -MASTER_SITES= GH +MASTER_SITES= https://www.alsa-project.org/files/pub/lib/ -USE_GITHUB= yes -GH_ACCOUNT= alsa-project -GH_PROJECT= ${PORTNAME} - -MAINTAINER= ports@FreeBSD.org +MAINTAINER= rodrigo@FreeBSD.org COMMENT= ALSA compatibility library WWW= https://www.alsa-project.org/ LICENSE= LGPL21+ -USES= autoreconf cpe libtool:keepla tar:bzip2 +USES= cpe libtool:keepla tar:bzip2 CPE_VENDOR= alsa-project CPE_PRODUCT= alsa USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pkgconfdir="\$${prefix}/libdata/pkgconfig" CONFIGURE_ENV= ac_cv_header_endian_h=no INSTALL_TARGET= install-strip TEST_ENV= ${MAKE_ENV} \ ALSA_CONFIG_PATH="${FILESDIR}/asound.conf.sample" TEST_TARGET= check CPPFLAGS+= -I${FILESDIR} # Some symbols in the linker version script Versions.in are only defined when # --enable-alisp is used at configure time. Suppress errors with lld >= 17 due # to these undefined symbols. LDFLAGS+= -Wl,--undefined-version -OPTIONS_DEFINE= PYTHON -OPTIONS_SUB= yes +OPTIONS_DEFINE= PYTHON +OPTIONS_SUB= yes PYTHON_USES= gettext-runtime python PYTHON_CONFIGURE_ENABLE= mixer-pymods python PYTHON_BINARY_ALIAS= python3-config=${PYTHON_CMD:T}-config post-patch: @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/src/conf/alsa.conf post-install: ${INSTALL_DATA} ${FILESDIR}/asound.conf.sample ${STAGEDIR}${PREFIX}/etc .include diff --git a/audio/alsa-lib/distinfo b/audio/alsa-lib/distinfo index 2e5d1eeeb2e5..7340d0a43ba4 100644 --- a/audio/alsa-lib/distinfo +++ b/audio/alsa-lib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634081449 -SHA256 (alsa-project-alsa-lib-v1.2.2_GH0.tar.gz) = ad4fa29e3927c5bec0f71b24b6a88523f4e386905341fc9047abef5744805023 -SIZE (alsa-project-alsa-lib-v1.2.2_GH0.tar.gz) = 780688 +TIMESTAMP = 1695515195 +SHA256 (alsa-lib-1.2.10.tar.bz2) = c86a45a846331b1b0aa6e6be100be2a7aef92efd405cf6bac7eef8174baa920e +SIZE (alsa-lib-1.2.10.tar.bz2) = 1107007 diff --git a/audio/alsa-lib/files/patch-src_async.c b/audio/alsa-lib/files/patch-src_async.c deleted file mode 100644 index a510736e9607..000000000000 --- a/audio/alsa-lib/files/patch-src_async.c +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-bk,v 1.1 2008/12/25 13:18:00 hasso Exp $ - ---- src/async.c.orig 2020-02-19 09:35:39 UTC -+++ src/async.c -@@ -54,6 +54,15 @@ static LIST_HEAD(snd_async_handlers); - - static void snd_async_handler(int signo ATTRIBUTE_UNUSED, siginfo_t *siginfo, void *context ATTRIBUTE_UNUSED) - { -+#if defined(__DragonFly__) || defined(__FreeBSD__) -+ /* XXX XXX XXX */ -+ struct list_head *i; -+ list_for_each(i, &snd_async_handlers) { -+ snd_async_handler_t *h = list_entry(i, snd_async_handler_t, glist); -+ if (h->callback) -+ h->callback(h); -+ } -+#else - int fd; - struct list_head *i; - //assert(siginfo->si_code == SI_SIGIO); -@@ -66,6 +75,7 @@ static void snd_async_handler(int signo ATTRIBUTE_UNUS - if (h->fd == fd && h->callback) - h->callback(h); - } -+#endif - } - - /** diff --git a/audio/alsa-lib/files/patch-src_conf_alsa.conf b/audio/alsa-lib/files/patch-src_conf_alsa.conf index 4c2c9d6f565b..d85c2d9d874c 100644 --- a/audio/alsa-lib/files/patch-src_conf_alsa.conf +++ b/audio/alsa-lib/files/patch-src_conf_alsa.conf @@ -1,13 +1,15 @@ ---- src/conf/alsa.conf.orig 2020-02-19 09:35:39 UTC +--- src/conf/alsa.conf.orig 2022-01-01 09:52:43 UTC +++ src/conf/alsa.conf -@@ -8,8 +8,8 @@ +@@ -8,10 +8,8 @@ { func load files [ +- "/var/lib/alsa/conf.d" +- "/usr/etc/alsa/conf.d" - "/etc/alsa/conf.d" -- "/etc/asound.conf" +- "/etc/asound.conf|||/usr/etc/asound.conf" + "%%PREFIX%%/etc/alsa/conf.d" + "%%PREFIX%%/etc/asound.conf" "~/.asoundrc" - ] - errors false + { + @func concat diff --git a/audio/alsa-lib/files/patch-src_pcm_pcm__direct.c b/audio/alsa-lib/files/patch-src_pcm_pcm__direct.c deleted file mode 100644 index ec8600e63c9d..000000000000 --- a/audio/alsa-lib/files/patch-src_pcm_pcm__direct.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/pcm/pcm_direct.c.orig 2016-03-31 13:10:39 UTC -+++ src/pcm/pcm_direct.c -@@ -44,12 +44,17 @@ - * - */ - -+#if !defined(__DragonFly__) && !defined(__OpenBSD__) \ -+ && !(defined(__FreeBSD__) && __FreeBSD__ < 12) - union semun { - int val; /* Value for SETVAL */ - struct semid_ds *buf; /* Buffer for IPC_STAT, IPC_SET */ - unsigned short *array; /* Array for GETALL, SETALL */ -+#ifdef __linux__ - struct seminfo *__buf; /* Buffer for IPC_INFO (Linux specific) */ -+#endif - }; -+#endif - - /* - * FIXME: diff --git a/audio/alsa-lib/files/patch-test_midifile.c b/audio/alsa-lib/files/patch-test_midifile.c deleted file mode 100644 index 7c970b7548af..000000000000 --- a/audio/alsa-lib/files/patch-test_midifile.c +++ /dev/null @@ -1,20 +0,0 @@ ---- test/midifile.c.orig 2016-03-31 13:10:39 UTC -+++ test/midifile.c -@@ -71,7 +71,7 @@ - #endif - - #include --#include -+#include - - #include - /*void exit(), free();*/ -@@ -328,7 +328,7 @@ readtrack () /* read a track chunk */ - - if (Mf_interactive) - { -- Mf_toberead = MAXINT; -+ Mf_toberead = INT_MAX; - } - else - { diff --git a/audio/alsa-lib/pkg-plist b/audio/alsa-lib/pkg-plist index 5b6f5bfe2873..d9477b58d2bd 100644 --- a/audio/alsa-lib/pkg-plist +++ b/audio/alsa-lib/pkg-plist @@ -1,139 +1,143 @@ bin/aserver include/alsa/asoundef.h include/alsa/asoundlib.h include/alsa/conf.h include/alsa/control.h include/alsa/control_external.h +include/alsa/control_plugin.h include/alsa/error.h include/alsa/global.h include/alsa/hwdep.h include/alsa/input.h include/alsa/mixer.h include/alsa/mixer_abst.h include/alsa/output.h include/alsa/pcm.h include/alsa/pcm_external.h include/alsa/pcm_extplug.h include/alsa/pcm_ioplug.h include/alsa/pcm_old.h include/alsa/pcm_plugin.h include/alsa/pcm_rate.h include/alsa/rawmidi.h include/alsa/seq.h include/alsa/seq_event.h include/alsa/seq_midi_event.h include/alsa/seqmid.h include/alsa/sound/asoc.h include/alsa/sound/asound_fm.h include/alsa/sound/emu10k1.h include/alsa/sound/hdsp.h include/alsa/sound/hdspm.h include/alsa/sound/sb16_csp.h include/alsa/sound/sscape_ioctl.h include/alsa/sound/tlv.h include/alsa/sound/type_compat.h include/alsa/sound/uapi/asoc.h include/alsa/sound/uapi/asound_fm.h include/alsa/sound/uapi/emu10k1.h include/alsa/sound/uapi/hdsp.h include/alsa/sound/uapi/hdspm.h include/alsa/sound/uapi/sb16_csp.h include/alsa/sound/uapi/sscape_ioctl.h include/alsa/sound/uapi/tlv.h include/alsa/timer.h include/alsa/topology.h +include/alsa/ump.h +include/alsa/ump_msg.h include/alsa/use-case.h include/alsa/version.h include/asoundlib.h include/sys/asoundlib.h %%PYTHON%%lib/alsa-lib/smixer/smixer-python.la %%PYTHON%%lib/alsa-lib/smixer/smixer-python.so lib/libasound.la lib/libasound.so lib/libasound.so.2 lib/libasound.so.2.0.0 lib/libatopology.la lib/libatopology.so lib/libatopology.so.2 lib/libatopology.so.2.0.0 libdata/pkgconfig/alsa-topology.pc libdata/pkgconfig/alsa.pc share/aclocal/alsa.m4 share/alsa/alsa.conf share/alsa/cards/AACI.conf share/alsa/cards/ATIIXP-MODEM.conf share/alsa/cards/ATIIXP-SPDMA.conf share/alsa/cards/ATIIXP.conf share/alsa/cards/AU8810.conf share/alsa/cards/AU8820.conf share/alsa/cards/AU8830.conf share/alsa/cards/Audigy.conf share/alsa/cards/Audigy2.conf share/alsa/cards/Aureon51.conf share/alsa/cards/Aureon71.conf share/alsa/cards/CA0106.conf share/alsa/cards/CMI8338-SWIEC.conf share/alsa/cards/CMI8338.conf share/alsa/cards/CMI8738-MC6.conf share/alsa/cards/CMI8738-MC8.conf share/alsa/cards/CMI8788.conf share/alsa/cards/CS46xx.conf share/alsa/cards/EMU10K1.conf share/alsa/cards/EMU10K1X.conf share/alsa/cards/ENS1370.conf share/alsa/cards/ENS1371.conf share/alsa/cards/ES1968.conf share/alsa/cards/Echo_Echo3G.conf share/alsa/cards/FM801.conf share/alsa/cards/FWSpeakers.conf share/alsa/cards/FireWave.conf share/alsa/cards/GUS.conf share/alsa/cards/HDA-Intel.conf share/alsa/cards/HdmiLpeAudio.conf share/alsa/cards/ICE1712.conf share/alsa/cards/ICE1724.conf share/alsa/cards/ICH-MODEM.conf share/alsa/cards/ICH.conf share/alsa/cards/ICH4.conf share/alsa/cards/Loopback.conf share/alsa/cards/Maestro3.conf share/alsa/cards/NFORCE.conf share/alsa/cards/PC-Speaker.conf share/alsa/cards/PMac.conf share/alsa/cards/PMacToonie.conf share/alsa/cards/PS3.conf share/alsa/cards/RME9636.conf share/alsa/cards/RME9652.conf share/alsa/cards/SB-XFi.conf share/alsa/cards/SI7018.conf share/alsa/cards/TRID4DWAVENX.conf share/alsa/cards/USB-Audio.conf share/alsa/cards/VIA686A.conf share/alsa/cards/VIA8233.conf share/alsa/cards/VIA8233A.conf share/alsa/cards/VIA8237.conf share/alsa/cards/VX222.conf share/alsa/cards/VXPocket.conf share/alsa/cards/VXPocket440.conf share/alsa/cards/YMF744.conf share/alsa/cards/aliases.conf share/alsa/cards/pistachio-card.conf share/alsa/cards/vc4-hdmi.conf +share/alsa/ctl/default.conf share/alsa/pcm/center_lfe.conf share/alsa/pcm/default.conf share/alsa/pcm/dmix.conf share/alsa/pcm/dpl.conf share/alsa/pcm/dsnoop.conf share/alsa/pcm/front.conf share/alsa/pcm/hdmi.conf share/alsa/pcm/iec958.conf share/alsa/pcm/modem.conf share/alsa/pcm/rear.conf share/alsa/pcm/side.conf share/alsa/pcm/surround21.conf share/alsa/pcm/surround40.conf share/alsa/pcm/surround41.conf share/alsa/pcm/surround50.conf share/alsa/pcm/surround51.conf share/alsa/pcm/surround71.conf @sample etc/asound.conf.sample