Skip to content
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

components/x11/xorg-server: explicitly enable libdrm #20405

Open
wants to merge 1 commit into
base: oi/hipster
Choose a base branch
from

Conversation

xmhd
Copy link
Contributor

@xmhd xmhd commented Jan 12, 2025

Depends on #20404

With the updates to Mesa and libdrm in 2024, glxinfo + glxgears were in a broken state. Explicitly enabling libdrm within the xorg-server package fixes this.

With the recent change in default GCC_VERSION to gcc-14, at least one patch (maybe more) will require tweaking due to gcc-14 now defaulting to -Werror=sizeof-pointer-memaccess. I have chosen to set GCC_VERSION to gcc-13 for xorg-server as I will be working on updating xorg-server to the current upstream release in the near future.

I am not too happy about needing to pass --disable-dependency-tracking to pass configure, but for the same reason as above, I don't want to spend any further time on it right now.

@xmhd
Copy link
Contributor Author

xmhd commented Jan 12, 2025

IPS is not yet my strong point - but my understanding is that gcc-13 will need to be declared as a build time dependency , ditto for runtime?

Depends on OpenIndiana#20404

With the updates to Mesa and libdrm in 2024, glxinfo + glxgears
were in a broken state. Explicitly enabling libdrm within the
xorg-server package fixes this.

With the recent change in default GCC_VERSION to gcc-14, at least
one patch (maybe more) will require tweaking due to gcc-14 now
defaulting to -Werror=sizeof-pointer-memaccess. I have chosen to
set GCC_VERSION to gcc-13 for xorg-server as I will be working on
updating xorg-server to the current upstream release in the near
future.

I am not too happy about needing to pass --disable-dependency-tracking
to pass configure, but for the same reason as above, I don't want to
spend any further time on it right now.
@Toasterson
Copy link
Contributor

Yes, Both should be added to REQUIRED_PACKAGES for the Runtime we have GCC_RUNTIME_PKG which automatically points to GCC_VERSION Runtime Pkg.

A quick grep in make-rules gives you a definition list which Runtimes we define

make-rules/shared-macros.mk:GCC_RUNTIME_PKG =   system/library/gcc-$(GCC_VERSION)-runtime
make-rules/shared-macros.mk:GXX_RUNTIME_PKG =   system/library/g++-$(GCC_VERSION)-runtime
make-rules/shared-macros.mk:GCCGO_RUNTIME_PKG = system/library/gccgo-$(GCC_VERSION)-runtime
make-rules/shared-macros.mk:GFORTRAN_RUNTIME_PKG =      system/library/gfortran-$(GCC_VERSION)-runtime
make-rules/shared-macros.mk:GOBJC_RUNTIME_PKG = system/library/gobjc-$(GCC_VERSION)-runtime

@Toasterson
Copy link
Contributor

For example Audacity defines

REQUIRED_PACKAGES += $(GCC_RUNTIME_PKG)
REQUIRED_PACKAGES += $(GXX_RUNTIME_PKG)

@xmhd
Copy link
Contributor Author

xmhd commented Jan 12, 2025

Yes, Both should be added to REQUIRED_PACKAGES for the Runtime we have GCC_RUNTIME_PKG which automatically points to GCC_VERSION Runtime Pkg.

A quick grep in make-rules gives you a definition list which Runtimes we define

make-rules/shared-macros.mk:GCC_RUNTIME_PKG =   system/library/gcc-$(GCC_VERSION)-runtime
make-rules/shared-macros.mk:GXX_RUNTIME_PKG =   system/library/g++-$(GCC_VERSION)-runtime
make-rules/shared-macros.mk:GCCGO_RUNTIME_PKG = system/library/gccgo-$(GCC_VERSION)-runtime
make-rules/shared-macros.mk:GFORTRAN_RUNTIME_PKG =      system/library/gfortran-$(GCC_VERSION)-runtime
make-rules/shared-macros.mk:GOBJC_RUNTIME_PKG = system/library/gobjc-$(GCC_VERSION)-runtime

Thanks! Will update and comment when this is ready for merging.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants