onkelbeh
/
GentooRepository
mirror of https://github.com/gentoo-mirror/gentoo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "www-client/firefox: enable wayland+pgo build on rapid" 

This reverts commit 063b3e0e3d.

 - forgot to include the part which disables virtualx.eclass's dependency on
   x11-base/xorg-server[xvfb].

Bug: https://bugs.gentoo.org/848858
Bug: https://bugs.gentoo.org/767997
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
This commit is contained in:
Joonas Niilola 2022-10-03 20:06:00 +03:00
parent 774ed3f1fb
commit a5d952b948
No known key found for this signature in database
GPG Key ID: 7383942B8DC06962
1 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
www-client/firefox/firefox-105.0.1.ebuild
View File

@ -76,6 +76,7 @@ REQUIRED_USE="debug? ( !system-av1 )
# Firefox-only REQUIRED_USE flags
REQUIRED_USE+=" || ( X wayland )"
REQUIRED_USE+=" pgo? ( X )"
REQUIRED_USE+=" screencast? ( wayland )"
FF_ONLY_DEPEND="!www-client/firefox:0
@ -108,10 +109,7 @@ BDEPEND="${PYTHON_DEPS}
)
)
amd64? ( >=dev-lang/nasm-2.14 )
x86? ( >=dev-lang/nasm-2.14 )
pgo? (
wayland? ( >=gui-libs/wlroots-0.15.1-r1[tinywl] )
)"
x86? ( >=dev-lang/nasm-2.14 )"
COMMON_DEPEND="${FF_ONLY_DEPEND}
dev-libs/atk
dev-libs/expat
@ -410,27 +408,6 @@ mozconfig_use_with() {
mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
}
virtwl() {
debug-print-function ${FUNCNAME} "$@"
[[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument"
[[ -n $XDG_RUNTIME_DIR ]] || die "${FUNCNAME} needs XDG_RUNTIME_DIR to be set; try xdg_environment_reset"
tinywl -h >/dev/null || die 'tinywl -h failed'
# TODO: don't run addpredict in utility function. WLR_RENDERER=pixman doesn't work
addpredict /dev/dri
local VIRTWL VIRTWL_PID
coproc VIRTWL { WLR_BACKENDS=headless exec tinywl -s 'echo $WAYLAND_DISPLAY; read _; kill $PPID'; }
local -x WAYLAND_DISPLAY
read WAYLAND_DISPLAY <&${VIRTWL[0]}
debug-print "${FUNCNAME}: $@"
"$@"
[[ -n $VIRTWL_PID ]] || die "tinywl exited unexpectedly"
exec {VIRTWL[0]}<&- {VIRTWL[1]}>&-
}
pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]] ; then
if use pgo ; then
@ -1034,20 +1011,16 @@ src_configure() {
src_compile() {
local virtx_cmd=
if use pgo; then
if use pgo ; then
virtx_cmd=virtx
# Reset and cleanup environment variables used by GNOME/XDG
gnome2_environment_reset
addpredict /root
if ! use X; then
virtx_cmd=virtwl
else
virtx_cmd=virtx
fi
fi
if ! use X; then
if ! use X && use wayland; then
local -x GDK_BACKEND=wayland
else
local -x GDK_BACKEND=x11