Date: Sat, 15 Dec 2018 12:45:51 +0000 (UTC) From: Jochen Neumeister <joneum@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487508 - in head/www/nginx: . files Message-ID: <201812151245.wBFCjpO5094865@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: joneum Date: Sat Dec 15 12:45:51 2018 New Revision: 487508 URL: https://svnweb.freebsd.org/changeset/ports/487508 Log: www/nginx: Add 3rd Party Module VOD VOD is a NGINX-based MP4 Repackager Module Sponsored by: Netzkommune GmbH Added: head/www/nginx/files/extra-patch-nginx-vod-module-config (contents, props changed) head/www/nginx/files/extra-patch-vod-filters-audio_encoder.c (contents, props changed) Modified: head/www/nginx/Makefile head/www/nginx/Makefile.extmod head/www/nginx/Makefile.options.desc head/www/nginx/distinfo head/www/nginx/pkg-plist Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Sat Dec 15 11:55:13 2018 (r487507) +++ head/www/nginx/Makefile Sat Dec 15 12:45:51 2018 (r487508) @@ -85,7 +85,7 @@ OPTIONS_GROUP_HTTPGRP+= AJP AWS_AUTH BROTLI CACHE_PURG HTTP_UPSTREAM_CHECK HTTP_UPSTREAM_FAIR HTTP_UPSTREAM_STICKY \ HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET LUA MEMC MODSECURITY \ MODSECURITY3 NAXSI NJS PASSENGER POSTGRES RDS_CSV RDS_JSON REDIS2 RTMP \ - SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SMALL_LIGHT SRCACHE VTS XSS + SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SMALL_LIGHT SRCACHE VOD VTS XSS OPTIONS_GROUP_MAILGRP= MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL OPTIONS_DEFINE= DEBUG DEBUGLOG DSO FILE_AIO IPV6 THREADS WWW OPTIONS_DEFAULT?= DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \ @@ -304,6 +304,11 @@ post-patch-SFLOW-on: @${REINPLACE_CMD} \ 's!%%PREFIX%%!${LOCALBASE}!g' \ ${WRKSRC_sflow}/ngx_http_sflow_config.h + +post-patch-VOD-on: + @${REINPLACE_CMD} \ + 's!%%PREFIX%%!${LOCALBASE}!g' \ + ${WRKSRC_vod}/config pre-configure-MODSECURITY-on: ( cd ${WRKSRC_MODSECURITY} && \ Modified: head/www/nginx/Makefile.extmod ============================================================================== --- head/www/nginx/Makefile.extmod Sat Dec 15 11:55:13 2018 (r487507) +++ head/www/nginx/Makefile.extmod Sat Dec 15 12:45:51 2018 (r487508) @@ -280,6 +280,12 @@ SRCACHE_GH_TUPLE= openresty:srcache-nginx-module:v0.31 #SRCACHE_CONFIGURE_ON= --add-module=${WRKSRC_srcache} SRCACHE_VARS= DSO_EXTMODS+=srcache +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 \ + ${PATCHDIR}/extra-patch-vod-filters-audio_encoder.c + VTS_GH_TUPLE= vozlt:nginx-module-vts:v0.1.18:vts VTS_CONFIGURE_ON= --add-module=${WRKSRC_vts} Modified: head/www/nginx/Makefile.options.desc ============================================================================== --- head/www/nginx/Makefile.options.desc Sat Dec 15 11:55:13 2018 (r487507) +++ head/www/nginx/Makefile.options.desc Sat Dec 15 12:45:51 2018 (r487508) @@ -104,6 +104,7 @@ STREAM_DESC= Enable stream module STREAM_SSL_DESC= Enable stream_ssl module (SSL req.) STREAM_SSL_PREREAD_DESC= Enable stream_ssl_preread module (SSL req.) THREADS_DESC= Enable threads support +VOD_DESC= 3rd party vod module VTS_DESC= 3rd party vts module WWW_DESC= Enable html sample files XSS_DESC= 3rd party xss module Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Sat Dec 15 11:55:13 2018 (r487507) +++ head/www/nginx/distinfo Sat Dec 15 12:45:51 2018 (r487508) @@ -1,4 +1,4 @@ -TIMESTAMP = 1544778790 +TIMESTAMP = 1544876911 SHA256 (nginx-1.14.2.tar.gz) = 002d9f6154e331886a2dd4e6065863c9c1cf8291ae97a1255308572c02be9797 SIZE (nginx-1.14.2.tar.gz) = 1015384 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c @@ -129,6 +129,8 @@ SHA256 (cubicdaiya-ngx_small_light-v0.9.2_GH0.tar.gz) 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.23_GH0.tar.gz) = 800cf3de639567e27f4cb75527392f23842b349fb680abefd12d4db9a5be951f +SIZE (kaltura-nginx-vod-module-1.23_GH0.tar.gz) = 442053 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 (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 958bd8de773601d8d3138501cc4be0420f1c818a3987a70cc9c0023371e432cf Added: head/www/nginx/files/extra-patch-nginx-vod-module-config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-nginx-vod-module-config Sat Dec 15 12:45:51 2018 (r487508) @@ -0,0 +1,17 @@ +--- ../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> + #include <libxml/tree.h>" +-ngx_feature_path="/usr/include/libxml2" +-ngx_feature_libs="-lxml2" ++ngx_feature_path="%%PREFIX%%/include/libxml2 %%PREFIX%%/include" ++if [ $NGX_RPATH = YES ]; then ++ ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -lxml2 -lxslt" ++else ++ ngx_feature_libs="-L%%PREFIX%%/lib -lxml2 -lxslt" ++fi + ngx_feature_test="xmlReadMemory(NULL, 0, NULL, NULL, 0);" + . auto/feature + Added: head/www/nginx/files/extra-patch-vod-filters-audio_encoder.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-vod-filters-audio_encoder.c Sat Dec 15 12:45:51 2018 (r487508) @@ -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; + } Modified: head/www/nginx/pkg-plist ============================================================================== --- head/www/nginx/pkg-plist Sat Dec 15 11:55:13 2018 (r487507) +++ head/www/nginx/pkg-plist Sat Dec 15 12:45:51 2018 (r487508) @@ -55,6 +55,7 @@ %%DSO%%%%SMALL_LIGHT%%libexec/nginx/ngx_http_small_light_module.so %%DSO%%%%SRCACHE%%libexec/nginx/ngx_http_srcache_filter_module.so %%DSO%%%%STREAM%%libexec/nginx/ngx_stream_module.so +%%DSO%%%%VOD%%libexec/nginx/ngx_http_vod_module.so %%WWW%%@postexec mkdir -p -m 755 %D/www/nginx-dist %%WWW%%@postexec if [ ! -d %D/www/nginx/ ] ; then ln -fs %D/www/nginx-dist %D/www/nginx; fi %%WWW%%www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812151245.wBFCjpO5094865>