www/nginx: Update 3rd Party Module vod-module to 1.27

PR: 254680
This commit is contained in:
Jochen Neumeister 2021-04-14 22:20:31 +02:00
parent b65badcf13
commit 21106f1072
5 changed files with 10 additions and 30 deletions

View file

@ -2,7 +2,7 @@
PORTNAME= nginx PORTNAME= nginx
PORTVERSION= 1.18.0 PORTVERSION= 1.18.0
PORTREVISION?= 49 PORTREVISION?= 50
PORTEPOCH= 2 PORTEPOCH= 2
CATEGORIES= www CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \ MASTER_SITES= https://nginx.org/download/ \

View file

@ -301,11 +301,11 @@ SMALL_LIGHT_VARS= DSO_EXTMODS+=small_light
SRCACHE_GH_TUPLE= openresty:srcache-nginx-module:v0.32:srcache SRCACHE_GH_TUPLE= openresty:srcache-nginx-module:v0.32:srcache
SRCACHE_VARS= DSO_EXTMODS+=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_USE= GNOME=libxml2
VOD_USES= iconv
VOD_VARS= DSO_EXTMODS+=vod VOD_VARS= DSO_EXTMODS+=vod
VOD_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-vod-module-config \ VOD_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-vod-module-config
${PATCHDIR}/extra-patch-vod-filters-audio_encoder.c
VTS_GH_TUPLE= vozlt:nginx-module-vts:v0.1.18:vts VTS_GH_TUPLE= vozlt:nginx-module-vts:v0.1.18:vts
VTS_CONFIGURE_ON= --add-module=${WRKSRC_vts} VTS_CONFIGURE_ON= --add-module=${WRKSRC_vts}

View file

@ -1,4 +1,4 @@
TIMESTAMP = 1616136977 TIMESTAMP = 1617205157
SHA256 (nginx-1.18.0.tar.gz) = 4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99 SHA256 (nginx-1.18.0.tar.gz) = 4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99
SIZE (nginx-1.18.0.tar.gz) = 1039530 SIZE (nginx-1.18.0.tar.gz) = 1039530
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae 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 SIZE (cubicdaiya-ngx_small_light-v0.9.2_GH0.tar.gz) = 56502
SHA256 (openresty-srcache-nginx-module-v0.32_GH0.tar.gz) = fd80e59b672e4ff3b4e943740b3facab421c6965226b5934aed16a514baacf47 SHA256 (openresty-srcache-nginx-module-v0.32_GH0.tar.gz) = fd80e59b672e4ff3b4e943740b3facab421c6965226b5934aed16a514baacf47
SIZE (openresty-srcache-nginx-module-v0.32_GH0.tar.gz) = 49891 SIZE (openresty-srcache-nginx-module-v0.32_GH0.tar.gz) = 49891
SHA256 (kaltura-nginx-vod-module-1.23_GH0.tar.gz) = 800cf3de639567e27f4cb75527392f23842b349fb680abefd12d4db9a5be951f SHA256 (kaltura-nginx-vod-module-1.27_GH0.tar.gz) = b7f0e2eecbcdb8ed1f8c90eb86c756f563fc5d21768a351abe4de63f3ddf01d6
SIZE (kaltura-nginx-vod-module-1.23_GH0.tar.gz) = 442053 SIZE (kaltura-nginx-vod-module-1.27_GH0.tar.gz) = 450777
SHA256 (vozlt-nginx-module-vts-v0.1.18_GH0.tar.gz) = 17ea41d4083f6d1ab1ab83dad9160eeca66867abe16c5a0421f85a39d7c84b65 SHA256 (vozlt-nginx-module-vts-v0.1.18_GH0.tar.gz) = 17ea41d4083f6d1ab1ab83dad9160eeca66867abe16c5a0421f85a39d7c84b65
SIZE (vozlt-nginx-module-vts-v0.1.18_GH0.tar.gz) = 380327 SIZE (vozlt-nginx-module-vts-v0.1.18_GH0.tar.gz) = 380327
SHA256 (tg123-websockify-nginx-module-e82d254_GH0.tar.gz) = 1ea0fd35e3bed61c822aa0bfb9329a38d908a602b78a5e5fef9c7e946a26de6b SHA256 (tg123-websockify-nginx-module-e82d254_GH0.tar.gz) = 1ea0fd35e3bed61c822aa0bfb9329a38d908a602b78a5e5fef9c7e946a26de6b

View file

@ -1,6 +1,6 @@
--- ../nginx-vod-module-1.23/config.orig 2018-04-24 17:51:34.654430000 -0400 --- ../nginx-vod-module-1.27/config.orig 2020-07-09 20:33:33 UTC
+++ ../nginx-vod-module-1.23/config 2018-04-24 18:10:13.517041000 -0400 +++ ../nginx-vod-module-1.27/config
@@ -154,8 +154,12 @@ @@ -227,8 +227,12 @@ ngx_feature_name="NGX_HAVE_LIBXML2"
ngx_feature_run=no ngx_feature_run=no
ngx_feature_incs="#include <libxml/parser.h> ngx_feature_incs="#include <libxml/parser.h>
#include <libxml/tree.h>" #include <libxml/tree.h>"

View file

@ -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;
}