Merge updates from master

This commit is contained in:
Repository mirror & CI 2025-12-23 02:00:52 +00:00
commit 80dd9d1efb
No known key found for this signature in database
GPG Key ID: 7C2AC09CD98F2EDF
9 changed files with 315 additions and 0 deletions

View File

@ -0,0 +1,93 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{11..14} )
inherit autotools multilib-minimal flag-o-matic toolchain-funcs python-single-r1
DESCRIPTION="Advanced Linux Sound Architecture Library"
HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
if [[ ${PV} == *_p* ]] ; then
# Please set correct commit ID for a snapshot release!
COMMIT="7e3a3c2b0a092d0f568ba3c98365030dd91cc877"
SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz"
S="${WORKDIR}"/${PN}-${COMMIT:0:7}
else
# TODO: Upstream does publish .sig files, so someone could implement verify-sig ;)
SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
fi
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="debug doc python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
media-libs/alsa-topology-conf
media-libs/alsa-ucm-conf
python? ( ${PYTHON_DEPS} )
"
DEPEND="${RDEPEND}"
BDEPEND="doc? ( >=app-text/doxygen-1.2.6 )"
PATCHES=(
"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
)
pkg_setup() {
use python && python-single-r1_pkg_setup
}
src_prepare() {
default
find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
# bug #545950
sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
eautoreconf
}
multilib_src_configure() {
# bug #616108, bug #669086, and https://github.com/alsa-project/alsa-lib/issues/6.
tc-is-clang && filter-lto
local myeconfargs=(
--disable-maintainer-mode
--disable-resmgr
--enable-aload
--enable-rawmidi
--enable-seq
--enable-shared
--enable-thread-safety
$(multilib_native_use_enable python)
$(use_with debug)
)
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
multilib_src_compile() {
emake
if multilib_is_native_abi && use doc; then
emake doc
grep -FZrl "${S}" doc/doxygen/html | \
xargs -0 sed -i -e "s:${S}::" || die
fi
}
multilib_src_install() {
multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. )
default
}
multilib_src_install_all() {
find "${ED}" -type f -name '*.la' -delete || die
dodoc ChangeLog doc/asoundrc.txt NOTES TODO
}

View File

@ -17,6 +17,10 @@
#--- END OF EXAMPLES ---
# Sam James <sam@gentoo.org> (2025-12-23)
# sys-process/numactl is available here
sys-fs/fuse -io-uring
# Mike Gilbert <floppym@gentoo.org> (2025-12-15)
# arch-specific platform values
sys-boot/grub -grub_platforms_pc -grub_platforms_xen-32

View File

@ -1,6 +1,10 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Sam James <sam@gentoo.org> (2025-12-23)
# sys-process/numactl is available here
sys-fs/fuse -io-uring
# Michał Górny <mgorny@gentoo.org> (2025-11-01)
# app-crypt/sequoia-chameleon-gnupg is keyworded here.
app-alternatives/gpg -sequoia

View File

@ -1,6 +1,10 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Sam James <sam@gentoo.org> (2025-12-23)
# sys-process/numactl is not available everywhere
sys-fs/fuse io-uring
# Mike Gilbert <floppym@gentoo.org (2025-12-15)
# arch-specific platform values
sys-boot/grub grub_platforms_loongson grub_platforms_qemu-mips

View File

@ -1,4 +1,5 @@
DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
DIST fuse-3.16.2.tar.gz 14165836 BLAKE2B 04f0037f924ef7b7cc90cb4c26afd1e942da69efebd93f3114774f2101550729379a0256ba190d7c99249fbce4ead5902133c01b29d8d75f41777d148540f521 SHA512 3e8889863cd67dada67271f095f694dc9e5aaf2561fd1e2285aee95b5a54e692bb195ab8fce57fc2bdf08d0ea17b6d56ca4967b4e4371d639d6133907b2370d3
DIST fuse-3.17.4.tar.gz 7307414 BLAKE2B eb9dfd5c446a35f7ef0b6b58c52fe22d306782f5a8b56dc54b00829aa8a59700bd2b03755cc58221d154b88cbdb3da59913700b3d7efa67a586bfaa8fef00e9d SHA512 5451b374ceadb4cb5a8f0c396f1111932ec63984b80dfad7a76258c026b4e8e5ab4a563bb4a9e272d7fa62a5f452113885d4c3ea080a9f56b6aeb85d50c01010
DIST fuse-3.18.1.tar.gz 8350400 BLAKE2B b0a38794b8eb932f7b23314afdaeacbdd302e9f9037794f5dceb87b22f19de8d125ec0112ee28751b94063324c872e03c26e3128c6cd817858245f7df5acd7ef SHA512 02a6ed591e3a634893ab9a621ccc3b745abda06c5da5a4f2a7cc5a1740ddf8199c841f987bcbc8958fc134c2d773055a06cf25aeb6ef55204a4598b99371cb0b
DIST iconv.m4.bz2 3057 BLAKE2B 9d8f7637d87bfcea1b60f3ea11e162aecf391b3f4579a3b85afb01735f56bfbae363a7e781279f3b2bed0d1dd3336f7d0678d3b1d59004824d7d0ca848dceb6e SHA512 9899368b8acc06e216a7a548b83a894f780e152a02612cd52af02b5c3f2ff38e2c36e77bda300587f81c3d74c90addec8066885216fa0e74f3f3280a383d2b55

View File

@ -0,0 +1,94 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{11..14} )
inherit flag-o-matic meson-multilib toolchain-funcs udev python-any-r1
DESCRIPTION="An interface for filesystems implemented in userspace"
HOMEPAGE="https://github.com/libfuse/libfuse"
SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="3/4"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="io-uring +suid systemtap test"
RESTRICT="test"
PROPERTIES="test_privileged"
DEPEND="
io-uring? (
sys-libs/liburing:=[${MULTILIB_USEDEP}]
sys-process/numactl
)
"
RDEPEND="
${DEPEND}
>=sys-fs/fuse-common-3.3.0-r1
"
BDEPEND="
virtual/pkgconfig
test? (
${PYTHON_DEPS}
$(python_gen_any_dep '
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/looseversion[${PYTHON_USEDEP}]
')
)
"
DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
python_check_deps() {
python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" &&
python_has_version "dev-python/looseversion[${PYTHON_USEDEP}]"
}
pkg_setup() {
use test && python-any-r1_pkg_setup
}
multilib_src_configure() {
# bug #853058
tc-is-clang && filter-lto
local emesonargs=(
$(meson_use test examples)
$(meson_use test tests)
$(meson_use systemtap enable-usdt)
$(meson_use io-uring enable-io-uring)
-Duseroot=false
-Dinitscriptdir=
-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
)
meson_src_configure
}
src_test() {
# For tests to pass:
# - sandbox must be disabled.
# - Write access to /dev/cuse* and /dev/fuse is required.
# - root must be a member of the portage group; CAP_DAC_OVERRIDE is dropped.
# - TMPDIR must be short for unix socket paths.
local -x TMPDIR=/tmp
local -x SANDBOX_ON=0
multilib-minimal_src_test
}
multilib_src_test() {
# Explicit test/ needed to pick up pytest.ini
epytest test/
}
multilib_src_install_all() {
# Installed via fuse-common
rm -r "${ED}"{/etc,$(get_udevdir)} || die
# useroot=false prevents the build system from doing this.
use suid && fperms u+s /usr/bin/fusermount3
# manually install man pages to respect compression
rm -r "${ED}"/usr/share/man || die
doman doc/{fusermount3.1,mount.fuse3.8}
}

View File

@ -4,6 +4,9 @@
<maintainer type="project">
<email>base-system@gentoo.org</email>
</maintainer>
<use>
<flag name="systemtap">Enable SystemTap/DTrace tracing</flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/a:fuse:fuse</remote-id>
<remote-id type="github">libfuse/libfuse</remote-id>

View File

@ -8,3 +8,5 @@ DIST xterm-404.tgz 1619300 BLAKE2B 07f9f0815063038beac77c8fc5f3c7a91e709f71b3fc5
DIST xterm-404.tgz.asc 729 BLAKE2B 5b2e3f039e110a097379aabe23522066aea815348fcbc5ab3377b613671e55dceadeb3f0e0f00811be2804adbe7417305fd35f0ee6d179a38cc1b34056ba0efe SHA512 5245129fcd668263fda340ef4d280b06c6399feba08cefc836dcb7f42ab4058d3e7728c04ffc9fd2a55e9547ad5d78a7781f2b34b764dbd32a4dc30b0be66f9c
DIST xterm-405.tgz 1619098 BLAKE2B 51e4a70a70c88e7557f7cd0d8ea465666b0458e7de88bc404189692736fe7dd37acaabab495b7d37c6268017908b564bafed2433bba12b6f8d71a7c136dd037b SHA512 6078fe6056d18dfd65406a4d7ff678c2e4f04fa2ae6c89f2492e314862067cbf5bfe626ac675b61d7582f0db8b55bd7cc37e6e466d36daf2a994d979b827e448
DIST xterm-405.tgz.asc 729 BLAKE2B 43450eb9cd4428a93ae19222414b2221e405efdf1bec624f2a98c13118a1c5f54db18a463f6e122a876951b75b1b150ad54d62e12d9c69194f31f86319182873 SHA512 28532a5a6fa098d541c98429206a94c684dc308b5c62be4c0989595cefb521441c78c0773f0eb9ef6145add67db15c9de77ac2ade3e8d153c0333a9bb2cc2603
DIST xterm-406.tgz 1619843 BLAKE2B 4b2b056b78037d38b89b638a9df7f76e7d47f03bb4b5f8e5d3557ce6de0092e7a575153fa9bf2801d3c775c1beb7df859eecd2c37ef06f2f5b0045429ebfc079 SHA512 55e1b8f271510552f74225b00ce450c74955b803fefb2f80f72a24f0cb017108a5e2c5a5b8ecb07b478f8e50a9823bbf238dfde14d7128c65922b9761fa51d07
DIST xterm-406.tgz.asc 729 BLAKE2B 822fe3c3e155f752701223ece999cef1a1c8329acb0abe72a60e45b4bef809132cf00206dc0f5d1f8ed34e3bf9c1c16023a93b11afe53d45637e2dbead34f64d SHA512 981a6680e3bbb63b898b2a868b8f0963dbe836bc199283d622a27aacf40b2cb5a720f1824799f5be46c875f864ae7427289129d577735d75fa562cc83f1aff62

View File

@ -0,0 +1,110 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
inherit desktop flag-o-matic toolchain-funcs verify-sig xdg
DESCRIPTION="Terminal Emulator for X Windows"
HOMEPAGE="https://invisible-island.net/xterm/"
SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
DEPEND="
kernel_linux? ( sys-libs/libutempter )
media-libs/fontconfig:1.0
media-libs/freetype
>=sys-libs/ncurses-5.7-r7:=
x11-apps/xmessage
x11-libs/libICE
x11-libs/libX11
x11-libs/libXaw
x11-libs/libXft
x11-libs/libxkbfile
x11-libs/libXmu
x11-libs/libXrender
x11-libs/libXt
unicode? ( x11-apps/luit )
Xaw3d? ( x11-libs/libXaw3d )
xinerama? ( x11-libs/libXinerama )
"
RDEPEND="
${DEPEND}
media-fonts/font-misc-misc
x11-apps/rgb
"
DEPEND+=" x11-base/xorg-proto"
BDEPEND="
virtual/pkgconfig
verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
"
DOCS=( README{,.i18n} ctlseqs.txt )
src_configure() {
DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
# bug #454736
# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
# something sane like pkg-config or ncurses5-config and stops guessing libs
# Everything gets linked against ncurses anyways, so don't shout
append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
local myeconfargs=(
--disable-full-tgetent
--disable-imake
--disable-setgid
--disable-setuid
--enable-256-color
--enable-broken-osc
--enable-broken-st
--enable-dabbrev
--enable-exec-xterm
--enable-i18n
--enable-load-vt-fonts
--enable-logging
--enable-screen-dumps
--enable-warnings
--enable-wide-chars
--libdir="${EPREFIX}"/etc
--with-app-defaults="${DEFAULTS_DIR}"
--with-icon-theme=hicolor
--with-icondir="${EPREFIX}"/usr/share/icons
--with-utempter
--with-x
$(use_enable openpty)
$(use_enable sixel sixel-graphics)
$(use_enable toolbar)
$(use_enable truetype freetype)
$(use_enable unicode luit)
$(use_enable unicode mini-luit)
$(use_with Xaw3d)
$(use_with xinerama)
)
econf "${myeconfargs[@]}"
}
src_install() {
default
docinto html
dodoc xterm.log.html
sed -i -e 's/_48x48//g' *.desktop || die
domenu *.desktop
# Fix permissions -- it grabs them from live system, and they can
# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
# respectively (#69510).
# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
fperms 0755 /usr/bin/xterm
# restore the navy blue
sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
}