-
Notifications
You must be signed in to change notification settings - Fork 3
ANGLE - Bump b1f1ae87ae3a459561d899dbf46e5a5595999ae #12
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: dev
Are you sure you want to change the base?
Conversation
|
Maybe related: LadybirdBrowser/ladybird@c60e3fb |
|
Keep it up :3 If you're struggling finding the right deps for the angle ebuild, once it builds, |
|
@Norbiros I don't think It's related to that. I'm not even sure if vcpkg is used here (it seems to be for Windows?). @CastixGitHub Thanks for the script! I was almost going to set up a chroot env (or a vm with the new-ish qcow2 images) and trial-and-erroring it. It's been a fun/frustrating trip learning about cmake. I'm still having some issue linking the libraries but I think I'm almost there. |
|
vcpkg is used to manage libraries within the codebase, ensuring consistency across development environments. My concern was that they use version |
7498b1f to
b301aa1
Compare
|
@Norbiros Aaaaah I see, thanks! I this is the first time I'm working on ebuilds (other than my last PR here) and with cmake so your input is very helpful. It seems like it runs "fine" (I have no frame of reference, I should probably be running a test suite?*) with the newer version of Angle. |
|
Yeah, it's better to use the same versions that Ladybird uses in vcpkg to ensure compatibility and avoid unexpected issues during build or runtime.
Their CI also uses versions from vcpkg, so it's well tested. Using slightly different versions might cause problems. It's just better practice. |
b301aa1 to
08d5320
Compare
|
Okay I've pinned it to |
|
For the record I got this PR to build. I still seg fault (same error I have always gotten when I try again though). |
|
Hi @robclancy thanks for the report, can you provide more info? (like running it with gdb and sending the backtrace) (edit: ok, please update #11 if you can (so it worked for you with simdutf 7.0.0 but not 7.3.3)) Keeping me from merging this:
So, as long as angle isn't a meta-program that needs that much source code as it's input, I see three paths:
Thanks |
|
I'm trying to wrap my head around. Why ANGLE is here? |
| find_package(PkgConfig) | ||
| pkg_check_modules(angle REQUIRED IMPORTED_TARGET angle) | ||
| - set(ANGLE_TARGETS PkgConfig::angle) | ||
| + pkg_check_modules(GL REQUIRED IMPORTED_TARGET angle_glesv2=0.0.0) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@uis246 pointed out (no, I didn't understand) Seems like you're not using vulkan, but depend on it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems to be upstream already
| set(CMAKE_INSTALL_RPATH "@executable_path/../lib") | ||
| else() | ||
| - set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") | ||
| + set(CMAKE_INSTALL_RPATH "/usr/lib64/angle:$ORIGIN:$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lib64 here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hardcoded path? Not good. We don't know where EPREFIX is.
If you wish to remove ANGLE, you're stuck with opengl (you won't get a WebGL that uses vulkan), to remove it, you need to find all the little things such as EGL_IOSURFACE_PLANE_ANGLE and so on and give them aliases to the "input" API https://github.com/LadybirdBrowser/ladybird/pull/2688/files <- example commit that shows some of the angle usage |
Zink. Does exactly same thing. |
It is not used outside of MacOS only code |
| postrm() { | ||
| xdg_desktop_database_update | ||
| } | ||
|
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please, don't submit unreviewed LLM generated output
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I try not to. I do use LLMs but I think I just copied this from another ebuild and I think I even read the docs on this one, but I was pretty fatigued. I thought it was just to clean up the desktop shortcuts and pretty harmless to leave in. Sorry if this wasn't harmless. I only started with ebuilds with ladybird-ebuild, hopefully I get time to learn more later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No prob. sorry being harsh... It's just it didn't pull in the eclass nor copy the relevant xdg files, so like "oh you added xdg -> no you didn't"
and also some function/hook name was just incorrect
clean up the desktop shortcuts
(trying to simplify)
it's about creating and categorizing the launcher for the desktop environment, in a format backed by freedesktop
and the mime db is about "what 'apps' can open the file you double-clicked into"
Well, So I discovered Removed ANGLE through patch files, let's see how quickly they become outdated Thx |
My segfaults are unrelated to this ebuild I'm 99% sure. It's just something wrong on my system that is hard to figure out, last time I tried debugging it I got to some issues on the ladybug repo but it wasn't clear. I just try new builds every known and again to see if it works and will try debug again when I have time. |
|
@robclancy Got it, make sure you don't have a |
As I mentioned in LadybirdBrowser/ladybird#5785 (comment) edit2, there are some calls to |
|
My ladybird tree is at |
I figured it was time for an update to the ebuild.
ANGLE was added as a dependency and I didn't want to use gclient so the angle ebuild is a mess.
Hence this is a work in progress but I'm not sure if I'll continue working on it.
angle installs with a bunch of warnings. I am still learning how to properly get the libraries to link so Ladybird failed the last time I tried to build it. I'll see if it's fixed tomorrow.