Date: Wed, 14 Apr 2021 20:31:20 GMT From: Jochen Neumeister <joneum@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 21106f107244 - main - www/nginx: Update 3rd Party Module vod-module to 1.27 Message-ID: <202104142031.13EKVK60016570@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=21106f10724433cf7dba848bd12457616e130130 commit 21106f10724433cf7dba848bd12457616e130130 Author: Jochen Neumeister <joneum@FreeBSD.org> AuthorDate: 2021-04-14 20:20:31 +0000 Commit: Jochen Neumeister <joneum@FreeBSD.org> CommitDate: 2021-04-14 20:22:08 +0000 www/nginx: Update 3rd Party Module vod-module to 1.27 PR: 254680 --- www/nginx/Makefile | 2 +- www/nginx/Makefile.extmod | 6 +++--- www/nginx/distinfo | 6 +++--- www/nginx/files/extra-patch-nginx-vod-module-config | 6 +++--- .../files/extra-patch-vod-filters-audio_encoder.c | 20 -------------------- 5 files changed, 10 insertions(+), 30 deletions(-) diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 60fd1eff8acc..c1d3de3b88db 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -2,7 +2,7 @@ PORTNAME= nginx PORTVERSION= 1.18.0 -PORTREVISION?= 49 +PORTREVISION?= 50 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index 953186e1b253..6a5ee4c27686 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -301,11 +301,11 @@ SMALL_LIGHT_VARS= DSO_EXTMODS+=small_light SRCACHE_GH_TUPLE= openresty:srcache-nginx-module:v0.32:srcache SRCACHE_VARS= DSO_EXTMODS+=srcache -VOD_GH_TUPLE= kaltura:nginx-vod-module:1.23:vod +VOD_GH_TUPLE= kaltura:nginx-vod-module:1.27:vod VOD_USE= GNOME=libxml2 +VOD_USES= iconv VOD_VARS= DSO_EXTMODS+=vod -VOD_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-vod-module-config \ - ${PATCHDIR}/extra-patch-vod-filters-audio_encoder.c +VOD_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-vod-module-config VTS_GH_TUPLE= vozlt:nginx-module-vts:v0.1.18:vts VTS_CONFIGURE_ON= --add-module=${WRKSRC_vts} diff --git a/www/nginx/distinfo b/www/nginx/distinfo index c11e55e41774..8dafef0ee2e4 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1616136977 +TIMESTAMP = 1617205157 SHA256 (nginx-1.18.0.tar.gz) = 4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99 SIZE (nginx-1.18.0.tar.gz) = 1039530 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -137,8 +137,8 @@ SHA256 (cubicdaiya-ngx_small_light-v0.9.2_GH0.tar.gz) = 4cf660651d11330a13aab29e SIZE (cubicdaiya-ngx_small_light-v0.9.2_GH0.tar.gz) = 56502 SHA256 (openresty-srcache-nginx-module-v0.32_GH0.tar.gz) = fd80e59b672e4ff3b4e943740b3facab421c6965226b5934aed16a514baacf47 SIZE (openresty-srcache-nginx-module-v0.32_GH0.tar.gz) = 49891 -SHA256 (kaltura-nginx-vod-module-1.23_GH0.tar.gz) = 800cf3de639567e27f4cb75527392f23842b349fb680abefd12d4db9a5be951f -SIZE (kaltura-nginx-vod-module-1.23_GH0.tar.gz) = 442053 +SHA256 (kaltura-nginx-vod-module-1.27_GH0.tar.gz) = b7f0e2eecbcdb8ed1f8c90eb86c756f563fc5d21768a351abe4de63f3ddf01d6 +SIZE (kaltura-nginx-vod-module-1.27_GH0.tar.gz) = 450777 SHA256 (vozlt-nginx-module-vts-v0.1.18_GH0.tar.gz) = 17ea41d4083f6d1ab1ab83dad9160eeca66867abe16c5a0421f85a39d7c84b65 SIZE (vozlt-nginx-module-vts-v0.1.18_GH0.tar.gz) = 380327 SHA256 (tg123-websockify-nginx-module-e82d254_GH0.tar.gz) = 1ea0fd35e3bed61c822aa0bfb9329a38d908a602b78a5e5fef9c7e946a26de6b diff --git a/www/nginx/files/extra-patch-nginx-vod-module-config b/www/nginx/files/extra-patch-nginx-vod-module-config index de3a85fccc57..1f32296b0e9c 100644 --- a/www/nginx/files/extra-patch-nginx-vod-module-config +++ b/www/nginx/files/extra-patch-nginx-vod-module-config @@ -1,6 +1,6 @@ ---- ../nginx-vod-module-1.23/config.orig 2018-04-24 17:51:34.654430000 -0400 -+++ ../nginx-vod-module-1.23/config 2018-04-24 18:10:13.517041000 -0400 -@@ -154,8 +154,12 @@ +--- ../nginx-vod-module-1.27/config.orig 2020-07-09 20:33:33 UTC ++++ ../nginx-vod-module-1.27/config +@@ -227,8 +227,12 @@ ngx_feature_name="NGX_HAVE_LIBXML2" ngx_feature_run=no ngx_feature_incs="#include <libxml/parser.h> #include <libxml/tree.h>" diff --git a/www/nginx/files/extra-patch-vod-filters-audio_encoder.c b/www/nginx/files/extra-patch-vod-filters-audio_encoder.c deleted file mode 100644 index 0bbe7e427ed5..000000000000 --- a/www/nginx/files/extra-patch-vod-filters-audio_encoder.c +++ /dev/null @@ -1,20 +0,0 @@ ---- ../nginx-vod-module-1.23/vod/filters/audio_encoder.c.orig 2018-05-13 10:05:51.704192000 -0400 -+++ ../nginx-vod-module-1.23/vod/filters/audio_encoder.c 2018-05-13 10:08:30.590029000 -0400 -@@ -100,7 +100,7 @@ - encoder->channel_layout = params->channel_layout; - encoder->channels = params->channels; - encoder->bit_rate = params->bitrate; -- encoder->flags |= CODEC_FLAG_GLOBAL_HEADER; // make the codec generate the extra data -+ encoder->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; // make the codec generate the extra data - - avrc = avcodec_open2(encoder, encoder_codec, NULL); - if (avrc < 0) -@@ -139,7 +139,7 @@ - { - audio_encoder_state_t* state = context; - -- if ((state->encoder->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) != 0) -+ if ((state->encoder->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) != 0) - { - return 0; - }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104142031.13EKVK60016570>