svn commit: r538247 - in head/www/nginx: . files

[Jochen Neumeister]

Author: joneum
Date: Mon Jun  8 18:45:18 2020
New Revision: 538247
URL: https://svnweb.freebsd.org/changeset/ports/538247

Log:
  Merge r533158 from www/nginx-devel:
  
  Convert third-party ngx_http_h264_streaming module to dynamic.
  
  Sponsored by:	Netzkommune GmbH

Added:
  head/www/nginx/files/extra-patch-nginx_mod_h264_streaming-config   (contents, props changed)
Modified:
  head/www/nginx/Makefile
  head/www/nginx/Makefile.extmod
  head/www/nginx/pkg-plist

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Mon Jun  8 18:27:21 2020	(r538246)
+++ head/www/nginx/Makefile	Mon Jun  8 18:45:18 2020	(r538247)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.18.0
-PORTREVISION?=	13
+PORTREVISION?=	14
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \

Modified: head/www/nginx/Makefile.extmod
==============================================================================
--- head/www/nginx/Makefile.extmod	Mon Jun  8 18:27:21 2020	(r538246)
+++ head/www/nginx/Makefile.extmod	Mon Jun  8 18:45:18 2020	(r538247)
@@ -125,9 +125,11 @@ HTTP_MOGILEFS_VARS=		DSO_EXTDIRS+=nginx_mogilefs_modul
 
 
 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/files/extra-patch-nginx_mod_h264_streaming-config
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/nginx/files/extra-patch-nginx_mod_h264_streaming-config	Mon Jun  8 18:45:18 2020	(r538247)
@@ -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/pkg-plist
==============================================================================
--- head/www/nginx/pkg-plist	Mon Jun  8 18:27:21 2020	(r538246)
+++ head/www/nginx/pkg-plist	Mon Jun  8 18:45:18 2020	(r538247)
@@ -40,6 +40,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