diff options
| -rw-r--r-- | www/nginx-devel/Makefile | 6 | ||||
| -rw-r--r-- | www/nginx-devel/Makefile.extmod | 5 | ||||
| -rw-r--r-- | www/nginx-devel/distinfo | 6 | ||||
| -rw-r--r-- | www/nginx-devel/files/extra-patch-nginx-vod-module-config | 4 | ||||
| -rw-r--r-- | www/nginx-devel/files/extra-patch-vod-filters-audio_encoder.c | 20 |
5 files changed, 30 insertions, 11 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 38282e1dadf0..685ebdfcf9e5 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.14.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ \ LOCAL/osa @@ -55,6 +55,7 @@ CONFIGURE_ARGS+=--prefix=${ETCDIR} \ --pid-path=${NGINX_RUNDIR}/nginx.pid \ --error-log-path=${NGINX_ERRORLOG} \ --user=${WWWOWN} --group=${WWWGRP} +ALL_TARGET= PLIST_SUB+= NGINX_TMPDIR=${NGINX_TMPDIR} NGINX_LOGDIR=${NGINX_LOGDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} @@ -314,9 +315,6 @@ pre-configure-MODSECURITY-on: pre-configure-SMALL_LIGHT-on: ( cd ${WRKSRC_small_light} && ./setup ) -do-build: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} - do-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${MKDIR} ${STAGEDIR}${NGINX_TMPDIR} diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index 02f4315fa3ea..91b792c32615 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -277,10 +277,11 @@ SMALL_LIGHT_VARS= DSO_EXTMODS+=small_light SRCACHE_GH_TUPLE= openresty:srcache-nginx-module:v0.31:srcache SRCACHE_VARS= DSO_EXTMODS+=srcache -VOD_GH_TUPLE= kaltura:nginx-vod-module:1.22:vod +VOD_GH_TUPLE= kaltura:nginx-vod-module:1.23:vod VOD_USE= GNOME=libxml2 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.15:vts VTS_CONFIGURE_ON= --add-module=${WRKSRC_vts} diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index 1b9e829defb1..d28ddbb9d71c 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1524780114 +TIMESTAMP = 1526172928 SHA256 (nginx-1.14.0.tar.gz) = 5d15becbf69aba1fe33f8d416d97edd95ea8919ea9ac519eff9bafebb6022cb5 SIZE (nginx-1.14.0.tar.gz) = 1016272 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c @@ -129,8 +129,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.31_GH0.tar.gz) = 3f9729e73a8340926fa9d9fc15707c2f287cd27b6a9fe42e83f660ca48a5972d SIZE (openresty-srcache-nginx-module-v0.31_GH0.tar.gz) = 48310 -SHA256 (kaltura-nginx-vod-module-1.22_GH0.tar.gz) = 79214a1c2f9b133e039ae78d6a09635ad2bec183c77e2a32bf03003841b3c35b -SIZE (kaltura-nginx-vod-module-1.22_GH0.tar.gz) = 438203 +SHA256 (kaltura-nginx-vod-module-1.23_GH0.tar.gz) = 800cf3de639567e27f4cb75527392f23842b349fb680abefd12d4db9a5be951f +SIZE (kaltura-nginx-vod-module-1.23_GH0.tar.gz) = 442053 SHA256 (vozlt-nginx-module-vts-v0.1.15_GH0.tar.gz) = 5112a054b1b1edb4c0042a9a840ef45f22abb3c05c68174e28ebf483164fb7e1 SIZE (vozlt-nginx-module-vts-v0.1.15_GH0.tar.gz) = 371128 SHA256 (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 958bd8de773601d8d3138501cc4be0420f1c818a3987a70cc9c0023371e432cf diff --git a/www/nginx-devel/files/extra-patch-nginx-vod-module-config b/www/nginx-devel/files/extra-patch-nginx-vod-module-config index d71f81774644..de3a85fccc57 100644 --- a/www/nginx-devel/files/extra-patch-nginx-vod-module-config +++ b/www/nginx-devel/files/extra-patch-nginx-vod-module-config @@ -1,5 +1,5 @@ ---- ../nginx-vod-module-1.22/config.orig 2018-04-24 17:51:34.654430000 -0400 -+++ ../nginx-vod-module-1.22/config 2018-04-24 18:10:13.517041000 -0400 +--- ../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 @@ ngx_feature_run=no ngx_feature_incs="#include <libxml/parser.h> diff --git a/www/nginx-devel/files/extra-patch-vod-filters-audio_encoder.c b/www/nginx-devel/files/extra-patch-vod-filters-audio_encoder.c new file mode 100644 index 000000000000..0bbe7e427ed5 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-vod-filters-audio_encoder.c @@ -0,0 +1,20 @@ +--- ../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; + } |