Diff qemu-8.0.5 with a qemu-8.1.0-r1

/usr/portage/app-emulation/qemu/qemu-8.1.0-r1.ebuild 2023-10-09 14:52:28.732368331 +0300
8 8
# (the construct below is to allow overriding from env for script)
9 9
QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
10 10
QEMU_DOCS_PREBUILT_DEV=sam
11
QEMU_DOCS_VERSION="8.0.0"
11
QEMU_DOCS_VERSION=$(ver_cut 1-3)
12 12
# Default to generating docs (inc. man pages) if no prebuilt; overridden later
13 13
# bug #830088
14 14
QEMU_DOC_USEFLAG="+doc"
......
28 28
	EGIT_SUBMODULES=(
29 29
		tests/fp/berkeley-softfloat-3
30 30
		tests/fp/berkeley-testfloat-3
31
		ui/keycodemapdb
31
		subprojects/keycodemapdb
32 32
	)
33 33
	inherit git-r3
34 34
	SRC_URI=""
......
56 56
	+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
57 57
	jack jemalloc +jpeg
58 58
	lzo multipath
59
	ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs
59
	ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire
60 60
	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
61 61
	+slirp
62 62
	smartcard snappy spice ssh static-user systemtap test udev usb
......
179 179
		dev-libs/nettle:=[static-libs(+)]
180 180
	)
181 181
	gtk? (
182
		x11-libs/cairo
183
		x11-libs/gdk-pixbuf:2
184 182
		x11-libs/gtk+:3
185
		x11-libs/libX11
186 183
		vte? ( x11-libs/vte:2.91 )
187 184
	)
188 185
	infiniband? ( sys-cluster/rdma-core[static-libs(+)] )
......
207 204
		media-libs/mesa[egl(+),gbm(+)]
208 205
	)
209 206
	pam? ( sys-libs/pam )
207
	pipewire? ( >=media-video/pipewire-0.3.60 )
210 208
	png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] )
211 209
	pulseaudio? ( media-libs/libpulse )
212 210
	rbd? ( sys-cluster/ceph )
......
270 268
	)
271 269
"
272 270

  
271
# See bug #913084 for pip dep
273 272
BDEPEND="
274 273
	$(python_gen_impl_dep)
275 274
	dev-lang/perl
276
	dev-util/meson
277
	sys-apps/texinfo
275
	>=dev-util/meson-0.63.0
276
	dev-python/pip[${PYTHON_USEDEP}]
278 277
	virtual/pkgconfig
279 278
	doc? (
280
		dev-python/sphinx[${PYTHON_USEDEP}]
279
		>=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]
281 280
		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
282 281
	)
283 282
	gtk? ( nls? ( sys-devel/gettext ) )
......
310 309

  
311 310
PATCHES=(
312 311
	"${FILESDIR}"/${PN}-8.0.0-disable-keymap.patch
313
	"${FILESDIR}"/${PN}-8.0.0-make.patch
314
	"${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch
315 312
	"${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch
316
	"${FILESDIR}"/${PN}-7.2.0-disable-gmp.patch
317
	"${FILESDIR}"/${PN}-8.0.0-remove-python-meson-check.patch
313
	"${FILESDIR}"/${PN}-8.1.0-also-build-virtfs-proxy-helper.patch
314
	"${FILESDIR}"/${PN}-8.1.0-skip-tests.patch
315
	"${FILESDIR}"/${PN}-8.1.0-find-sphinx.patch
318 316
)
319 317

  
320 318
QA_PREBUILT="
......
455 453
	# Verbose builds
456 454
	MAKEOPTS+=" V=1"
457 455

  
458
	# We already force -D_FORTIFY_SOURCE=2 (or 3) in our toolchain, but
459
	# this setting (-U then -D..=2) will prevent us from trying out 3, so
460
	# drop it. No change to level of protection b/c we patch our toolchain.
461
	sed -i -e 's/-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2//' configure || die
462

  
463 456
	# Remove bundled modules
464
	rm -r dtc meson roms/*/ || die
457
	rm -r subprojects/dtc roms/*/ || die
465 458
}
466 459

  
467 460
##
......
489 482
		--disable-containers # bug #732972
490 483
		--disable-guest-agent
491 484
		--disable-strip
492
		--with-git-submodules=ignore
485
		--disable-download
493 486

  
494 487
		# bug #746752: TCG interpreter has a few limitations:
495 488
		# - it does not support FPU
......
508 501
		--disable-gcrypt
509 502
		--cc="$(tc-getCC)"
510 503
		--cxx="$(tc-getCXX)"
504
		--objcc="$(tc-getCC)"
511 505
		--host-cc="$(tc-getBUILD_CC)"
512 506

  
513 507
		$(use_enable alsa)
......
516 510
		$(use_enable jack)
517 511
		$(use_enable nls gettext)
518 512
		$(use_enable oss)
513
		$(use_enable pipewire)
519 514
		$(use_enable plugins)
520 515
		$(use_enable pulseaudio pa)
521 516
		$(use_enable selinux)
......
614 609
			# Note: backend order matters here: #716202
615 610
			# We iterate from higher-level to lower level.
616 611
			$(usex pulseaudio pa "")
612
			$(usev pipewire)
617 613
			$(usev jack)
618 614
			$(usev sdl)
619 615
			$(usev alsa)
......
845 841
	doins "${FILESDIR}/bridge.conf"
846 842

  
847 843
	cd "${S}" || die
848
	dodoc MAINTAINERS docs/specs/pci-ids.txt
844
	dodoc MAINTAINERS
849 845
	newdoc pc-bios/README README.pc-bios
850 846

  
851 847
	# Disallow stripping of prebuilt firmware files.
Thank you!