-
Notifications
You must be signed in to change notification settings - Fork 740
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Patch consumers and bump PORTREVISION where appropriate. PR: 258999 Reported by: jailbird@fdf.net (maintainer) Reviewed by: madpilot@
- Loading branch information
Showing
17 changed files
with
321 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,28 @@ | ||
| # Created by: wlloyd@slap.net | ||
|
|
||
| PORTNAME= spandsp | ||
| PORTVERSION= 0.0.6 | ||
| DISTVERSION= ${SPANDSP_VERSION}.g20211014 | ||
| CATEGORIES= comms | ||
| MASTER_SITES= http://www.soft-switch.org/downloads/spandsp/ | ||
|
|
||
| MAINTAINER= ports@FreeBSD.org | ||
| MAINTAINER= jailbird@fdf.net | ||
| COMMENT= DSP library and software FAX machine | ||
|
|
||
| LICENSE= LGPL21 | ||
|
|
||
| LIB_DEPENDS= libtiff.so:graphics/tiff | ||
|
|
||
| USES= autoreconf gmake jpeg libtool localbase | ||
|
|
||
| USE_GITHUB= yes | ||
| GH_ACCOUNT= freeswitch | ||
| GH_TAGNAME= ${GITHUB_COMMIT} | ||
| GITHUB_COMMIT= 284fe91 | ||
|
|
||
| USE_LDCONFIG= yes | ||
|
|
||
| GNU_CONFIGURE= yes | ||
| INSTALL_TARGET= install-strip | ||
| USES= autoreconf gmake libtool localbase | ||
| USE_LDCONFIG= yes | ||
|
|
||
| SPANDSP_VERSION= 3.0.0 | ||
|
|
||
| .include <bsd.port.mk> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| SHA256 (spandsp-0.0.6.tar.gz) = cc053ac67e8ac4bb992f258fd94f275a7872df959f6a87763965feabfdcc9465 | ||
| SIZE (spandsp-0.0.6.tar.gz) = 3309837 | ||
| TIMESTAMP = 1634216290 | ||
| SHA256 (freeswitch-spandsp-3.0.0.g20211014-284fe91_GH0.tar.gz) = 288b12eb058d615c526e85fe0fe339293e5713b3513e7918043e93e52e4efd49 | ||
| SIZE (freeswitch-spandsp-3.0.0.g20211014-284fe91_GH0.tar.gz) = 3584374 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| --- res/res_fax_spandsp.c.orig 2021-11-02 08:40:01 UTC | ||
| +++ res/res_fax_spandsp.c | ||
| @@ -167,8 +167,8 @@ struct spandsp_pvt { | ||
| static int spandsp_v21_new(struct spandsp_pvt *p); | ||
| static void session_destroy(struct spandsp_pvt *p); | ||
| static int t38_tx_packet_handler(t38_core_state_t *t38_core_state, void *data, const uint8_t *buf, int len, int count); | ||
| -static void t30_phase_e_handler(t30_state_t *t30_state, void *data, int completion_code); | ||
| -static void spandsp_log(int level, const char *msg); | ||
| +static void t30_phase_e_handler(void *data, int completion_code); | ||
| +static void spandsp_log(void *user_data, int level, const char *msg); | ||
| static int update_stats(struct spandsp_pvt *p, int completion_code); | ||
| static int spandsp_modems(struct ast_fax_session_details *details); | ||
|
|
||
| @@ -375,10 +375,11 @@ static int update_stats(struct spandsp_pvt *p, int com | ||
| * This function pulls stats from the spandsp stack and stores them for res_fax | ||
| * to use later. | ||
| */ | ||
| -static void t30_phase_e_handler(t30_state_t *t30_state, void *data, int completion_code) | ||
| +static void t30_phase_e_handler(void *data, int completion_code) | ||
| { | ||
| struct ast_fax_session *s = data; | ||
| struct spandsp_pvt *p = s->tech_pvt; | ||
| + t30_state_t *t30_state = p->t30_state; | ||
| char headerinfo[T30_MAX_PAGE_HEADER_INFO + 1]; | ||
| const char *c; | ||
| t30_stats_t stats; | ||
| @@ -430,7 +431,7 @@ static void t30_phase_e_handler(t30_state_t *t30_state | ||
| * | ||
| * \note This function is a callback function called by spandsp. | ||
| */ | ||
| -static void spandsp_log(int level, const char *msg) | ||
| +static void spandsp_log(void *user_data, int level, const char *msg) | ||
| { | ||
| if (level == SPAN_LOG_ERROR) { | ||
| ast_log(LOG_ERROR, "%s", msg); | ||
| @@ -449,7 +450,7 @@ static void set_logging(logging_state_t *state, struct | ||
| level = SPAN_LOG_DEBUG_3; | ||
| } | ||
|
|
||
| - span_log_set_message_handler(state, spandsp_log); | ||
| + span_log_set_message_handler(state, spandsp_log, NULL); | ||
| span_log_set_level(state, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | level); | ||
| } | ||
|
|
||
| @@ -479,7 +480,7 @@ static void set_file(t30_state_t *t30_state, struct as | ||
| static void set_ecm(t30_state_t *t30_state, struct ast_fax_session_details *details) | ||
| { | ||
| t30_set_ecm_capability(t30_state, details->option.ecm); | ||
| - t30_set_supported_compressions(t30_state, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION); | ||
| + t30_set_supported_compressions(t30_state, T4_COMPRESSION_T4_1D | T4_COMPRESSION_T4_2D | T4_COMPRESSION_T6); | ||
| } | ||
|
|
||
| static int spandsp_v21_new(struct spandsp_pvt *p) | ||
| @@ -1256,7 +1257,7 @@ static int load_module(void) | ||
| } | ||
|
|
||
| /* prevent logging to stderr */ | ||
| - span_set_message_handler(NULL); | ||
| + span_set_message_handler(NULL, NULL); | ||
|
|
||
| return AST_MODULE_LOAD_SUCCESS; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| --- res/res_fax_spandsp.c.orig 2021-11-02 08:42:19 UTC | ||
| +++ res/res_fax_spandsp.c | ||
| @@ -167,8 +167,8 @@ struct spandsp_pvt { | ||
| static int spandsp_v21_new(struct spandsp_pvt *p); | ||
| static void session_destroy(struct spandsp_pvt *p); | ||
| static int t38_tx_packet_handler(t38_core_state_t *t38_core_state, void *data, const uint8_t *buf, int len, int count); | ||
| -static void t30_phase_e_handler(t30_state_t *t30_state, void *data, int completion_code); | ||
| -static void spandsp_log(int level, const char *msg); | ||
| +static void t30_phase_e_handler(void *data, int completion_code); | ||
| +static void spandsp_log(void *user_data, int level, const char *msg); | ||
| static int update_stats(struct spandsp_pvt *p, int completion_code); | ||
| static int spandsp_modems(struct ast_fax_session_details *details); | ||
|
|
||
| @@ -375,10 +375,11 @@ static int update_stats(struct spandsp_pvt *p, int com | ||
| * This function pulls stats from the spandsp stack and stores them for res_fax | ||
| * to use later. | ||
| */ | ||
| -static void t30_phase_e_handler(t30_state_t *t30_state, void *data, int completion_code) | ||
| +static void t30_phase_e_handler(void *data, int completion_code) | ||
| { | ||
| struct ast_fax_session *s = data; | ||
| struct spandsp_pvt *p = s->tech_pvt; | ||
| + t30_state_t *t30_state = p->t30_state; | ||
| char headerinfo[T30_MAX_PAGE_HEADER_INFO + 1]; | ||
| const char *c; | ||
| t30_stats_t stats; | ||
| @@ -430,7 +431,7 @@ static void t30_phase_e_handler(t30_state_t *t30_state | ||
| * | ||
| * \note This function is a callback function called by spandsp. | ||
| */ | ||
| -static void spandsp_log(int level, const char *msg) | ||
| +static void spandsp_log(void *user_data, int level, const char *msg) | ||
| { | ||
| if (level == SPAN_LOG_ERROR) { | ||
| ast_log(LOG_ERROR, "%s", msg); | ||
| @@ -449,7 +450,7 @@ static void set_logging(logging_state_t *state, struct | ||
| level = SPAN_LOG_DEBUG_3; | ||
| } | ||
|
|
||
| - span_log_set_message_handler(state, spandsp_log); | ||
| + span_log_set_message_handler(state, spandsp_log, NULL); | ||
| span_log_set_level(state, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | level); | ||
| } | ||
|
|
||
| @@ -479,7 +480,7 @@ static void set_file(t30_state_t *t30_state, struct as | ||
| static void set_ecm(t30_state_t *t30_state, struct ast_fax_session_details *details) | ||
| { | ||
| t30_set_ecm_capability(t30_state, details->option.ecm); | ||
| - t30_set_supported_compressions(t30_state, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION); | ||
| + t30_set_supported_compressions(t30_state, T4_COMPRESSION_T4_1D | T4_COMPRESSION_T4_2D | T4_COMPRESSION_T6); | ||
| } | ||
|
|
||
| static int spandsp_v21_new(struct spandsp_pvt *p) | ||
| @@ -1256,7 +1257,7 @@ static int load_module(void) | ||
| } | ||
|
|
||
| /* prevent logging to stderr */ | ||
| - span_set_message_handler(NULL); | ||
| + span_set_message_handler(NULL, NULL); | ||
|
|
||
| return AST_MODULE_LOAD_SUCCESS; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.