diff options
Diffstat (limited to 'sys-firmware/sof-firmware')
| -rw-r--r-- | sys-firmware/sof-firmware/Manifest | 10 | ||||
| -rw-r--r-- | sys-firmware/sof-firmware/metadata.xml | 3 | ||||
| -rw-r--r-- | sys-firmware/sof-firmware/sof-firmware-2023.12.ebuild | 33 | ||||
| -rw-r--r-- | sys-firmware/sof-firmware/sof-firmware-2024.03.ebuild | 2 | ||||
| -rw-r--r-- | sys-firmware/sof-firmware/sof-firmware-2024.06.ebuild (renamed from sys-firmware/sof-firmware/sof-firmware-2023.12.1.ebuild) | 20 |
5 files changed, 21 insertions, 47 deletions
diff --git a/sys-firmware/sof-firmware/Manifest b/sys-firmware/sof-firmware/Manifest index 9dbc84336f08..3c5c9ee6c4a3 100644 --- a/sys-firmware/sof-firmware/Manifest +++ b/sys-firmware/sof-firmware/Manifest @@ -1,7 +1,5 @@ -DIST sof-firmware-2023.12.1.tar.gz 5446189 BLAKE2B a901637ba25df51152f04c7db5330b70a18c92363b102c061568a4c3a8a7e2fc506ac9783abe715f680a27be8a040d63b7dd5b62682979ccf1e4eaeb30789d83 SHA512 e0175f3af5336f23548efcf8fa302bafbb6122fd173273203f687c05ee17fab4e7bd457b27cc7a62fd25ea77708ffdbf9e1fe3880d3df1cf2196d7073c6f7677 -DIST sof-firmware-2023.12.tar.gz 5427762 BLAKE2B 48169378609119555f9b655599cef55e5722be71fdfc8fb71b699188fcb3f62a68e217fc3fec8859cd3e1c252f046208d5123c961dd824bd9b6559bd1fb72325 SHA512 ed43e7597c93140b15499ba17bae1866dcf1e2959d910e81b3831e4db2224a1dcff790ef21afcd610d7cc9309251a08351bae1c959ded18e5e28a6b24ae99506 DIST sof-firmware-2024.03.tar.gz 8161590 BLAKE2B 23d73ff3ab30b5134086bb21e606805a7d9667adf1a5598a3d31068ba0254dc4c34464ee3913eb3530a8124e3614eff9ba28fa731e9816b28980ea05834c1037 SHA512 1e9891d3891f5a4413a77a68ea6d3a2e6ead8c1a67eaa7e9aaf30871753617ffce19bd3b85ebcbb617e606646f6aa0e1dafee5279c294ec72ef4b2885e009f72 -EBUILD sof-firmware-2023.12.1.ebuild 889 BLAKE2B 56d91db39fe4cd30314c52a307e504162a0c50b14b24bffc9796fff0f0742308c82e2ed7efc6d02457b17e47fd0cd7f15222d6d304783143ee5c4c803d3fe2ec SHA512 fb82f1b76f2e1ac137d535adfb5c737c03465dcf39dc3b9817a2e3a653cd9a2028cdcfa3f261c5150ddd92cfd67b65009bc22a8188d9b93e9966224ebbdf10d4 -EBUILD sof-firmware-2023.12.ebuild 889 BLAKE2B 56d91db39fe4cd30314c52a307e504162a0c50b14b24bffc9796fff0f0742308c82e2ed7efc6d02457b17e47fd0cd7f15222d6d304783143ee5c4c803d3fe2ec SHA512 fb82f1b76f2e1ac137d535adfb5c737c03465dcf39dc3b9817a2e3a653cd9a2028cdcfa3f261c5150ddd92cfd67b65009bc22a8188d9b93e9966224ebbdf10d4 -EBUILD sof-firmware-2024.03.ebuild 1125 BLAKE2B 532575d14965d0b685baec966e4ec001a4741bddd8513caade012c439f09b354ce166bbb9281b05b306310fb43b2fce3a5cbec35bc0e080dd786049c2f26dbe4 SHA512 40656572634ab323ab0cbf454550d297fc47d84d880e236709e15e9a488fc6bc3f677d0dda6285acdacf0352bc0d51f8b80b303d0f35992e115aa606ef2b965e -MISC metadata.xml 575 BLAKE2B 5805cca1f6bd8bb40cc6cc9cd63883777b81e008380535fcf9e89b8fbda28f604fceb492d53f4cabdfb3121645962963d3063b1288d4c14d015c8851adf5f6c6 SHA512 509550c56431087b5b521672f824d95d9256a4622a08f4281a00c489164e45412f2b5aafc13c38b0f60a7d33a7f61d39e13924fba69f26c934c0ee94b1fbf013 +DIST sof-firmware-2024.06.tar.gz 9848270 BLAKE2B 31189e81400981b76db585019324e7dec9f81ff488c6bbc575534d4968ea974764ecf0b585918cc1871e99ef8cff45f77c8c7509bb954360693f3a283b391d6a SHA512 50dbd849b086158af88dd629566b80de4e841dd8a74b6ea8b1d99b3321be94a0d2d6f742b557f0445b9618a6dbeee3fec6a4e9822b320d511ede1ec1812c0d4d +EBUILD sof-firmware-2024.03.ebuild 1124 BLAKE2B 2ed38272b31f245b9874cdfc003de76a2eb75096f8156109348c5ab987ef9e82f805b23e1137fa53a1484c9180495e0beec35ba76696ec6c9da42b74acd32e58 SHA512 c1f1acebb053582913b47073be06f4a8cfd06058e8fbb302784c12890a590dcad4ed5d4bee4368487f9a382f12e527f35678a75977d8878c19eddb3976fe47af +EBUILD sof-firmware-2024.06.ebuild 1125 BLAKE2B 532575d14965d0b685baec966e4ec001a4741bddd8513caade012c439f09b354ce166bbb9281b05b306310fb43b2fce3a5cbec35bc0e080dd786049c2f26dbe4 SHA512 40656572634ab323ab0cbf454550d297fc47d84d880e236709e15e9a488fc6bc3f677d0dda6285acdacf0352bc0d51f8b80b303d0f35992e115aa606ef2b965e +MISC metadata.xml 493 BLAKE2B fb1e626fd8c645e3e96e4f6b424cea55d009a1d13fc2d8ff019a4e95a9899d2412aecfc9c89391b194cf058e10dedb4e3bf1bfa004247762353fe4fa9148a9e8 SHA512 24142f67672b2af14b0b426d71c6f0d97319614309e1dc3c761bd270d021bde817551ed6d08f4be87d0a53450f7930193f637df35cde6fb2a9189aa8fc037645 diff --git a/sys-firmware/sof-firmware/metadata.xml b/sys-firmware/sof-firmware/metadata.xml index 5933a501e2ec..d217e2814282 100644 --- a/sys-firmware/sof-firmware/metadata.xml +++ b/sys-firmware/sof-firmware/metadata.xml @@ -4,9 +4,6 @@ <maintainer type="person"> <email>pacho@gentoo.org</email> </maintainer> - <maintainer type="project"> - <email>alsa-bugs@gentoo.org</email> - </maintainer> <use> <flag name="tools">Tools to interact with sof firmwares (upstream expects them to be present, but allow to skip them for systems not able to install needed dependencies)</flag> </use> diff --git a/sys-firmware/sof-firmware/sof-firmware-2023.12.ebuild b/sys-firmware/sof-firmware/sof-firmware-2023.12.ebuild deleted file mode 100644 index 5d36427294f2..000000000000 --- a/sys-firmware/sof-firmware/sof-firmware-2023.12.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Sound Open Firmware (SOF) binary files" -HOMEPAGE="https://www.sofproject.org https://github.com/thesofproject/sof https://github.com/thesofproject/sof-bin" -SRC_URI="https://github.com/thesofproject/sof-bin/releases/download/v${PV}/sof-bin-${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}"/sof-bin-${PV} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64" - -# Needed for sof-ctl -RDEPEND="media-libs/alsa-lib" - -QA_PREBUILT="usr/bin/sof-ctl - usr/bin/sof-logger - usr/bin/sof-probes" - -src_install() { - dodir /lib/firmware/intel - dodir /usr/bin - FW_DEST="${D}/lib/firmware/intel" TOOLS_DEST="${D}/usr/bin" "${S}/install.sh" || die -} - -pkg_preinst() { - local sofpath="${EROOT}/lib/firmware/intel/sof" - if [[ ! -L "${sofpath}" && -d "${sofpath}" ]] ; then - rm -r "${sofpath}" || die - fi -} diff --git a/sys-firmware/sof-firmware/sof-firmware-2024.03.ebuild b/sys-firmware/sof-firmware/sof-firmware-2024.03.ebuild index 105eaae58f37..33fbc19f20ac 100644 --- a/sys-firmware/sof-firmware/sof-firmware-2024.03.ebuild +++ b/sys-firmware/sof-firmware/sof-firmware-2024.03.ebuild @@ -10,7 +10,7 @@ S="${WORKDIR}"/sof-bin-${PV} LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="+tools" RDEPEND=" diff --git a/sys-firmware/sof-firmware/sof-firmware-2023.12.1.ebuild b/sys-firmware/sof-firmware/sof-firmware-2024.06.ebuild index 5d36427294f2..105eaae58f37 100644 --- a/sys-firmware/sof-firmware/sof-firmware-2023.12.1.ebuild +++ b/sys-firmware/sof-firmware/sof-firmware-2024.06.ebuild @@ -10,10 +10,15 @@ S="${WORKDIR}"/sof-bin-${PV} LICENSE="BSD" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="~amd64" +IUSE="+tools" -# Needed for sof-ctl -RDEPEND="media-libs/alsa-lib" +RDEPEND=" + tools? ( + media-libs/alsa-lib + sys-libs/glibc + ) +" QA_PREBUILT="usr/bin/sof-ctl usr/bin/sof-logger @@ -23,10 +28,17 @@ src_install() { dodir /lib/firmware/intel dodir /usr/bin FW_DEST="${D}/lib/firmware/intel" TOOLS_DEST="${D}/usr/bin" "${S}/install.sh" || die + + # Drop tools if requested (i.e. useful for musl systems, where glibc + # is not available) + if ! use tools ; then + rm -rv "${D}"/usr/bin || die + fi } pkg_preinst() { - local sofpath="${EROOT}/lib/firmware/intel/sof" + # Fix sof-ace-tplg directory symlink collisions + local sofpath="${EROOT}/lib/firmware/intel/sof-ace-tplg" if [[ ! -L "${sofpath}" && -d "${sofpath}" ]] ; then rm -r "${sofpath}" || die fi |