Page MenuHomeFreeBSD
Differential D13462

science/paraview: Unbreak build
ClosedPublic
Actions

Authored by jwb on Dec 12 2017, 1:49 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Apr 1, 1:37 PM
Unknown Object (File)
Mon, Mar 17, 4:35 PM
Unknown Object (File)
Mon, Mar 17, 1:36 PM
Unknown Object (File)
Feb 24 2025, 6:39 AM
Unknown Object (File)
Feb 24 2025, 4:36 AM
Unknown Object (File)
Feb 23 2025, 11:41 PM
Unknown Object (File)
Feb 23 2025, 2:03 PM
Unknown Object (File)
Feb 23 2025, 11:59 AM
View All Files
Subscribers
jbeich
mat
tcberner

Details

Reviewers
jrm
koobs
Commits
rP456189: science/paraview: Unbreak build with clang 4.0
Summary

science/paraview: Unbreak build
PR: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=216634

Approved by: jrm (mentor) or wen (mentor)
Differential to be added to commit log

Test Plan

portlint -C: Clean
Poudriere test running now on {10.3,11.1}-{amd64,i386}

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 13516
Build 13740: arc lint + arc unit

Event Timeline

jwb created this revision.Dec 12 2017, 1:49 PM
Herald added a subscriber: mat. · View Herald TranscriptDec 12 2017, 1:49 PM
jrm added inline comments.Dec 12 2017, 2:15 PM
science/paraview/Makefile
32

Should this have the flavor-foo for the python version? Should this be done now or should the focus be only on fixing the build issue?

87–100

For future work, these could be converted to option helpers.

science/paraview/files/patch-Plugins_CDIReader_cdilib.c
1

It looks like just the timestamp changed here, so this change could/should be left out?

mat added inline comments.Dec 12 2017, 2:25 PM
science/paraview/Makefile
32

It must, yes. Add @${PY_FLAVOR}.

jwb updated this revision to Diff 36506.Dec 12 2017, 2:41 PM

Add Python flavor and silence REINPLACE_CMD.

Harbormaster completed remote builds in B13508: Diff 36506.Dec 12 2017, 2:41 PM
jrm added a comment.Dec 12 2017, 3:08 PM
In D13462#281369, @jwb wrote:

Add Python flavor and silence REINPLACE_CMD.

Also, RUN_DEPENDS= ... ${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib@${PY_FLAVOR}

jwb added a comment.Dec 12 2017, 3:38 PM

I'm getting swamped again this morning, so I'll get back to these later when I can focus again...

jwb updated this revision to Diff 36523.Dec 12 2017, 9:45 PM

Add python flavor to RUN_DEPENDS

jrm accepted this revision.Dec 12 2017, 9:53 PM

Looks good. Don't forget the maintainer in the Approved by: field.

This revision is now accepted and ready to land.Dec 12 2017, 9:53 PM
jwb added a comment.Dec 12 2017, 10:18 PM

Haven't heard from the maintainer yet. He submitted part of the patch on Aprll 6th and that's the last anyone heard from him. Should I try to reach out to him in case he didn't see the bugtracker updates?

jrm added a comment.Dec 12 2017, 10:35 PM

The two week timeout could probably be considered to have started after Tobias's comment in August. You could 1) commit it noting the maintainer timeout, 2) confirm with portmgr that the timeout has been reached then commit it, or 3) contact the maintainer. In case of 3) you should wait two weeks.

jrm added a comment.Dec 12 2017, 10:36 PM
In D13462#281494, @jrm wrote:

In case of 3) you should wait two weeks.

That is, wait two weeks if you don't hear back.

jwb added a comment.Dec 12 2017, 11:14 PM

I think 4 months without a response to Tobias is enough. Just wanted to know if there are any strict rules about this situation. I'm going to let the last of 4 poudriere builds finish and then I'll do the commit assuming it succeeds.

Closed by commit rP456189: science/paraview: Unbreak build with clang 4.0 (authored by jwb). · Explain WhyDec 13 2017, 3:34 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 36523

View Options

science/paraview/Makefile

Show First 20 Lines • Show All 701 Lines • ▼ Show 20 Linesieee80211_phy_vht_validate_mcs(enum ieee80211_sta_rx_bw bw, uint8_t nss,
uint16_t mask; uint16_t mask;
mask = ieee80211_phy_vht_get_mcs_mask(bw, nss); mask = ieee80211_phy_vht_get_mcs_mask(bw, nss);
if (mask == 0) if (mask == 0)
return (false); return (false);
return ((mask & (1 << mcs)) != 0); return ((mask & (1 << mcs)) != 0);
} }
struct mcs_entry {
int n_sym; /* Number of bits per symbol */
int cod_n; /* Coding rate numerator */
int cod_d; /* Coding rate denominator */
};
/*
* These parameters are taken from 802.11-2020 Table 21-29
* (VHT-MCSs for Mandatory 20 MHZ, Nss=1).
*
* n_sym corresponds to "Nbpscs", cod_n/cod_d corresponds to
* "R".
*/
static struct mcs_entry mcs_entries[] = {
{ 1, 1, 2 }, /* MCS0 */
{ 2, 1, 2 },
{ 2, 3, 4 },
{ 4, 1, 2 },
{ 4, 3, 4 },
{ 6, 2, 3 },
{ 6, 3, 4 },
{ 6, 5, 6 },
{ 8, 3, 4 },
{ 8, 5, 6 }, /* MCS9 */
};
/**
* @brief Calculate the bitrate of the given VHT MCS rate.
*
* @param bw Channel bandwidth (enum ieee80211_sta_rx_bw)
* @param nss Number of spatial streams, 1..8
* @param mcs MCS, 0..9
* @param is_shortgi True if short guard-interval (400nS)
* false otherwise (800nS)
*
* @returns The bitrate in kbit/sec.
*/
uint32_t
ieee80211_phy_vht_get_mcs_kbit(enum ieee80211_sta_rx_bw bw,
uint8_t nss, uint8_t mcs, bool is_shortgi)
{
uint32_t sym_len, n_carriers;
/* Validate MCS 0..9, NSS 1..8 */
if (mcs > 9)
return (0);
if (nss == 0 || nss > 8)
return (0);
/*
* Short-GI - 3.6uS symbol time, long-GI - 4.0uS symbol time
*
* See 802.11-2020 Table 21-5 (Timing-related constraints.)
*/
if (is_shortgi)
sym_len = 36;
else
sym_len = 40;
/*
* Calculate the number of carriers for the given channel bandwidth
*
* See 802.11-2020 Table 21-5 (Timing-related constraints.)
*/
switch (bw) {
case IEEE80211_STA_RX_BW_20:
n_carriers = 52;
break;
case IEEE80211_STA_RX_BW_40:
n_carriers = 108;
break;
case IEEE80211_STA_RX_BW_80:
n_carriers = 234;
break;
case IEEE80211_STA_RX_BW_160:
n_carriers = 468;
break;
default:
return (0);
}
return ((n_carriers * mcs_entries[mcs].n_sym * mcs_entries[mcs].cod_n *
nss * 10000) / (mcs_entries[mcs].cod_d * sym_len));
}
View Options

science/paraview/files/patch-Plugins_CDIReader_cdilib.c

Show First 20 Lines • Show All 701 Lines • ▼ Show 20 Linesieee80211_phy_vht_validate_mcs(enum ieee80211_sta_rx_bw bw, uint8_t nss,
uint16_t mask; uint16_t mask;
mask = ieee80211_phy_vht_get_mcs_mask(bw, nss); mask = ieee80211_phy_vht_get_mcs_mask(bw, nss);
if (mask == 0) if (mask == 0)
return (false); return (false);
return ((mask & (1 << mcs)) != 0); return ((mask & (1 << mcs)) != 0);
} }
struct mcs_entry {
int n_sym; /* Number of bits per symbol */
int cod_n; /* Coding rate numerator */
int cod_d; /* Coding rate denominator */
};
/*
* These parameters are taken from 802.11-2020 Table 21-29
* (VHT-MCSs for Mandatory 20 MHZ, Nss=1).
*
* n_sym corresponds to "Nbpscs", cod_n/cod_d corresponds to
* "R".
*/
static struct mcs_entry mcs_entries[] = {
{ 1, 1, 2 }, /* MCS0 */
{ 2, 1, 2 },
{ 2, 3, 4 },
{ 4, 1, 2 },
{ 4, 3, 4 },
{ 6, 2, 3 },
{ 6, 3, 4 },
{ 6, 5, 6 },
{ 8, 3, 4 },
{ 8, 5, 6 }, /* MCS9 */
};
/**
* @brief Calculate the bitrate of the given VHT MCS rate.
*
* @param bw Channel bandwidth (enum ieee80211_sta_rx_bw)
* @param nss Number of spatial streams, 1..8
* @param mcs MCS, 0..9
* @param is_shortgi True if short guard-interval (400nS)
* false otherwise (800nS)
*
* @returns The bitrate in kbit/sec.
*/
uint32_t
ieee80211_phy_vht_get_mcs_kbit(enum ieee80211_sta_rx_bw bw,
uint8_t nss, uint8_t mcs, bool is_shortgi)
{
uint32_t sym_len, n_carriers;
/* Validate MCS 0..9, NSS 1..8 */
if (mcs > 9)
return (0);
if (nss == 0 || nss > 8)
return (0);
/*
* Short-GI - 3.6uS symbol time, long-GI - 4.0uS symbol time
*
* See 802.11-2020 Table 21-5 (Timing-related constraints.)
*/
if (is_shortgi)
sym_len = 36;
else
sym_len = 40;
/*
* Calculate the number of carriers for the given channel bandwidth
*
* See 802.11-2020 Table 21-5 (Timing-related constraints.)
*/
switch (bw) {
case IEEE80211_STA_RX_BW_20:
n_carriers = 52;
break;
case IEEE80211_STA_RX_BW_40:
n_carriers = 108;
break;
case IEEE80211_STA_RX_BW_80:
n_carriers = 234;
break;
case IEEE80211_STA_RX_BW_160:
n_carriers = 468;
break;
default:
return (0);
}
return ((n_carriers * mcs_entries[mcs].n_sym * mcs_entries[mcs].cod_n *
nss * 10000) / (mcs_entries[mcs].cod_d * sym_len));
}
View Options

science/paraview/files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_ncvalues.h

Show First 20 Lines • Show All 701 Lines • ▼ Show 20 Linesieee80211_phy_vht_validate_mcs(enum ieee80211_sta_rx_bw bw, uint8_t nss,
uint16_t mask; uint16_t mask;
mask = ieee80211_phy_vht_get_mcs_mask(bw, nss); mask = ieee80211_phy_vht_get_mcs_mask(bw, nss);
if (mask == 0) if (mask == 0)
return (false); return (false);
return ((mask & (1 << mcs)) != 0); return ((mask & (1 << mcs)) != 0);
} }
struct mcs_entry {
int n_sym; /* Number of bits per symbol */
int cod_n; /* Coding rate numerator */
int cod_d; /* Coding rate denominator */
};
/*
* These parameters are taken from 802.11-2020 Table 21-29
* (VHT-MCSs for Mandatory 20 MHZ, Nss=1).
*
* n_sym corresponds to "Nbpscs", cod_n/cod_d corresponds to
* "R".
*/
static struct mcs_entry mcs_entries[] = {
{ 1, 1, 2 }, /* MCS0 */
{ 2, 1, 2 },
{ 2, 3, 4 },
{ 4, 1, 2 },
{ 4, 3, 4 },
{ 6, 2, 3 },
{ 6, 3, 4 },
{ 6, 5, 6 },
{ 8, 3, 4 },
{ 8, 5, 6 }, /* MCS9 */
};
/**
* @brief Calculate the bitrate of the given VHT MCS rate.
*
* @param bw Channel bandwidth (enum ieee80211_sta_rx_bw)
* @param nss Number of spatial streams, 1..8
* @param mcs MCS, 0..9
* @param is_shortgi True if short guard-interval (400nS)
* false otherwise (800nS)
*
* @returns The bitrate in kbit/sec.
*/
uint32_t
ieee80211_phy_vht_get_mcs_kbit(enum ieee80211_sta_rx_bw bw,
uint8_t nss, uint8_t mcs, bool is_shortgi)
{
uint32_t sym_len, n_carriers;
/* Validate MCS 0..9, NSS 1..8 */
if (mcs > 9)
return (0);
if (nss == 0 || nss > 8)
return (0);
/*
* Short-GI - 3.6uS symbol time, long-GI - 4.0uS symbol time
*
* See 802.11-2020 Table 21-5 (Timing-related constraints.)
*/
if (is_shortgi)
sym_len = 36;
else
sym_len = 40;
/*
* Calculate the number of carriers for the given channel bandwidth
*
* See 802.11-2020 Table 21-5 (Timing-related constraints.)
*/
switch (bw) {
case IEEE80211_STA_RX_BW_20:
n_carriers = 52;
break;
case IEEE80211_STA_RX_BW_40:
n_carriers = 108;
break;
case IEEE80211_STA_RX_BW_80:
n_carriers = 234;
break;
case IEEE80211_STA_RX_BW_160:
n_carriers = 468;
break;
default:
return (0);
}
return ((n_carriers * mcs_entries[mcs].n_sym * mcs_entries[mcs].cod_n *
nss * 10000) / (mcs_entries[mcs].cod_d * sym_len));
}
View Options

science/paraview/files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_netcdfcpp.h

Show First 20 Lines • Show All 701 Lines • ▼ Show 20 Linesieee80211_phy_vht_validate_mcs(enum ieee80211_sta_rx_bw bw, uint8_t nss,
uint16_t mask; uint16_t mask;
mask = ieee80211_phy_vht_get_mcs_mask(bw, nss); mask = ieee80211_phy_vht_get_mcs_mask(bw, nss);
if (mask == 0) if (mask == 0)
return (false); return (false);
return ((mask & (1 << mcs)) != 0); return ((mask & (1 << mcs)) != 0);
} }
struct mcs_entry {
int n_sym; /* Number of bits per symbol */
int cod_n; /* Coding rate numerator */
int cod_d; /* Coding rate denominator */
};
/*
* These parameters are taken from 802.11-2020 Table 21-29
* (VHT-MCSs for Mandatory 20 MHZ, Nss=1).
*
* n_sym corresponds to "Nbpscs", cod_n/cod_d corresponds to
* "R".
*/
static struct mcs_entry mcs_entries[] = {
{ 1, 1, 2 }, /* MCS0 */
{ 2, 1, 2 },
{ 2, 3, 4 },
{ 4, 1, 2 },
{ 4, 3, 4 },
{ 6, 2, 3 },
{ 6, 3, 4 },
{ 6, 5, 6 },
{ 8, 3, 4 },
{ 8, 5, 6 }, /* MCS9 */
};
/**
* @brief Calculate the bitrate of the given VHT MCS rate.
*
* @param bw Channel bandwidth (enum ieee80211_sta_rx_bw)
* @param nss Number of spatial streams, 1..8
* @param mcs MCS, 0..9
* @param is_shortgi True if short guard-interval (400nS)
* false otherwise (800nS)
*
* @returns The bitrate in kbit/sec.
*/
uint32_t
ieee80211_phy_vht_get_mcs_kbit(enum ieee80211_sta_rx_bw bw,
uint8_t nss, uint8_t mcs, bool is_shortgi)
{
uint32_t sym_len, n_carriers;
/* Validate MCS 0..9, NSS 1..8 */
if (mcs > 9)
return (0);
if (nss == 0 || nss > 8)
return (0);
/*
* Short-GI - 3.6uS symbol time, long-GI - 4.0uS symbol time
*
* See 802.11-2020 Table 21-5 (Timing-related constraints.)
*/
if (is_shortgi)
sym_len = 36;
else
sym_len = 40;
/*
* Calculate the number of carriers for the given channel bandwidth
*
* See 802.11-2020 Table 21-5 (Timing-related constraints.)
*/
switch (bw) {
case IEEE80211_STA_RX_BW_20:
n_carriers = 52;
break;
case IEEE80211_STA_RX_BW_40:
n_carriers = 108;
break;
case IEEE80211_STA_RX_BW_80:
n_carriers = 234;
break;
case IEEE80211_STA_RX_BW_160:
n_carriers = 468;
break;
default:
return (0);
}
return ((n_carriers * mcs_entries[mcs].n_sym * mcs_entries[mcs].cod_n *
nss * 10000) / (mcs_entries[mcs].cod_d * sym_len));
}
View Options

science/paraview/files/patch-VTK_ThirdParty_xdmf2_vtkxdmf2_libsrc_XdmfDsmComm.cxx

Show First 20 Lines • Show All 701 Lines • ▼ Show 20 Linesieee80211_phy_vht_validate_mcs(enum ieee80211_sta_rx_bw bw, uint8_t nss,
uint16_t mask; uint16_t mask;
mask = ieee80211_phy_vht_get_mcs_mask(bw, nss); mask = ieee80211_phy_vht_get_mcs_mask(bw, nss);
if (mask == 0) if (mask == 0)
return (false); return (false);
return ((mask & (1 << mcs)) != 0); return ((mask & (1 << mcs)) != 0);
} }
struct mcs_entry {
int n_sym; /* Number of bits per symbol */
int cod_n; /* Coding rate numerator */
int cod_d; /* Coding rate denominator */
};
/*
* These parameters are taken from 802.11-2020 Table 21-29
* (VHT-MCSs for Mandatory 20 MHZ, Nss=1).
*
* n_sym corresponds to "Nbpscs", cod_n/cod_d corresponds to
* "R".
*/
static struct mcs_entry mcs_entries[] = {
{ 1, 1, 2 }, /* MCS0 */
{ 2, 1, 2 },
{ 2, 3, 4 },
{ 4, 1, 2 },
{ 4, 3, 4 },
{ 6, 2, 3 },
{ 6, 3, 4 },
{ 6, 5, 6 },
{ 8, 3, 4 },
{ 8, 5, 6 }, /* MCS9 */
};
/**
* @brief Calculate the bitrate of the given VHT MCS rate.
*
* @param bw Channel bandwidth (enum ieee80211_sta_rx_bw)
* @param nss Number of spatial streams, 1..8
* @param mcs MCS, 0..9
* @param is_shortgi True if short guard-interval (400nS)
* false otherwise (800nS)
*
* @returns The bitrate in kbit/sec.
*/
uint32_t
ieee80211_phy_vht_get_mcs_kbit(enum ieee80211_sta_rx_bw bw,
uint8_t nss, uint8_t mcs, bool is_shortgi)
{
uint32_t sym_len, n_carriers;
/* Validate MCS 0..9, NSS 1..8 */
if (mcs > 9)
return (0);
if (nss == 0 || nss > 8)
return (0);
/*
* Short-GI - 3.6uS symbol time, long-GI - 4.0uS symbol time
*
* See 802.11-2020 Table 21-5 (Timing-related constraints.)
*/
if (is_shortgi)
sym_len = 36;
else
sym_len = 40;
/*
* Calculate the number of carriers for the given channel bandwidth
*
* See 802.11-2020 Table 21-5 (Timing-related constraints.)
*/
switch (bw) {
case IEEE80211_STA_RX_BW_20:
n_carriers = 52;
break;
case IEEE80211_STA_RX_BW_40:
n_carriers = 108;
break;
case IEEE80211_STA_RX_BW_80:
n_carriers = 234;
break;
case IEEE80211_STA_RX_BW_160:
n_carriers = 468;
break;
default:
return (0);
}
return ((n_carriers * mcs_entries[mcs].n_sym * mcs_entries[mcs].cod_n *
nss * 10000) / (mcs_entries[mcs].cod_d * sym_len));
}