2024-03-04
00:02eslerm[m]for mesa, I `git reset --hard` ubuntu/mantic to the first commit in mesa, and then rebased on the main asahi/mesa branch
00:04eslerm[m]tobhe[m]: there are some out of order commits https://github.com/eslerm/mesa/compare/ubuntu/mantic...UbuntuAsahi%3Amesa%3Aubuntu/mantic
00:06eslerm[m]s/(I tried to do this more cautiously, and needed to go back and redo this)/(I tried to do this more cautiously at first, only restting as much as *needed*, but ended up needing to go back further)/
00:09tobhe[m]imo most important is to show that the commit history up to asahi-20240228 is intact and then there's some packaging on top
00:12tobhe[m]since upstream rebases and force pushes regularly it might not even be possible to keep a linear commit history
00:12tobhe[m]but by keeping our diff on top small and easy to review we can at least make sure we didn't break anything in merges
00:15tobhe[m]not bad, eebfe841 matches https://gitlab.freedesktop.org/asahi/mesa/-/tags/asahi-20240228
00:16tobhe[m]because now you have two remotes with conflicting tags and that confuses git (and humans)
00:16tobhe[m]https://gitlab.freedesktop.org/asahi/mesa/-/tags/asahi-20240228 vs https://github.com/eslerm/mesa/releases/tag/asahi-20240228
00:18tobhe[m]normally I'd use something closer to the debain/changelog package version for the Ubuntu tag, see https://github.com/UbuntuAsahi/mesa/tags
00:28tobhe_it doesn't really matter but those are per ppa so you can just upload it to another one if it bothers you
00:34eslerm[m]iiuc, if there is no changes the `0` would be dropped, and +`1` means downstream changes
00:36tobhe_mesa has a bit of a special version number anyway. but I couldn't come up with a better one
00:44eslerm[m]github doesn't like the tag 24.0~pre20240228-0asahi1.23.10, even though that's they syntax of the current tags
00:45eslerm[m]I think I'm swapping to fields https://github.com/UbuntuAsahi/mesa/releases/tag/Ubuntu-24.0_pre20231121-0asahi1.23.10
00:46eslerm[m]https://github.com/eslerm/mesa/releases/tag/Ubuntu-24.0_pre20240228-0asahi1.23.10 done :)
09:07tobhe[m]oh and build 22.04 mesa because otherwise your snaps will break once we push out the new kernel
19:31tobhe[m]https://www.apple.com/newsroom/2024/03/apple-unveils-the-new-13-and-15-inch-macbook-air-with-the-powerful-m3-chip/
19:32john-cabaj[m]Hopefully we have some people in the future buying these to test.
19:32john-cabaj[m]I will be financially strapped
22:36glem has joined #ubuntu-asahi
23:00glem has quit [Quit: My Mac has gone to sleep. ZZZzzz…]
23:28glem has joined #ubuntu-asahi