Page MenuHomeFreeBSD
Differential D45743

graphics/mesa: Simplify x11/wayland option
ClosedPublic
Actions

Authored by manu on Jun 26 2024, 1:47 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 18, 12:11 PM
Unknown Object (File)
Wed, Feb 26, 11:49 AM
Unknown Object (File)
Feb 15 2025, 10:01 PM
Unknown Object (File)
Feb 10 2025, 12:36 AM
Unknown Object (File)
Jan 28 2025, 4:31 PM
Unknown Object (File)
Jan 13 2025, 2:36 PM
Unknown Object (File)
Dec 21 2024, 4:02 PM
Unknown Object (File)
Dec 21 2024, 4:01 PM
View All 33 Files
Subscribers
None

Details

Reviewers
bapt
Group Reviewers
x11
Commits
R11:aa6c9614c0f6: graphics/mesa: Simplify x11/wayland option
Summary

Simply use X11 for x11 support as it's done for all other ports.
Same for Wayland, just use WAYLAND.

While here always use xcb and xrandr for X11 support in mesa-dri as we
always build a vulkan driver (swrast).

Sponsored by: Beckhoff Automation GmbH & Co. KG

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 58358
Build 55246: arc lint + arc unit

Event Timeline

manu requested review of this revision.Jun 26 2024, 1:47 PM
manu created this revision.
manu added a reviewer: x11.Jun 26 2024, 1:47 PM
Harbormaster completed remote builds in B58358: Diff 140270.Jun 26 2024, 1:47 PM
manu added inline comments.Jun 26 2024, 4:32 PM
graphics/mesa-dri/Makefile
17

Removed locally

22

Duplicate WAYLAND option removed locally.

bapt accepted this revision.Jun 28 2024, 2:24 PM
This revision is now accepted and ready to land.Jun 28 2024, 2:24 PM
Closed by commit R11:aa6c9614c0f6: graphics/mesa: Simplify x11/wayland option (authored by manu). · Explain WhyJul 1 2024, 8:19 AM
This revision was automatically updated to reflect the committed changes.
manu added a commit: R11:aa6c9614c0f6: graphics/mesa: Simplify x11/wayland option.

Revision Contents
Changeset List

PathSize
graphics/
mesa-dri/
31 lines
2 lines
mesa-libs/
25 lines

Diff 140270

View Options

graphics/mesa-dri/Makefile

Show First 20 Lines • Show All 1,124 Lines • ▼ Show 20 Lines if (S_ISDIR(DIP(dp, mode))) {
fs->fs_cstotal.cs_ndir++; fs->fs_cstotal.cs_ndir++;
fs->fs_cs(fs, cg).cs_ndir++; fs->fs_cs(fs, cg).cs_ndir++;
} }
/* /*
* Initialize inode blocks on the fly for UFS2. * Initialize inode blocks on the fly for UFS2.
*/ */
initediblk = ufs_rw32(cgp->cg_initediblk, fsopts->needswap); initediblk = ufs_rw32(cgp->cg_initediblk, fsopts->needswap);
if (ffs_opts->version == 2 && cgino + INOPB(fs) > initediblk && while (ffs_opts->version == 2 && cgino + INOPB(fs) > initediblk &&
initediblk < ufs_rw32(cgp->cg_niblk, fsopts->needswap)) { initediblk < ufs_rw32(cgp->cg_niblk, fsopts->needswap)) {
memset(buf, 0, fs->fs_bsize); memset(buf, 0, fs->fs_bsize);
dip = (struct ufs2_dinode *)buf; dip = (struct ufs2_dinode *)buf;
for (i = 0; i < INOPB(fs); i++) { for (i = 0; i < INOPB(fs); i++) {
dip->di_gen = random(); dip->di_gen = random();
dip++; dip++;
} }
ffs_wtfs(fsbtodb(fs, ino_to_fsba(fs, ffs_wtfs(fsbtodb(fs, ino_to_fsba(fs,
Show All 40 Lines
View Options

graphics/mesa-dri/Makefile.common

Show First 20 Lines • Show All 1,124 Lines • ▼ Show 20 Lines if (S_ISDIR(DIP(dp, mode))) {
fs->fs_cstotal.cs_ndir++; fs->fs_cstotal.cs_ndir++;
fs->fs_cs(fs, cg).cs_ndir++; fs->fs_cs(fs, cg).cs_ndir++;
} }
/* /*
* Initialize inode blocks on the fly for UFS2. * Initialize inode blocks on the fly for UFS2.
*/ */
initediblk = ufs_rw32(cgp->cg_initediblk, fsopts->needswap); initediblk = ufs_rw32(cgp->cg_initediblk, fsopts->needswap);
if (ffs_opts->version == 2 && cgino + INOPB(fs) > initediblk && while (ffs_opts->version == 2 && cgino + INOPB(fs) > initediblk &&
initediblk < ufs_rw32(cgp->cg_niblk, fsopts->needswap)) { initediblk < ufs_rw32(cgp->cg_niblk, fsopts->needswap)) {
memset(buf, 0, fs->fs_bsize); memset(buf, 0, fs->fs_bsize);
dip = (struct ufs2_dinode *)buf; dip = (struct ufs2_dinode *)buf;
for (i = 0; i < INOPB(fs); i++) { for (i = 0; i < INOPB(fs); i++) {
dip->di_gen = random(); dip->di_gen = random();
dip++; dip++;
} }
ffs_wtfs(fsbtodb(fs, ino_to_fsba(fs, ffs_wtfs(fsbtodb(fs, ino_to_fsba(fs,
Show All 40 Lines
View Options

graphics/mesa-libs/Makefile

Show First 20 Lines • Show All 1,124 Lines • ▼ Show 20 Lines if (S_ISDIR(DIP(dp, mode))) {
fs->fs_cstotal.cs_ndir++; fs->fs_cstotal.cs_ndir++;
fs->fs_cs(fs, cg).cs_ndir++; fs->fs_cs(fs, cg).cs_ndir++;
} }
/* /*
* Initialize inode blocks on the fly for UFS2. * Initialize inode blocks on the fly for UFS2.
*/ */
initediblk = ufs_rw32(cgp->cg_initediblk, fsopts->needswap); initediblk = ufs_rw32(cgp->cg_initediblk, fsopts->needswap);
if (ffs_opts->version == 2 && cgino + INOPB(fs) > initediblk && while (ffs_opts->version == 2 && cgino + INOPB(fs) > initediblk &&
initediblk < ufs_rw32(cgp->cg_niblk, fsopts->needswap)) { initediblk < ufs_rw32(cgp->cg_niblk, fsopts->needswap)) {
memset(buf, 0, fs->fs_bsize); memset(buf, 0, fs->fs_bsize);
dip = (struct ufs2_dinode *)buf; dip = (struct ufs2_dinode *)buf;
for (i = 0; i < INOPB(fs); i++) { for (i = 0; i < INOPB(fs); i++) {
dip->di_gen = random(); dip->di_gen = random();
dip++; dip++;
} }
ffs_wtfs(fsbtodb(fs, ino_to_fsba(fs, ffs_wtfs(fsbtodb(fs, ino_to_fsba(fs,
Show All 40 Lines