temp/mesa-git: new aport

Some devices need bleeding edge drivers, for example the Hammerhead to have a non-broken Freedreno driver, the Pine devices to use newer versions of Lima (as it's currently an unstable driver still), etc. Every other device can use Alpine's drivers.

So to replace our current mess of Mesa packging, replace both our forked mesa and the Freedreno one with a general mesa-git package. This way we don't need to have it on version 9999, can use a bleeding edge version only for the devices that need it, and can enable new drivers in the future when needed before it's upstreamed to Alpine.

Devices requiring this driver rather than Alpine's should explicitly depend on mesa-git, mesa-git-glapi, mesa-git-gl and mesa-git-dri-<required driver> to not cause dependency conflicts. In theory a device can be switched back to a stable version of Mesa by removing -git from the Mesa entries in the dependency list, but I haven't tested this.

This MR basically makes !519 (closed) unnecessary.

added category::device category::upgrade + 1 deleted label

added 3 commits

• f5161ff5 - device-asus-flo: use mesa-git
• 1b1b0bfe - device-sony-castor-windy: use mesa-git
• a47d3015 - device-sony-sirius: use mesa-git

Compare with previous version

By Bart Ribbers on 2019-07-25T20:54:58

UPDATE: Please ignore the below, I needed to pmbootstrap init again (or maybe just zap?)

---

IGNORE THIS PLEASE!

I tried this out, though I don't know if it would be expected to work. I'm on a nexus 5. I just checked out this branch and ran pmbootstrap install.

The script ended with:

jadams ~/.l/v/p/c/pmaports λ pmbootstrap install
[19:27:43] *** (1/5) PREPARE NATIVE CHROOT ***
[19:27:43] *** (2/5) CREATE DEVICE ROOTFS ("lg-hammerhead") ***
[19:27:43] Update package index for armv7 (4 file(s))
[sudo] password for jadams: 
[19:28:01] Update package index for x86_64 (4 file(s))
[19:28:05] (buildroot_armv7) install alpine-base
[19:28:06] (buildroot_armv7) install abuild build-base ccache
[19:29:16] (buildroot_armv7) generate abuild keys
[19:29:23] (buildroot_armv7) install bison elfutils-dev eudev-dev expat-dev flex gettext libdrm-dev libtool libva-dev libvdpau-dev libx11-dev libxcb-dev libxdamage-dev libxext-dev libxfixes-dev libxrandr-dev libxshmfence-dev libxt-dev libxvmc-dev libxxf86vm-dev llvm8-dev makedepend meson py-mako py3-libxml2 python3 talloc-dev wayland-dev wayland-protocols xorgproto zlib-dev
[19:30:14] (native) install ccache-cross-symlinks gcc-armv7 g++-armv7 crossdirect
[19:32:09] (buildroot_armv7) build armv7/mesa-git-0_git20190725-r0.apk
[19:45:21] (buildroot_armv7) install linux-postmarketos-qcom mesa-git mesa-git-dri-freedreno mesa-git-gl mesa-git-glapi mkbootimg ofono postmarketos-base
[sudo] password for jadams: 
[19:45:51] (buildroot_armv7) build armv7/device-lg-hammerhead-2-r7.apk
[19:45:57] (rootfs_lg-hammerhead) install
[19:46:43] NOTE: The failed command's output is above the ^^^ line in the log file: /home/jadams/.local/var/pmbootstrap/log.txt
[19:46:43] ERROR: Command failed: (rootfs_lg-hammerhead) % apk --no-progress add -u --virtual .pmbootstrap mesa-gl postmarketos-mkinitfs mkinitfs glib networkmanager networkmanager-openrc mesa /mnt/pmbootstrap-packages/armv7/device-lg-hammerhead-2-r7.apk xkeyboard-config virtboard libxvmc /mnt/pmbootstrap-packages/armv7/mesa-git-0_git20190725-r0.apk
[19:46:43] See also: <https://postmarketos.org/troubleshooting>
Run 'pmbootstrap log' for details.

Here's the error log. It contains entries like this:

ERROR: mesa-git-glapi-0_git20190725-r0: trying to overwrite usr/lib/libglapi.so.0 owned by mesa-freedreno-glapi-19.1.0_git20190620-r9.
ERROR: mesa-git-glapi-0_git20190725-r0: trying to overwrite usr/lib/libglapi.so.0.0.0 owned by mesa-freedreno-glapi-19.1.0_git20190620-r9.
(4/20) Installing mesa-git (0_git20190725-r0)
ERROR: mesa-git-0_git20190725-r0: trying to overwrite usr/share/drirc.d/00-mesa-defaults.conf owned by mesa-freedreno-19.1.0_git20190620-r9.
(5/20) Installing mesa-git-gl (0_git20190725-r0)
ERROR: mesa-git-gl-0_git20190725-r0: trying to overwrite usr/lib/libGL.so.1 owned by mesa-freedreno-gl-19.1.0_git20190620-r9.
ERROR: mesa-git-gl-0_git20190725-r0: trying to overwrite usr/lib/libGL.so.1.2.0 owned by mesa-freedreno-gl-19.1.0_git20190620-r9.

ERROR: mesa-git-dri-freedreno-0_git20190725-r0: trying to overwrite usr/lib/xorg/modules/dri/kgsl_dri.so owned by mesa-freedreno-dri-freedreno-19.1.0_git20190620-r9.
ERROR: mesa-git-dri-freedreno-0_git20190725-r0: usr/lib/xorg/modules/dri/msm_dri.so: no hard link target (usr/lib/xorg/modules/dri/kgsl_dri.so) in archive

lddtree: /usr/lib/libGL.so.1: file does not exist

By Josh Adams on 2019-07-26T01:21:40

@PureTryOut with this PR what happens if you try to install libepoxy-dev?

By Bhushan Shah on 2019-07-26T19:00:13

changed the description

By Martijn Braam on 2019-07-27T11:00:01

Seems to work for me, for using mesa git I had to add basically all mesa-* things to my device APKBUILD to make it work, I guess it depends on the UI you install.

By Martijn Braam on 2019-07-27T11:01:10

added 11 commits

• a47d3015...9fde7509 - 2 commits from branch postmarketOS:master
• a91d4a57 - temp/mesa-git: new aport (!524 (merged))
• af6f112f - temp/mesa: remove in favor of mesa-git (!524 (merged))
• 1cd98b1a - device-pine-a64lts: use mesa-git (!524 (merged))
• 9558c821 - device-pine-dontbeevil: use mesa-git (!524 (merged))
• a01fac5a - temp/mesa-freedreno: remove in favor of mesa-git (!524 (merged))
• 8e422e43 - device-lg-hammerhead: use mesa-git (!524 (merged))
• 83a0e09e - device-asus-flo: use mesa-git (!524 (merged))
• e91920aa - device-sony-castor-windy: use mesa-git (!524 (merged))
• 78e6c5b8 - device-sony-sirius: use mesa-git (!524 (merged))

Compare with previous version

By Martijn Braam on 2019-07-27T15:50:52

added 9 commits

• ce7e4d79 - temp/mesa-git: new aport (!524 (merged))
• 7686e15a - temp/mesa: remove in favor of mesa-git (!524 (merged))
• eb4526b2 - device-pine-a64lts: use mesa-git (!524 (merged))
• 384a130d - device-pine-dontbeevil: use mesa-git (!524 (merged))
• adbe9f75 - temp/mesa-freedreno: remove in favor of mesa-git (!524 (merged))
• d69b1146 - device-lg-hammerhead: use mesa-git (!524 (merged))
• 8dcca987 - device-asus-flo: use mesa-git (!524 (merged))
• 639a9fd8 - device-sony-castor-windy: use mesa-git (!524 (merged))
• 162414ff - device-sony-sirius: use mesa-git (!524 (merged))

Compare with previous version

By Bart Ribbers on 2019-07-27T16:22:21

Tested on the pinetab and on the hammerhead, mesa-git works fine but the devices depending on it don't have enough of the dependencies added to make the older mesa go away.

By Martijn Braam on 2019-07-27T17:12:20

added 7 commits

• a8d7b804 - device-pine-a64lts: use mesa-git (!524 (merged))
• 944460fa - device-pine-dontbeevil: use mesa-git (!524 (merged))
• 28a04f8f - temp/mesa-freedreno: remove in favor of mesa-git (!524 (merged))
• b11d96dc - device-lg-hammerhead: use mesa-git (!524 (merged))
• 3b4d8765 - device-asus-flo: use mesa-git (!524 (merged))
• 02bc1dd0 - device-sony-castor-windy: use mesa-git (!524 (merged))
• bb00212b - device-sony-sirius: use mesa-git (!524 (merged))

Compare with previous version

By Martijn Braam on 2019-07-27T18:39:07

approved this merge request

By Martijn Braam on 2019-07-27T18:44:59

resolved all threads

By Martijn Braam on 2019-07-27T18:46:04

merged

By Martijn Braam on 2019-07-27T18:46:15

mentioned in commit ce7e4d79

By Bart Ribbers on 2019-07-27T18:46:15

mentioned in commit bb00212b

By Bart Ribbers on 2019-07-27T18:46:16

mentioned in merge request !519 (closed)

By Martijn Braam on 2019-07-27T18:47:12

mentioned in commit 84492bef

By Oliver Smith on 2019-07-28T08:49:58

mentioned in commit 944460fa

By Bart Ribbers on 2019-08-01T20:52:11

mentioned in commit 28a04f8f

By Bart Ribbers on 2019-08-01T20:52:11

mentioned in commit b11d96dc

By Bart Ribbers on 2019-08-01T20:52:14