Skip to content

Fix bitstream dependency and netmap in new build system #1107

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix bitstream dependency and netmap in new build system #1107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99c8d31
upipe-modules: make build know upipe_rtp_anc_unpack depends on bitstream
Nov 22, 2025
88bd7ca
upipe-netmap: make build know more headers are needed for configure d…
Nov 22, 2025
54ff3db
upipe-netmap: make build know it depends on bitstream
Nov 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions lib/upipe-modules/Build.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ libupipe_modules-includes = \
upipe_rate_limit.h \
upipe_row_join.h \
upipe_row_split.h \
upipe_rtp_anc_unpack.h \
upipe_rtp_h264.h \
upipe_rtp_mpeg4.h \
upipe_rtp_pcm_pack.h \
Expand Down Expand Up @@ -138,7 +137,6 @@ libupipe_modules-src = \
upipe_rate_limit.c \
upipe_row_join.c \
upipe_row_split.c \
upipe_rtp_anc_unpack.c \
upipe_rtp_h264.c \
upipe_rtp_mpeg4.c \
upipe_rtp_pcm_pack.c \
Expand Down Expand Up @@ -167,26 +165,28 @@ libupipe_modules-src = \
uprobe_blit_prepare.c \
uprobe_http_redirect.c

have_upipe_fsink = $(have_writev)
have_upipe_udpsink = $(have_writev)
have_upipe_id3v2 = $(have_bitstream)
have_upipe_id3v2_encaps = $(have_bitstream)
have_upipe_id3v2_decaps = $(have_bitstream)
have_upipe_rtcp = $(have_bitstream)
have_upipe_rtpd = $(have_bitstream)
have_upipe_rtp_demux = $(have_bitstream)
have_upipe_rtp_prepend = $(have_bitstream)
have_upipe_rtpr = $(have_bitstream)
have_upipe_rtpsrc = $(have_bitstream)
have_upipe_s337_encaps = $(have_bitstream)
have_upipe_vancd = $(have_bitstream)
have_upipe_fsink = $(have_writev)
have_upipe_udpsink = $(have_writev)
have_upipe_id3v2 = $(have_bitstream)
have_upipe_id3v2_encaps = $(have_bitstream)
have_upipe_id3v2_decaps = $(have_bitstream)
have_upipe_rtcp = $(have_bitstream)
have_upipe_rtpd = $(have_bitstream)
have_upipe_rtp_anc_unpack = $(have_bitstream)
Copy link
Collaborator

@nto nto Nov 28, 2025

Choose a reason for hiding this comment

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

Can you change the other lines to keep the "=" alignment?

Copy link
Contributor Author

@JDarnley JDarnley Nov 28, 2025

Choose a reason for hiding this comment

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

Sure. Do you want me to amend or make a whitespace only commit?

Copy link
Contributor Author

@JDarnley JDarnley Nov 28, 2025

Choose a reason for hiding this comment

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

As for adding netmap to the CI: you, we, I can consider it. I think it only needs 4 headers in an include path.

Copy link
Collaborator

@nto nto Nov 28, 2025

Choose a reason for hiding this comment

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

Sure. Do you want me to amend or make a whitespace only commit?

You can amend your current commit. BTW, can you rephrase your commit messages in imperative?

Copy link
Collaborator

@nto nto Dec 2, 2025

Choose a reason for hiding this comment

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

You can use a more direct style, as commit titles should avoid taking much more than 50 characters. Eg:

upipe_rtp_anc_unpack: add missing bitstream dependency
upipe-netmap: fix netmap config check
upipe-netmap: add missing bitstream dependency

have_upipe_rtp_demux = $(have_bitstream)
have_upipe_rtp_prepend = $(have_bitstream)
have_upipe_rtpr = $(have_bitstream)
have_upipe_rtpsrc = $(have_bitstream)
have_upipe_s337_encaps = $(have_bitstream)
have_upipe_vancd = $(have_bitstream)

libupipe_modules-includes += \
$(if $(have_upipe_fsink),upipe_file_sink.h) \
$(if $(have_upipe_id3v2),upipe_id3v2.h) \
$(if $(have_upipe_id3v2_encaps),upipe_id3v2_encaps.h) \
$(if $(have_upipe_id3v2_decaps),upipe_id3v2_decaps.h) \
$(if $(have_upipe_rtcp),upipe_rtcp.h) \
$(if $(have_upipe_rtp_anc_unpack),upipe_rtp_anc_unpack.h) \
$(if $(have_upipe_rtp_demux),upipe_rtp_demux.h) \
$(if $(have_upipe_rtpd),upipe_rtp_decaps.h) \
$(if $(have_upipe_rtp_prepend),upipe_rtp_prepend.h) \
Expand All @@ -202,6 +202,7 @@ libupipe_modules-src += \
$(if $(have_upipe_id3v2_encaps),upipe_id3v2_encaps.c) \
$(if $(have_upipe_id3v2_decaps),upipe_id3v2_decaps.c) \
$(if $(have_upipe_rtcp),upipe_rtcp.c) \
$(if $(have_upipe_rtp_anc_unpack),upipe_rtp_anc_unpack.c) \
$(if $(have_upipe_rtp_demux),upipe_rtp_demux.c) \
$(if $(have_upipe_rtpd),upipe_rtp_decaps.c) \
$(if $(have_upipe_rtp_prepend),upipe_rtp_prepend.c) \
Expand Down
4 changes: 2 additions & 2 deletions lib/upipe-netmap/Build.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
configs += netmap
netmap-includes = net/netmap.h
netmap-includes = net/if.h stdint.h sys/time.h net/netmap.h

lib-targets = libupipe_netmap

libupipe_netmap-desc = netmap interface module
libupipe_netmap-includes = upipe_netmap_source.h
libupipe_netmap-src = upipe_netmap_source.c
libupipe_netmap-deps = netmap
libupipe_netmap-libs = libupipe
libupipe_netmap-libs = libupipe bitstream
Loading