Page MenuHomeFreeBSD
Differential D52426

audio/virtual_oss_bluetooth: New port
ClosedPublic
Actions

Authored by christos on Mon, Sep 8, 4:01 PM.
Tags
None
Referenced Files
F131314888: D52426.id161724.diff
Mon, Oct 6, 8:33 PM
Unknown Object (File)
Thu, Oct 2, 1:44 PM
Unknown Object (File)
Thu, Oct 2, 8:09 AM
Unknown Object (File)
Wed, Oct 1, 3:46 PM
Unknown Object (File)
Wed, Oct 1, 5:14 AM
Unknown Object (File)
Wed, Oct 1, 4:07 AM
Unknown Object (File)
Tue, Sep 30, 8:51 PM
Unknown Object (File)
Tue, Sep 30, 3:57 PM
View All 29 Files
Subscribers
None

Details

Reviewers
markj
emaste
arrowd
fuz
Commits
R11:2dcc66e8c6c4: audio/virtual_oss_bluetooth: New port
Summary

src commit FILLME ("virtual_oss: Port to base") includes the bluetooth
backend, however the backend also has a HAVE_LIBAV ifdef, which, if set,
enables libav support, which depends on multimedia/gstreamer1-libav.
While we could build the non-libav parts from base and the libav ones as
a port, we instead build the whole backend as a port to avoid
unnecessary complexity. The reason for that being that building from
base would install the backend in /usr/lib/virtual_oss/voss_bt.so, and
the port would install _another_ voss_bt.so, but this time in
/usr/local/lib/virtual_oss/voss_bt.so, which would create conflicts.

The port simply builds the files from src, which is not ideal, as this
means that the src repo needs to be present in the system in order for
the port to build, but this way we can avoid version mismatches and
ifdef hell as the project progresses.

Note that this is an extension for the base system virtual_oss, and not
audio/virtual_oss.

Sponsored by: The FreeBSD Foundation

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 66898
Build 63781: arc lint + arc unit

Event Timeline

christos requested review of this revision.Mon, Sep 8, 4:01 PM
christos created this revision.
Harbormaster completed remote builds in B66890: Diff 161722.Mon, Sep 8, 4:01 PM
christos added a comment.Mon, Sep 8, 4:02 PM

Only issue is that it installs in /usr/local/lib/virtual_oss, whereas we (might) want it to install under /usr/lib/virtual_oss, which is where the bluetooth backend is installed when built from /usr/src.

christos added a parent revision: D52308: virtual_oss: Port to base.Mon, Sep 8, 4:02 PM
christos retitled this revision from virtual_oss_libav: New port to audio/virtual_oss_libav: New port.Mon, Sep 8, 4:15 PM
arrowd added a comment.Mon, Sep 8, 4:33 PM
In D52426#1197314, @christos wrote:

Only issue is that it installs in /usr/local/lib/virtual_oss, whereas we (might) want it to install under /usr/lib/virtual_oss, which is where the bluetooth backend is installed when built from /usr/src.

This is correct from the Ports side of things - we try to make all ports to install files under ${LOCALBASE}. The exception is maybe kmods, which go into /boot/ and Linuxulator ports, which use /compat/linux/ as PREFIX.

Is this a problem to have voss_bt.so installed under ${LOCALBASE}?

audio/virtual_oss_libav/Makefile
22 ↗(On Diff #161722)

I think this can be made a part of MAKE_ENV too?

christos marked an inline comment as done.Mon, Sep 8, 4:39 PM
In D52426#1197323, @arrowd wrote:
In D52426#1197314, @christos wrote:

Only issue is that it installs in /usr/local/lib/virtual_oss, whereas we (might) want it to install under /usr/lib/virtual_oss, which is where the bluetooth backend is installed when built from /usr/src.

This is correct from the Ports side of things - we try to make all ports to install files under ${LOCALBASE}. The exception is maybe kmods, which go into /boot/ and Linuxulator ports, which use /compat/linux/ as PREFIX.

Is this a problem to have voss_bt.so installed under ${LOCALBASE}?

It would be a problem because the base install will install /usr/lib/virtual_oss/voss_bt.so, and with the port we'll also have /usr/local/lib/virtual_oss/voss_bt.so. I do not really like the hackiness, but I think it might be better to just install it in /usr/lib/virtual_oss/voss_bt.so to not complicate things. Is this done by just setting PREFIX=/usr?

christos updated this revision to Diff 161724.Mon, Sep 8, 4:39 PM

Set HAVE_LIBAV in MAKE_ENV.

Harbormaster completed remote builds in B66892: Diff 161724.Mon, Sep 8, 4:39 PM
christos updated this revision to Diff 161727.Mon, Sep 8, 4:48 PM

Re-sort audio/Makefile after renaming in D52365.

Harbormaster completed remote builds in B66895: Diff 161727.Mon, Sep 8, 4:48 PM
arrowd added a comment.Mon, Sep 8, 5:01 PM

Packages can't overwrite files belonging to other packages. If I understand it correctly, using PREFIX=/usr would create a conflict.

Maybe the correct solution here would be first try loading the library from LOCALBASE and then fall back to /usr/lib?

christos added a comment.Mon, Sep 8, 5:13 PM
In D52426#1197351, @arrowd wrote:

Packages can't overwrite files belonging to other packages. If I understand it correctly, using PREFIX=/usr would create a conflict.

Maybe the correct solution here would be first try loading the library from LOCALBASE and then fall back to /usr/lib?

I guess an alternative could be to just build the whole bluetooth backend as a port in the first place, and have HAVE_LIBAV as an option.
@fuz What do you think about this?

christos retitled this revision from audio/virtual_oss_libav: New port to audio/virtual_oss_bluetooth: New port.Mon, Sep 8, 5:39 PM
christos edited the summary of this revision. (Show Details)
christos updated this revision to Diff 161730.Mon, Sep 8, 5:40 PM

Scratch that. Build the whole thing as a port, it is significantly simpler and
cleaner this way.

Harbormaster completed remote builds in B66898: Diff 161730.Mon, Sep 8, 5:40 PM
christos mentioned this in D52308: virtual_oss: Port to base.Mon, Sep 8, 5:44 PM
arrowd added inline comments.Mon, Sep 8, 5:48 PM
audio/virtual_oss_bluetooth/Makefile
25

Actually, no need for += there.

christos added inline comments.Mon, Sep 8, 5:49 PM
audio/virtual_oss_bluetooth/Makefile
25

That applies to the other ports as well?

arrowd added inline comments.Mon, Sep 8, 5:50 PM
audio/virtual_oss_bluetooth/Makefile
25

Yes. += is only needed for master/slave ports, that is if this Makefile gets .included from some other Makefile.

christos updated this revision to Diff 161733.Mon, Sep 8, 5:53 PM
christos marked an inline comment as done.

Address Gleb's comment. Keep += in LIBAV_MAKE_ENV though.

Harbormaster completed remote builds in B66901: Diff 161733.Mon, Sep 8, 5:53 PM
christos marked an inline comment as done.Mon, Sep 8, 5:54 PM
arrowd added a comment.Mon, Sep 8, 6:57 PM

Keep += in LIBAV_MAKE_ENV though.

Out of curiosity, why? It is just a Makefile variable and it isn't set anywhere before, so you're appending to an undefined var.

christos updated this revision to Diff 161754.Mon, Sep 8, 10:35 PM

Remove += from LIBAV_MAKE_ENV as well. I thought this inherits MAKE_ENV
hence why the +=. My bad.

Harbormaster completed remote builds in B66910: Diff 161754.Mon, Sep 8, 10:35 PM
christos mentioned this in D52365: audio/virtual_oss_sndio: New port.Thu, Sep 11, 4:10 PM
arrowd accepted this revision.Tue, Sep 30, 3:35 PM
This revision is now accepted and ready to land.Tue, Sep 30, 3:35 PM
Closed by commit R11:2dcc66e8c6c4: audio/virtual_oss_bluetooth: New port (authored by christos). · Explain WhyTue, Sep 30, 3:41 PM
This revision was automatically updated to reflect the committed changes.
christos added a commit: R11:2dcc66e8c6c4: audio/virtual_oss_bluetooth: New port.

Revision Contents
Changeset List

PathSize
audio/
1 line
virtual_oss_bluetooth/
41 lines
6 lines

Diff 161730

View Options

audio/Makefile

Loading...
View Options

audio/virtual_oss_bluetooth/Makefile

Loading...
View Options

audio/virtual_oss_bluetooth/pkg-descr

Loading...