Page MenuHomeFreeBSD

libdrm: Update to 2.4.102
ClosedPublic

Authored by manu on May 27 2020, 8:58 AM.

Details

Reviewers
zeising
Group Reviewers
x11
Commits
rP537533: libdrm: Update to 2.4.102
Summary

This update libdrm to the latest version which have all (-1) FreeBSD patches
upstream. I'd like to keep it that way so please refrain from adding patches
here.
2.4.101 release notes:
https://lists.freedesktop.org/archives/dri-devel/2020-April/261067.html
2.4.102 release notes:
https://lists.freedesktop.org/archives/dri-devel/2020-May/267255.html

No timeline in https://abi-laboratory.pro/index.php?view=timeline&l=libdrm
but should be ok based on what I saw

Test Plan

Build and works fine on 13-CURRENT amd64
Builds fine on 13-CURRENT arm64
Build fine on 12-1 amd64
Build fine on 12-1 arm64

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

manu requested review of this revision.May 27 2020, 8:58 AM
manu created this revision.
zeising requested changes to this revision.May 27 2020, 8:38 PM
zeising added a subscriber: zeising.
zeising added inline comments.
graphics/libdrm/files/patch-libsync.h
1–14 ↗(On Diff #72306)

I think this patch is still needed. As far as I can tell, FreeBSD doesn't have ETIME, only ETIMEOUT, and a inline function in libsync.h is using ETIME.
This file is installed as part of libdrm.
Removing this patch would make an application which uses libsynch.h break.

I don't know if libsync.h is actually used anywhere, I think mesa uses it.

graphics/libdrm/pkg-plist
47–48 ↗(On Diff #72306)

These might still be installed on arm? They are still in libdrm sources as far as I can tell, but you know more about arm than I do.

This revision now requires changes to proceed.May 27 2020, 8:38 PM
jbeich added inline comments.
graphics/libdrm/pkg-plist
47–48 ↗(On Diff #72306)

poudriere testport or poudriere bulk -t (without -k) fails at least on 11.3 aarch64/armv6, 12.1 aarch64/armv6/armv7.

$ make check-plist
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
Error: Orphaned: include/libdrm/vc4_packet.h
Error: Orphaned: include/libdrm/vc4_qpu_defines.h
===> Checking for items in pkg-plist which are not in STAGEDIR
===> Error: Plist issues found.
*** Error code 1
66 ↗(On Diff #72306)
$ make check-plist
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
Error: Orphaned: lib/libdrm_intel.so.1
Error: Orphaned: lib/libdrm_intel.so.1.0.0
===> Checking for items in pkg-plist which are not in STAGEDIR
Error: Missing: lib/libdrm_intel.so.2
Error: Missing: lib/libdrm_intel.so.2.0.0
===> Error: Plist issues found.
*** Error code 1

Disable some drivers when we know that they don't work on FreeBSD or
on the arch
Fix plist issue for intel libs.

manu marked 3 inline comments as done.Jun 1 2020, 11:04 AM
manu added inline comments.
graphics/libdrm/pkg-plist
47–48 ↗(On Diff #72306)

I now explicitly disable vc4, it doesn't work for us on FreeBSD anyway.

66 ↗(On Diff #72306)

I don't know how I got .2 ....

This revision is now accepted and ready to land.Jun 1 2020, 8:01 PM
This revision was automatically updated to reflect the committed changes.
manu marked 2 inline comments as done.