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.

Sign up for GitHub

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

Jump to bottom

FreeBSD support #363

Merged
merged 6 commits into from Oct 16, 2020
Merged

FreeBSD support #363

merged 6 commits into from Oct 16, 2020

Conversation

jbeich
Copy link
Contributor

@jbeich jbeich commented Jan 15, 2020 •
edited

Depends on #292. Runtime tested via i965, iHD+QSV and radeonsi from Mesa.

@jbeich
Copy link
Contributor Author

jbeich commented Jan 15, 2020

@Niacat, can you try building Wayland backend on NetBSD?
@iarebatman, I've salvaged useful bits from #350. Can you recheck?

@alarixnia
Copy link

alarixnia commented Jan 15, 2020 •
edited

@jbeich Seems to build successfully with meson and -Dwayland=yes on NetBSD. Haven't tested it, but these files are generated:

./output/va/198dea3@@va-wayland@sha/wayland_va_wayland.c.o
./output/va/198dea3@@va-wayland@sha/wayland_va_wayland_drm.c.o
./output/va/198dea3@@va-wayland@sha/wayland_va_wayland_emgd.c.o

Just realized this PR is for the autotools build system. Afraid not, with BSD make:

Making all in wayland                   
make[3]: make[3]: don't know how to make wayland-drm-client-protocol.h. Stop

But with gmake it's fine.

@jbeich jbeich mentioned this pull request Feb 7, 2020
Open
This was referenced May 22, 2020
Closed
Open
jbeich
jbeich commented May 23, 2020
View reviewed changes
.travis.yml Outdated Show resolved Hide resolved
@jbeich
Copy link
Contributor Author

jbeich commented Oct 7, 2020

What would it take to merge this? I'm not affiliated with any vendor, so can't negotiate through sales. DragonFly, FreeBSD, NetBSD have VAAPI enabled in binary packages for years. Transcoding in Plex using VAAPI (libva but not libmfx) is popular among FreeNAS users.

libva, libva-utils, intel-vaapi-driver are already somewhat portable and don't change much, so the maintanence should be low.

dvrogozh
dvrogozh reviewed Oct 13, 2020
View reviewed changes
Copy link
Contributor

@dvrogozh dvrogozh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for upstreaming BSD changes!

Initial PR description says that this PR depends on #292. Is that still true or #363 became self-sufficient?

Effectively I have nothing against merging this in. The only question I have is: who can be a contact point in case more changes will be needed or some questions will arise? I wish we had some kind of file like MAINTANERS or OWNERS or whatever (might be wiki article) listing whom people can contact w/ different questions.

@jbeich
Copy link
Contributor Author

jbeich commented Oct 13, 2020 •
edited

Initial PR description says that this PR depends on #292. Is that still true or #363 became self-sufficient?

#292 is still necessary but it's a runtime fix (used by mpv --gpu-context=drm and encoding) with small risk. This PR contains only build-related changes with zero risk (after passing CI).

who can be a contact point in case more changes will be needed or some questions will arise?

FreeBSD package maintainer (currently, @jbeich) or FreeBSD graphics team/maillist (e.g., @evadot, @zeising, @myfreeweb).

@jbeich
va/va_trace: implement gettid() for BSDs
bc9bb4a 
../va/va_trace.c:291:28: error: use of undeclared identifier '__NR_gettid'
    pid_t thd_id = syscall(__NR_gettid);
                           ^
../va/va_trace.c:669:28: error: use of undeclared identifier '__NR_gettid'
    pid_t thd_id = syscall(__NR_gettid);
                           ^
../va/va_trace.c:708:28: error: use of undeclared identifier '__NR_gettid'
    pid_t thd_id = syscall(__NR_gettid);
                           ^
../va/va_trace.c:1234:28: error: use of undeclared identifier '__NR_gettid'
    pid_t thd_id = syscall(__NR_gettid);
                           ^
@jbeich
autotools: unbreak --enable-wayland with BSD sed
028a8b2 
BSD sed doesn't support inlining argument for `i` command, so embed
newlines as proposed in http://austingroupbugs.net/view.php?id=249

  GEN      wayland-drm-client-protocol.c
sed: 1: "1i#include "sysdeps.h"
": command i expects \ followed by text
@jbeich
build: respect SYSCONFDIR for libva.conf
be41783 
On DragonFly and FreeBSD config are installed to /usr/local/etc by default.
@jbeich
autotools: avoid -ldl if not required or not supported
438d43e 
ld: error: unable to find library -ldl
@jbeich
va/va: don't try to use RTLD_NODELETE on non-Android if not available
eaf819c 
../va/va.c:455:64: error: use of undeclared identifier 'RTLD_NODELETE'
        handle = dlopen( driver_path, RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE );
                                                               ^
@jbeich
CI: add FreeBSD job
b8c3c8d 
Unlike Linux it uses Meson/Clang to improve coverage.
@dvrogozh
Copy link
Contributor

Thx. No, I don't like squashing either. @jbeich : did you have travis ci passing at some point? /I'll give it couple of hours in hope it will work, but will merge if it won't. If you will note that you had it working - this will give me some confidence:)./

@jbeich
Copy link
Contributor Author

jbeich commented Oct 15, 2020

did you have travis ci passing at some point?

From https://travis-ci.org/github/intel/libva/pull_requests

https://travis-ci.org/github/intel/libva/builds/732134798
https://travis-ci.org/github/intel/libva/builds/727005698
https://travis-ci.org/github/intel/libva/builds/720179146
https://travis-ci.org/github/intel/libva/builds/717845645
https://travis-ci.org/github/intel/libva/builds/711657033
[...]

@jbeich jbeich mentioned this pull request Oct 15, 2020
Closed
@jbeich
Copy link
Contributor Author

jbeich commented Oct 15, 2020

Same commit on TravisCI:

@dvrogozh dvrogozh mentioned this pull request Oct 16, 2020
Merged
@dvrogozh
Copy link
Contributor

This builds ok on freebsd: https://github.com/dvrogozh/libva/actions/runs/311038053. Let's try to merge this in. There is a risk that travis CI is not enabled correctly for freebsd, but we can deal with this separately.

@dvrogozh dvrogozh merged commit 437d426 into intel:master Oct 16, 2020
@uartie
Copy link
Contributor

uartie commented Oct 16, 2020

This breaks build on ubuntu focal (20.04):

17:05:59,298 INFO  - va_trace.c:67:14: error: static declaration of ‘gettid’ follows non-static declaration
17:05:59,299 INFO  - 67 | static pid_t gettid()
17:05:59,299 INFO  - | ^~~~~~
17:05:59,299 INFO  - In file included from /usr/include/unistd.h:1170,
17:05:59,299 INFO  - from va_trace.c:48:
17:05:59,299 INFO  - /usr/include/x86_64-linux-gnu/bits/unistd_ext.h:34:16: note: previous declaration of ‘gettid’ was here
17:05:59,299 INFO  - 34 | extern __pid_t gettid (void) __THROW;
17:05:59,299 INFO  - | ^~~~~~

@uartie
Copy link
Contributor

uartie commented Oct 16, 2020

... and Fedora builds broken too

@jbeich jbeich mentioned this pull request Oct 16, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dvrogozh dvrogozh dvrogozh approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jbeich @alarixnia @dvrogozh @uartie