public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Eli Schwartz" <eschwartz@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/
Date: Mon, 22 Sep 2025 19:18:19 +0000 (UTC)	[thread overview]
Message-ID: <1758568589.1ade9151a28e38b4a8deef8cadc6ebc0a52f465b.eschwartz@gentoo> (raw)

commit:     1ade9151a28e38b4a8deef8cadc6ebc0a52f465b
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 22 19:01:23 2025 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Mon Sep 22 19:16:29 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ade9151

dev-build/meson: add 1.9.1

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 dev-build/meson/Manifest           |   3 +
 dev-build/meson/meson-1.9.1.ebuild | 232 +++++++++++++++++++++++++++++++++++++
 2 files changed, 235 insertions(+)

diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index c843458821aa..f6a3bf2e2d8f 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -18,6 +18,8 @@ DIST meson-1.8.4.tar.gz 2336961 BLAKE2B fd574be17f1dde56fed13e18151cddc3265b4175
 DIST meson-1.8.4.tar.gz.asc 833 BLAKE2B 33fea09355be6f3df1c9f82daf2c92cbebd79846f82039e697f390db4811ade49edaeb942a4d1da8cb95238cff400e4ef1a76e141189acf10bc5da70e3fb3c44 SHA512 e0e6474a020e320d940d8de1843b491d1906c38bca304168324cae333c5635c70b210ef14e1d31ada2a31e7d3b8e5ae4a8563373230f40c52c2cac017359fd29
 DIST meson-1.9.0.tar.gz 2366082 BLAKE2B 54cef087a9629087e67a0d75422d08370e86273a202d9e054d160a4ae52b7b1ad612a2a2c8e72a00a8e29bd5857375bedca5935cd74a560950c6b45a48d69f19 SHA512 62e633e07e7e8be1bf4f62f9e5a2df9535750fc0047ee5c21b17bc851d190cc0cf8e6696614692091013dc72e68aa23d2c1fe04500e146f56876591250474d04
 DIST meson-1.9.0.tar.gz.asc 833 BLAKE2B 3054c5f24b264fd5471b4094e6a37cfa4cad3567b8eda69d4b7a6c0e5486c95199b683c1b5b9ed1be44fd0eacaca1afb9dd95fd363a23753fdd0f71f194e9793 SHA512 7f2ce856cf16004ebdef1ce294e7efc44f644691cac2f704625b4a56b270d4b2db54564bef9f4c90360c1ec738e54b948aba336e1feb70dca2daf0e500f2b627
+DIST meson-1.9.1.tar.gz 5083044 BLAKE2B a4d1894636ee61fa0101153f07d53717d34ba9de620b69becf669e06dc09a85874b4c5d619a509347c97e4112502a431affecccc5faf96464b072b5563247b9e SHA512 e5a167ff035f1494d6b1df7d3bf6feb37aa6421222fd27bfbebb36de4c7c3083e327679b82b7d9d3d4a2cc4dc2a3babb7cbf03358e4a2784d47eb34502014a1c
+DIST meson-1.9.1.tar.gz.asc 992 BLAKE2B 5271c87e19da0f0776c01b1f9f71eef0540e532a9397dbbff3c09c9b3b7698b8ea650f46c8b7edab8e5fd72c1fce4445d556c310770cc23c8275ebf8f06241f6 SHA512 a621781134e4793ea557fd1487895b65a38de23b676a7b6d8d7ac779abcdf768bdf09f933ea7ecedee0cd78fa62ab6319a9108cdf39ffa2e5695cddf183fb903
 DIST meson-reference-1.4.2.3 339324 BLAKE2B 1a4fbd8c27a8cfba773777eabd2ebaa0f76ec0c61dcfe1c7b4483737b348ff9528d68f26e68d7d40b2e1875611eed5b9a31c1cf55fed8eabb42fc1e31d9ef14b SHA512 8b8ec43e812599203ec44c08805eb6818485805c45b9c69802261eaa35efc97846a96f6472c6b1ef5f6c703e7153fd957df7b805f173ca3400a2030dfbe002ca
 DIST meson-reference-1.5.2.3 341110 BLAKE2B 0d588b796f7f2da2dcb0e7822acde6a9a461930da4bfead3cf9148fa0fac18cd0ccbc6e891f555c973836f1c16b4eae299908a838a0b6843293de8815d30fc23 SHA512 64715ce2113e362e7d67179fe13566bc8f84ce7f4e6d795b836f42455a871173fee06e3e969e2996022d7e6c9b4b5379587a4c0c3d97b4bca527fb8902d3547f
 DIST meson-reference-1.6.1.3 343730 BLAKE2B 55df822192781a70e4bc44cfe14fb363e3f820406260ca9705d7fdb5fad1bf0117e3f1325d37e58e23477bc075ab6bd84056409355ec694f72eeaa5bf982ecc7 SHA512 553cdcd86a7a600cda05ac970cc285c4c50017d1e7d2925645d7f19a62b34c2f079673cafecf4111aa102afbe9d8e4d56f166d1d9940b740eeec0bb99d6cbc0d
@@ -25,3 +27,4 @@ DIST meson-reference-1.7.2.3 344764 BLAKE2B 82de9a7a01c2f1b45a2b3432deb4713af3cf
 DIST meson-reference-1.8.3.3 345855 BLAKE2B c8825ba7b72b36866ebfa8cdf63362f2d38673315378ea213c438057f5dafa36b9e729e8c415a29715c1da4fe72733a4a6a2cdbee4b7df57e5eb97f50152491b SHA512 3085c10cfc08ce4f0edad7129ce4d9a0bf75c6522309e344ba14e27c34d46c3da25ebb46260de28caef4a6c8134857d63297ded26f1296639a8a097e62a1801c
 DIST meson-reference-1.8.4.3 345964 BLAKE2B a2840cfabe319cb244ad46bb3b72b7e19bcaf3bfbd0f804c3982a191f795284cc4d35ee00266bf069dd95c0fa99fdb565343007aed75a7a0859ad85528422667 SHA512 95385faa364103c9f38b497f6e021d81c0e08048863a046b5c9030d11f7554f8237d405fe04d2145513e3685a13c71b167f29a8727d0f8cb0ca591076e0b39b9
 DIST meson-reference-1.9.0.3 347286 BLAKE2B 1fb96870791e7bdaefed5c9a0e807d412e922e965690ef2f8820075a27c2d20d7b8057f0f3b7b009dcc5f20cb7ba7ee778d2df6e4eac583cda58625d58fe9266 SHA512 6e0e127c988b6269c13ba901ce7bbedab135d81a0b4bcd8528a01371d9f74964381c446c2fa35876953ad0199866a0016b1e39f315b054b91499fc00597a9c5d
+DIST meson-reference-1.9.1.3 347286 BLAKE2B cae2e9a97bcb7fc6894723156280306ea0fb35d9cbe68d31785ac0678b17b8a4bdfdf2362834b9daf3c01e0ff8dd67c0f1d384595ef4e93858064bdad3e46840 SHA512 d79a772f4fdd55309acda104087d0bbdc707e8fd2816b516daf0b8d1c034892ddb0bec9a383d6f65184e9509a358e2a8b392a484b65ab9d26c0e68a02fd6db95

diff --git a/dev-build/meson/meson-1.9.1.ebuild b/dev-build/meson/meson-1.9.1.ebuild
new file mode 100644
index 000000000000..f18b9192131e
--- /dev/null
+++ b/dev-build/meson/meson-1.9.1.ebuild
@@ -0,0 +1,232 @@
+# Copyright 2016-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..14} pypy3_11 )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit shell-completion edo distutils-r1 flag-o-matic toolchain-funcs
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit ninja-utils git-r3
+
+	BDEPEND="
+		${NINJA_DEPEND}
+		$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	"
+
+else
+	inherit verify-sig
+
+	MY_PV=${PV/_/}
+	MY_P=${P/_/}
+	S=${WORKDIR}/${MY_P}
+
+	SRC_URI="
+		https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz
+		verify-sig? ( https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc )
+		https://github.com/mesonbuild/meson/releases/download/${MY_PV}/meson-reference.3 -> meson-reference-${MY_PV}.3
+	"
+	# Releases may be signed by those listed in Releasing.md. Jussi
+	# remains the default release manager.
+	# https://github.com/mesonbuild/meson/commit/c2d795735fa1c46c54d6aed4d4a30f36a1f853cb
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-eschwartz sec-keys/openpgp-keys-jpakkane )"
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/eschwartz.asc
+	#VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	fi
+fi
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test test-full"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test-full? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		app-alternatives/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+		dev-build/cmake
+	)
+	test-full? (
+		|| ( dev-lang/rust dev-lang/rust-bin )
+		dev-lang/nasm
+		>=dev-lang/pypy-3
+		dev-lang/vala
+		dev-python/cython
+		virtual/fortran
+		virtual/jdk
+
+		app-text/doxygen
+		dev-cpp/gtest
+		dev-libs/protobuf
+		dev-util/bindgen
+		dev-util/gtk-doc
+		dev-util/itstool
+		llvm-core/llvm
+		media-libs/libsdl2
+		media-libs/libwmf
+		net-libs/libpcap
+		sci-libs/hdf5[fortran]
+		sci-libs/netcdf
+		sys-cluster/openmpi[fortran]
+		sys-devel/bison
+		sys-devel/flex
+
+		dev-qt/linguist-tools:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtbase:6[gui,widgets]
+		dev-qt/qtdeclarative:6
+		dev-qt/qttools:6
+		dev-util/gdbus-codegen
+		x11-libs/gtk+:3
+
+		dev-libs/wayland
+		dev-util/wayland-scanner
+	)
+"
+RDEPEND="
+	!<dev-build/muon-0.2.0-r2[man(-)]
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.1-python-path.patch
+)
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+}
+
+python_prepare_all() {
+	local disable_unittests=(
+		# ASAN and sandbox both want control over LD_PRELOAD
+		# https://bugs.gentoo.org/673016
+		-e 's/test_generate_gir_with_address_sanitizer/_&/'
+		-e 's/test_env_cflags_ldflags/_&/'
+		-e 's/test_c_link_args_and_env/_&/'
+
+		# ASAN is unsupported on some targets
+		# https://bugs.gentoo.org/692822
+		-e 's/test_pch_with_address_sanitizer/_&/'
+
+		# clippy-driver fails, but only when run via portage.
+		#
+		#   error[E0463]: can't find crate for `std`
+		#   error: requires `sized` lang_item
+		-e 's/test_rust_clippy/_&/'
+	)
+
+	sed -i "${disable_unittests[@]}" unittests/*.py || die
+
+	# Broken due to python2 script created by python_wrapper_setup
+	rm -r "test cases/frameworks/1 boost" || die
+	# nvcc breaks on essentially any LDFLAGS
+	# https://bugs.gentoo.org/936757
+	# https://github.com/mesonbuild/meson/issues/11234
+	rm -r "test cases/cuda"/* || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_check_deps() {
+	if [[ ${PV} = *9999* ]]; then
+		python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+	fi
+}
+
+python_configure_all() {
+	if [[ ${PV} = *9999* ]]; then
+		# We use the unsafe_yaml loader because strictyaml is not packaged. In
+		# theory they produce the same results, but pyyaml is faster and
+		# without safety checks.
+		edo ./meson.py setup \
+			--prefix "${EPREFIX}/usr" \
+			-Dhtml=false \
+			-Dunsafe_yaml=true \
+			docs/ docs/builddir
+	fi
+}
+
+python_compile_all() {
+	if [[ ${PV} = *9999* ]]; then
+		eninja -C docs/builddir
+	fi
+}
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# meson has its own tests for LTO support. We don't need to verify that
+		# all tests work when they happen to use it. And in particular, this
+		# breaks rust.
+		filter-lto
+
+		# remove unwanted python_wrapper_setup contents
+		# We actually do want to non-error if python2 is installed and tested.
+		remove="${T}/${EPYTHON}/bin:"
+		PATH=${PATH/${remove}/}
+
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		# 'test cases/unit/73 summary' expects 80 columns
+		export COLUMNS=80
+
+		# If JAVA_HOME is not set, meson looks for javac in PATH.
+		# If javac is in /usr/bin, meson assumes /usr/include is a valid
+		# JDK include path. Setting JAVA_HOME works around this broken
+		# autodetection. If no JDK is installed, we should end up with an empty
+		# value in JAVA_HOME, and the tests should get skipped.
+		export JAVA_HOME=$(java-config -O 2>/dev/null)
+
+		${EPYTHON} -u run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+
+	dozshcomp data/shell-completions/zsh/_meson
+	dobashcomp data/shell-completions/bash/meson
+
+	if [[ ${PV} = *9999* ]]; then
+		DESTDIR="${ED}" eninja -C docs/builddir install
+	else
+		newman "${DISTDIR}"/meson-reference-${MY_PV}.3 meson-reference.3
+	fi
+}


             reply	other threads:[~2025-09-22 19:18 UTC|newest]

Thread overview: 138+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-09-22 19:18 Eli Schwartz [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-09-26 21:38 [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/ Eli Schwartz
2025-09-26 21:38 Eli Schwartz
2025-09-26 21:38 Eli Schwartz
2025-08-24 18:55 Eli Schwartz
2025-08-21 17:23 Eli Schwartz
2025-08-21 16:37 Sam James
2025-08-21 16:37 Sam James
2025-08-20 14:31 Sam James
2025-08-19 23:26 Eli Schwartz
2025-08-11  5:38 Eli Schwartz
2025-08-07 16:42 Eli Schwartz
2025-08-01 21:45 Eli Schwartz
2025-07-31  1:01 Eli Schwartz
2025-07-30 22:47 Eli Schwartz
2025-07-30 22:47 Eli Schwartz
2025-06-10  4:52 Eli Schwartz
2025-06-10  4:52 Eli Schwartz
2025-06-05 10:31 Sam James
2025-05-25  8:37 Eli Schwartz
2025-05-25  8:37 Eli Schwartz
2025-05-24 18:44 Sam James
2025-05-24  9:03 Michał Górny
2025-05-24  9:03 Michał Górny
2025-04-29  1:58 Eli Schwartz
2025-04-25 22:19 Eli Schwartz
2025-04-17 17:22 Eli Schwartz
2025-04-17 17:22 Eli Schwartz
2025-04-05 13:24 Sam James
2025-04-01 22:01 Eli Schwartz
2025-03-13  0:30 Eli Schwartz
2025-03-12 23:27 Eli Schwartz
2025-03-12 23:21 Sam James
2025-03-09 20:15 Sam James
2025-03-09 20:15 Sam James
2025-03-09 20:15 Sam James
2025-03-09 20:15 Sam James
2025-03-09 20:15 Sam James
2025-03-01  7:11 Michał Górny
2025-03-01  6:01 Sam James
2025-03-01  4:41 Sam James
2025-01-27  7:45 Eli Schwartz
2025-01-27  6:07 Eli Schwartz
2025-01-27  4:47 Eli Schwartz
2025-01-20  2:33 Sam James
2025-01-20  2:33 Sam James
2025-01-20  2:33 Sam James
2025-01-19 18:39 Arthur Zamarin
2025-01-19 18:39 Arthur Zamarin
2025-01-19 18:39 Arthur Zamarin
2025-01-10 13:28 Sam James
2024-12-17  0:13 Eli Schwartz
2024-12-06 21:19 Sam James
2024-11-24 11:02 Sam James
2024-11-02  6:18 Sam James
2024-10-21  6:34 Sam James
2024-10-21  6:34 Sam James
2024-10-21  5:48 Sam James
2024-10-21  2:55 Eli Schwartz
2024-10-14  5:28 Eli Schwartz
2024-10-06 22:26 Eli Schwartz
2024-09-20 21:23 Eli Schwartz
2024-08-29 14:32 Eli Schwartz
2024-08-29 14:28 Ionen Wolkens
2024-08-29 14:28 Ionen Wolkens
2024-08-21  9:40 Arthur Zamarin
2024-08-21  9:40 Arthur Zamarin
2024-08-21  9:40 Arthur Zamarin
2024-08-21  9:40 Arthur Zamarin
2024-08-21  9:40 Arthur Zamarin
2024-08-21  9:39 Arthur Zamarin
2024-08-21  7:16 Arthur Zamarin
2024-08-21  7:16 Arthur Zamarin
2024-08-21  7:16 Arthur Zamarin
2024-08-21  7:16 Arthur Zamarin
2024-08-20 22:22 Jakov Smolić
2024-08-20 18:05 Sam James
2024-08-16  1:16 Eli Schwartz
2024-08-14 23:29 Sam James
2024-08-14 23:29 Sam James
2024-07-29  1:19 Eli Schwartz
2024-07-29  1:19 Eli Schwartz
2024-07-11 16:29 Eli Schwartz
2024-07-11  3:15 Eli Schwartz
2024-07-11  0:34 Eli Schwartz
2024-07-11  0:34 Eli Schwartz
2024-07-08 19:25 Eli Schwartz
2024-07-03 21:25 Eli Schwartz
2024-06-25  4:48 Sam James
2024-06-25  3:35 Sam James
2024-06-25  3:35 Sam James
2024-06-25  3:35 Sam James
2024-06-25  3:35 Sam James
2024-06-25  3:35 Sam James
2024-06-25  3:35 Sam James
2024-06-25  3:11 Sam James
2024-06-25  1:32 Sam James
2024-06-25  1:32 Sam James
2024-06-25  1:32 Sam James
2024-05-31 20:10 Sam James
2024-05-13 19:41 Sam James
2024-05-13 18:45 Michał Górny
2024-05-05 20:07 Arthur Zamarin
2024-05-01  6:03 Sam James
2024-05-01  6:03 Sam James
2024-05-01  6:03 Sam James
2024-05-01  6:03 Sam James
2024-05-01  6:03 Sam James
2024-05-01  6:03 Sam James
2024-05-01  6:03 Sam James
2024-04-17  5:37 Arthur Zamarin
2024-03-22  6:14 Arthur Zamarin
2024-03-22  6:14 Arthur Zamarin
2024-03-22  4:03 Sam James
2024-03-22  4:03 Sam James
2024-03-22  4:03 Sam James
2024-03-22  4:03 Sam James
2024-03-22  4:03 Sam James
2024-03-19  7:21 Sam James
2024-03-19  6:09 Sam James
2024-03-19  5:50 Sam James
2024-03-19  5:50 Sam James
2024-03-19  5:50 Sam James
2024-03-19  3:42 Ionen Wolkens
2024-03-14  6:40 Sam James
2024-03-03 23:18 Sam James
2024-03-03 23:18 Sam James
2024-03-02 18:07 Arthur Zamarin
2024-02-28 15:27 Sam James
2024-02-26 22:27 Sam James
2024-02-19  5:08 Sam James
2024-02-19  5:08 Sam James
2024-02-19  5:08 Sam James
2024-02-19  5:08 Sam James
2024-02-19  5:08 Sam James
2024-02-19  4:04 Sam James
2024-02-14  0:27 Sam James
2024-01-14  3:18 Sam James

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1758568589.1ade9151a28e38b4a8deef8cadc6ebc0a52f465b.eschwartz@gentoo \
    --to=eschwartz@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox