diff options
| author |   Joonas Niilola <juippis@gentoo.org> | 2022-10-03 20:06:00 +0300 |
|---|---|---|
| committer | Joonas Niilola <juippis@gentoo.org> | 2022-10-03 20:08:05 +0300 |
| commit | a5d952b94841d874c47714eb7e4e52d6594c137e (patch) | |
| tree | 7820336ffb6e6985f14d04eb24b28d9cce225fe5 /www-client | |
| parent | dev-python/jsonschema: Remove old (diff) | |
| download | gentoo-a5d952b94841d874c47714eb7e4e52d6594c137e.tar.gz gentoo-a5d952b94841d874c47714eb7e4e52d6594c137e.tar.bz2 gentoo-a5d952b94841d874c47714eb7e4e52d6594c137e.zip | |
Revert "www-client/firefox: enable wayland+pgo build on rapid"
This reverts commit 063b3e0e3d31acd88f453831f71d74d976d66359.
- 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>
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/firefox/firefox-105.0.1.ebuild | 39 |
1 files changed, 6 insertions, 33 deletions
diff --git a/www-client/firefox/firefox-105.0.1.ebuild b/www-client/firefox/firefox-105.0.1.ebuild index 1b8da3f2d869..a44bccfac2a9 100644 --- a/www-client/firefox/firefox-105.0.1.ebuild +++ b/www-client/firefox/firefox-105.0.1.ebuild @@ -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 |