From 1bdc79fe27dbb0f4ecf0b6bc110c67fdda7f0305 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 1 Jun 2022 09:10:08 +0000 Subject: [PATCH 1/5] alsa-topology-conf: update to PKG_ to HTTPS --- packages/audio/alsa-topology-conf/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/audio/alsa-topology-conf/package.mk b/packages/audio/alsa-topology-conf/package.mk index d0104fc043..bc1cc777e1 100644 --- a/packages/audio/alsa-topology-conf/package.mk +++ b/packages/audio/alsa-topology-conf/package.mk @@ -5,8 +5,8 @@ PKG_NAME="alsa-topology-conf" PKG_VERSION="1.2.5.1" PKG_SHA256="f7c5bae1545abcd73824bc97f4e72c340e11abea188ba0f1c06f5e0ad776b179" PKG_LICENSE="BSD-3c" -PKG_SITE="http://www.alsa-project.org/" -PKG_URL="ftp://ftp.alsa-project.org/pub/lib/alsa-topology-conf-${PKG_VERSION}.tar.bz2" +PKG_SITE="https://www.alsa-project.org/" +PKG_URL="https://www.alsa-project.org/files/pub/lib/alsa-topology-conf-${PKG_VERSION}.tar.bz2" PKG_LONGDESC="ALSA topology configuration files" PKG_TOOLCHAIN="manual" From 0a8f019c0c1df71455f979bb3d944df7970a305a Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 1 Jun 2022 09:05:47 +0000 Subject: [PATCH 2/5] alsa-ucm-conf: update to 1.2.7 and HTTPS --- packages/audio/alsa-ucm-conf/package.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/audio/alsa-ucm-conf/package.mk b/packages/audio/alsa-ucm-conf/package.mk index 8fb4b40c6c..561e499090 100644 --- a/packages/audio/alsa-ucm-conf/package.mk +++ b/packages/audio/alsa-ucm-conf/package.mk @@ -2,11 +2,11 @@ # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv) PKG_NAME="alsa-ucm-conf" -PKG_VERSION="1.2.6.3" -PKG_SHA256="b8a03aa387a624a2f65edc201bf777421190b60529a92087646823afbd96c5cd" +PKG_VERSION="1.2.7" +PKG_SHA256="b97f2395ca2c1fd9bfab7627f0178f9069868e2a42a35894dacd280e7e40680e" PKG_LICENSE="BSD-3c" -PKG_SITE="http://www.alsa-project.org/" -PKG_URL="ftp://ftp.alsa-project.org/pub/lib/alsa-ucm-conf-${PKG_VERSION}.tar.bz2" +PKG_SITE="https://www.alsa-project.org/" +PKG_URL="https://www.alsa-project.org/files/pub/lib/alsa-ucm-conf-${PKG_VERSION}.tar.bz2" PKG_LONGDESC="ALSA Use Case Manager configuration (and topologies)" PKG_TOOLCHAIN="manual" From a810f01f71e458b6a0d946405bbc50ed7a188766 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 1 Jun 2022 09:00:50 +0000 Subject: [PATCH 3/5] alsa-utils: update to 1.2.7 and HTTPS --- packages/audio/alsa-utils/package.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/audio/alsa-utils/package.mk b/packages/audio/alsa-utils/package.mk index 5142d0f372..562ef6d483 100644 --- a/packages/audio/alsa-utils/package.mk +++ b/packages/audio/alsa-utils/package.mk @@ -3,11 +3,11 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="alsa-utils" -PKG_VERSION="1.2.6" -PKG_SHA256="6a1efd8a1f1d9d38e489633eaec1fffa5c315663b316cab804be486887e6145d" +PKG_VERSION="1.2.7" +PKG_SHA256="e906bf2404ff04c448eaa3d226d283a62b9a283f12e4fd8457fb24bac274e678" PKG_LICENSE="GPL" -PKG_SITE="http://www.alsa-project.org/" -PKG_URL="ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PKG_VERSION}.tar.bz2" +PKG_SITE="https://www.alsa-project.org/" +PKG_URL="https://www.alsa-project.org/files/pub/utils/alsa-utils-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain alsa-lib ncurses systemd" PKG_LONGDESC="This package includes the utilities for ALSA, like alsamixer, aplay, arecord, alsactl, iecset and speaker-test." From 526d2a84683b07f1ddbbe6174d93ae4755078d6c Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 1 Jun 2022 08:07:22 +0000 Subject: [PATCH 4/5] alsa-lib: update to 1.2.7 and HTTPS --- packages/audio/alsa-lib/package.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/audio/alsa-lib/package.mk b/packages/audio/alsa-lib/package.mk index 2b4b6ef501..3bc535a638 100644 --- a/packages/audio/alsa-lib/package.mk +++ b/packages/audio/alsa-lib/package.mk @@ -3,11 +3,11 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="alsa-lib" -PKG_VERSION="1.2.6.1" -PKG_SHA256="ad582993d52cdb5fb159a0beab60a6ac57eab0cc1bdf85dc4db6d6197f02333f" +PKG_VERSION="1.2.7" +PKG_SHA256="8814e61f7ec6812c76e23a85cab00e0b0d3bba40816af36b726beb1bc04c74a7" PKG_LICENSE="GPL" -PKG_SITE="http://www.alsa-project.org/" -PKG_URL="ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PKG_VERSION}.tar.bz2" +PKG_SITE="https://www.alsa-project.org/" +PKG_URL="https://www.alsa-project.org/files/pub/lib/alsa-lib-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="ALSA (Advanced Linux Sound Architecture) is the next generation Linux Sound API." PKG_TOOLCHAIN="autotools" From 87b3cb529b89ea1dca3fa35f506dccdfae754621 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 1 Jun 2022 15:03:13 +0200 Subject: [PATCH 5/5] RPi: remove vc4-hdmi.conf ALSA card conf This is now upstream in alsa-lib 1.2.7 Signed-off-by: Matthias Reichl --- .../usr/share/alsa/cards/vc4-hdmi.conf | 82 ------------------- 1 file changed, 82 deletions(-) delete mode 100644 projects/RPi/filesystem/usr/share/alsa/cards/vc4-hdmi.conf diff --git a/projects/RPi/filesystem/usr/share/alsa/cards/vc4-hdmi.conf b/projects/RPi/filesystem/usr/share/alsa/cards/vc4-hdmi.conf deleted file mode 100644 index af87b3a8ae..0000000000 --- a/projects/RPi/filesystem/usr/share/alsa/cards/vc4-hdmi.conf +++ /dev/null @@ -1,82 +0,0 @@ -# -# Configuration for the VC4-HDMI sound card using software IEC958 -# subframe conversion -# - - - -vc4-hdmi.pcm.hdmi.0 { - @args [ CARD AES0 AES1 AES2 AES3 ] - @args.CARD { - type string - } - @args.AES0 { - type integer - } - @args.AES1 { - type integer - } - @args.AES2 { - type integer - } - @args.AES3 { - type integer - } - type iec958 - slave { - format IEC958_SUBFRAME_LE - pcm { - type hooks - slave.pcm { - type hw - card $CARD - device 0 - } - hooks.0 { - type ctl_elems - hook_args [ - { - name "IEC958 Playback Default" - interface PCM - optional true - lock true - preserve true - value [ $AES0 $AES1 $AES2 $AES3 ] - } - ] - } - } - } - status [ $AES0 $AES1 $AES2 $AES3 ] - hdmi_mode true -} - -# default with plug and softvol -vc4-hdmi.pcm.default { - @args [ CARD ] - @args.CARD { - type string - } - type asym - playback.pcm { - type plug - slave.pcm { - type softvol - slave.pcm { - @func concat - strings [ - "cards.vc4-hdmi.pcm.hdmi.0:" - "CARD=" $CARD "," - "AES0=0x04," # IEC958_AES0_CON_NOT_COPYRIGHT | IEC958_AES0_CON_EMPHASIS_NONE - "AES1=0x82," # IEC958_AES1_CON_ORIGINAL | IEC958_AES1_CON_PCM_CODER - "AES2=0x00," # IEC958_AES2_CON_SOURCE_UNSPEC | IEC958_AES2_CON_CHANNEL_UNSPEC - "AES3=0x01" # IEC958_AES3_CON_FS_NOTID (iec958 plugin will fill in actual rate) - ] - } - control { - name "PCM Playback Volume" - card $CARD - } - } - } -}