commit:     9138958e54f4a1e00a1111243a4e577b598233b6
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  7 05:41:01 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Aug  7 05:41:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9138958e

www-client/firefox: clear some leftover addpredicts from 115esr

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 www-client/firefox/firefox-115.13.0.ebuild | 28 ----------------------------
 www-client/firefox/firefox-115.14.0.ebuild | 28 ----------------------------
 2 files changed, 56 deletions(-)

diff --git a/www-client/firefox/firefox-115.13.0.ebuild 
b/www-client/firefox/firefox-115.13.0.ebuild
index ab2ac2550f3b..67c0548f35c3 100644
--- a/www-client/firefox/firefox-115.13.0.ebuild
+++ b/www-client/firefox/firefox-115.13.0.ebuild
@@ -487,8 +487,6 @@ virtwl() {
        [[ -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
@@ -586,32 +584,6 @@ pkg_setup() {
 
                        # Clear tons of conditions, since PGO is 
hardware-dependant.
                        addpredict /dev
-
-                       # Allow access to GPU during PGO run
-                       local ati_cards mesa_cards nvidia_cards render_cards
-                       shopt -s nullglob
-
-                       ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-                       if [[ -n "${ati_cards}" ]] ; then
-                               addpredict "${ati_cards}"
-                       fi
-
-                       mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-                       if [[ -n "${mesa_cards}" ]] ; then
-                               addpredict "${mesa_cards}"
-                       fi
-
-                       nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-                       if [[ -n "${nvidia_cards}" ]] ; then
-                               addpredict "${nvidia_cards}"
-                       fi
-
-                       render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ 
/:/g')
-                       if [[ -n "${render_cards}" ]] ; then
-                               addpredict "${render_cards}"
-                       fi
-
-                       shopt -u nullglob
                fi
 
                if ! mountpoint -q /dev/shm ; then

diff --git a/www-client/firefox/firefox-115.14.0.ebuild 
b/www-client/firefox/firefox-115.14.0.ebuild
index 0d38aaa8ab50..894d9203b7f2 100644
--- a/www-client/firefox/firefox-115.14.0.ebuild
+++ b/www-client/firefox/firefox-115.14.0.ebuild
@@ -487,8 +487,6 @@ virtwl() {
        [[ -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
@@ -586,32 +584,6 @@ pkg_setup() {
 
                        # Clear tons of conditions, since PGO is 
hardware-dependant.
                        addpredict /dev
-
-                       # Allow access to GPU during PGO run
-                       local ati_cards mesa_cards nvidia_cards render_cards
-                       shopt -s nullglob
-
-                       ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-                       if [[ -n "${ati_cards}" ]] ; then
-                               addpredict "${ati_cards}"
-                       fi
-
-                       mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-                       if [[ -n "${mesa_cards}" ]] ; then
-                               addpredict "${mesa_cards}"
-                       fi
-
-                       nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-                       if [[ -n "${nvidia_cards}" ]] ; then
-                               addpredict "${nvidia_cards}"
-                       fi
-
-                       render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ 
/:/g')
-                       if [[ -n "${render_cards}" ]] ; then
-                               addpredict "${render_cards}"
-                       fi
-
-                       shopt -u nullglob
                fi
 
                if ! mountpoint -q /dev/shm ; then

Reply via email to