Date: Mon, 27 Apr 2020 17:33:31 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r533158 - in head/www/nginx-devel: . files Message-ID: <202004271733.03RHXVH2039630@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Mon Apr 27 17:33:31 2020 New Revision: 533158 URL: https://svnweb.freebsd.org/changeset/ports/533158 Log: Convert third-party ngx_http_h264_streaming module to dynamic. Bump PORTREVISION. Added: head/www/nginx-devel/files/extra-patch-nginx_mod_h264_streaming-config (contents, props changed) Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/Makefile.extmod head/www/nginx-devel/pkg-plist Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Mon Apr 27 17:29:27 2020 (r533157) +++ head/www/nginx-devel/Makefile Mon Apr 27 17:33:31 2020 (r533158) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.18.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa Modified: head/www/nginx-devel/Makefile.extmod ============================================================================== --- head/www/nginx-devel/Makefile.extmod Mon Apr 27 17:29:27 2020 (r533157) +++ head/www/nginx-devel/Makefile.extmod Mon Apr 27 17:33:31 2020 (r533158) @@ -128,9 +128,11 @@ HTTP_MOGILEFS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-n HTTP_MOGILEFS_VARS= DSO_EXTDIRS+=nginx_mogilefs_module-1.0.4 HTTP_MP4_H264_MASTER_SITES= http://h264.code-shop.com/download/:mp4streaming +HTTP_MP4_H264_CONFIGURE_ON= --with-cc-opt="-DLARGEFILE_SOURCE -DBUILDING_NGINX" HTTP_MP4_H264_DISTFILES= nginx_mod_h264_streaming-2.2.7.tar.gz:mp4streaming -HTTP_MP4_H264_CONFIGURE_ON= --add-module=${WRKDIR}/nginx_mod_h264_streaming-2.2.7 -HTTP_MP4_H264_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_streaming_module.c +HTTP_MP4_H264_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_streaming_module.c \ + ${PATCHDIR}/extra-patch-nginx_mod_h264_streaming-config +HTTP_MP4_H264_VARS= DSO_EXTDIRS+=nginx_mod_h264_streaming-2.2.7 HTTP_NOTICE_GH_TUPLE= kr:nginx-notice:3c95966:notice HTTP_NOTICE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_notice_module.c \ Added: head/www/nginx-devel/files/extra-patch-nginx_mod_h264_streaming-config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx-devel/files/extra-patch-nginx_mod_h264_streaming-config Mon Apr 27 17:33:31 2020 (r533158) @@ -0,0 +1,41 @@ +--- ../nginx_mod_h264_streaming-2.2.7/config.orig 2020-04-27 12:01:37.153986000 -0400 ++++ ../nginx_mod_h264_streaming-2.2.7/config 2020-04-27 12:16:52.832788000 -0400 +@@ -1,26 +1,19 @@ + ngx_addon_name=ngx_http_h264_streaming_module +-HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_h264_streaming_module" +-CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -DBUILDING_NGINX" +- +-H264_STREAMING_MODULE_SOURCES="$ngx_addon_dir/src/ngx_http_h264_streaming_module.c \ ++ngx_module_name="$ngx_addon_name" ++ngx_module_type=HTTP_AUX_FILTER ++ngx_module_srcs="$ngx_addon_dir/src/ngx_http_h264_streaming_module.c \ + $ngx_addon_dir/src/moov.c \ + $ngx_addon_dir/src/mp4_io.c \ + $ngx_addon_dir/src/mp4_reader.c \ + $ngx_addon_dir/src/mp4_writer.c \ + $ngx_addon_dir/src/output_bucket.c \ + $ngx_addon_dir/src/output_mp4.c" +- +-for streaming_module_source in $H264_STREAMING_MODULE_SOURCES +-do +- already_included=NO +- for ngx_addon_src in $NGX_ADDON_SRCS +- do +- if [ "`basename $ngx_addon_src`" = "`basename $streaming_module_source`" ]; then +- already_included=YES +- break +- fi +- done +- if [ "$already_included" = "NO" ]; then +- NGX_ADDON_SRCS="$NGX_ADDON_SRCS $streaming_module_source" +- fi +-done ++ngx_module_deps="$ngx_addon_dir/src/mod_streaming_export.h \ ++ $ngx_addon_dir/src/moov.h \ ++ $ngx_addon_dir/src/mp4_io.h \ ++ $ngx_addon_dir/src/mp4_process.h \ ++ $ngx_addon_dir/src/mp4_reader.h \ ++ $ngx_addon_dir/src/mp4_writer.h \ ++ $ngx_addon_dir/src/output_bucket.h \ ++ $ngx_addon_dir/src/output_mp4.h" ++. auto/module Modified: head/www/nginx-devel/pkg-plist ============================================================================== --- head/www/nginx-devel/pkg-plist Mon Apr 27 17:29:27 2020 (r533157) +++ head/www/nginx-devel/pkg-plist Mon Apr 27 17:33:31 2020 (r533158) @@ -42,6 +42,7 @@ %%DSO%%%%HTTP_IP2PROXY%%libexec/nginx/ngx_http_ip2proxy_module.so %%DSO%%%%HTTP_JSON_STATUS%%libexec/nginx/ngx_http_json_status_module.so %%DSO%%%%HTTP_MOGILEFS%%libexec/nginx/ngx_http_mogilefs_module.so +%%DSO%%%%HTTP_MP4_H264%%libexec/nginx/ngx_http_h264_streaming_module.so %%DSO%%%%HTTP_NOTICE%%libexec/nginx/ngx_http_notice_module.so %%DSO%%%%HTTP_PERL%%libexec/nginx/ngx_http_perl_module.so %%DSO%%%%HTTP_PUSH%%libexec/nginx/ngx_nchan_module.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004271733.03RHXVH2039630>