dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2025-02-22 21:12:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pinxi egl fixes

Browse source
This commit is contained in:
Harald Hope 2023-12-06 20:47:42 -08:00
parent 5ced8d4b84
commit 357551da68
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pinxi
View file

@ -50,8 +50,8 @@ use POSIX qw(ceil uname strftime ttyname);
## INXI INFO ##
my $self_name='pinxi';
my $self_version='3.3.31';
my $self_date='2023-11-29';
my $self_patch='21';
my $self_date='2023-12-06';
my $self_patch='22';
## END INXI INFO ##
my ($b_pledge,@pledges);
@ -16144,7 +16144,7 @@ sub gl_data {
# $file = "$fake_data_dir/graphics/glxinfo/glxinfo-mali-allwinner-lima-1.txt";
# $file = "$fake_data_dir/graphics/glxinfo/glxinfo-partial-intel-5500-1.txt";
# $file = "$fake_data_dir/graphics/glxinfo/glxinfo-vbox-debian-etch-1.txt";
$file = "$fake_data_dir/graphics/glxinfo/glxinfo-x11-neomagic-lenny-1.txt";
# $file = "$fake_data_dir/graphics/glxinfo/glxinfo-x11-neomagic-lenny-1.txt";
# $file = "$fake_data_dir/graphics/glxinfo/glxinfo-nvidia-gl4.6-chr.txt";
# $file = "$fake_data_dir/graphics/glxinfo/glxinfo-intel-atom-dell_studio-bm.txt";
# $file = "$fake_data_dir/graphics/glxinfo/glxinfo-asus_1025c-atom-bm.txt";
@ -16158,12 +16158,13 @@ sub gl_data {
}
else {
my $file;
$file = "$fake_data_dir/graphics/egl-es/eglinfo-x11-3.txt";
# $file = "$fake_data_dir/graphics/egl-es/eglinfo-x11-3.txt";
# $file = "$fake_data_dir/graphics/egl-es/eglinfo-wayland-intel-c30.txt";
# $file = "$fake_data_dir/grapOhics/egl-es/eglinfo-2022-x11-nvidia-egl1.5.txt";
# $file = "$fake_data_dir/graphics/egl-es/eglinfo-wayland-intel-nvidia-radu.txt";
$file = "$fake_data_dir/graphics/egl-es/eglinfo-intel-atom-dell_studio-bm.txt";
$file = "$fake_data_dir/graphics/egl-es/eglinfo-asus_1025c-atom-bm.txt";
# $file = "$fake_data_dir/graphics/egl-es/eglinfo-intel-atom-dell_studio-bm.txt";
# $file = "$fake_data_dir/graphics/egl-es/eglinfo-asus_1025c-atom-bm.txt";
# $file = "$fake_data_dir/graphics/egl-es/eglinfo-x11-amd-raphael-1.txt";
$gl_data = main::reader($file,'','ref');
}
}
@ -16266,13 +16267,13 @@ sub gl_data {
}
}
push(@{$gl->{'egl'}{'data'}{'vendors'}},$working[1]);
if ($working[1] eq 'nvidia'){
if ($platform && $working[1] eq 'nvidia'){
$value = (defined $device) ? "$platform-$device": $platform;
push(@{$gl->{'egl'}{'data'}{'drivers'}{$working[1]}},$value);
$gl->{'egl'}{'data'}{'hw'}{$working[1]} = $working[1];
}
}
elsif ($working[0] eq 'EGL driver name'){
elsif ($platform && $working[0] eq 'EGL driver name'){
if (!defined $device){
$gl->{'egl'}{'platforms'}{$platform}{'egl'}{'driver'} = $working[1];
if ($mesa_drivers{$working[1]}){
@ -16291,7 +16292,7 @@ sub gl_data {
$gl->{'egl'}{'data'}{'hw'}{$working[1]} = $mesa_drivers{$working[1]};
}
}
if ($working[0] eq 'EGL client APIs'){
if ($platform && $working[0] eq 'EGL client APIs'){
if (defined $device){
$gl->{'egl'}{'platforms'}{$platform}{$device}{'egl'}{'client-apis'} = [split(/\s+/,$working[1])];
}
@ -28815,8 +28816,10 @@ sub version_proc {
# $result='Linux version 6.0.8-0-generic (chimera@chimera) (clang version 15.0.4, LLD 15.0.4) #1 SMP PREEMPT_DYNAMIC Fri Nov 11 13:45:29 UTC 2022';
# 2023 ubuntu, sigh..
# $result='Linux version 6.5.8-1-liquorix-amd64 (steven@liquorix.net) (gcc (Debian 13.2.0-4) 13.2.0, GNU ld (GNU Binutils for Debian) 2.41) #1 ZEN SMP PREEMPT liquorix 6.5-9.1~trixie (2023-10-19)';
$result='Linux version 6.5.0-9-generic (buildd@bos03-amd64-043) (x86_64-linux-gnu-gcc-13 (Ubuntu 13.2.0-4ubuntu3) 13.2.0, GNU ld (GNU Binutils for Ubuntu) 2.41) #9-Ubuntu SMP PREEMPT_DYNAMIC Sat Oct 7 01:35:40 UTC 2023';
# $result='Linux version 6.5.0-9-generic (buildd@bos03-amd64-043) (x86_64-linux-gnu-gcc-13 (Ubuntu 13.2.0-4ubuntu3) 13.2.0, GNU ld (GNU Binutils for Ubuntu) 2.41) #9-Ubuntu SMP PREEMPT_DYNAMIC Sat Oct 7 01:35:40 UTC 2023';
$result='Linux version 6.5.13-un-def-alt1 (builder@localhost.localdomain) (gcc-13 (GCC) 13.2.1 20230817 (ALT Sisyphus 13.2.1-alt2), GNU ld (GNU Binutils) 2.41.0.20230826) #1 SMP PREEMPT_DYNAMIC Wed Nov 29 15:54:38 UTC 2023';
}
# 'clang version 9.0.0 ('; 'gcc version 7.5.0'
if ($result =~ /(gcc|clang).*version\s([^,\s\)]+)/){
$version = $2;
$version ||= 'N/A';