X-Loop: help-debbugs@HIDDEN
Subject: [bug#40835] [PATCH] Update to use panfrost for graphics hardware acceleration
Resent-From: Brian Woodcox <bw@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 25 Apr 2020 00:00:02 +0000
Resent-Message-ID: <handler.40835.B.158777277921116 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 40835
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 40835 <at> debbugs.gnu.org
X-Debbugs-Original-To: guix-patches@HIDDEN
Received: via spool by submit <at> debbugs.gnu.org id=B.158777277921116
(code B ref -1); Sat, 25 Apr 2020 00:00:02 +0000
Received: (at submit) by debbugs.gnu.org; 24 Apr 2020 23:59:39 +0000
Received: from localhost ([127.0.0.1]:58244 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1jS8EN-0005UW-5d
for submit <at> debbugs.gnu.org; Fri, 24 Apr 2020 19:59:39 -0400
Received: from lists.gnu.org ([209.51.188.17]:46856)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <bw@HIDDEN>) id 1jS8EL-0005UO-59
for submit <at> debbugs.gnu.org; Fri, 24 Apr 2020 19:59:37 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:57394)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <bw@HIDDEN>) id 1jS8EK-0000dn-9r
for guix-patches@HIDDEN; Fri, 24 Apr 2020 19:59:36 -0400
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on eggs.gnu.org
X-Spam-Level:
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,HTML_MESSAGE,
URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1)
(envelope-from <bw@HIDDEN>) id 1jS8EI-0004Iy-Vv
for guix-patches@HIDDEN; Fri, 24 Apr 2020 19:59:36 -0400
Received: from mail.inskydata.com ([184.68.229.6]:34372
helo=server.inskydata.com) by eggs.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <bw@HIDDEN>) id 1jS8EI-0003E4-2n
for guix-patches@HIDDEN; Fri, 24 Apr 2020 19:59:34 -0400
Received: from [192.168.19.76] (unknown [192.168.19.76])
by server.inskydata.com (Postfix) with ESMTPSA id 632D55D2FE8B
for <guix-patches@HIDDEN>; Fri, 24 Apr 2020 17:58:43 -0600 (MDT)
From: Brian Woodcox <bw@HIDDEN>
Content-Type: multipart/alternative;
boundary="Apple-Mail=_117939A4-A5F4-4A8C-8357-C454B29C6639"
Mime-Version: 1.0 (Mac OS X Mail 11.3 \(3445.6.18\))
Message-Id: <54EFA16B-27F2-40F4-8FF0-F59BC65BF8AB@HIDDEN>
Date: Fri, 24 Apr 2020 17:58:41 -0600
X-Mailer: Apple Mail (2.3445.6.18)
Received-SPF: none client-ip=184.68.229.6; envelope-from=bw@HIDDEN;
helo=server.inskydata.com
X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/24 19:59:06
X-ACL-Warn: Detected OS = Mac OS X 10.x
X-Received-From: 184.68.229.6
X-Spam-Score: -0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--Apple-Mail=_117939A4-A5F4-4A8C-8357-C454B29C6639
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
charset=utf-8
Hello ARM Pinebook Pro Users,
These patches add the panfrost graphics acceleration for the Pinebook =
Pro laptop.
These patches must be applied on top of
d4c6e06f369024efc63e11de1a5bacd3fe9f7e8d (wip-pinebook-pro branch)
The following instructions assume this patch has been added to the =
wip-pinebook-pro branch. So apply the patch if necessary.
Many thanks to janneke and for his blog post =E2=80=94> =
https://joyofsource.com/guix-system-on-the-pinebook-pro.html =
<https://joyofsource.com/guix-system-on-the-pinebook-pro.html>
Some notes for successfully creating the image to boot guix on the =
Pinebook pro. Most of this is borrowed from janneke. Many thanks.
If you are using the Pinebook Pro to build this image, you need to have =
guix running on a foreign distro.
janneke showed how to use Debian, I used Arch Linux, but you can =
probably also use Manjaro.
Since I was booting arch linux from an SD card already, I installed the =
image on the SD card plugged into an adapter.
So with the SD card (256G in my case) inserted into a USB adapter.
Prepare SD Card:
sudo parted -- /dev/sda mkpart p 0% -1
sudo parted -- /dev/sda set 1 boot on
sudo mkfs.ext4 -F /dev/sda1
sudo mount /dev/sda1 /mnt
Clone guix:
git clone https://git.savannah.gnu.org/git/guix.git =
<https://git.savannah.gnu.org/git/guix.git>
cd guix
git checkout wip-pinebook-pro
For the next commands, you need to setup your Pinebook Pro to have =
enough swap, otherwise webkitgtk will fail to build and it takes about 3 =
Hours for that alone.
modprobe zram
echo lz4 > /sys/block/zram0/comp_algorithm
echo 12G > /sys/block/zram0/disksize
mkswap --label zram0 /dev/zram0
swapon --priority 100 /dev/zram0
Increase size of tmp file:
mount -o remount,size=3D6G,noatime /tmp
guix environment guix --ad-hoc git
./bootstrap
./configure --localstatedir=3D/var GUILE=3D$(type -p guile) GUILD=3D$(type=
-p guild)
make
sudo -E ./pre-inst-env guix system init config.scm /mnt --fallback
Once the image is created and copied along with uboot to the SD card, =
there is one more thing you need to boot.
You need to edit the /boot/extlinux/extlinux.conf file on the SD card =
and alter the FDTDIR line.
I changed mine from
FDTDIR =
/gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebook-pro-5.6.0=
/lib/dtbs
to
FDTDIR =
/gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebook-pro-5.6.0=
/lib/dtbs/rockchip
Shutdown the laptop and insert the freshly minted SD card into the SD =
card slot on the Pinebook Pro.
You should now have a guix system running and if you setup your using =
the sample attached config.scm file, you will have Xorg running on =
hardware and xfce4 will run nicely.
Some extra notes (not the guix way):
Since I don=E2=80=99t have a usb wifi adapter, I cheated (until I get =
one) and I commented out the following in the gnu/packages/linux.scm =
file as follows:
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -326,8 +326,8 @@ corresponding UPSTREAM-SOURCE (an origin), using the =
given DEBLOB-SCRIPTS."
(with-directory-excursion dir
(setenv "PYTHON" (which "python"))
(format #t "Running deblob script...~%")
- (force-output)
- (invoke "/tmp/bin/deblob"))
+ (force-output))
+;; (invoke "/tmp/bin/deblob"))
(format #t "~%Packing new Linux-libre tarball...~%")
(force-output)
Also if you do this, you need to create the following folders on the SD =
card:
/lib/firmware/brcm
/lib/firmware/rockchip
Inside the brcm folder you need to place all the brcmfmac43456-sdio.* =
files
Inside the rockchip folder you need to place pptx.bin
I will leave it up to the reader to find and install these files, since =
this is not the preferred way.
Good luck!!
Brian C. Woodcox
--Apple-Mail=_117939A4-A5F4-4A8C-8357-C454B29C6639
Content-Type: multipart/mixed;
boundary="Apple-Mail=_CEF45708-8A2F-4C92-8041-D3733640AD79"
--Apple-Mail=_CEF45708-8A2F-4C92-8041-D3733640AD79
Content-Transfer-Encoding: quoted-printable
Content-Type: text/html;
charset=utf-8
<html><head><meta http-equiv=3D"Content-Type" content=3D"text/html; =
charset=3Dutf-8"></head><body style=3D"word-wrap: break-word; =
-webkit-nbsp-mode: space; line-break: after-white-space;" class=3D"">Hello=
ARM Pinebook Pro Users,<div class=3D""><br class=3D""></div><div =
class=3D"">These patches add the panfrost graphics acceleration for the =
Pinebook Pro laptop.</div><div class=3D""><br class=3D""></div><div =
class=3D"">These patches must be applied on top of</div><div =
class=3D""><br class=3D""></div><div =
class=3D"">d4c6e06f369024efc63e11de1a5bacd3fe9f7e8d (wip-pinebook-pro =
branch)</div><div class=3D""><br class=3D""></div><div class=3D"">The =
following instructions assume this patch has been added to the =
wip-pinebook-pro branch. So apply the patch if =
necessary.</div><div class=3D""><br class=3D""></div><div class=3D"">Many =
thanks to janneke and for his blog post =E2=80=94> <a =
href=3D"https://joyofsource.com/guix-system-on-the-pinebook-pro.html" =
class=3D"">https://joyofsource.com/guix-system-on-the-pinebook-pro.html</a=
></div><div class=3D""><br class=3D""></div><div class=3D"">Some notes =
for successfully creating the image to boot guix on the Pinebook pro. =
Most of this is borrowed from janneke. Many =
thanks.</div><div class=3D""><br class=3D""></div><div class=3D"">If you =
are using the Pinebook Pro to build this image, you need to have guix =
running on a foreign distro.</div><div class=3D""><br =
class=3D""></div><div class=3D"">janneke showed how to use Debian, I =
used Arch Linux, but you can probably also use Manjaro.</div><div =
class=3D""><br class=3D""></div><div class=3D"">Since I was booting arch =
linux from an SD card already, I installed the image on the SD card =
plugged into an adapter.</div><div class=3D""><br class=3D""></div><div =
class=3D"">So with the SD card (256G in my case) inserted into a USB =
adapter.</div><div class=3D""><br class=3D""></div><div class=3D"">Prepare=
SD Card:</div><div class=3D""><br class=3D""></div><div class=3D""><div =
class=3D"">sudo parted -- /dev/sda mkpart p 0% -1</div><div =
class=3D"">sudo parted -- /dev/sda set 1 boot on</div><div class=3D"">sudo=
mkfs.ext4 -F /dev/sda1</div></div><div class=3D"">sudo mount /dev/sda1 =
/mnt</div><div class=3D""><br class=3D""></div><div class=3D"">Clone =
guix:</div><div class=3D""><br class=3D""></div><div class=3D"">git =
clone <a href=3D"https://git.savannah.gnu.org/git/guix.git" =
class=3D"">https://git.savannah.gnu.org/git/guix.git</a></div><div =
class=3D"">cd guix</div><div class=3D"">git checkout =
wip-pinebook-pro</div><div class=3D""><br class=3D""></div><div =
class=3D""><br class=3D""></div><div class=3D"">For the next commands, =
you need to setup your Pinebook Pro to have enough swap, otherwise =
webkitgtk will fail to build and it takes about 3 Hours for that =
alone.<br class=3D""><br class=3D"">modprobe zram<br class=3D"">echo lz4 =
> /sys/block/zram0/comp_algorithm<br class=3D"">echo 12G > =
/sys/block/zram0/disksize<br class=3D"">mkswap --label zram0 =
/dev/zram0<br class=3D"">swapon --priority 100 /dev/zram0<br =
class=3D""><br class=3D"">Increase size of tmp file:<br class=3D""><br =
class=3D"">mount -o remount,size=3D6G,noatime /tmp<br class=3D""><br =
class=3D""></div><div class=3D"">guix environment guix --ad-hoc =
git</div><div class=3D"">./bootstrap</div><div class=3D"">./configure =
--localstatedir=3D/var GUILE=3D$(type -p guile) GUILD=3D$(type -p =
guild)</div><div class=3D"">make</div><div class=3D""><br =
class=3D""></div><div class=3D"">sudo -E ./pre-inst-env guix system init =
config.scm /mnt --fallback</div><div class=3D""><br class=3D""></div><div =
class=3D"">Once the image is created and copied along with uboot to the =
SD card, there is one more thing you need to boot.</div><div =
class=3D""><br class=3D""></div><div class=3D"">You need to edit the =
/boot/extlinux/extlinux.conf file on the SD card and alter the FDTDIR =
line.</div><div class=3D""><br class=3D""></div><div class=3D"">I =
changed mine from</div><div class=3D""><br class=3D""></div><div =
class=3D"">FDTDIR =
/gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebook-pro-5.6.0=
/lib/dtbs</div><div class=3D""><br class=3D""></div><div =
class=3D"">to</div><div class=3D""><br class=3D""></div><div =
class=3D"">FDTDIR =
/gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebook-pro-5.6.0=
/lib/dtbs/rockchip</div><div class=3D""><br class=3D""></div><div =
class=3D"">Shutdown the laptop and insert the freshly minted SD card =
into the SD card slot on the Pinebook Pro.</div><div class=3D""><br =
class=3D""></div><div class=3D"">You should now have a guix system =
running and if you setup your using the sample attached config.scm file, =
you will have Xorg running on hardware and xfce4 will run =
nicely.</div><div class=3D""><br class=3D""></div><div class=3D"">Some =
extra notes (not the guix way):</div><div class=3D""><br =
class=3D""></div><div class=3D"">Since I don=E2=80=99t have a usb wifi =
adapter, I cheated (until I get one) and I commented out the following =
in the gnu/packages/linux.scm file as follows:</div><div class=3D""><br =
class=3D""></div><div class=3D"">--- a/gnu/packages/linux.scm<br =
class=3D"">+++ b/gnu/packages/linux.scm<br class=3D"">@@ -326,8 +326,8 =
@@ corresponding UPSTREAM-SOURCE (an origin), using the given =
DEBLOB-SCRIPTS."<br class=3D""> =
(with-directory-excursion dir<br =
class=3D""> =
(setenv "PYTHON" (which "python"))<br =
class=3D""> =
(format #t "Running deblob script...~%")<br =
class=3D"">- =
(force-output)<br class=3D"">- =
(invoke "/tmp/bin/deblob"))<br =
class=3D"">+ =
(force-output))<br class=3D"">+;; =
(invoke =
"/tmp/bin/deblob"))<br class=3D""><br class=3D""> =
(format #t "~%Packing =
new Linux-libre tarball...~%")<br class=3D""> =
(force-output)<br class=3D""><br =
class=3D""></div><div class=3D"">Also if you do this, you need to create =
the following folders on the SD card:</div><div class=3D""><br =
class=3D""></div><div class=3D"">/lib/firmware/brcm</div><div =
class=3D"">/lib/firmware/rockchip</div><div class=3D""><br =
class=3D""></div><div class=3D"">Inside the brcm folder you need to =
place all the brcmfmac43456-sdio.* files</div><div class=3D""><br =
class=3D""></div><div class=3D"">Inside the rockchip folder you need to =
place pptx.bin</div><div class=3D""><br class=3D""></div><div class=3D"">I=
will leave it up to the reader to find and install these files, since =
this is not the preferred way.</div><div class=3D""><br =
class=3D""></div><div class=3D"">Good luck!!</div><div class=3D""><br =
class=3D""></div><div class=3D""><div class=3D"">
<div style=3D"color: rgb(0, 0, 0); letter-spacing: normal; text-align: =
start; text-indent: 0px; text-transform: none; white-space: normal; =
word-spacing: 0px; -webkit-text-stroke-width: 0px; word-wrap: =
break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" =
class=3D""><div style=3D"color: rgb(0, 0, 0); letter-spacing: normal; =
text-align: start; text-indent: 0px; text-transform: none; white-space: =
normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; word-wrap: =
break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" =
class=3D"">Brian C. Woodcox<br class=3D""><br =
class=3D""></div></div></div></div></body></html>=
--Apple-Mail=_CEF45708-8A2F-4C92-8041-D3733640AD79
Content-Disposition: attachment;
filename=0001-Update-to-use-panfrost-for-graphics-hardware-acceler.patch
Content-Type: application/octet-stream;
x-unix-mode=0644;
name="0001-Update-to-use-panfrost-for-graphics-hardware-acceler.patch"
Content-Transfer-Encoding: quoted-printable
=46rom=204de545a13aa01b167c52f1cff19b2e9b3aa7ec12=20Mon=20Sep=2017=20=
00:00:00=202001=0AFrom:=20"Brian=20C.=20Woodcox"=20<bw@HIDDEN>=0A=
Date:=20Fri,=2024=20Apr=202020=2016:35:45=20-0600=0ASubject:=20[PATCH]=20=
Update=20to=20use=20panfrost=20for=20graphics=20hardware=20acceleration=0A=
=0A---=0A=20gnu/packages/gl.scm=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=2027=20+--=0A=20=
gnu/packages/gnome.scm=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20|=20=2013=20+-=0A=20gnu/packages/linux.scm=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=20=204=20=
+-=0A=20.../cogl-1.22.6-add-eglmesaext-header.patch=20=20=20|=20=2075=20=
+++++++=0A=20.../patches/mesa-skip-disk-cache-test.patch=20=20=20|=20=20=20=
7=20+-=0A=20.../mutter-3.32.2-add-eglmesaext-header.patch=20|=20=2052=20=
+++++=0A=20.../webkitgtk-2.28.0-fix-bug-197192.patch=20=20=20=20=20|=20=
203=20++++++++++++++++++=0A=20gnu/packages/qt.scm=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=20=202=20+=0A=
=20gnu/packages/webkit.scm=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20|=20=20=205=20+-=0A=209=20files=20changed,=20364=20=
insertions(+),=2024=20deletions(-)=0A=20create=20mode=20100644=20=
gnu/packages/patches/cogl-1.22.6-add-eglmesaext-header.patch=0A=20create=20=
mode=20100644=20=
gnu/packages/patches/mutter-3.32.2-add-eglmesaext-header.patch=0A=20=
create=20mode=20100644=20=
gnu/packages/patches/webkitgtk-2.28.0-fix-bug-197192.patch=0A=0Adiff=20=
--git=20a/gnu/packages/gl.scm=20b/gnu/packages/gl.scm=0Aindex=20=
01241cd88e..65fe389927=20100644=0A---=20a/gnu/packages/gl.scm=0A+++=20=
b/gnu/packages/gl.scm=0A@@=20-12,6=20+12,7=20@@=0A=20;;;=20Copyright=20=
=C2=A9=202018,=202019=20Tobias=20Geerinckx-Rice=20<me@HIDDEN>=0A=20=
;;;=20Copyright=20=C2=A9=202019=20Pierre=20Neidhardt=20=
<mail@HIDDEN>=0A=20;;;=20Copyright=20=C2=A9=202020=20Marius=20=
Bakke=20<mbakke@HIDDEN>=0A+;;;=20Copyright=20=C2=A9=202020=20Brian=20=
C.=20Woodcox=20<bw@HIDDEN>=0A=20;;;=0A=20;;;=20This=20file=20is=20=
part=20of=20GNU=20Guix.=0A=20;;;=0A@@=20-230,21=20+231,21=20@@=20also=20=
known=20as=20DXTn=20or=20DXTC)=20for=20Mesa.")=0A=20=20=20=20=20=20=20=20=
=20=20=20=20'(list=20"--disable-glx"=20"--disable-egl"))))))))=0A=20=0A=20=
(define-public=20mesa=0A-=20=20(package=0A+=20=20(let=20((commit=20=
"69628ababbd79a5865c2c5bd01b4a963eb7800f9")=0A+=20=20=20=20=20=20=20=20=
(revision=20"1"))=0A+=20=20=20(package=0A=20=20=20=20=20(name=20"mesa")=0A=
-=20=20=20=20(version=20"19.3.4")=0A+=20=20=20=20(version=20=
"20.1.0_devel.120669.69628ababbd")=0A=20=20=20=20=20(source=0A-=20=20=20=20=
=20=20(origin=0A-=20=20=20=20=20=20=20=20(method=20url-fetch)=0A-=20=20=20=
=20=20=20=20=20(uri=20(list=20(string-append=20=
"https://mesa.freedesktop.org/archive/"=0A-=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
"mesa-"=20version=20".tar.xz")=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20(string-append=20"ftp://ftp.freedesktop.org/pub/mesa/"=0A=
-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20"mesa-"=20version=20".tar.xz")=0A-=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20(string-append=20=
"ftp://ftp.freedesktop.org/pub/mesa/"=0A-=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
version=20"/mesa-"=20version=20".tar.xz")))=0A+=20=20=20=20=20=20=20=
(origin=0A+=20=20=20=20=20=20=20=20=20(method=20git-fetch)=0A+=20=20=20=20=
=20=20=20=20=20(uri=20(git-reference=0A+=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20(url=20"git://anongit.freedesktop.org/mesa/mesa")=0A+=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20(commit=20commit)))=0A+=20=20=20=20=20=
=20=20=20=20(file-name=20(git-file-name=20"mesa-git"=20version))=0A=20=20=
=20=20=20=20=20=20=20(sha256=0A=20=20=20=20=20=20=20=20=20=20(base32=0A-=20=
=20=20=20=20=20=20=20=20=20=
"1r4giqq7q7zqbn23lbw7v5vswagxx8qj6ij2w8bsb697mvk6g90x"))=0A+=20=20=20=20=20=
=20=20=20=20=20"1bv39f466k6ig11byw2dmgib62vh9sm2hvi7rqcdplsaynxmbc6l"))=0A=
=20=20=20=20=20=20=20=20=20(patches=0A=20=20=20=20=20=20=20=20=20=20=
(search-patches=20"mesa-skip-disk-cache-test.patch"))))=0A=20=20=20=20=20=
(build-system=20meson-build-system)=0A@@=20-293,7=20+294,7=20@@=20also=20=
known=20as=20DXTn=20or=20DXTC)=20for=20Mesa.")=0A=20=20=20=20=20=20=20=20=
'(,@(match=20(%current-system)=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
((or=20"armhf-linux"=20"aarch64-linux")=0A=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20;;=20TODO:=20Fix=20svga=20driver=20for=20aarch64=20and=20=
armhf.=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
'("-Dgallium-drivers=3Detnaviv,freedreno,nouveau,r300,r600,swrast,tegra,v3=
d,vc4,virgl"))=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
'("-Dgallium-drivers=3Detnaviv,freedreno,kmsro,lima,nouveau,panfrost,r300,=
r600,swrast,tegra,v3d,vc4,virgl"))=0A=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20(_=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
'("-Dgallium-drivers=3Diris,nouveau,r300,r600,radeonsi,svga,swrast,virgl")=
))=0A=20=20=20=20=20=20=20=20=20=20;;=20Enable=20various=20optional=20=
features.=20=20TODO:=20opencl=20requires=20libclc,=0A@@=20-422,7=20=
+423,7=20@@=20also=20known=20as=20DXTn=20or=20DXTC)=20for=20Mesa.")=0A=20=
specifications=20-=20systems=20for=20rendering=20interactive=203D=20=
graphics.=20=20A=20variety=20of=0A=20device=20drivers=20allows=20Mesa=20=
to=20be=20used=20in=20many=20different=20environments=20ranging=0A=20=
from=20software=20emulation=20to=20complete=20hardware=20acceleration=20=
for=20modern=20GPUs.")=0A-=20=20=20=20(license=20license:x11)))=0A+=20=20=
=20=20(license=20license:x11))))=0A=20=0A=20(define-public=20mesa-opencl=0A=
=20=20=20(package=0Adiff=20--git=20a/gnu/packages/gnome.scm=20=
b/gnu/packages/gnome.scm=0Aindex=20088de7dd4c..44d82b2c75=20100644=0A---=20=
a/gnu/packages/gnome.scm=0A+++=20b/gnu/packages/gnome.scm=0A@@=20-50,6=20=
+50,7=20@@=0A=20;;;=20Copyright=20=C2=A9=202020=20raingloom=20=
<raingloom@HIDDEN>=0A=20;;;=20Copyright=20=C2=A9=202020=20Nicolas=20=
Goaziou=20<mail@HIDDEN>=0A=20;;;=20Copyright=20=C2=A9=202020=20=
Naga=20Malleswari=20<nagamalli@HIDDEN>=0A+;;;=20Copyright=20=C2=A9=20=
2020=20Brian=20C.=20Woodcox=20<bw@HIDDEN>=0A=20;;;=0A=20;;;=20=
This=20file=20is=20part=20of=20GNU=20Guix.=0A=20;;;=0A@@=20-4425,15=20=
+4426,17=20@@=20throughout=20GNOME=20for=20API=20documentation).")=0A=20=
(define-public=20cogl=0A=20=20=20(package=0A=20=20=20=20=20(name=20=
"cogl")=0A-=20=20=20=20(version=20"1.22.4")=0A+=20=20=20=20(version=20=
"1.22.6")=0A=20=20=20=20=20(source=0A=20=20=20=20=20=20(origin=0A=20=20=20=
=20=20=20=20=20(method=20url-fetch)=0A=20=20=20=20=20=20=20=20(uri=20=
(string-append=20"mirror://gnome/sources/cogl/"=0A=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
(version-major+minor=20version)=20"/"=0A=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20"cogl-"=20version=20=
".tar.xz"))=0A+=20=20=20=20=20=20=20(patches=0A+=20=20=20=20=20=20=20=20=20=
(search-patches=20"cogl-1.22.6-add-eglmesaext-header.patch"))=0A=20=20=20=
=20=20=20=20=20(sha256=0A-=20=20=20=20=20=20=20=20(base32=20=
"1q0drs82a8f6glg1v29bb6g2nf15fw0rvdx3d0rgcgfarfaby5sj"))))=0A+=20=20=20=20=
=20=20=20=20(base32=20=
"0x8v4n61q89qy27v824bqswpz6bmn801403w2q3pa1lcwk9ln4vd"))))=0A=20=20=20=20=
=20;;=20NOTE:=20mutter=20exports=20a=20bundled=20fork=20of=20cogl,=20so=20=
when=20making=20changes=20to=0A=20=20=20=20=20;;=20cogl,=20corresponding=20=
changes=20may=20be=20appropriate=20in=20mutter=20as=20well.=0A=20=20=20=20=
=20(build-system=20gnu-build-system)=0A@@=20-4462,7=20+4465,7=20@@=20=
throughout=20GNOME=20for=20API=20documentation).")=0A=20=20=20=20=20=20=
`(#:configure-flags=20(list=20"--enable-cogl-gst"=0A=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
"--enable-wayland-egl-platform"=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
"--enable-wayland-egl-server"=0A-=0A+=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
"--enable-gles2"=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20;;=20Arrange=20to=20pass=20an=20=
absolute=20file=20name=20to=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20;;=20dlopen=20for=20=
libGL.so.=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20(string-append=20"--with-gl-libname=3D"=0A=
@@=20-5872,6=20+5875,9=20@@=20configuration=20program=20to=20choose=20=
applications=20starting=20on=20login.")=0A=20=20=20=20=20=20=20=20=20=20=20=
=20=20(substitute*=20"installed-tests/js/testLocale.js"=0A=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20((".*toBeDefined.*")=20"")=0A=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20((".*expect\\(datestr\\).*")=20""))=0A+=20=20=
=20=20=20=20=20=20=20=20=20=20(substitute*=20=
"installed-tests/scripts/testCommandLine.sh"=0A+=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20(("gjs=20-c=20'imports.system.exit(0)'=20&&=20!=20stat=20=
gjs-*.syscap")=20"")=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20(("gjs=20=
--profile=20-c=20'imports.system.exit(0)'=20&&=20!=20stat=20=
gjs-*.syscap")=20""))=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=
(substitute*=20"installed-tests/scripts/testCommandLine.sh"=0A=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20(("Valent=C3=ADn")=20"")=0A=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20(("=E2=98=AD")=20""))=0A@@=20-6029,6=20=
+6035,7=20@@=20to=20display=20dialog=20boxes=20from=20the=20commandline=20=
and=20shell=20scripts.")=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
(uri=20(string-append=20"mirror://gnome/sources/"=20name=20"/"=0A=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20(version-major+minor=20version)=20"/"=0A=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20name=20"-"=20version=20".tar.xz"))=0A+=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20(patches=20(search-patches=20=
"mutter-3.32.2-add-eglmesaext-header.patch"))=0A=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20(sha256=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20(base32=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
"1h577i2ap7dpfy1jg101jvc6nzccc0csgvd55ahydlr8f94frcva"))))=0Adiff=20=
--git=20a/gnu/packages/linux.scm=20b/gnu/packages/linux.scm=0Aindex=20=
dd088ea24f..d4a36533ab=20100644=0A---=20a/gnu/packages/linux.scm=0A+++=20=
b/gnu/packages/linux.scm=0A@@=20-43,6=20+43,7=20@@=0A=20;;;=20Copyright=20=
=C2=A9=202020=20Pierre=20Neidhardt=20<mail@HIDDEN>=0A=20;;;=20=
Copyright=20=C2=A9=202020=20Chris=20Marusich=20<cmmarusich@HIDDEN>=0A=20=
;;;=20Copyright=20=C2=A9=202020=20Vincent=20Legoll=20=
<vincent.legoll@HIDDEN>=0A+;;;=20Copyright=20=C2=A9=202020=20Brian=20=
C.=20Woodcox=20<bw@HIDDEN>=0A=20;;;=0A=20;;;=20This=20file=20is=20=
part=20of=20GNU=20Guix.=0A=20;;;=0A@@=20-326,7=20+327,7=20@@=20=
corresponding=20UPSTREAM-SOURCE=20(an=20origin),=20using=20the=20given=20=
DEBLOB-SCRIPTS."=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20(with-directory-excursion=20dir=0A=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20(setenv=20"PYTHON"=20(which=20"python"))=0A=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20(format=20#t=20=
"Running=20deblob=20script...~%")=0A-=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20(force-output)=0A+=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20(force-output))=0A=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20(invoke=20"/tmp/bin/deblob"))=0A=20=0A=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20(format=20#t=20=
"~%Packing=20new=20Linux-libre=20tarball...~%")=0A@@=20-604,6=20+605,7=20=
@@=20for=20ARCH=20and=20optionally=20VARIANT,=20or=20#f=20if=20there=20=
is=20no=20such=20configuration."=0A=20=20=20=20=20=
("CONFIG_SECURITY_DMESG_RESTRICT"=20.=20#t)=0A=20=20=20=20=20;;=20All=20=
kernels=20should=20have=20NAMESPACES=20options=20enabled=0A=20=20=20=20=20=
("CONFIG_NAMESPACES"=20.=20#t)=0A+=20=20=20=20("CONFIG_DRM_PANFROST"=20.=20=
#t)=0A=20=20=20=20=20("CONFIG_UTS_NS"=20.=20#t)=0A=20=20=20=20=20=
("CONFIG_IPC_NS"=20.=20#t)=0A=20=20=20=20=20("CONFIG_USER_NS"=20.=20#t)=0A=
diff=20--git=20=
a/gnu/packages/patches/cogl-1.22.6-add-eglmesaext-header.patch=20=
b/gnu/packages/patches/cogl-1.22.6-add-eglmesaext-header.patch=0Anew=20=
file=20mode=20100644=0Aindex=200000000000..71117dd261=0A---=20/dev/null=0A=
+++=20b/gnu/packages/patches/cogl-1.22.6-add-eglmesaext-header.patch=0A=
@@=20-0,0=20+1,75=20@@=0A+Add=20references=20to=20eglmesaext.h=20for=20=
build=20to=20succeed.=0A+This=20patch=20should=20not=20be=20necessary=20=
in=20the=20future=20as=20these=0A+have=20been=20added=20to=20eglext.h.=0A=
+See=20=
https://github.com/KhronosGroup/EGL-Registry/commit/1343ecc9f55d3e8ded6a42=
d7ccfd33391a1dd35f=0A+=0A+From:=20Brian=20Woodcox=20<bw@HIDDEN>=0A=
+Date:=20March=2018,=202020=0A+=0A+---=20a/configure=0A++++=20=
b/configure=0A+@@=20-24156,8=20+24156,9=20@@=0A+=20=20=20cat=20=
>>confdefs.h=20<<_ACEOF=0A+=20#define=20HAVE_EGL_EGLEXT_H=201=0A+=20=
_ACEOF=0A+-=20COGL_EGL_INCLUDES=3D"$COGL_EGL_INCLUDE=0A+-#include=20=
<EGL/eglext.h>"=0A++=20COGL_EGL_INCLUDES=3D"$COGL_EGL_INCLUDES=0A=
++#include=20<EGL/eglext.h>=0A++#include=20<EGL/eglmesaext.h>"=0A+=20fi=0A=
+=20=0A+=20done=0A+@@=20-25565,8=20+25566,8=20@@=0A+=20fi=0A+=20=0A+=20=20=
=20=20=20=20=20=20=20COGL_EGL_INCLUDES=3D"#include=20<EGL/egl.h>=0A=
+-#include=20<EGL/eglext.h>"=0A+-=0A++#include=20<EGL/eglext.h>=0A=
++#include=20<EGL/eglmesaext.h>"=0A+=20=0A+=20fi=0A+=20=0A+---=20=
a/configure.ac=0A++++=20b/configure.ac=0A+@@=20-685,10=20+685,15=20@@=0A=
+=20=20=20=20=20=20=20=20=20=20=20=20=20AC_SUBST([COGL_EGL_INCLUDES])=0A=
+=20=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=
AC_CHECK_HEADERS([EGL/eglext.h],=0A+-=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
[COGL_EGL_INCLUDES=3D"$COGL_EGL_INCLUDE=0A++=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
[COGL_EGL_INCLUDES=3D"$COGL_EGL_INCLUDES=0A+=20#include=20=
<EGL/eglext.h>"],=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20[],=0A+=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
[$COGL_EGL_INCLUDES])=0A++=20=20=20=20=20=20=20=20=20=20=20=20=
AC_CHECK_HEADERS([EGL/eglmesaext.h],=0A++=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
[COGL_EGL_INCLUDES=3D"$COGL_EGL_INCLUDES=0A++#include=20=
<EGL/eglmesaext.h>"],=0A++=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20[],=0A++=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
[$COGL_EGL_INCLUDES])=0A+=20=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20#=20=
Check=20for=20a=20GLES=201.x=20Common=20Profile=20library=20with/without=20=
EGL.=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20#=0A+@@=20-1216,6=20=
+1221,13=20@@=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20[],=0A+=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20[AC_MSG_ERROR([Unable=20to=20=
locate=20required=20EGL=20headers])],=0A+=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20[#include=20<EGL/egl.h>])=0A++=20=20=20=20=20=20=20=20=20=20=20=
=20AC_CHECK_HEADERS(=0A++=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
[EGL/eglmesaext.h],=0A++=20=20=20=20=20=20=20=20=20=20=20=20=20=20[],=0A=
++=20=20=20=20=20=20=20=20=20=20=20=20=20=20[AC_MSG_ERROR([Unable=20to=20=
locate=20required=20EGL=20headers])],=0A++=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20[#include=20<EGL/egl.h>=0A++#include=20<EGL/eglext.h>=0A=
++#include=20<EGL/eglmesaext.h>])=0A+=20=0A+=20=20=20=20=20=20=20=20=20=20=
=20=20=20AC_CHECK_LIB(EGL,=20[eglInitialize],=0A+=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20[COGL_EXTRA_LDFLAGS=3D"$COGL_EXTRA_LDFLAGS=20=
-lEGL"],=0A+@@=20-1226,7=20+1238,8=20@@=0A+=20=20=20=20=20=20=20=20=20=20=
=20)=0A+=20=0A+=20=20=20=20=20=20=20=20=20COGL_EGL_INCLUDES=3D"#include=20=
<EGL/egl.h>=0A+-#include=20<EGL/eglext.h>"=0A++#include=20<EGL/eglext.h>=0A=
++#include=20<EGL/eglmesaext.h>"=0A+=20=20=20=20=20=20=20=20=20=
AC_SUBST([COGL_EGL_INCLUDES])=0A+=20=20=20=20=20=20=20])=0Adiff=20--git=20=
a/gnu/packages/patches/mesa-skip-disk-cache-test.patch=20=
b/gnu/packages/patches/mesa-skip-disk-cache-test.patch=0Aindex=20=
190f6b6ee1..585bf4f648=20100644=0A---=20=
a/gnu/packages/patches/mesa-skip-disk-cache-test.patch=0A+++=20=
b/gnu/packages/patches/mesa-skip-disk-cache-test.patch=0A@@=20-1,11=20=
+1,6=20@@=0A-disk_cache_create()=20here=20looks=20up=20the=20users=20=
home=20directory=20from=20<pwd.h>=0A-which=20resolves=20to=20"/"=20in=20=
the=20build=20environment.=20I=20could=20not=20find=20an=20easy=0A-way=20=
to=20set=20the=20home=20directory=20to=20something=20else,=20so=20we=20=
disable=20this=20test=0A-for=20now.=0A-=0A=20---=20=
a/src/compiler/glsl/tests/cache_test.c=0A=20+++=20=
b/src/compiler/glsl/tests/cache_test.c=0A-@@=20-170,11=20+170,6=20@@=0A=
+@@=20-219,11=20+219,6=20@@=0A=20=20=20=20=20=
unsetenv("MESA_GLSL_CACHE_DIR");=0A=20=20=20=20=20=
unsetenv("XDG_CACHE_HOME");=0A=20=20=0Adiff=20--git=20=
a/gnu/packages/patches/mutter-3.32.2-add-eglmesaext-header.patch=20=
b/gnu/packages/patches/mutter-3.32.2-add-eglmesaext-header.patch=0Anew=20=
file=20mode=20100644=0Aindex=200000000000..1d80c4e842=0A---=20/dev/null=0A=
+++=20b/gnu/packages/patches/mutter-3.32.2-add-eglmesaext-header.patch=0A=
@@=20-0,0=20+1,52=20@@=0A+Add=20references=20to=20eglmesaext.h=20for=20=
build=20to=20succeed.=0A+This=20patch=20should=20not=20be=20necessary=20=
in=20the=20future=20as=20these=0A+have=20been=20added=20to=20eglext.h.=20=
=20=20=0A+See=20=
https://github.com/KhronosGroup/EGL-Registry/commit/1343ecc9f55d3e8ded6a42=
d7ccfd33391a1dd35f=0A+=0A+From:=20Brian=20Woodcox=20<bw@HIDDEN>=0A=
+Date:=20March=2018,=202020=0A+=0A+---=20a/cogl/cogl/meson.build=0A++++=20=
b/cogl/cogl/meson.build=0A+@@=20-48,7=20+48,7=20@@=0A+=20built_headers=20=
+=3D=20[cogl_gl_header_h]=0A+=20=0A+=20if=20have_egl=0A+-=20=20=
cogl_egl_includes_string=20=3D=20'#include=20<EGL/egl.h>\n#include=20=
<EGL/eglext.h>'=0A++=20=20cogl_egl_includes_string=20=3D=20'#include=20=
<EGL/egl.h>\n#include=20<EGL/eglext.h>\n#include=20<EGL/eglmesaext.h>'=0A=
+=20else=0A+=20=20=20cogl_egl_includes_string=20=3D=20''=0A+=20endif=0A+=0A=
+---=20a/src/backends/meta-egl-ext.h=0A++++=20=
b/src/backends/meta-egl-ext.h=0A+@@=20-29,6=20+29,7=20@@=0A+=20=0A+=20=
#include=20<EGL/egl.h>=0A+=20#include=20<EGL/eglext.h>=0A++#include=20=
<EGL/eglmesaext.h>=0A+=20=0A+=20/*=0A+=20=20*=20This=20is=20a=20little=20=
different=20to=20the=20tests=20shipped=20with=20EGL=20implementations,=0A=
+=0A+---=20a/src/backends/meta-egl.c=0A++++=20b/src/backends/meta-egl.c=0A=
+@@=20-26,6=20+26,7=20@@=0A+=20=0A+=20#include=20<EGL/egl.h>=0A+=20=
#include=20<EGL/eglext.h>=0A++#include=20<EGL/eglmesaext.h>=0A+=20=
#include=20<gio/gio.h>=0A+=20#include=20<glib.h>=0A+=20#include=20=
<glib-object.h>=0A+=0A+---=20a/src/backends/meta-egl.h=0A++++=20=
b/src/backends/meta-egl.h=0A+@@=20-27,6=20+27,7=20@@=0A+=20=0A+=20=
#include=20<EGL/egl.h>=0A+=20#include=20<EGL/eglext.h>=0A++#include=20=
<EGL/eglmesaext.h>=0A+=20#include=20<glib-object.h>=0A+=20=0A+=20#define=20=
META_EGL_ERROR=20meta_egl_error_quark=20()=0Adiff=20--git=20=
a/gnu/packages/patches/webkitgtk-2.28.0-fix-bug-197192.patch=20=
b/gnu/packages/patches/webkitgtk-2.28.0-fix-bug-197192.patch=0Anew=20=
file=20mode=20100644=0Aindex=200000000000..251b2f271c=0A---=20/dev/null=0A=
+++=20b/gnu/packages/patches/webkitgtk-2.28.0-fix-bug-197192.patch=0A@@=20=
-0,0=20+1,203=20@@=0A+There=20was=20a=20bug=20in=20older=20Cortex-A53,=20=
however=20in=20newer=20versions=20of=20Cortex-A53,=0A+webkit=20fails=20=
to=20build.=20=20The=20code=20is=20removed=20for=20newer=20versions=20of=20=
Cortex-A53.=20=20=20=0A+See=20=
https://bugs.webkit.org/show_bug.cgi?id=3D197192=0A+=0A+From:=20Brian=20=
Woodcox=20<bw@HIDDEN>=0A+Date:=20March=2018,=202020=0A+=0A+---=20=
a/Source/JavaScriptCore/assembler/ARM64Assembler.h=0A++++=20=
a/Source/JavaScriptCore/assembler/ARM64Assembler.h=0A+@@=20-740,7=20=
+740,6=20@@=0A+=20=20=20=20=20{=0A+=20=20=20=20=20=20=20=20=20=
ASSERT(!(offset=20&=200xfff));=0A+=20=20=20=20=20=20=20=20=20=
insn(pcRelative(true,=20offset=20>>=2012,=20rd));=0A+-=20=20=20=20=20=20=20=
=20nopCortexA53Fix843419();=0A+=20=20=20=20=20}=0A+=20=0A+=20=20=20=20=20=
template<int=20datasize,=20SetFlags=20setFlags=20=3D=20DontSetFlags>=0A=
+@@=20-1390,7=20+1389,6=20@@=0A+=20=20=20=20=20ALWAYS_INLINE=20void=20=
madd(RegisterID=20rd,=20RegisterID=20rn,=20RegisterID=20rm,=20RegisterID=20=
ra)=0A+=20=20=20=20=20{=0A+=20=20=20=20=20=20=20=20=20CHECK_DATASIZE();=0A=
+-=20=20=20=20=20=20=20=20nopCortexA53Fix835769<datasize>();=0A+=20=20=20=
=20=20=20=20=20=20insn(dataProcessing3Source(DATASIZE,=20DataOp_MADD,=20=
rm,=20ra,=20rn,=20rd));=0A+=20=20=20=20=20}=0A+=20=0A+@@=20-1443,7=20=
+1441,6=20@@=0A+=20=20=20=20=20ALWAYS_INLINE=20void=20msub(RegisterID=20=
rd,=20RegisterID=20rn,=20RegisterID=20rm,=20RegisterID=20ra)=0A+=20=20=20=
=20=20{=0A+=20=20=20=20=20=20=20=20=20CHECK_DATASIZE();=0A+-=20=20=20=20=20=
=20=20=20nopCortexA53Fix835769<datasize>();=0A+=20=20=20=20=20=20=20=20=20=
insn(dataProcessing3Source(DATASIZE,=20DataOp_MSUB,=20rm,=20ra,=20rn,=20=
rd));=0A+=20=20=20=20=20}=0A+=20=0A+@@=20-1691,7=20+1688,6=20@@=0A+=20=0A=
+=20=20=20=20=20ALWAYS_INLINE=20void=20smaddl(RegisterID=20rd,=20=
RegisterID=20rn,=20RegisterID=20rm,=20RegisterID=20ra)=0A+=20=20=20=20=20=
{=0A+-=20=20=20=20=20=20=20=20nopCortexA53Fix835769<64>();=0A+=20=20=20=20=
=20=20=20=20=20insn(dataProcessing3Source(Datasize_64,=20DataOp_SMADDL,=20=
rm,=20ra,=20rn,=20rd));=0A+=20=20=20=20=20}=0A+=20=0A+@@=20-1702,7=20=
+1698,6=20@@=0A+=20=0A+=20=20=20=20=20ALWAYS_INLINE=20void=20=
smsubl(RegisterID=20rd,=20RegisterID=20rn,=20RegisterID=20rm,=20=
RegisterID=20ra)=0A+=20=20=20=20=20{=0A+-=20=20=20=20=20=20=20=20=
nopCortexA53Fix835769<64>();=0A+=20=20=20=20=20=20=20=20=20=
insn(dataProcessing3Source(Datasize_64,=20DataOp_SMSUBL,=20rm,=20ra,=20=
rn,=20rd));=0A+=20=20=20=20=20}=0A+=20=0A+@@=20-1960,7=20+1955,6=20@@=0A=
+=20=0A+=20=20=20=20=20ALWAYS_INLINE=20void=20umaddl(RegisterID=20rd,=20=
RegisterID=20rn,=20RegisterID=20rm,=20RegisterID=20ra)=0A+=20=20=20=20=20=
{=0A+-=20=20=20=20=20=20=20=20nopCortexA53Fix835769<64>();=0A+=20=20=20=20=
=20=20=20=20=20insn(dataProcessing3Source(Datasize_64,=20DataOp_UMADDL,=20=
rm,=20ra,=20rn,=20rd));=0A+=20=20=20=20=20}=0A+=20=0A+@@=20-1971,7=20=
+1965,6=20@@=0A+=20=0A+=20=20=20=20=20ALWAYS_INLINE=20void=20=
umsubl(RegisterID=20rd,=20RegisterID=20rn,=20RegisterID=20rm,=20=
RegisterID=20ra)=0A+=20=20=20=20=20{=0A+-=20=20=20=20=20=20=20=20=
nopCortexA53Fix835769<64>();=0A+=20=20=20=20=20=20=20=20=20=
insn(dataProcessing3Source(Datasize_64,=20DataOp_UMSUBL,=20rm,=20ra,=20=
rn,=20rd));=0A+=20=20=20=20=20}=0A+=20=0A+@@=20-3691,37=20+3684,6=20@@=0A=
+=20=20=20=20=20=20=20=20=20return=200x1e7e0000=20|=20(dn=20<<=205)=20|=20=
rd;=0A+=20=20=20=20=20}=0A+=20=0A+-=20=20=20=20//=20Workaround=20for=20=
Cortex-A53=20erratum=20(835769).=20Emit=20an=20extra=20nop=20if=20the=0A=
+-=20=20=20=20//=20last=20instruction=20in=20the=20buffer=20is=20a=20=
load,=20store=20or=20prefetch.=20Needed=0A+-=20=20=20=20//=20before=20=
64-bit=20multiply-accumulate=20instructions.=0A+-=20=20=20=20=
template<int=20datasize>=0A+-=20=20=20=20ALWAYS_INLINE=20void=20=
nopCortexA53Fix835769()=0A+-=20=20=20=20{=0A+-#if=20CPU(ARM64_CORTEXA53)=0A=
+-=20=20=20=20=20=20=20=20CHECK_DATASIZE();=0A+-=20=20=20=20=20=20=20=20=
if=20(datasize=20=3D=3D=2064)=20{=0A+-=20=20=20=20=20=20=20=20=20=20=20=20=
if=20(LIKELY(m_buffer.codeSize()=20>=3D=20sizeof(int32_t)))=20{=0A+-=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20//=20=46rom=20ARMv8=20=
Reference=20Manual,=20Section=20C4.1:=20the=20encoding=20of=20the=0A+-=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20//=20instructions=20in=20=
the=20Loads=20and=20stores=20instruction=20group=20is:=0A+-=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20//=20----=201-0-=20----=20----=20----=20=
----=20----=20----=0A+-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
if=20=
(UNLIKELY((*reinterpret_cast_ptr<int32_t*>(reinterpret_cast_ptr<char*>(m_b=
uffer.data())=20+=20m_buffer.codeSize()=20-=20sizeof(int32_t))=20&=20=
0x0a000000)=20=3D=3D=200x08000000))=0A+-=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20nop();=0A+-=20=20=20=20=20=20=20=20=20=20=20=20=
}=0A+-=20=20=20=20=20=20=20=20}=0A+-#endif=0A+-=20=20=20=20}=0A+-=0A+-=20=
=20=20=20//=20Workaround=20for=20Cortex-A53=20erratum=20(843419).=20Emit=20=
extra=20nops=20to=20avoid=0A+-=20=20=20=20//=20wrong=20address=20access=20=
after=20ADRP=20instruction.=0A+-=20=20=20=20ALWAYS_INLINE=20void=20=
nopCortexA53Fix843419()=0A+-=20=20=20=20{=0A+-#if=20CPU(ARM64_CORTEXA53)=0A=
+-=20=20=20=20=20=20=20=20nop();=0A+-=20=20=20=20=20=20=20=20nop();=0A+-=20=
=20=20=20=20=20=20=20nop();=0A+-#endif=0A+-=20=20=20=20}=0A+-=0A+=20=20=20=
=20=20Vector<LinkRecord,=200,=20UnsafeVectorOverflow>=20m_jumpsToLink;=0A=
+=20=20=20=20=20int=20m_indexOfLastWatchpoint;=0A+=20=20=20=20=20int=20=
m_indexOfTailOfLastWatchpoint;=0A+---=20=
a/Source/JavaScriptCore/offlineasm/arm64.rb=0A++++=20=
a/Source/JavaScriptCore/offlineasm/arm64.rb=0A+@@=20-351,33=20+351,6=20=
@@=0A+=20=20=20=20=20newList=0A+=20end=0A+=20=0A+-#=20Workaround=20for=20=
Cortex-A53=20erratum=20(835769)=0A+-def=20arm64CortexA53Fix835769(list)=0A=
+-=20=20=20=20newList=20=3D=20[]=0A+-=20=20=20=20lastOpcodeUnsafe=20=3D=20=
false=0A+-=0A+-=20=20=20=20list.each=20{=0A+-=20=20=20=20=20=20=20=20|=20=
node=20|=0A+-=20=20=20=20=20=20=20=20if=20node.is_a?=20Instruction=0A+-=20=
=20=20=20=20=20=20=20=20=20=20=20case=20node.opcode=0A+-=20=20=20=20=20=20=
=20=20=20=20=20=20when=20/^store/,=20/^load/=0A+-=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20#=20List=20all=20macro=20instructions=20that=20=
can=20be=20lowered=20to=20a=20load,=20store=20or=20prefetch=20ARM64=20=
assembly=20instruction=0A+-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
lastOpcodeUnsafe=20=3D=20true=0A+-=20=20=20=20=20=20=20=20=20=20=20=20=
when=20=20"muli",=20"mulp",=20"mulq",=20"smulli"=0A+-=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20#=20List=20all=20macro=20instructions=20that=20=
can=20be=20lowered=20to=20a=2064-bit=20multiply-accumulate=20ARM64=20=
assembly=20instruction=0A+-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
#=20(defined=20as=20one=20of=20MADD,=20MSUB,=20SMADDL,=20SMSUBL,=20=
UMADDL=20or=20UMSUBL).=0A+-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
if=20lastOpcodeUnsafe=0A+-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20newList=20<<=20Instruction.new(node.codeOrigin,=20=
"nopCortexA53Fix835769",=20[])=0A+-=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20end=0A+-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
lastOpcodeUnsafe=20=3D=20false=0A+-=20=20=20=20=20=20=20=20=20=20=20=20=
else=0A+-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
lastOpcodeUnsafe=20=3D=20false=0A+-=20=20=20=20=20=20=20=20=20=20=20=20=
end=0A+-=20=20=20=20=20=20=20=20end=0A+-=20=20=20=20=20=20=20=20newList=20=
<<=20node=0A+-=20=20=20=20}=0A+-=20=20=20=20newList=0A+-end=0A+=20=0A+=20=
class=20Sequence=0A+=20=20=20=20=20def=20getModifiedListARM64(result=20=3D=
=20@list)=0A+@@=20-470,7=20+443,6=20@@=0A+=20=20=20=20=20=20=20=20=20=
result=20=3D=20arm64FixSpecialRegisterArithmeticMode(result)=0A+=20=20=20=
=20=20=20=20=20=20result=20=3D=20assignRegistersToTemporaries(result,=20=
:gpr,=20ARM64_EXTRA_GPRS)=0A+=20=20=20=20=20=20=20=20=20result=20=3D=20=
assignRegistersToTemporaries(result,=20:fpr,=20ARM64_EXTRA_FPRS)=0A+-=20=20=
=20=20=20=20=20=20result=20=3D=20arm64CortexA53Fix835769(result)=0A+=20=20=
=20=20=20=20=20=20=20return=20result=0A+=20=20=20=20=20end=0A+=20end=0A=
+@@=20-1115,10=20+1087,6=20@@=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=
$asm.puts=20"bfi=20#{operands[3].arm64Operand(:quad)},=20=
#{operands[0].arm64Operand(:quad)},=20#{operands[1].value},=20=
#{operands[2].value}"=0A+=20=20=20=20=20=20=20=20=20when=20"pcrtoaddr"=0A=
+=20=20=20=20=20=20=20=20=20=20=20=20=20$asm.puts=20"adr=20=
#{operands[1].arm64Operand(:quad)},=20#{operands[0].value}"=0A+-=20=20=20=
=20=20=20=20=20when=20"nopCortexA53Fix835769"=0A+-=20=20=20=20=20=20=20=20=
=20=20=20=20$asm.putStr("#if=20CPU(ARM64_CORTEXA53)")=0A+-=20=20=20=20=20=
=20=20=20=20=20=20=20$asm.puts=20"nop"=0A+-=20=20=20=20=20=20=20=20=20=20=
=20=20$asm.putStr("#endif")=0A+=20=20=20=20=20=20=20=20=20when=20=
"globaladdr"=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20uid=20=3D=20=
$asm.newUID=0A+=20=0A+---=20=
a/Source/JavaScriptCore/offlineasm/instructions.rb=0A++++=20=
a/Source/JavaScriptCore/offlineasm/instructions.rb=0A+@@=20-354,7=20=
+354,6=20@@=0A+=20=20=20=20=20[=0A+=20=20=20=20=20=20"bfiq",=20#=20Bit=20=
field=20insert=20<source=20reg>=20<last=20bit=20written>=20<width=20=
immediate>=20<dest=20reg>=0A+=20=20=20=20=20=20"pcrtoaddr",=20=20=20#=20=
Address=20from=20PC=20relative=20offset=20-=20adr=20instruction=0A+-=20=20=
=20=20=20"nopFixCortexA53Err835769",=20#=20nop=20on=20Cortex-A53=20=
(nothing=20otherwise)=0A+=20=20=20=20=20=20"globaladdr",=0A+=20=20=20=20=20=
=20"divi",=0A+=20=20=20=20=20=20"divis",=0A+---=20=
a/Source/cmake/OptionsCommon.cmake=0A++++=20=
a/Source/cmake/OptionsCommon.cmake=0A+@@=20-19,32=20+19,6=20@@=0A+=20=
set_property(GLOBAL=20PROPERTY=20USE_FOLDERS=20ON)=0A+=20=
define_property(TARGET=20PROPERTY=20FOLDER=20INHERITED=20BRIEF_DOCS=20=
"folder"=20FULL_DOCS=20"IDE=20folder=20name")=0A+=20=0A+-#=20Detect=20=
Cortex-A53=20core=20if=20CPU=20is=20ARM64=20and=20OS=20is=20Linux.=0A+-#=20=
Query=20/proc/cpuinfo=20for=20each=20available=20core=20and=20check=20=
reported=20CPU=20part=20number:=200xd03=20signals=20Cortex-A53.=0A+-#=20=
(see=20Main=20ID=20Register=20in=20ARM=20Cortex-A53=20MPCore=20Processor=20=
Technical=20Reference=20Manual)=0A=
+-set(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE=20OFF)=0A+-if=20=
(WTF_CPU_ARM64=20AND=20(${CMAKE_SYSTEM_NAME}=20STREQUAL=20"Linux"))=0A+-=20=
=20=20=20execute_process(COMMAND=20nproc=20OUTPUT_VARIABLE=20PROC_COUNT)=0A=
+-=20=20=20=20math(EXPR=20PROC_MAX=20${PROC_COUNT}-1)=0A+-=20=20=20=20=
foreach=20(PROC_ID=20RANGE=20${PROC_MAX})=0A+-=20=20=20=20=20=20=20=20=
execute_process(COMMAND=20taskset=20-c=20${PROC_ID}=20grep=20"^CPU=20=
part"=20/proc/cpuinfo=20OUTPUT_VARIABLE=20PROC_PART)=0A+-=20=20=20=20=20=20=
=20=20if=20(PROC_PART=20MATCHES=20"0xd03")=0A+-=20=20=20=20=20=20=20=20=20=
=20=20=20set(WTF_CPU_ARM64_CORTEXA53_INITIALVALUE=20ON)=0A+-=20=20=20=20=20=
=20=20=20=20=20=20=20break=20()=0A+-=20=20=20=20=20=20=20=20endif=20()=0A=
+-=20=20=20=20endforeach=20()=0A+-endif=20()=0A=
+-option(WTF_CPU_ARM64_CORTEXA53=20"Enable=20Cortex-A53-specific=20code=20=
paths"=20${WTF_CPU_ARM64_CORTEXA53_INITIALVALUE})=0A+-=0A+-if=20=
(WTF_CPU_ARM64_CORTEXA53)=0A+-=20=20=20=20if=20(NOT=20WTF_CPU_ARM64)=0A=
+-=20=20=20=20=20=20=20=20message(FATAL_ERROR=20"WTF_CPU_ARM64_CORTEXA53=20=
set=20without=20WTF_CPU_ARM64")=0A+-=20=20=20=20endif=20()=0A+-=20=20=20=20=
WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-mfix-cortex-a53-835769)=0A+-endif=20=
()=0A+-=0A+-EXPOSE_VARIABLE_TO_BUILD(WTF_CPU_ARM64_CORTEXA53)=0A+-=0A+=20=
set(ARM_TRADITIONAL_DETECTED=20FALSE)=0A+=20if=20(WTF_CPU_ARM)=0A+=20=20=20=
=20=20set(ARM_THUMB2_TEST_SOURCE=0Adiff=20--git=20a/gnu/packages/qt.scm=20=
b/gnu/packages/qt.scm=0Aindex=208696dc4bb6..a1e7684964=20100644=0A---=20=
a/gnu/packages/qt.scm=0A+++=20b/gnu/packages/qt.scm=0A@@=20-15,6=20+15,7=20=
@@=0A=20;;;=20Copyright=20=C2=A9=202018=20John=20Soo=20<jsoo1@HIDDEN>=0A=
=20;;;=20Copyright=20=C2=A9=202020=20Mike=20Rosset=20=
<mike.rosset@HIDDEN>=0A=20;;;=20Copyright=20=C2=A9=202020=20Jakub=20=
K=C4=85dzio=C5=82ka=20<kuba@HIDDEN>=0A+;;;=20Copyright=20=C2=A9=20=
2020=20Brian=20C.=20Woodcox=20<bw@HIDDEN>=0A=20;;;=0A=20;;;=20=
This=20file=20is=20part=20of=20GNU=20Guix.=0A=20;;;=0A@@=20-485,6=20=
+486,7=20@@=20developers=20using=20C++=20or=20QML,=20a=20CSS=20&=20=
JavaScript=20like=20language.")=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20"-no-compile-examples"=0A=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20;;=20Most=20"-system-..."=20are=20automatic,=20but=20=
some=20use=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20;;=20=
the=20bundled=20copy=20by=20default.=0A+=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20"-opengl"=20"es2"=0A=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20"-system-sqlite"=0A=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20"-system-harfbuzz"=0A=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20"-system-pcre"=0Adiff=20--git=20=
a/gnu/packages/webkit.scm=20b/gnu/packages/webkit.scm=0Aindex=20=
2c8697223c..8e9d5d7d05=20100644=0A---=20a/gnu/packages/webkit.scm=0A+++=20=
b/gnu/packages/webkit.scm=0A@@=20-6,6=20+6,7=20@@=0A=20;;;=20Copyright=20=
=C2=A9=202018,=202019=20Tobias=20Geerinckx-Rice=20<me@HIDDEN>=0A=20=
;;;=20Copyright=20=C2=A9=202018=20Pierre=20Neidhardt=20=
<mail@HIDDEN>=0A=20;;;=20Copyright=20=C2=A9=202019=20Marius=20=
Bakke=20<mbakke@HIDDEN>=0A+;;;=20Copyright=20=C2=A9=202020=20Brian=20=
C.=20Woodcox=20<bw@HIDDEN>=0A=20;;;=0A=20;;;=20This=20file=20is=20=
part=20of=20GNU=20Guix.=0A=20;;;=0A@@=20-128,7=20+129,9=20@@=20engine=20=
that=20uses=20Wayland=20for=20graphics=20output.")=0A=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20"webkitgtk-"=20version=20".tar.xz"))=0A=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20(sha256=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20(base32=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
"12qfs9w93c5kiyi14ynm4rf4ad3c213dvzmdrc9c3ab2iwbks7rn"))))=0A+=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=
"12qfs9w93c5kiyi14ynm4rf4ad3c213dvzmdrc9c3ab2iwbks7rn"))=0A+=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20(patches=0A+=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20(search-patches=20"webkitgtk-2.28.0-fix-bug-197192.patch"))))=0A=
=20=20=20=20=20(build-system=20cmake-build-system)=0A=20=20=20=20=20=
(outputs=20'("out"=20"doc"))=0A=20=20=20=20=20(arguments=0A--=20=0A=
2.25.1=0A=0A=
--Apple-Mail=_CEF45708-8A2F-4C92-8041-D3733640AD79
Content-Transfer-Encoding: 7bit
Content-Type: text/html;
charset=us-ascii
<html><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;"><head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii"></head><div><div></div></div></body></html>
--Apple-Mail=_CEF45708-8A2F-4C92-8041-D3733640AD79
Content-Disposition: attachment;
filename=config.scm
Content-Type: application/octet-stream;
x-unix-mode=0644;
name="config.scm"
Content-Transfer-Encoding: 7bit
;; This is an operating system configuration template
;; for a "bare bones" pinebook pro
;; The default image's kernel 4.4.190 has
;; microSD: /dev/mmcblk0
;; eMMC: /dev/mmcblk1
;;
;; Note that after booting the Guix System with linux-libre
;; 5.5-pinebook-pro this changes to
;; microSD: /dev/mmcblk1
;; eMMC: /dev/mmcblk2
;; Assuming https://gitlab.com/janneke/guix.git wip-pinebook-pro
;; has been built in .
;; cp gnu/system/examples/pinebook-pro.tmpl arm-baar.scm
;; sudo -E ./pre-inst-env guix system init arm-baar.scm /mnt --fallback
(use-modules (gnu) (gnu bootloader u-boot))
(use-service-modules avahi desktop networking ssh databases)
(use-package-modules admin bootloaders certs linux ssh)
(operating-system
(host-name "armbook")
(timezone "America/Edmonton")
(locale "en_GB.utf8")
;; Assuming not using a typewriter that needs qwerty slowdown
;;(keyboard-layout (keyboard-layout "us" "qwerty"
;; #:options '("ctrl:nocaps" "compose:menu")))
;; Assuming /dev/mmcblk0 is the microSD...
(bootloader (bootloader-configuration
(target "/dev/mmcblk0")
(bootloader u-boot-pinebook-pro-rk3399-bootloader)))
;; ...and after booting, /dev/mmcblk1p1 is the root file system
(file-systems (cons* (file-system (device "/dev/mmcblk1p1")
(mount-point "/")
(type "ext4"))
%base-file-systems))
(kernel linux-libre-pinebook-pro)
(kernel-arguments '("ethaddr=${ethaddr}" "eth1addr=${eth1addr}" "serial=${serial#}"
"video=HDMI-A-1:1920x1080@60" "video=eDP-1:1920x1080@60"
"vga=current"))
(initrd-modules '())
(users (cons* (user-account (name "me")
(comment "My GuixOS")
(group "users")
(supplementary-groups '("wheel" "netdev"
"audio" "video"))
(home-directory "/home/me"))
%base-user-accounts))
(name-service-switch %mdns-host-lookup-nss)
(packages (cons* nss-certs openssh wpa-supplicant-minimal %base-packages))
(services (cons* (service xfce-desktop-service-type)
(service openssh-service-type
(openssh-configuration
(port-number 4849)))
(service mongodb-service-type)
%desktop-services)))
--Apple-Mail=_CEF45708-8A2F-4C92-8041-D3733640AD79
Content-Transfer-Encoding: 7bit
Content-Type: text/html;
charset=us-ascii
<html><head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div class=""><div class=""><br class="">
</div></div></body></html>
--Apple-Mail=_CEF45708-8A2F-4C92-8041-D3733640AD79--
--Apple-Mail=_117939A4-A5F4-4A8C-8357-C454B29C6639--
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Brian Woodcox <bw@HIDDEN> Subject: bug#40835: Acknowledgement ([PATCH] Update to use panfrost for graphics hardware acceleration) Message-ID: <handler.40835.B.158777277921116.ack <at> debbugs.gnu.org> References: <54EFA16B-27F2-40F4-8FF0-F59BC65BF8AB@HIDDEN> X-Gnu-PR-Message: ack 40835 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 40835 <at> debbugs.gnu.org Date: Sat, 25 Apr 2020 00:00:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 40835 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 40835: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D40835 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN
Subject: [bug#40835] [PATCH] Update to use panfrost for graphics hardware acceleration
Resent-From: Vagrant Cascadian <vagrant@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 27 Apr 2020 18:16:02 +0000
Resent-Message-ID: <handler.40835.B40835.158801131816725 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 40835
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Brian Woodcox <bw@HIDDEN>, 40835 <at> debbugs.gnu.org
Received: via spool by 40835-submit <at> debbugs.gnu.org id=B40835.158801131816725
(code B ref 40835); Mon, 27 Apr 2020 18:16:02 +0000
Received: (at 40835) by debbugs.gnu.org; 27 Apr 2020 18:15:18 +0000
Received: from localhost ([127.0.0.1]:38065 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1jT8Hm-0004Lf-5r
for submit <at> debbugs.gnu.org; Mon, 27 Apr 2020 14:15:18 -0400
Received: from cascadia.aikidev.net ([173.255.214.101]:42342)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <vagrant@HIDDEN>) id 1jT8Hk-0004LR-5c
for 40835 <at> debbugs.gnu.org; Mon, 27 Apr 2020 14:15:16 -0400
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:21:21:0:100e])
(Authenticated sender: vagrant@HIDDEN)
by cascadia.aikidev.net (Postfix) with ESMTPSA id E66CE1A9BD;
Mon, 27 Apr 2020 11:15:08 -0700 (PDT)
From: Vagrant Cascadian <vagrant@HIDDEN>
In-Reply-To: <54EFA16B-27F2-40F4-8FF0-F59BC65BF8AB@HIDDEN>
References: <54EFA16B-27F2-40F4-8FF0-F59BC65BF8AB@HIDDEN>
Date: Mon, 27 Apr 2020 11:15:02 -0700
Message-ID: <87lfmgvlqx.fsf@ponder>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
On 2020-04-24, Brian Woodcox wrote:
> These patches add the panfrost graphics acceleration for the Pinebook
> Pro laptop.
Thanks! Been working with the pinebook pro for some months now running
guix, and it's great to see others making progress on it. :)
> You need to edit the /boot/extlinux/extlinux.conf file on the SD card and=
alter the FDTDIR line.
>
> I changed mine from
>
> FDTDIR /gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebook-p=
ro-5.6.0/lib/dtbs
>
> to
>
> FDTDIR /gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebook-p=
ro-5.6.0/lib/dtbs/rockchip
The u-boot-pinebook-pro-rk3399 on guix master works correctly as well as
the one from wip-pinebook-pro (should be the same).
This seems like your u-boot does not contain the correct value for
"fdtfile". It should be rockchip/rk3399-pinebook-pro.dtb. Are you
actually running an older u-boot? Did you at any point run saveenv from
u-boot, which saves the old u-boot configuration with an inappropriate
fdtfile variable?
It would be better to split up your patches into a separate patch
series, it is hard to review as one single large patch changing many
things.
A few targeted comments below...
> diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
> index 01241cd88e..65fe389927 100644
> --- a/gnu/packages/gl.scm
> +++ b/gnu/packages/gl.scm
> @@ -293,7 +294,7 @@ also known as DXTn or DXTC) for Mesa.")
> '(,@(match (%current-system)
> ((or "armhf-linux" "aarch64-linux")
> ;; TODO: Fix svga driver for aarch64 and armhf.
> - '("-Dgallium-drivers=3Detnaviv,freedreno,nouveau,r300,r600=
,swrast,tegra,v3d,vc4,virgl"))
> + '("-Dgallium-drivers=3Detnaviv,freedreno,kmsro,lima,nouvea=
u,panfrost,r300,r600,swrast,tegra,v3d,vc4,virgl"))
> (_
> '("-Dgallium-drivers=3Diris,nouveau,r300,r600,radeonsi,svg=
a,swrast,virgl")))
> ;; Enable various optional features. TODO: opencl requires lib=
clc,
This last part of your mesa patch is already on core-updates. Looking
forward to when the rest is properly supported upstream!
> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
> index dd088ea24f..d4a36533ab 100644
> --- a/gnu/packages/linux.scm
> +++ b/gnu/packages/linux.scm
> @@ -326,7 +327,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the =
given DEBLOB-SCRIPTS."
> (with-directory-excursion dir
> (setenv "PYTHON" (which "python"))
> (format #t "Running deblob script...~%")
> - (force-output)
> + (force-output))
> (invoke "/tmp/bin/deblob"))
>=20
> (format #t "~%Packing new Linux-libre tarball...~%")
This looks like leftovers from your hack breaking linux-libre :P
> @@ -604,6 +605,7 @@ for ARCH and optionally VARIANT, or #f if there is no=
such configuration."
> ("CONFIG_SECURITY_DMESG_RESTRICT" . #t)
> ;; All kernels should have NAMESPACES options enabled
> ("CONFIG_NAMESPACES" . #t)
> + ("CONFIG_DRM_PANFROST" . #t)
> ("CONFIG_UTS_NS" . #t)
> ("CONFIG_IPC_NS" . #t)
> ("CONFIG_USER_NS" . #t)
This obviously can't be enabled on all architectures. In the
linux-libre-arm64-generic and linux-libre-pinebook-pro kernels it's
already enabled as a module.
It obviously makes debugging easier to be available earlier, but it also
bloats platforms that do not use this driver.
> diff --git a/gnu/packages/patches/mesa-skip-disk-cache-test.patch b/gnu/p=
ackages/patches/mesa-skip-disk-cache-test.patch
> index 190f6b6ee1..585bf4f648 100644
> --- a/gnu/packages/patches/mesa-skip-disk-cache-test.patch
> +++ b/gnu/packages/patches/mesa-skip-disk-cache-test.patch
> @@ -1,11 +1,6 @@
> -disk_cache_create() here looks up the users home directory from <pwd.h>
> -which resolves to "/" in the build environment. I could not find an easy
> -way to set the home directory to something else, so we disable this test
> -for now.
> -
> --- a/src/compiler/glsl/tests/cache_test.c
> +++ b/src/compiler/glsl/tests/cache_test.c
> -@@ -170,11 +170,6 @@
> +@@ -219,11 +219,6 @@
> unsetenv("MESA_GLSL_CACHE_DIR");
> unsetenv("XDG_CACHE_HOME");
=20=20
This removes a comment from the refreshed patch; I presume the comment
is still appropriate, though?
> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
> index 8696dc4bb6..a1e7684964 100644
> --- a/gnu/packages/qt.scm
> +++ b/gnu/packages/qt.scm
> @@ -15,6 +15,7 @@
> ;;; Copyright =C2=A9 2018 John Soo <jsoo1@HIDDEN>
> ;;; Copyright =C2=A9 2020 Mike Rosset <mike.rosset@HIDDEN>
> ;;; Copyright =C2=A9 2020 Jakub K=C4=85dzio=C5=82ka <kuba@HIDDEN>
> +;;; Copyright =C2=A9 2020 Brian C. Woodcox <bw@HIDDEN>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -485,6 +486,7 @@ developers using C++ or QML, a CSS & JavaScript like =
language.")
> "-no-compile-examples"
> ;; Most "-system-..." are automatic, but some use
> ;; the bundled copy by default.
> + "-opengl" "es2"
> "-system-sqlite"
> "-system-harfbuzz"
> "-system-pcre"
This might break some things where a different opengl is the default,
some architectures or platforms may require a different opengl
implementation.
I seem to recall some conversations in Debian about the complexities
around which opengl to enable per-architecture or per-platform or ... a
complicated matrix of concerns.
live well,
vagrant
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCXqchKAAKCRDcUY/If5cW
qh2RAP0XldpeAu99ODtXvGqBfOOYFrM2LDvjwTbPAUyNwYNt7AD/UYsT4o6s75xF
0+KmvjyQ5x+anxSdqXsLlvKYkQHwxAI=
=Lf4B
-----END PGP SIGNATURE-----
--=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#40835] [PATCH] Update to use panfrost for graphics hardware acceleration
Resent-From: Brian Woodcox <bw@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 27 Apr 2020 21:19:01 +0000
Resent-Message-ID: <handler.40835.B40835.15880222892883 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 40835
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Vagrant Cascadian <vagrant@HIDDEN>
Cc: 40835 <at> debbugs.gnu.org
Received: via spool by 40835-submit <at> debbugs.gnu.org id=B40835.15880222892883
(code B ref 40835); Mon, 27 Apr 2020 21:19:01 +0000
Received: (at 40835) by debbugs.gnu.org; 27 Apr 2020 21:18:09 +0000
Received: from localhost ([127.0.0.1]:38245 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1jTB8j-0000kQ-4X
for submit <at> debbugs.gnu.org; Mon, 27 Apr 2020 17:18:09 -0400
Received: from mail.inskydata.com ([184.68.229.6]:47560
helo=server.inskydata.com)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <bw@HIDDEN>) id 1jTB8h-0000jp-Au
for 40835 <at> debbugs.gnu.org; Mon, 27 Apr 2020 17:18:08 -0400
Received: from [192.168.19.76] (unknown [192.168.19.76])
by server.inskydata.com (Postfix) with ESMTPSA id 1908D5D73B0E;
Mon, 27 Apr 2020 15:17:36 -0600 (MDT)
From: Brian Woodcox <bw@HIDDEN>
Message-Id: <65E1BABE-56D0-4F84-92A3-7C4238722FC3@HIDDEN>
Content-Type: multipart/alternative;
boundary="Apple-Mail=_6103C829-0C10-4CDB-B304-28E6203B07DB"
Mime-Version: 1.0 (Mac OS X Mail 11.3 \(3445.6.18\))
Date: Mon, 27 Apr 2020 15:17:34 -0600
In-Reply-To: <87lfmgvlqx.fsf@ponder>
References: <54EFA16B-27F2-40F4-8FF0-F59BC65BF8AB@HIDDEN>
<87lfmgvlqx.fsf@ponder>
X-Mailer: Apple Mail (2.3445.6.18)
X-Spam-Score: 0.4 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--Apple-Mail=_6103C829-0C10-4CDB-B304-28E6203B07DB
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
charset=utf-8
Hi Vagrant,
Sorry, this should have been applied to commit =
d4c6e06f369024efc63e11de1a5bacd3fe9f7e8d on the tip-pinebook-pro branch.
The rest of my answers below.
> On Apr 27, 2020, at 12:15 PM, Vagrant Cascadian <vagrant@HIDDEN> =
wrote:
>=20
> On 2020-04-24, Brian Woodcox wrote:
>> These patches add the panfrost graphics acceleration for the Pinebook
>> Pro laptop.
>=20
> Thanks! Been working with the pinebook pro for some months now running
> guix, and it's great to see others making progress on it. :)
>=20
>=20
>> You need to edit the /boot/extlinux/extlinux.conf file on the SD card =
and alter the FDTDIR line.
>>=20
>> I changed mine from
>>=20
>> FDTDIR =
/gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebook-pro-5.6.0=
/lib/dtbs
>>=20
>> to
>>=20
>> FDTDIR =
/gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebook-pro-5.6.0=
/lib/dtbs/rockchip
>=20
> The u-boot-pinebook-pro-rk3399 on guix master works correctly as well =
as
> the one from wip-pinebook-pro (should be the same).
>=20
> This seems like your u-boot does not contain the correct value for
> "fdtfile". It should be rockchip/rk3399-pinebook-pro.dtb. Are you
> actually running an older u-boot? Did you at any point run saveenv =
from
> u-boot, which saves the old u-boot configuration with an inappropriate
> fdtfile variable?
>=20
>=20
> It would be better to split up your patches into a separate patch
> series, it is hard to review as one single large patch changing many
> things.
>=20
I=E2=80=99m not sure what this problem is exactly. For some reason the =
rockchip folder is not being added
to the end of the patch for the FDTFILE, also, you do not need to =
actually specify the file as u-boot will
find it as long as it=E2=80=99s on the directory.
> A few targeted comments below...
>=20
>> diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
>> index 01241cd88e..65fe389927 100644
>> --- a/gnu/packages/gl.scm
>> +++ b/gnu/packages/gl.scm
>> @@ -293,7 +294,7 @@ also known as DXTn or DXTC) for Mesa.")
>> '(,@(match (%current-system)
>> ((or "armhf-linux" "aarch64-linux")
>> ;; TODO: Fix svga driver for aarch64 and armhf.
>> - =
'("-Dgallium-drivers=3Detnaviv,freedreno,nouveau,r300,r600,swrast,tegra,v3=
d,vc4,virgl"))
>> + =
'("-Dgallium-drivers=3Detnaviv,freedreno,kmsro,lima,nouveau,panfrost,r300,=
r600,swrast,tegra,v3d,vc4,virgl"))
>> (_
>> =
'("-Dgallium-drivers=3Diris,nouveau,r300,r600,radeonsi,svga,swrast,virgl")=
))
>> ;; Enable various optional features. TODO: opencl requires =
libclc,
>=20
> This last part of your mesa patch is already on core-updates. Looking
> forward to when the rest is properly supported upstream!
Okay, thanks.
>=20
>=20
>> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
>> index dd088ea24f..d4a36533ab 100644
>> --- a/gnu/packages/linux.scm
>> +++ b/gnu/packages/linux.scm
>> @@ -326,7 +327,7 @@ corresponding UPSTREAM-SOURCE (an origin), using =
the given DEBLOB-SCRIPTS."
>> (with-directory-excursion dir
>> (setenv "PYTHON" (which "python"))
>> (format #t "Running deblob script...~%")
>> - (force-output)
>> + (force-output))
>> (invoke "/tmp/bin/deblob"))
>>=20
>> (format #t "~%Packing new Linux-libre =
tarball...~%")
>=20
> This looks like leftovers from your hack breaking linux-libre :P
Doh, you are correct, my mistake. This should of course be left as the =
original code.
>=20
>=20
>> @@ -604,6 +605,7 @@ for ARCH and optionally VARIANT, or #f if there =
is no such configuration."
>> ("CONFIG_SECURITY_DMESG_RESTRICT" . #t)
>> ;; All kernels should have NAMESPACES options enabled
>> ("CONFIG_NAMESPACES" . #t)
>> + ("CONFIG_DRM_PANFROST" . #t)
>> ("CONFIG_UTS_NS" . #t)
>> ("CONFIG_IPC_NS" . #t)
>> ("CONFIG_USER_NS" . #t)
>=20
> This obviously can't be enabled on all architectures. In the
> linux-libre-arm64-generic and linux-libre-pinebook-pro kernels it's
> already enabled as a module.
>=20
> It obviously makes debugging easier to be available earlier, but it =
also
> bloats platforms that do not use this driver.
Okay.
>=20
>=20
>> diff --git a/gnu/packages/patches/mesa-skip-disk-cache-test.patch =
b/gnu/packages/patches/mesa-skip-disk-cache-test.patch
>> index 190f6b6ee1..585bf4f648 100644
>> --- a/gnu/packages/patches/mesa-skip-disk-cache-test.patch
>> +++ b/gnu/packages/patches/mesa-skip-disk-cache-test.patch
>> @@ -1,11 +1,6 @@
>> -disk_cache_create() here looks up the users home directory from =
<pwd.h>
>> -which resolves to "/" in the build environment. I could not find an =
easy
>> -way to set the home directory to something else, so we disable this =
test
>> -for now.
>> -
>> --- a/src/compiler/glsl/tests/cache_test.c
>> +++ b/src/compiler/glsl/tests/cache_test.c
>> -@@ -170,11 +170,6 @@
>> +@@ -219,11 +219,6 @@
>> unsetenv("MESA_GLSL_CACHE_DIR");
>> unsetenv("XDG_CACHE_HOME");
>=20
> This removes a comment from the refreshed patch; I presume the comment
> is still appropriate, though?
Yes, Patch should have been applied to =
d4c6e06f369024efc63e11de1a5bacd3fe9f7e8d as stated above.
>=20
>=20
>> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
>> index 8696dc4bb6..a1e7684964 100644
>> --- a/gnu/packages/qt.scm
>> +++ b/gnu/packages/qt.scm
>> @@ -15,6 +15,7 @@
>> ;;; Copyright =C2=A9 2018 John Soo <jsoo1@HIDDEN>
>> ;;; Copyright =C2=A9 2020 Mike Rosset <mike.rosset@HIDDEN>
>> ;;; Copyright =C2=A9 2020 Jakub K=C4=85dzio=C5=82ka =
<kuba@HIDDEN>
>> +;;; Copyright =C2=A9 2020 Brian C. Woodcox <bw@HIDDEN>
>> ;;;
>> ;;; This file is part of GNU Guix.
>> ;;;
>> @@ -485,6 +486,7 @@ developers using C++ or QML, a CSS & JavaScript =
like language.")
>> "-no-compile-examples"
>> ;; Most "-system-..." are automatic, but some use
>> ;; the bundled copy by default.
>> + "-opengl" "es2"
>> "-system-sqlite"
>> "-system-harfbuzz"
>> "-system-pcre"
>=20
> This might break some things where a different opengl is the default,
> some architectures or platforms may require a different opengl
> implementation.
>=20
> I seem to recall some conversations in Debian about the complexities
> around which opengl to enable per-architecture or per-platform or ... =
a
> complicated matrix of concerns.
Open to suggestions.
>=20
>=20
> live well,
> vagrant
Thanks for the feedback.
Brian.=
--Apple-Mail=_6103C829-0C10-4CDB-B304-28E6203B07DB
Content-Transfer-Encoding: quoted-printable
Content-Type: text/html;
charset=utf-8
<html><head><meta http-equiv=3D"Content-Type" content=3D"text/html; =
charset=3Dutf-8"></head><body style=3D"word-wrap: break-word; =
-webkit-nbsp-mode: space; line-break: after-white-space;" class=3D""><div =
class=3D""><div style=3D"text-align: start; text-indent: 0px; word-wrap: =
break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" =
class=3D""><div style=3D"color: rgb(0, 0, 0); letter-spacing: normal; =
text-transform: none; white-space: normal; word-spacing: 0px; =
-webkit-text-stroke-width: 0px; text-align: start; text-indent: 0px; =
word-wrap: break-word; -webkit-nbsp-mode: space; line-break: =
after-white-space;" class=3D"">Hi Vagrant,</div><div style=3D"color: =
rgb(0, 0, 0); letter-spacing: normal; text-transform: none; white-space: =
normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-align: =
start; text-indent: 0px; word-wrap: break-word; -webkit-nbsp-mode: =
space; line-break: after-white-space;" class=3D""><br =
class=3D""></div><div style=3D"text-align: start; text-indent: 0px; =
word-wrap: break-word; -webkit-nbsp-mode: space; line-break: =
after-white-space;" class=3D"">Sorry, this should have been applied to =
commit d4c6e06f369024efc63e11de1a5bacd3fe9f7e8d on the =
tip-pinebook-pro branch.</div><div style=3D"text-align: start; =
text-indent: 0px; word-wrap: break-word; -webkit-nbsp-mode: space; =
line-break: after-white-space;" class=3D""><br class=3D""></div><div =
style=3D"text-align: start; text-indent: 0px; word-wrap: break-word; =
-webkit-nbsp-mode: space; line-break: after-white-space;" class=3D"">The =
rest of my answers below.</div></div>
</div>
<div><br class=3D""><blockquote type=3D"cite" class=3D""><div =
class=3D"">On Apr 27, 2020, at 12:15 PM, Vagrant Cascadian <<a =
href=3D"mailto:vagrant@HIDDEN" class=3D"">vagrant@HIDDEN</a>> =
wrote:</div><br class=3D"Apple-interchange-newline"><div class=3D""><div =
class=3D"">On 2020-04-24, Brian Woodcox wrote:<br class=3D""><blockquote =
type=3D"cite" class=3D"">These patches add the panfrost graphics =
acceleration for the Pinebook<br class=3D"">Pro laptop.<br =
class=3D""></blockquote><br class=3D"">Thanks! Been working with the =
pinebook pro for some months now running<br class=3D"">guix, and it's =
great to see others making progress on it. :)<br class=3D""><br =
class=3D""><br class=3D""><blockquote type=3D"cite" class=3D"">You need =
to edit the /boot/extlinux/extlinux.conf file on the SD card and alter =
the FDTDIR line.<br class=3D""><br class=3D"">I changed mine from<br =
class=3D""><br class=3D"">FDTDIR =
/gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebook-pro-5.6.0=
/lib/dtbs<br class=3D""><br class=3D"">to<br class=3D""><br =
class=3D"">FDTDIR =
/gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebook-pro-5.6.0=
/lib/dtbs/rockchip<br class=3D""></blockquote><br class=3D"">The =
u-boot-pinebook-pro-rk3399 on guix master works correctly as well as<br =
class=3D"">the one from wip-pinebook-pro (should be the same).<br =
class=3D""><br class=3D"">This seems like your u-boot does not contain =
the correct value for<br class=3D"">"fdtfile". It should be =
rockchip/rk3399-pinebook-pro.dtb. Are you<br class=3D"">actually running =
an older u-boot? Did you at any point run saveenv from<br =
class=3D"">u-boot, which saves the old u-boot configuration with an =
inappropriate<br class=3D"">fdtfile variable?<br class=3D""><br =
class=3D""><br class=3D"">It would be better to split up your patches =
into a separate patch<br class=3D"">series, it is hard to review as one =
single large patch changing many<br class=3D"">things.<br class=3D""><br =
class=3D""></div></div></blockquote><div><br class=3D""></div><div>I=E2=80=
=99m not sure what this problem is exactly. For some reason the =
rockchip folder is not being added<br class=3D"">to the end of the patch =
for the FDTFILE, also, you do not need to actually specify the file as =
u-boot will<br class=3D"">find it as long as it=E2=80=99s on the =
directory.</div><div><br class=3D""></div><br class=3D""><blockquote =
type=3D"cite" class=3D""><div class=3D""><div class=3D"">A few targeted =
comments below...<br class=3D""><br class=3D""><blockquote type=3D"cite" =
class=3D"">diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm<br =
class=3D"">index 01241cd88e..65fe389927 100644<br class=3D"">--- =
a/gnu/packages/gl.scm<br class=3D"">+++ b/gnu/packages/gl.scm<br =
class=3D"">@@ -293,7 +294,7 @@ also known as DXTn or DXTC) for =
Mesa.")<br class=3D""> =
'(,@(match =
(%current-system)<br class=3D""> =
&n=
bsp;((or "armhf-linux" "aarch64-linux")<br class=3D""> =
&n=
bsp; ;; TODO: Fix svga driver for aarch64 and armhf.<br class=3D"">- =
&n=
bsp;'("-Dgallium-drivers=3Detnaviv,freedreno,nouveau,r300,r600,swrast,tegr=
a,v3d,vc4,virgl"))<br class=3D"">+ =
&n=
bsp;'("-Dgallium-drivers=3Detnaviv,freedreno,kmsro,lima,nouveau,panfrost,r=
300,r600,swrast,tegra,v3d,vc4,virgl"))<br class=3D""> =
&n=
bsp;(_<br class=3D""> =
&n=
bsp; '("-Dgallium-drivers=3Diris,nouveau,r300,r600,radeonsi,svga,swra=
st,virgl")))<br class=3D""> =
;; Enable various =
optional features. TODO: opencl requires libclc,<br =
class=3D""></blockquote><br class=3D"">This last part of your mesa patch =
is already on core-updates. Looking<br class=3D"">forward to when the =
rest is properly supported upstream!<br =
class=3D""></div></div></blockquote><div><br class=3D""></div><div>Okay, =
thanks.</div><br class=3D""><blockquote type=3D"cite" class=3D""><div =
class=3D""><div class=3D""><br class=3D""><br class=3D""><blockquote =
type=3D"cite" class=3D"">diff --git a/gnu/packages/linux.scm =
b/gnu/packages/linux.scm<br class=3D"">index dd088ea24f..d4a36533ab =
100644<br class=3D"">--- a/gnu/packages/linux.scm<br class=3D"">+++ =
b/gnu/packages/linux.scm<br class=3D"">@@ -326,7 +327,7 @@ corresponding =
UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."<br =
class=3D""> =
&n=
bsp; (with-directory-excursion dir<br =
class=3D""> =
&n=
bsp; (setenv "PYTHON" (which =
"python"))<br class=3D""> =
&n=
bsp; (format #t "Running deblob =
script...~%")<br class=3D"">- =
&n=
bsp; (force-output)<br class=3D"">+ =
&n=
bsp; (force-output))<br class=3D""> =
&n=
bsp; (invoke =
"/tmp/bin/deblob"))<br class=3D""><br class=3D""> =
&n=
bsp; (format #t "~%Packing new Linux-libre =
tarball...~%")<br class=3D""></blockquote><br class=3D"">This looks like =
leftovers from your hack breaking linux-libre :P<br =
class=3D""></div></div></blockquote><div><br class=3D""></div><div>Doh, =
you are correct, my mistake. This should of course be left as the =
original code.<br class=3D""></div><br class=3D""><blockquote =
type=3D"cite" class=3D""><div class=3D""><div class=3D""><br =
class=3D""><br class=3D""><blockquote type=3D"cite" class=3D"">@@ -604,6 =
+605,7 @@ for ARCH and optionally VARIANT, or #f if there is no such =
configuration."<br class=3D""> =
("CONFIG_SECURITY_DMESG_RESTRICT" . #t)<br =
class=3D""> ;; All kernels should have =
NAMESPACES options enabled<br class=3D""> =
("CONFIG_NAMESPACES" . #t)<br class=3D"">+ =
("CONFIG_DRM_PANFROST" . #t)<br class=3D""> =
("CONFIG_UTS_NS" . #t)<br class=3D""> =
("CONFIG_IPC_NS" . #t)<br class=3D""> =
("CONFIG_USER_NS" . #t)<br =
class=3D""></blockquote><br class=3D"">This obviously can't be enabled =
on all architectures. In the<br class=3D"">linux-libre-arm64-generic and =
linux-libre-pinebook-pro kernels it's<br class=3D"">already enabled as a =
module.<br class=3D""><br class=3D"">It obviously makes debugging easier =
to be available earlier, but it also<br class=3D"">bloats platforms that =
do not use this driver.<br class=3D""></div></div></blockquote><div><br =
class=3D""></div><div>Okay.</div><br class=3D""><blockquote type=3D"cite" =
class=3D""><div class=3D""><div class=3D""><br class=3D""><br =
class=3D""><blockquote type=3D"cite" class=3D"">diff --git =
a/gnu/packages/patches/mesa-skip-disk-cache-test.patch =
b/gnu/packages/patches/mesa-skip-disk-cache-test.patch<br class=3D"">index=
190f6b6ee1..585bf4f648 100644<br class=3D"">--- =
a/gnu/packages/patches/mesa-skip-disk-cache-test.patch<br class=3D"">+++ =
b/gnu/packages/patches/mesa-skip-disk-cache-test.patch<br class=3D"">@@ =
-1,11 +1,6 @@<br class=3D"">-disk_cache_create() here looks up the users =
home directory from <pwd.h><br class=3D"">-which resolves to "/" =
in the build environment. I could not find an easy<br class=3D"">-way to =
set the home directory to something else, so we disable this test<br =
class=3D"">-for now.<br class=3D"">-<br class=3D""> --- =
a/src/compiler/glsl/tests/cache_test.c<br class=3D""> +++ =
b/src/compiler/glsl/tests/cache_test.c<br class=3D"">-@@ -170,11 +170,6 =
@@<br class=3D"">+@@ -219,11 +219,6 @@<br class=3D""> =
unsetenv("MESA_GLSL_CACHE_DIR");<br class=3D""> =
unsetenv("XDG_CACHE_HOME");<br =
class=3D""></blockquote><br class=3D"">This removes a comment from the =
refreshed patch; I presume the comment<br class=3D"">is still =
appropriate, though?<br class=3D""></div></div></blockquote><div><br =
class=3D""></div><div>Yes, Patch should have been applied =
to d4c6e06f369024efc63e11de1a5bacd3fe9f7e8d as stated =
above.</div><br class=3D""><blockquote type=3D"cite" class=3D""><div =
class=3D""><div class=3D""><br class=3D""><br class=3D""><blockquote =
type=3D"cite" class=3D"">diff --git a/gnu/packages/qt.scm =
b/gnu/packages/qt.scm<br class=3D"">index 8696dc4bb6..a1e7684964 =
100644<br class=3D"">--- a/gnu/packages/qt.scm<br class=3D"">+++ =
b/gnu/packages/qt.scm<br class=3D"">@@ -15,6 +15,7 @@<br class=3D""> ;;; =
Copyright =C2=A9 2018 John Soo <<a href=3D"mailto:jsoo1@HIDDEN" =
class=3D"">jsoo1@HIDDEN</a>><br class=3D""> ;;; Copyright =C2=A9 =
2020 Mike Rosset <<a href=3D"mailto:mike.rosset@HIDDEN" =
class=3D"">mike.rosset@HIDDEN</a>><br class=3D""> ;;; Copyright =C2=A9=
2020 Jakub K=C4=85dzio=C5=82ka <<a href=3D"mailto:kuba@HIDDEN" =
class=3D"">kuba@HIDDEN</a>><br class=3D"">+;;; Copyright =C2=A9 =
2020 Brian C. Woodcox <<a href=3D"mailto:bw@HIDDEN" =
class=3D"">bw@HIDDEN</a>><br class=3D""> ;;;<br class=3D""> =
;;; This file is part of GNU Guix.<br class=3D""> ;;;<br class=3D"">@@ =
-485,6 +486,7 @@ developers using C++ or QML, a CSS & JavaScript =
like language.")<br class=3D""> =
&n=
bsp; "-no-compile-examples"<br class=3D""> =
&n=
bsp; ;; Most "-system-..." are automatic, but =
some use<br class=3D""> =
&n=
bsp; ;; the bundled copy by default.<br =
class=3D"">+ =
&n=
bsp; "-opengl" "es2"<br class=3D""> =
&n=
bsp; "-system-sqlite"<br class=3D""> =
&n=
bsp; "-system-harfbuzz"<br class=3D""> =
&n=
bsp; "-system-pcre"<br class=3D""></blockquote><br =
class=3D"">This might break some things where a different opengl is the =
default,<br class=3D"">some architectures or platforms may require a =
different opengl<br class=3D"">implementation.<br class=3D""><br =
class=3D"">I seem to recall some conversations in Debian about the =
complexities<br class=3D"">around which opengl to enable =
per-architecture or per-platform or ... a<br class=3D"">complicated =
matrix of concerns.<br class=3D""></div></div></blockquote><div><br =
class=3D""></div><div>Open to suggestions.</div><br class=3D""><blockquote=
type=3D"cite" class=3D""><div class=3D""><div class=3D""><br =
class=3D""><br class=3D"">live well,<br class=3D""> vagrant<br =
class=3D""></div></div></blockquote></div><br class=3D""><div =
class=3D""><br class=3D""></div><div class=3D"">Thanks for the =
feedback.</div><div class=3D""><br class=3D""></div><div =
class=3D"">Brian.</div></body></html>=
--Apple-Mail=_6103C829-0C10-4CDB-B304-28E6203B07DB--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#40835] [PATCH] Update to use panfrost for graphics hardware acceleration
Resent-From: Vagrant Cascadian <vagrant@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 27 Apr 2020 21:56:02 +0000
Resent-Message-ID: <handler.40835.B40835.158802450215341 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 40835
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Brian Woodcox <bw@HIDDEN>
Cc: 40835 <at> debbugs.gnu.org
Received: via spool by 40835-submit <at> debbugs.gnu.org id=B40835.158802450215341
(code B ref 40835); Mon, 27 Apr 2020 21:56:02 +0000
Received: (at 40835) by debbugs.gnu.org; 27 Apr 2020 21:55:02 +0000
Received: from localhost ([127.0.0.1]:38327 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1jTBiP-0003z9-Hd
for submit <at> debbugs.gnu.org; Mon, 27 Apr 2020 17:55:02 -0400
Received: from cascadia.aikidev.net ([173.255.214.101]:42630)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <vagrant@HIDDEN>) id 1jTBiN-0003yo-TU
for 40835 <at> debbugs.gnu.org; Mon, 27 Apr 2020 17:55:00 -0400
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:21:21:0:100e])
(Authenticated sender: vagrant@HIDDEN)
by cascadia.aikidev.net (Postfix) with ESMTPSA id B44471A9BD;
Mon, 27 Apr 2020 14:54:53 -0700 (PDT)
From: Vagrant Cascadian <vagrant@HIDDEN>
In-Reply-To: <65E1BABE-56D0-4F84-92A3-7C4238722FC3@HIDDEN>
References: <54EFA16B-27F2-40F4-8FF0-F59BC65BF8AB@HIDDEN>
<87lfmgvlqx.fsf@ponder> <65E1BABE-56D0-4F84-92A3-7C4238722FC3@HIDDEN>
Date: Mon, 27 Apr 2020 14:54:48 -0700
Message-ID: <87ftcovbkn.fsf@ponder>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
On 2020-04-27, Brian Woodcox wrote:
> Sorry, this should have been applied to commit
> d4c6e06f369024efc63e11de1a5bacd3fe9f7e8d on the tip-pinebook-pro
> branch.
Yeah, I got that!
>> On Apr 27, 2020, at 12:15 PM, Vagrant Cascadian <vagrant@HIDDEN> wro=
te:
>> On 2020-04-24, Brian Woodcox wrote:
>>> You need to edit the /boot/extlinux/extlinux.conf file on the SD card a=
nd alter the FDTDIR line.
>>>=20
>>> I changed mine from
>>>=20
>>> FDTDIR /gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebook=
-pro-5.6.0/lib/dtbs
>>>=20
>>> to
>>>=20
>>> FDTDIR /gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebook=
-pro-5.6.0/lib/dtbs/rockchip
>>=20
>> The u-boot-pinebook-pro-rk3399 on guix master works correctly as well as
>> the one from wip-pinebook-pro (should be the same).
Oops, my bad. I've been merging master and core-updates locally and
forgot the status of wip-pinebook-pro... I think I was waiting for the
core-updates merge, but it's probably worth merging master just to get
the updated u-boot-pinebook-pro-rk3399 based more closely on upstream
u-boot!
> I=E2=80=99m not sure what this problem is exactly. For some reason the
> rockchip folder is not being added to the end of the patch for the
> FDTFILE, also, you do not need to actually specify the file as u-boot
> will find it as long as it=E2=80=99s on the directory.
It's probably a bug in the u-boot fork that's still in wip-pinebook-pro.
>>> diff --git a/gnu/packages/patches/mesa-skip-disk-cache-test.patch b/gnu=
/packages/patches/mesa-skip-disk-cache-test.patch
>>> index 190f6b6ee1..585bf4f648 100644
>>> --- a/gnu/packages/patches/mesa-skip-disk-cache-test.patch
>>> +++ b/gnu/packages/patches/mesa-skip-disk-cache-test.patch
>>> @@ -1,11 +1,6 @@
>>> -disk_cache_create() here looks up the users home directory from <pwd.h>
>>> -which resolves to "/" in the build environment. I could not find an ea=
sy
>>> -way to set the home directory to something else, so we disable this te=
st
>>> -for now.
>>> -
>>> --- a/src/compiler/glsl/tests/cache_test.c
>>> +++ b/src/compiler/glsl/tests/cache_test.c
>>> -@@ -170,11 +170,6 @@
>>> +@@ -219,11 +219,6 @@
>>> unsetenv("MESA_GLSL_CACHE_DIR");
>>> unsetenv("XDG_CACHE_HOME");
>>=20
>> This removes a comment from the refreshed patch; I presume the comment
>> is still appropriate, though?
>
> Yes, Patch should have been applied to d4c6e06f369024efc63e11de1a5bacd3fe=
9f7e8d as stated above.
Regardless of which branch it applies to, the comment in this patch
should probably be kept, unless it's no longer relevent.
>>> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
>>> index 8696dc4bb6..a1e7684964 100644
>>> --- a/gnu/packages/qt.scm
>>> +++ b/gnu/packages/qt.scm
>>> @@ -15,6 +15,7 @@
>>> ;;; Copyright =C2=A9 2018 John Soo <jsoo1@HIDDEN>
>>> ;;; Copyright =C2=A9 2020 Mike Rosset <mike.rosset@HIDDEN>
>>> ;;; Copyright =C2=A9 2020 Jakub K=C4=85dzio=C5=82ka <kuba@HIDDEN>
>>> +;;; Copyright =C2=A9 2020 Brian C. Woodcox <bw@HIDDEN>
>>> ;;;
>>> ;;; This file is part of GNU Guix.
>>> ;;;
>>> @@ -485,6 +486,7 @@ developers using C++ or QML, a CSS & JavaScript lik=
e language.")
>>> "-no-compile-examples"
>>> ;; Most "-system-..." are automatic, but some use
>>> ;; the bundled copy by default.
>>> + "-opengl" "es2"
>>> "-system-sqlite"
>>> "-system-harfbuzz"
>>> "-system-pcre"
>>=20
>> This might break some things where a different opengl is the default,
>> some architectures or platforms may require a different opengl
>> implementation.
>>=20
>> I seem to recall some conversations in Debian about the complexities
>> around which opengl to enable per-architecture or per-platform or ... a
>> complicated matrix of concerns.
>
> Open to suggestions.
From=20what I remember there were no *good* options; to fix things for one
platforms, you break things for another. In guix it might be slightly
better off in that you can have variant pacakges more easily, though for
libraries this would mean variants for everything that uses it,
too... :/
Thanks for joining the guix on pinebook pro adventures!
live well,
vagrant
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCXqdUqAAKCRDcUY/If5cW
qpTsAP9DO30K0WcncEV/0RHA1BV0QrMmKgvnTFDG63p/mRONCgD/csHputJPxRzF
hP17vbzER8vtO9agzfcuKyXf1RE3rgE=
=PtR4
-----END PGP SIGNATURE-----
--=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#40835] [PATCH] Update to use panfrost for graphics hardware acceleration
Resent-From: Brian Woodcox <bw@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 27 Apr 2020 22:38:01 +0000
Resent-Message-ID: <handler.40835.B40835.158802704619880 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 40835
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Vagrant Cascadian <vagrant@HIDDEN>
Cc: 40835 <at> debbugs.gnu.org
Received: via spool by 40835-submit <at> debbugs.gnu.org id=B40835.158802704619880
(code B ref 40835); Mon, 27 Apr 2020 22:38:01 +0000
Received: (at 40835) by debbugs.gnu.org; 27 Apr 2020 22:37:26 +0000
Received: from localhost ([127.0.0.1]:38370 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1jTCNE-0005AM-S9
for submit <at> debbugs.gnu.org; Mon, 27 Apr 2020 18:37:26 -0400
Received: from mail.inskydata.com ([184.68.229.6]:39345
helo=server.inskydata.com)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <bw@HIDDEN>) id 1jTCNC-0005A8-Ok
for 40835 <at> debbugs.gnu.org; Mon, 27 Apr 2020 18:37:11 -0400
Received: from [192.168.19.76] (unknown [192.168.19.76])
by server.inskydata.com (Postfix) with ESMTPSA id 398B15D750A6;
Mon, 27 Apr 2020 16:36:41 -0600 (MDT)
Content-Type: text/plain;
charset=utf-8
Mime-Version: 1.0 (Mac OS X Mail 11.3 \(3445.6.18\))
From: Brian Woodcox <bw@HIDDEN>
In-Reply-To: <87ftcovbkn.fsf@ponder>
Date: Mon, 27 Apr 2020 16:36:39 -0600
Content-Transfer-Encoding: quoted-printable
Message-Id: <A9E9BDCE-576E-4760-97DE-3F9E00B05169@HIDDEN>
References: <54EFA16B-27F2-40F4-8FF0-F59BC65BF8AB@HIDDEN>
<87lfmgvlqx.fsf@ponder> <65E1BABE-56D0-4F84-92A3-7C4238722FC3@HIDDEN>
<87ftcovbkn.fsf@ponder>
X-Mailer: Apple Mail (2.3445.6.18)
X-Spam-Score: 0.4 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
> On Apr 27, 2020, at 3:54 PM, Vagrant Cascadian <vagrant@HIDDEN> =
wrote:
>=20
>=20
>>> On Apr 27, 2020, at 12:15 PM, Vagrant Cascadian <vagrant@HIDDEN> =
wrote:
>>> On 2020-04-24, Brian Woodcox wrote:
>>>> You need to edit the /boot/extlinux/extlinux.conf file on the SD =
card and alter the FDTDIR line.
>>>>=20
>>>> I changed mine from
>>>>=20
>>>> FDTDIR =
/gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebook-pro-5.6.0=
/lib/dtbs
>>>>=20
>>>> to
>>>>=20
>>>> FDTDIR =
/gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebook-pro-5.6.0=
/lib/dtbs/rockchip
>>>=20
>>> The u-boot-pinebook-pro-rk3399 on guix master works correctly as =
well as
>>> the one from wip-pinebook-pro (should be the same).
>=20
> Oops, my bad. I've been merging master and core-updates locally and
> forgot the status of wip-pinebook-pro... I think I was waiting for the
> core-updates merge, but it's probably worth merging master just to get
> the updated u-boot-pinebook-pro-rk3399 based more closely on upstream
> u-boot!
I would be happy to test that out when done!
>=20
>=20
>> I=E2=80=99m not sure what this problem is exactly. For some reason =
the
>> rockchip folder is not being added to the end of the patch for the
>> FDTFILE, also, you do not need to actually specify the file as u-boot
>> will find it as long as it=E2=80=99s on the directory.
>=20
> It's probably a bug in the u-boot fork that's still in =
wip-pinebook-pro.
>=20
>=20
>>>> diff --git a/gnu/packages/patches/mesa-skip-disk-cache-test.patch =
b/gnu/packages/patches/mesa-skip-disk-cache-test.patch
>>>> index 190f6b6ee1..585bf4f648 100644
>>>> --- a/gnu/packages/patches/mesa-skip-disk-cache-test.patch
>>>> +++ b/gnu/packages/patches/mesa-skip-disk-cache-test.patch
>>>> @@ -1,11 +1,6 @@
>>>> -disk_cache_create() here looks up the users home directory from =
<pwd.h>
>>>> -which resolves to "/" in the build environment. I could not find =
an easy
>>>> -way to set the home directory to something else, so we disable =
this test
>>>> -for now.
>>>> -
>>>> --- a/src/compiler/glsl/tests/cache_test.c
>>>> +++ b/src/compiler/glsl/tests/cache_test.c
>>>> -@@ -170,11 +170,6 @@
>>>> +@@ -219,11 +219,6 @@
>>>> unsetenv("MESA_GLSL_CACHE_DIR");
>>>> unsetenv("XDG_CACHE_HOME");
>>>=20
>>> This removes a comment from the refreshed patch; I presume the =
comment
>>> is still appropriate, though?
>>=20
>> Yes, Patch should have been applied to =
d4c6e06f369024efc63e11de1a5bacd3fe9f7e8d as stated above.
>=20
> Regardless of which branch it applies to, the comment in this patch
> should probably be kept, unless it's no longer relevent.
Okay, I have to admit I was confused by this. Turns out when I was =
debugging, I accidentally
removed the comment (or at least my fingers did). I didn=E2=80=99t =
realize that and now I know why it
appeared in the patch set. Thus my comment about being applied to the =
correct commit.
That=E2=80=99s what happens when you don=E2=80=99t think things through =
enough.
>=20
>=20
>>>> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
>>>> index 8696dc4bb6..a1e7684964 100644
>>>> --- a/gnu/packages/qt.scm
>>>> +++ b/gnu/packages/qt.scm
>>>> @@ -15,6 +15,7 @@
>>>> ;;; Copyright =C2=A9 2018 John Soo <jsoo1@HIDDEN>
>>>> ;;; Copyright =C2=A9 2020 Mike Rosset <mike.rosset@HIDDEN>
>>>> ;;; Copyright =C2=A9 2020 Jakub K=C4=85dzio=C5=82ka =
<kuba@HIDDEN>
>>>> +;;; Copyright =C2=A9 2020 Brian C. Woodcox <bw@HIDDEN>
>>>> ;;;
>>>> ;;; This file is part of GNU Guix.
>>>> ;;;
>>>> @@ -485,6 +486,7 @@ developers using C++ or QML, a CSS & JavaScript =
like language.")
>>>> "-no-compile-examples"
>>>> ;; Most "-system-..." are automatic, but some use
>>>> ;; the bundled copy by default.
>>>> + "-opengl" "es2"
>>>> "-system-sqlite"
>>>> "-system-harfbuzz"
>>>> "-system-pcre"
>>>=20
>>> This might break some things where a different opengl is the =
default,
>>> some architectures or platforms may require a different opengl
>>> implementation.
>>>=20
>>> I seem to recall some conversations in Debian about the complexities
>>> around which opengl to enable per-architecture or per-platform or =
... a
>>> complicated matrix of concerns.
>>=20
>> Open to suggestions.
>=20
> =46rom what I remember there were no *good* options; to fix things for =
one
> platforms, you break things for another. In guix it might be slightly
> better off in that you can have variant pacakges more easily, though =
for
> libraries this would mean variants for everything that uses it,
> too... :/
=46rom the different configuration files I=E2=80=99ve look at from other =
people,
it appears the patch could be done when the system is configured.
Does that sound like a better place to put it?
I don=E2=80=99t know how else to keep things from getting messy.
>=20
>=20
> Thanks for joining the guix on pinebook pro adventures!
>=20
>=20
> live well,
> vagrant
X-Loop: help-debbugs@HIDDEN
Subject: [bug#40835] [PATCH] Update to use panfrost for graphics hardware acceleration
Resent-From: Vagrant Cascadian <vagrant@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 27 Apr 2020 22:49:02 +0000
Resent-Message-ID: <handler.40835.B40835.158802773420941 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 40835
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Brian Woodcox <bw@HIDDEN>
Cc: 40835 <at> debbugs.gnu.org
Received: via spool by 40835-submit <at> debbugs.gnu.org id=B40835.158802773420941
(code B ref 40835); Mon, 27 Apr 2020 22:49:02 +0000
Received: (at 40835) by debbugs.gnu.org; 27 Apr 2020 22:48:54 +0000
Received: from localhost ([127.0.0.1]:38374 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1jTCYP-0005RV-2B
for submit <at> debbugs.gnu.org; Mon, 27 Apr 2020 18:48:54 -0400
Received: from cascadia.aikidev.net ([173.255.214.101]:42750)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <vagrant@HIDDEN>) id 1jTCYM-0005RI-PH
for 40835 <at> debbugs.gnu.org; Mon, 27 Apr 2020 18:48:43 -0400
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:21:21:0:100e])
(Authenticated sender: vagrant@HIDDEN)
by cascadia.aikidev.net (Postfix) with ESMTPSA id D0E761A9BD;
Mon, 27 Apr 2020 15:48:36 -0700 (PDT)
From: Vagrant Cascadian <vagrant@HIDDEN>
In-Reply-To: <A9E9BDCE-576E-4760-97DE-3F9E00B05169@HIDDEN>
References: <54EFA16B-27F2-40F4-8FF0-F59BC65BF8AB@HIDDEN>
<87lfmgvlqx.fsf@ponder> <65E1BABE-56D0-4F84-92A3-7C4238722FC3@HIDDEN>
<87ftcovbkn.fsf@ponder> <A9E9BDCE-576E-4760-97DE-3F9E00B05169@HIDDEN>
Date: Mon, 27 Apr 2020 15:48:29 -0700
Message-ID: <87d07sv936.fsf@ponder>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
On 2020-04-27, Brian Woodcox wrote:
>> On Apr 27, 2020, at 3:54 PM, Vagrant Cascadian <vagrant@HIDDEN> wrot=
e:
>>>> On Apr 27, 2020, at 12:15 PM, Vagrant Cascadian <vagrant@HIDDEN> w=
rote:
>>>> On 2020-04-24, Brian Woodcox wrote:
>>>>> You need to edit the /boot/extlinux/extlinux.conf file on the SD card=
and alter the FDTDIR line.
>>>>>=20
>>>>> I changed mine from
>>>>>=20
>>>>> FDTDIR /gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebo=
ok-pro-5.6.0/lib/dtbs
>>>>>=20
>>>>> to
>>>>>=20
>>>>> FDTDIR /gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebo=
ok-pro-5.6.0/lib/dtbs/rockchip
>>>>=20
>>>> The u-boot-pinebook-pro-rk3399 on guix master works correctly as well =
as
>>>> the one from wip-pinebook-pro (should be the same).
>>=20
>> Oops, my bad. I've been merging master and core-updates locally and
>> forgot the status of wip-pinebook-pro... I think I was waiting for the
>> core-updates merge, but it's probably worth merging master just to get
>> the updated u-boot-pinebook-pro-rk3399 based more closely on upstream
>> u-boot!
>
> I would be happy to test that out when done!
Will keep you posted. Once I've merged that, maybe you can rebase your
patch into a patch series?
>>>>> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
>>>>> index 8696dc4bb6..a1e7684964 100644
>>>>> --- a/gnu/packages/qt.scm
>>>>> +++ b/gnu/packages/qt.scm
>>>>> @@ -15,6 +15,7 @@
>>>>> ;;; Copyright =C2=A9 2018 John Soo <jsoo1@HIDDEN>
>>>>> ;;; Copyright =C2=A9 2020 Mike Rosset <mike.rosset@HIDDEN>
>>>>> ;;; Copyright =C2=A9 2020 Jakub K=C4=85dzio=C5=82ka <kuba@HIDDEN=
et>
>>>>> +;;; Copyright =C2=A9 2020 Brian C. Woodcox <bw@HIDDEN>
>>>>> ;;;
>>>>> ;;; This file is part of GNU Guix.
>>>>> ;;;
>>>>> @@ -485,6 +486,7 @@ developers using C++ or QML, a CSS & JavaScript l=
ike language.")
>>>>> "-no-compile-examples"
>>>>> ;; Most "-system-..." are automatic, but some use
>>>>> ;; the bundled copy by default.
>>>>> + "-opengl" "es2"
>>>>> "-system-sqlite"
>>>>> "-system-harfbuzz"
>>>>> "-system-pcre"
>>>>=20
>>>> This might break some things where a different opengl is the default,
>>>> some architectures or platforms may require a different opengl
>>>> implementation.
>>>>=20
>>>> I seem to recall some conversations in Debian about the complexities
>>>> around which opengl to enable per-architecture or per-platform or ... a
>>>> complicated matrix of concerns.
>>>=20
>>> Open to suggestions.
>>=20
>> From what I remember there were no *good* options; to fix things for one
>> platforms, you break things for another. In guix it might be slightly
>> better off in that you can have variant pacakges more easily, though for
>> libraries this would mean variants for everything that uses it,
>> too... :/
>
> From the different configuration files I=E2=80=99ve look at from other pe=
ople,
> it appears the patch could be done when the system is configured.
> Does that sound like a better place to put it?
>
> I don=E2=80=99t know how else to keep things from getting messy.
Yeah, runtime detection is definitely the best option, if it's possible!
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCXqdhPwAKCRDcUY/If5cW
qobdAQCKrQhA82m+xCKeZXnT0zbBQYP+sxgXhy8eZFjfwDUcKQEAizd/oVcf//En
27pzYxI3uuJx4cmVBzoUz3RgnsIbHgo=
=FTNg
-----END PGP SIGNATURE-----
--=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#40835] [PATCH] Update to use panfrost for graphics hardware acceleration
Resent-From: Brian Woodcox <bw@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 27 Apr 2020 22:53:02 +0000
Resent-Message-ID: <handler.40835.B40835.158802792321258 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 40835
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Vagrant Cascadian <vagrant@HIDDEN>
Cc: 40835 <at> debbugs.gnu.org
Received: via spool by 40835-submit <at> debbugs.gnu.org id=B40835.158802792321258
(code B ref 40835); Mon, 27 Apr 2020 22:53:02 +0000
Received: (at 40835) by debbugs.gnu.org; 27 Apr 2020 22:52:03 +0000
Received: from localhost ([127.0.0.1]:38378 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1jTCba-0005Wo-VD
for submit <at> debbugs.gnu.org; Mon, 27 Apr 2020 18:52:03 -0400
Received: from mail.inskydata.com ([184.68.229.6]:43967
helo=server.inskydata.com)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <bw@HIDDEN>) id 1jTCbZ-0005WD-8v
for 40835 <at> debbugs.gnu.org; Mon, 27 Apr 2020 18:52:01 -0400
Received: from [192.168.19.76] (unknown [192.168.19.76])
by server.inskydata.com (Postfix) with ESMTPSA id 1CDB35D75475;
Mon, 27 Apr 2020 16:51:31 -0600 (MDT)
From: Brian Woodcox <bw@HIDDEN>
Message-Id: <9E35E769-6C29-4FB3-8AA7-E975F819ABE0@HIDDEN>
Content-Type: multipart/alternative;
boundary="Apple-Mail=_E80E743A-7224-4AC2-A5EB-02EE5D7CBAD4"
Mime-Version: 1.0 (Mac OS X Mail 11.3 \(3445.6.18\))
Date: Mon, 27 Apr 2020 16:51:29 -0600
In-Reply-To: <87d07sv936.fsf@ponder>
References: <54EFA16B-27F2-40F4-8FF0-F59BC65BF8AB@HIDDEN>
<87lfmgvlqx.fsf@ponder> <65E1BABE-56D0-4F84-92A3-7C4238722FC3@HIDDEN>
<87ftcovbkn.fsf@ponder> <A9E9BDCE-576E-4760-97DE-3F9E00B05169@HIDDEN>
<87d07sv936.fsf@ponder>
X-Mailer: Apple Mail (2.3445.6.18)
X-Spam-Score: 0.4 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--Apple-Mail=_E80E743A-7224-4AC2-A5EB-02EE5D7CBAD4
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
charset=us-ascii
> On Apr 27, 2020, at 4:48 PM, Vagrant Cascadian <vagrant@HIDDEN> =
wrote:
>=20
> On 2020-04-27, Brian Woodcox wrote:
>>> On Apr 27, 2020, at 3:54 PM, Vagrant Cascadian <vagrant@HIDDEN> =
wrote:
>>>>> On Apr 27, 2020, at 12:15 PM, Vagrant Cascadian =
<vagrant@HIDDEN> wrote:
>>>>> On 2020-04-24, Brian Woodcox wrote:
>>>>>> You need to edit the /boot/extlinux/extlinux.conf file on the SD =
card and alter the FDTDIR line.
>>>>>>=20
>>>>>> I changed mine from
>>>>>>=20
>>>>>> FDTDIR =
/gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebook-pro-5.6.0=
/lib/dtbs
>>>>>>=20
>>>>>> to
>>>>>>=20
>>>>>> FDTDIR =
/gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebook-pro-5.6.0=
/lib/dtbs/rockchip
>>>>>=20
>>>>> The u-boot-pinebook-pro-rk3399 on guix master works correctly as =
well as
>>>>> the one from wip-pinebook-pro (should be the same).
>>>=20
>>> Oops, my bad. I've been merging master and core-updates locally and
>>> forgot the status of wip-pinebook-pro... I think I was waiting for =
the
>>> core-updates merge, but it's probably worth merging master just to =
get
>>> the updated u-boot-pinebook-pro-rk3399 based more closely on =
upstream
>>> u-boot!
>>=20
>> I would be happy to test that out when done!
>=20
> Will keep you posted. Once I've merged that, maybe you can rebase your
> patch into a patch series?
>=20
Sounds good. I will do that.
--Apple-Mail=_E80E743A-7224-4AC2-A5EB-02EE5D7CBAD4
Content-Transfer-Encoding: quoted-printable
Content-Type: text/html;
charset=us-ascii
<html><head><meta http-equiv=3D"Content-Type" content=3D"text/html; =
charset=3Dus-ascii"></head><body style=3D"word-wrap: break-word; =
-webkit-nbsp-mode: space; line-break: after-white-space;" class=3D""><div =
class=3D""><div style=3D"color: rgb(0, 0, 0); letter-spacing: normal; =
text-align: start; text-indent: 0px; text-transform: none; white-space: =
normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; word-wrap: =
break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" =
class=3D""><div style=3D"color: rgb(0, 0, 0); letter-spacing: normal; =
text-align: start; text-indent: 0px; text-transform: none; white-space: =
normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; word-wrap: =
break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" =
class=3D""><div class=3D""><br =
class=3D""></div></div></div></div><div><blockquote type=3D"cite" =
class=3D""><div class=3D"">On Apr 27, 2020, at 4:48 PM, Vagrant =
Cascadian <<a href=3D"mailto:vagrant@HIDDEN" =
class=3D"">vagrant@HIDDEN</a>> wrote:</div><br =
class=3D"Apple-interchange-newline"><div class=3D""><span =
style=3D"caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: =
12px; font-style: normal; font-variant-caps: normal; font-weight: =
normal; letter-spacing: normal; text-align: start; text-indent: 0px; =
text-transform: none; white-space: normal; word-spacing: 0px; =
-webkit-text-stroke-width: 0px; text-decoration: none; float: none; =
display: inline !important;" class=3D"">On 2020-04-27, Brian Woodcox =
wrote:</span><br style=3D"caret-color: rgb(0, 0, 0); font-family: =
Helvetica; font-size: 12px; font-style: normal; font-variant-caps: =
normal; font-weight: normal; letter-spacing: normal; text-align: start; =
text-indent: 0px; text-transform: none; white-space: normal; =
word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: =
none;" class=3D""><blockquote type=3D"cite" style=3D"font-family: =
Helvetica; font-size: 12px; font-style: normal; font-variant-caps: =
normal; font-weight: normal; letter-spacing: normal; orphans: auto; =
text-align: start; text-indent: 0px; text-transform: none; white-space: =
normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; =
-webkit-text-stroke-width: 0px; text-decoration: none;" =
class=3D""><blockquote type=3D"cite" class=3D"">On Apr 27, 2020, at 3:54 =
PM, Vagrant Cascadian <<a href=3D"mailto:vagrant@HIDDEN" =
class=3D"">vagrant@HIDDEN</a>> wrote:<br class=3D""><blockquote =
type=3D"cite" class=3D""><blockquote type=3D"cite" class=3D"">On Apr 27, =
2020, at 12:15 PM, Vagrant Cascadian <<a =
href=3D"mailto:vagrant@HIDDEN" class=3D"">vagrant@HIDDEN</a>> =
wrote:<br class=3D"">On 2020-04-24, Brian Woodcox wrote:<br =
class=3D""><blockquote type=3D"cite" class=3D"">You need to edit the =
/boot/extlinux/extlinux.conf file on the SD card and alter the FDTDIR =
line.<br class=3D""><br class=3D"">I changed mine from<br class=3D""><br =
class=3D"">FDTDIR =
/gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebook-pro-5.6.0=
/lib/dtbs<br class=3D""><br class=3D"">to<br class=3D""><br =
class=3D"">FDTDIR =
/gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebook-pro-5.6.0=
/lib/dtbs/rockchip<br class=3D""></blockquote><br class=3D"">The =
u-boot-pinebook-pro-rk3399 on guix master works correctly as well as<br =
class=3D"">the one from wip-pinebook-pro (should be the same).<br =
class=3D""></blockquote></blockquote><br class=3D"">Oops, my bad. I've =
been merging master and core-updates locally and<br class=3D"">forgot =
the status of wip-pinebook-pro... I think I was waiting for the<br =
class=3D"">core-updates merge, but it's probably worth merging master =
just to get<br class=3D"">the updated u-boot-pinebook-pro-rk3399 based =
more closely on upstream<br class=3D"">u-boot!<br =
class=3D""></blockquote><br class=3D"">I would be happy to test that out =
when done!<br class=3D""></blockquote><br style=3D"caret-color: rgb(0, =
0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; =
font-variant-caps: normal; font-weight: normal; letter-spacing: normal; =
text-align: start; text-indent: 0px; text-transform: none; white-space: =
normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; =
text-decoration: none;" class=3D""><span style=3D"caret-color: rgb(0, 0, =
0); font-family: Helvetica; font-size: 12px; font-style: normal; =
font-variant-caps: normal; font-weight: normal; letter-spacing: normal; =
text-align: start; text-indent: 0px; text-transform: none; white-space: =
normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; =
text-decoration: none; float: none; display: inline !important;" =
class=3D"">Will keep you posted. Once I've merged that, maybe you can =
rebase your</span><br style=3D"caret-color: rgb(0, 0, 0); font-family: =
Helvetica; font-size: 12px; font-style: normal; font-variant-caps: =
normal; font-weight: normal; letter-spacing: normal; text-align: start; =
text-indent: 0px; text-transform: none; white-space: normal; =
word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: =
none;" class=3D""><span style=3D"caret-color: rgb(0, 0, 0); font-family: =
Helvetica; font-size: 12px; font-style: normal; font-variant-caps: =
normal; font-weight: normal; letter-spacing: normal; text-align: start; =
text-indent: 0px; text-transform: none; white-space: normal; =
word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: =
none; float: none; display: inline !important;" class=3D"">patch into a =
patch series?</span><br style=3D"caret-color: rgb(0, 0, 0); font-family: =
Helvetica; font-size: 12px; font-style: normal; font-variant-caps: =
normal; font-weight: normal; letter-spacing: normal; text-align: start; =
text-indent: 0px; text-transform: none; white-space: normal; =
word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: =
none;" class=3D""><br class=3D""></div></blockquote><br =
class=3D""></div><div>Sounds good. I will do that.</div><br =
class=3D""></body></html>=
--Apple-Mail=_E80E743A-7224-4AC2-A5EB-02EE5D7CBAD4--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#40835] [PATCH] Update to use panfrost for graphics hardware acceleration
Resent-From: Vagrant Cascadian <vagrant@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 28 Apr 2020 06:55:02 +0000
Resent-Message-ID: <handler.40835.B40835.158805687920794 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 40835
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Brian Woodcox <bw@HIDDEN>
Cc: 40835 <at> debbugs.gnu.org
Received: via spool by 40835-submit <at> debbugs.gnu.org id=B40835.158805687920794
(code B ref 40835); Tue, 28 Apr 2020 06:55:02 +0000
Received: (at 40835) by debbugs.gnu.org; 28 Apr 2020 06:54:39 +0000
Received: from localhost ([127.0.0.1]:38679 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1jTK8d-0005PK-Iv
for submit <at> debbugs.gnu.org; Tue, 28 Apr 2020 02:54:39 -0400
Received: from cascadia.aikidev.net ([173.255.214.101]:43228)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <vagrant@HIDDEN>) id 1jTK8Z-0005P5-N8
for 40835 <at> debbugs.gnu.org; Tue, 28 Apr 2020 02:54:37 -0400
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:21:21:0:100e])
(Authenticated sender: vagrant@HIDDEN)
by cascadia.aikidev.net (Postfix) with ESMTPSA id 510FE1A9BD;
Mon, 27 Apr 2020 23:54:29 -0700 (PDT)
From: Vagrant Cascadian <vagrant@HIDDEN>
In-Reply-To: <9E35E769-6C29-4FB3-8AA7-E975F819ABE0@HIDDEN>
References: <54EFA16B-27F2-40F4-8FF0-F59BC65BF8AB@HIDDEN>
<87lfmgvlqx.fsf@ponder> <65E1BABE-56D0-4F84-92A3-7C4238722FC3@HIDDEN>
<87ftcovbkn.fsf@ponder> <A9E9BDCE-576E-4760-97DE-3F9E00B05169@HIDDEN>
<87d07sv936.fsf@ponder> <9E35E769-6C29-4FB3-8AA7-E975F819ABE0@HIDDEN>
Date: Mon, 27 Apr 2020 23:54:22 -0700
Message-ID: <87y2qgt80x.fsf@ponder>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
On 2020-04-27, Brian Woodcox wrote:
>> On Apr 27, 2020, at 4:48 PM, Vagrant Cascadian <vagrant@HIDDEN> wrot=
e:
>>=20
>> On 2020-04-27, Brian Woodcox wrote:
>>>> On Apr 27, 2020, at 3:54 PM, Vagrant Cascadian <vagrant@HIDDEN> wr=
ote:
>>>>>> On Apr 27, 2020, at 12:15 PM, Vagrant Cascadian <vagrant@HIDDEN>=
wrote:
>>>>>> On 2020-04-24, Brian Woodcox wrote:
>>>>>>> You need to edit the /boot/extlinux/extlinux.conf file on the SD ca=
rd and alter the FDTDIR line.
>>>>>>>=20
>>>>>>> I changed mine from
>>>>>>>=20
>>>>>>> FDTDIR /gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pine=
book-pro-5.6.0/lib/dtbs
>>>>>>>=20
>>>>>>> to
>>>>>>>=20
>>>>>>> FDTDIR /gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pine=
book-pro-5.6.0/lib/dtbs/rockchip
>>>>>>=20
>>>>>> The u-boot-pinebook-pro-rk3399 on guix master works correctly as wel=
l as
>>>>>> the one from wip-pinebook-pro (should be the same).
>>>>=20
>>>> Oops, my bad. I've been merging master and core-updates locally and
>>>> forgot the status of wip-pinebook-pro... I think I was waiting for the
>>>> core-updates merge, but it's probably worth merging master just to get
>>>> the updated u-boot-pinebook-pro-rk3399 based more closely on upstream
>>>> u-boot!
>>>=20
>>> I would be happy to test that out when done!
>>=20
>> Will keep you posted. Once I've merged that, maybe you can rebase your
>> patch into a patch series?
>>=20
>
> Sounds good. I will do that.
Pushed!
live well,
vagrant
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCXqfTIAAKCRDcUY/If5cW
qnWMAP0Y700wlII4pwHAbegyX9wh6Y8DnRR3LSgmSY4wssI/9wD/SR5u+lDC5U6v
NW6vPAQAbPd8RBCZAqgaffnEFrundw0=
=Xeju
-----END PGP SIGNATURE-----
--=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#40835] [PATCH] Update to use panfrost for graphics hardware acceleration
Resent-From: Brian Woodcox <bw@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 02 May 2020 20:38:03 +0000
Resent-Message-ID: <handler.40835.B40835.158845186914638 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 40835
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Brian Woodcox <bw@HIDDEN>
Cc: 40835 <at> debbugs.gnu.org
Received: via spool by 40835-submit <at> debbugs.gnu.org id=B40835.158845186914638
(code B ref 40835); Sat, 02 May 2020 20:38:03 +0000
Received: (at 40835) by debbugs.gnu.org; 2 May 2020 20:37:49 +0000
Received: from localhost ([127.0.0.1]:54021 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1jUytQ-0003nx-To
for submit <at> debbugs.gnu.org; Sat, 02 May 2020 16:37:49 -0400
Received: from mail.inskydata.com ([184.68.229.6]:9971
helo=server.inskydata.com)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <bw@HIDDEN>) id 1jUytO-0003nX-Rr
for 40835 <at> debbugs.gnu.org; Sat, 02 May 2020 16:37:47 -0400
Received: from [192.168.19.76] (unknown [192.168.19.76])
by server.inskydata.com (Postfix) with ESMTPSA id C74D75DEACD1;
Sat, 2 May 2020 14:37:17 -0600 (MDT)
From: Brian Woodcox <bw@HIDDEN>
Message-Id: <68B8EE48-5C9A-4D1B-9EE6-88CFD30510CF@HIDDEN>
Content-Type: multipart/alternative;
boundary="Apple-Mail=_889AE5F8-48A7-4179-AF57-EBA4F64BCC58"
Mime-Version: 1.0 (Mac OS X Mail 11.3 \(3445.6.18\))
Date: Sat, 2 May 2020 14:37:16 -0600
In-Reply-To: <87y2qgt80x.fsf@ponder>
References: <54EFA16B-27F2-40F4-8FF0-F59BC65BF8AB@HIDDEN>
<87lfmgvlqx.fsf@ponder> <65E1BABE-56D0-4F84-92A3-7C4238722FC3@HIDDEN>
<87ftcovbkn.fsf@ponder> <A9E9BDCE-576E-4760-97DE-3F9E00B05169@HIDDEN>
<87d07sv936.fsf@ponder> <9E35E769-6C29-4FB3-8AA7-E975F819ABE0@HIDDEN>
<87y2qgt80x.fsf@ponder>
X-Mailer: Apple Mail (2.3445.6.18)
X-Spam-Score: 0.3 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--Apple-Mail=_889AE5F8-48A7-4179-AF57-EBA4F64BCC58
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
charset=utf-8
Success!!
I applied my newly revised patches to =
76ac1d3918f91b9234cfb26c6519da0cf5f86302 on the wip-pinebook-pro branch.
u-boot correctly finds the rk3399-pinebook-pro.dtb file.
The extlinux.conf file no longer needs to be altered. It is as follows:
# This file was generated from your Guix configuration. Any changes
# will be lost upon reconfiguration.
UI menu.c32
MENU TITLE GNU Guix Boot Options
PROMPT 1
TIMEOUT 50
LABEL GNU with Linux-Libre-Pinebook-Pro 5.6.0
MENU LABEL GNU with Linux-Libre-Pinebook-Pro 5.6.0
KERNEL =
/gnu/store/qs1292ckhvkprsgdyxq665qj167l5c07-linux-libre-pinebook-pro-5.6.0=
/Image
FDTDIR =
/gnu/store/qs1292ckhvkprsgdyxq665qj167l5c07-linux-libre-pinebook-pro-5.6.0=
/lib/dtbs
INITRD =
/gnu/store/2d01lxl21i74jflji5smi9fhwsgyqanf-raw-initrd/initrd.cpio.gz
APPEND --root=3D/dev/mmcblk1p1 =
--system=3D/gnu/store/453h9sqcqvnpj72k0gwia3zsfavhar4p-system =
--load=3D/gnu/store/453h9sqcqvnpj72k0gwia3zsfavhar4p-system/boot =
ethaddr=3D${ethaddr} eth1addr=3D${eth1addr} serial=3D${serial#} =
video=3DHDMI-A-1:1920x1080@60 video=3DeDP-1:1920x1080@60 vga=3Dcurrent
The FDTDIR =
/gnu/store/qs1292ckhvkprsgdyxq665qj167l5c07-linux-libre-pinebook-pro-5.6.0=
/lib/dtbs still has a rockchip sub-folder that contains the =
rk3399-pinebook-pro.dtb file.
I decided to go back to my older SD card and remove the rockchip from =
the FDTDIR path, and it also booted.
I know previously that janneke and I had problems with this, but =
obviously along the way something was fixed.
At any rate, it=E2=80=99s nice to see the image boot and no longer =
having to edit the extlinux.conf file.
I will have to put together a patch set in the near future.
Cheers!
Brian C. Woodcox
> On Apr 28, 2020, at 12:54 AM, Vagrant Cascadian <vagrant@HIDDEN> =
wrote:
>=20
> On 2020-04-27, Brian Woodcox wrote:
>>> On Apr 27, 2020, at 4:48 PM, Vagrant Cascadian <vagrant@HIDDEN> =
wrote:
>>>=20
>>> On 2020-04-27, Brian Woodcox wrote:
>>>>> On Apr 27, 2020, at 3:54 PM, Vagrant Cascadian =
<vagrant@HIDDEN> wrote:
>>>>>>> On Apr 27, 2020, at 12:15 PM, Vagrant Cascadian =
<vagrant@HIDDEN> wrote:
>>>>>>> On 2020-04-24, Brian Woodcox wrote:
>>>>>>>> You need to edit the /boot/extlinux/extlinux.conf file on the =
SD card and alter the FDTDIR line.
>>>>>>>>=20
>>>>>>>> I changed mine from
>>>>>>>>=20
>>>>>>>> FDTDIR =
/gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebook-pro-5.6.0=
/lib/dtbs
>>>>>>>>=20
>>>>>>>> to
>>>>>>>>=20
>>>>>>>> FDTDIR =
/gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebook-pro-5.6.0=
/lib/dtbs/rockchip
>>>>>>>=20
>>>>>>> The u-boot-pinebook-pro-rk3399 on guix master works correctly as =
well as
>>>>>>> the one from wip-pinebook-pro (should be the same).
>>>>>=20
>>>>> Oops, my bad. I've been merging master and core-updates locally =
and
>>>>> forgot the status of wip-pinebook-pro... I think I was waiting for =
the
>>>>> core-updates merge, but it's probably worth merging master just to =
get
>>>>> the updated u-boot-pinebook-pro-rk3399 based more closely on =
upstream
>>>>> u-boot!
>>>>=20
>>>> I would be happy to test that out when done!
>>>=20
>>> Will keep you posted. Once I've merged that, maybe you can rebase =
your
>>> patch into a patch series?
>>>=20
>>=20
>> Sounds good. I will do that.
>=20
> Pushed!
>=20
> live well,
> vagrant
--Apple-Mail=_889AE5F8-48A7-4179-AF57-EBA4F64BCC58
Content-Transfer-Encoding: quoted-printable
Content-Type: text/html;
charset=utf-8
<html><head><meta http-equiv=3D"Content-Type" content=3D"text/html; =
charset=3Dutf-8"></head><body style=3D"word-wrap: break-word; =
-webkit-nbsp-mode: space; line-break: after-white-space;" class=3D""><div =
class=3D""><div style=3D"text-align: start; text-indent: 0px; word-wrap: =
break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" =
class=3D""><div style=3D"text-align: start; text-indent: 0px; word-wrap: =
break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" =
class=3D"">Success!!<br class=3D""><br class=3D"">I applied my newly =
revised patches to 76ac1d3918f91b9234cfb26c6519da0cf5f86302 on the =
wip-pinebook-pro branch.<br class=3D""><br class=3D"">u-boot correctly =
finds the rk3399-pinebook-pro.dtb file.<br class=3D""><br class=3D"">The =
extlinux.conf file no longer needs to be altered. It is as =
follows:<br class=3D""><br class=3D""># This file was generated from =
your Guix configuration. Any changes<br class=3D""># will be lost =
upon reconfiguration.<br class=3D"">UI menu.c32<br class=3D"">MENU TITLE =
GNU Guix Boot Options<br class=3D"">PROMPT 1<br class=3D"">TIMEOUT 50<br =
class=3D"">LABEL GNU with Linux-Libre-Pinebook-Pro 5.6.0<br =
class=3D""> MENU LABEL GNU with Linux-Libre-Pinebook-Pro 5.6.0<br =
class=3D""> KERNEL =
/gnu/store/qs1292ckhvkprsgdyxq665qj167l5c07-linux-libre-pinebook-pro-5.6.0=
/Image<br class=3D""> FDTDIR =
/gnu/store/qs1292ckhvkprsgdyxq665qj167l5c07-linux-libre-pinebook-pro-5.6.0=
/lib/dtbs<br class=3D""> INITRD =
/gnu/store/2d01lxl21i74jflji5smi9fhwsgyqanf-raw-initrd/initrd.cpio.gz<br =
class=3D""> APPEND --root=3D/dev/mmcblk1p1 =
--system=3D/gnu/store/453h9sqcqvnpj72k0gwia3zsfavhar4p-system =
--load=3D/gnu/store/453h9sqcqvnpj72k0gwia3zsfavhar4p-system/boot =
ethaddr=3D${ethaddr} eth1addr=3D${eth1addr} serial=3D${serial#} =
video=3DHDMI-A-1:1920x1080@60 video=3DeDP-1:1920x1080@60 vga=3Dcurrent<br =
class=3D""><br class=3D""><br class=3D"">The FDTDIR =
/gnu/store/qs1292ckhvkprsgdyxq665qj167l5c07-linux-libre-pinebook-pro-5.6.0=
/lib/dtbs still has a rockchip sub-folder that contains the =
rk3399-pinebook-pro.dtb file.<br class=3D""><br class=3D"">I decided to =
go back to my older SD card and remove the rockchip from the FDTDIR =
path, and it also booted.<br class=3D""><br class=3D"">I know previously =
that janneke and I had problems with this, but obviously along the way =
something was fixed.<br class=3D""><br class=3D"">At any rate, it=E2=80=99=
s nice to see the image boot and no longer having to edit the =
extlinux.conf file.<br class=3D""><br class=3D"">I will have to put =
together a patch set in the near future.<br class=3D""><br =
class=3D"">Cheers!<br class=3D""><br class=3D"">Brian C. Woodcox<br =
class=3D""><div style=3D"color: rgb(0, 0, 0); letter-spacing: normal; =
text-transform: none; white-space: normal; word-spacing: 0px; =
-webkit-text-stroke-width: 0px;" class=3D""><br =
class=3D""></div></div></div></div><div><blockquote type=3D"cite" =
class=3D""><div class=3D"">On Apr 28, 2020, at 12:54 AM, Vagrant =
Cascadian <<a href=3D"mailto:vagrant@HIDDEN" =
class=3D"">vagrant@HIDDEN</a>> wrote:</div><br =
class=3D"Apple-interchange-newline"><div class=3D""><div class=3D"">On =
2020-04-27, Brian Woodcox wrote:<br class=3D""><blockquote type=3D"cite" =
class=3D""><blockquote type=3D"cite" class=3D"">On Apr 27, 2020, at 4:48 =
PM, Vagrant Cascadian <<a href=3D"mailto:vagrant@HIDDEN" =
class=3D"">vagrant@HIDDEN</a>> wrote:<br class=3D""><br =
class=3D"">On 2020-04-27, Brian Woodcox wrote:<br class=3D""><blockquote =
type=3D"cite" class=3D""><blockquote type=3D"cite" class=3D"">On Apr 27, =
2020, at 3:54 PM, Vagrant Cascadian <<a =
href=3D"mailto:vagrant@HIDDEN" class=3D"">vagrant@HIDDEN</a>> =
wrote:<br class=3D""><blockquote type=3D"cite" class=3D""><blockquote =
type=3D"cite" class=3D"">On Apr 27, 2020, at 12:15 PM, Vagrant Cascadian =
<<a href=3D"mailto:vagrant@HIDDEN" =
class=3D"">vagrant@HIDDEN</a>> wrote:<br class=3D"">On =
2020-04-24, Brian Woodcox wrote:<br class=3D""><blockquote type=3D"cite" =
class=3D"">You need to edit the /boot/extlinux/extlinux.conf file on the =
SD card and alter the FDTDIR line.<br class=3D""><br class=3D"">I =
changed mine from<br class=3D""><br class=3D"">FDTDIR =
/gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebook-pro-5.6.0=
/lib/dtbs<br class=3D""><br class=3D"">to<br class=3D""><br =
class=3D"">FDTDIR =
/gnu/store/ls1byzmapi911cylh4s6044x0cmc61c8-linux-libre-pinebook-pro-5.6.0=
/lib/dtbs/rockchip<br class=3D""></blockquote><br class=3D"">The =
u-boot-pinebook-pro-rk3399 on guix master works correctly as well as<br =
class=3D"">the one from wip-pinebook-pro (should be the same).<br =
class=3D""></blockquote></blockquote><br class=3D"">Oops, my bad. I've =
been merging master and core-updates locally and<br class=3D"">forgot =
the status of wip-pinebook-pro... I think I was waiting for the<br =
class=3D"">core-updates merge, but it's probably worth merging master =
just to get<br class=3D"">the updated u-boot-pinebook-pro-rk3399 based =
more closely on upstream<br class=3D"">u-boot!<br =
class=3D""></blockquote><br class=3D"">I would be happy to test that out =
when done!<br class=3D""></blockquote><br class=3D"">Will keep you =
posted. Once I've merged that, maybe you can rebase your<br =
class=3D"">patch into a patch series?<br class=3D""><br =
class=3D""></blockquote><br class=3D"">Sounds good. I will do =
that.<br class=3D""></blockquote><br class=3D"">Pushed!<br class=3D""><br =
class=3D"">live well,<br class=3D""> vagrant<br =
class=3D""></div></div></blockquote></div><br class=3D""></body></html>=
--Apple-Mail=_889AE5F8-48A7-4179-AF57-EBA4F64BCC58--
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.