Date: Fri, 19 Sep 2014 01:27:24 +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: r368537 - in head/www: nginx nginx-devel nginx-devel/files nginx/files Message-ID: <201409190127.s8J1ROvr088385@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Fri Sep 19 01:27:24 2014 New Revision: 368537 URL: http://svnweb.freebsd.org/changeset/ports/368537 QAT: https://qat.redports.org/buildarchive/r368537/ Log: Update third-party rtmp module from 1.1.4 to 1.1.5. Fix compilation issue (1). Do not bump PORTREVISION. Obtained from: https://github.com/arut/nginx-rtmp-module/commit/dd5f2aa117c617e1f0fde26f8fd58903be2d85e8.patch (1) Added: head/www/nginx-devel/files/extra-patch-arut-rtmp-module (contents, props changed) head/www/nginx/files/extra-patch-arut-rtmp-module (contents, props changed) Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/distinfo head/www/nginx/Makefile head/www/nginx/distinfo Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Fri Sep 19 00:56:18 2014 (r368536) +++ head/www/nginx-devel/Makefile Fri Sep 19 01:27:24 2014 (r368537) @@ -687,11 +687,11 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/o .endif .if ${PORT_OPTIONS:MRTMP} -IGNORE= RTMP: update require -NGINX_RTMP_VERSION= 1.1.4 +NGINX_RTMP_VERSION= 1.1.5 MASTER_SITES+= https://github.com/arut/nginx-rtmp-module/archive/v${NGINX_RTMP_VERSION}/:rtmp DISTFILES+= rtmp-nginx-module-v${NGINX_RTMP_VERSION}.tar.gz:rtmp CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-rtmp-module-${NGINX_RTMP_VERSION} +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-arut-rtmp-module .endif .if ${PORT_OPTIONS:MSET_MISC} Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Fri Sep 19 00:56:18 2014 (r368536) +++ head/www/nginx-devel/distinfo Fri Sep 19 01:27:24 2014 (r368537) @@ -84,8 +84,8 @@ SHA256 (openresty-redis2-nginx-module-v0 SIZE (openresty-redis2-nginx-module-v0.10-0-g78a7622.tar.gz) = 29850 SHA256 (alibaba-nginx-footer-filter-1.2.2-0-g3572184.tar.gz) = 48a23f879416c0d8da5795c419b94f1ffa42ee06602545f494db4d9aba646e8f SIZE (alibaba-nginx-footer-filter-1.2.2-0-g3572184.tar.gz) = 3934 -SHA256 (rtmp-nginx-module-v1.1.4.tar.gz) = 076efef9698076fa23622e093cfb3959e4d14fcd6e9dcdf0b8e6d9154c720dc9 -SIZE (rtmp-nginx-module-v1.1.4.tar.gz) = 517774 +SHA256 (rtmp-nginx-module-v1.1.5.tar.gz) = 990467fed853b8eecd9b1b10050e2406071d705896be452539be8eced24adf4a +SIZE (rtmp-nginx-module-v1.1.5.tar.gz) = 519507 SHA256 (openresty-set-misc-nginx-module-v0.24-0-g36fd035.tar.gz) = 5475877d67a952beaf0b726b96d0c9abf48ccfc27367a6bebb5738e04d054a76 SIZE (openresty-set-misc-nginx-module-v0.24-0-g36fd035.tar.gz) = 40390 SHA256 (nginx-sflow-module-0.9.7.tar.gz) = 508d15a43059abab08281bfa66d2dd520e2e7635d0b17043549bb331c8755b76 Added: head/www/nginx-devel/files/extra-patch-arut-rtmp-module ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx-devel/files/extra-patch-arut-rtmp-module Fri Sep 19 01:27:24 2014 (r368537) @@ -0,0 +1,78 @@ +diff --git a/ngx_rtmp.c b/ngx_rtmp.c +index c079c90..e525a93 100644 +--- ../nginx-rtmp-module-1.1.5/ngx_rtmp.c.orig ++++ ../nginx-rtmp-module-1.1.5/ngx_rtmp.c +@@ -31,7 +31,11 @@ static char * ngx_rtmp_merge_applications(ngx_conf_t *cf, + ngx_uint_t ctx_index); + + ++#if (nginx_version >= 1007005) ++ngx_thread_volatile ngx_queue_t ngx_rtmp_init_queue; ++#else + ngx_thread_volatile ngx_event_t *ngx_rtmp_init_queue; ++#endif + + + ngx_uint_t ngx_rtmp_max_module; +diff --git a/ngx_rtmp.h b/ngx_rtmp.h +index d3648f7..b87e99e 100644 +--- ../nginx-rtmp-module-1.1.5/ngx_rtmp.h ++++ ../nginx-rtmp-module-1.1.5/ngx_rtmp.h +@@ -12,6 +12,7 @@ + #include <ngx_core.h> + #include <ngx_event.h> + #include <ngx_event_connect.h> ++#include <nginx.h> + + #include "ngx_rtmp_amf.h" + #include "ngx_rtmp_bandwidth.h" +@@ -198,7 +199,11 @@ typedef struct { + ngx_str_t *addr_text; + int connected; + ++#if (nginx_version >= 1007005) ++ ngx_queue_t posted_dry_events; ++#else + ngx_event_t *posted_dry_events; ++#endif + + /* client buffer time in msec */ + uint32_t buflen; +@@ -602,7 +607,11 @@ extern ngx_rtmp_bandwidth_t ngx_rtmp_bw_in; + + + extern ngx_uint_t ngx_rtmp_naccepted; ++#if (nginx_version >= 1007005) ++extern ngx_thread_volatile ngx_queue_t ngx_rtmp_init_queue; ++#else + extern ngx_thread_volatile ngx_event_t *ngx_rtmp_init_queue; ++#endif + + extern ngx_uint_t ngx_rtmp_max_module; + extern ngx_module_t ngx_rtmp_core_module; +diff --git a/ngx_rtmp_play_module.c b/ngx_rtmp_play_module.c +index acaa46c..f6ea6c3 100644 +--- ../nginx-rtmp-module-1.1.5/ngx_rtmp_play_module.c ++++ ../nginx-rtmp-module-1.1.5/ngx_rtmp_play_module.c +@@ -6,6 +6,7 @@ + + #include <ngx_config.h> + #include <ngx_core.h> ++#include <nginx.h> + #include "ngx_rtmp_play_module.h" + #include "ngx_rtmp_cmd_module.h" + #include "ngx_rtmp_netcall_module.h" +@@ -430,7 +431,12 @@ ngx_rtmp_play_do_stop(ngx_rtmp_session_t *s) + ngx_del_timer(&ctx->send_evt); + } + +- if (ctx->send_evt.prev) { ++#if (nginx_version >= 1007005) ++ if (ctx->send_evt.posted) ++#else ++ if (ctx->send_evt.prev) ++#endif ++ { + ngx_delete_posted_event((&ctx->send_evt)); + } + Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Fri Sep 19 00:56:18 2014 (r368536) +++ head/www/nginx/Makefile Fri Sep 19 01:27:24 2014 (r368537) @@ -699,10 +699,11 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/o .endif .if ${PORT_OPTIONS:MRTMP} -NGINX_RTMP_VERSION= 1.1.4 +NGINX_RTMP_VERSION= 1.1.5 MASTER_SITES+= https://github.com/arut/nginx-rtmp-module/archive/v${NGINX_RTMP_VERSION}/:rtmp DISTFILES+= rtmp-nginx-module-v${NGINX_RTMP_VERSION}.tar.gz:rtmp CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-rtmp-module-${NGINX_RTMP_VERSION} +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-arut-rtmp-module .endif .if ${PORT_OPTIONS:MSET_MISC} Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Fri Sep 19 00:56:18 2014 (r368536) +++ head/www/nginx/distinfo Fri Sep 19 01:27:24 2014 (r368537) @@ -86,8 +86,8 @@ SHA256 (openresty-redis2-nginx-module-v0 SIZE (openresty-redis2-nginx-module-v0.10-0-g78a7622.tar.gz) = 29850 SHA256 (alibaba-nginx-footer-filter-1.2.2-0-g3572184.tar.gz) = 48a23f879416c0d8da5795c419b94f1ffa42ee06602545f494db4d9aba646e8f SIZE (alibaba-nginx-footer-filter-1.2.2-0-g3572184.tar.gz) = 3934 -SHA256 (rtmp-nginx-module-v1.1.4.tar.gz) = 076efef9698076fa23622e093cfb3959e4d14fcd6e9dcdf0b8e6d9154c720dc9 -SIZE (rtmp-nginx-module-v1.1.4.tar.gz) = 517774 +SHA256 (rtmp-nginx-module-v1.1.5.tar.gz) = 990467fed853b8eecd9b1b10050e2406071d705896be452539be8eced24adf4a +SIZE (rtmp-nginx-module-v1.1.5.tar.gz) = 519507 SHA256 (openresty-set-misc-nginx-module-v0.24-0-g36fd035.tar.gz) = 5475877d67a952beaf0b726b96d0c9abf48ccfc27367a6bebb5738e04d054a76 SIZE (openresty-set-misc-nginx-module-v0.24-0-g36fd035.tar.gz) = 40390 SHA256 (nginx-sflow-module-0.9.7.tar.gz) = 508d15a43059abab08281bfa66d2dd520e2e7635d0b17043549bb331c8755b76 Added: head/www/nginx/files/extra-patch-arut-rtmp-module ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-arut-rtmp-module Fri Sep 19 01:27:24 2014 (r368537) @@ -0,0 +1,78 @@ +diff --git a/ngx_rtmp.c b/ngx_rtmp.c +index c079c90..e525a93 100644 +--- ../nginx-rtmp-module-1.1.5/ngx_rtmp.c.orig ++++ ../nginx-rtmp-module-1.1.5/ngx_rtmp.c +@@ -31,7 +31,11 @@ static char * ngx_rtmp_merge_applications(ngx_conf_t *cf, + ngx_uint_t ctx_index); + + ++#if (nginx_version >= 1007005) ++ngx_thread_volatile ngx_queue_t ngx_rtmp_init_queue; ++#else + ngx_thread_volatile ngx_event_t *ngx_rtmp_init_queue; ++#endif + + + ngx_uint_t ngx_rtmp_max_module; +diff --git a/ngx_rtmp.h b/ngx_rtmp.h +index d3648f7..b87e99e 100644 +--- ../nginx-rtmp-module-1.1.5/ngx_rtmp.h ++++ ../nginx-rtmp-module-1.1.5/ngx_rtmp.h +@@ -12,6 +12,7 @@ + #include <ngx_core.h> + #include <ngx_event.h> + #include <ngx_event_connect.h> ++#include <nginx.h> + + #include "ngx_rtmp_amf.h" + #include "ngx_rtmp_bandwidth.h" +@@ -198,7 +199,11 @@ typedef struct { + ngx_str_t *addr_text; + int connected; + ++#if (nginx_version >= 1007005) ++ ngx_queue_t posted_dry_events; ++#else + ngx_event_t *posted_dry_events; ++#endif + + /* client buffer time in msec */ + uint32_t buflen; +@@ -602,7 +607,11 @@ extern ngx_rtmp_bandwidth_t ngx_rtmp_bw_in; + + + extern ngx_uint_t ngx_rtmp_naccepted; ++#if (nginx_version >= 1007005) ++extern ngx_thread_volatile ngx_queue_t ngx_rtmp_init_queue; ++#else + extern ngx_thread_volatile ngx_event_t *ngx_rtmp_init_queue; ++#endif + + extern ngx_uint_t ngx_rtmp_max_module; + extern ngx_module_t ngx_rtmp_core_module; +diff --git a/ngx_rtmp_play_module.c b/ngx_rtmp_play_module.c +index acaa46c..f6ea6c3 100644 +--- ../nginx-rtmp-module-1.1.5/ngx_rtmp_play_module.c ++++ ../nginx-rtmp-module-1.1.5/ngx_rtmp_play_module.c +@@ -6,6 +6,7 @@ + + #include <ngx_config.h> + #include <ngx_core.h> ++#include <nginx.h> + #include "ngx_rtmp_play_module.h" + #include "ngx_rtmp_cmd_module.h" + #include "ngx_rtmp_netcall_module.h" +@@ -430,7 +431,12 @@ ngx_rtmp_play_do_stop(ngx_rtmp_session_t *s) + ngx_del_timer(&ctx->send_evt); + } + +- if (ctx->send_evt.prev) { ++#if (nginx_version >= 1007005) ++ if (ctx->send_evt.posted) ++#else ++ if (ctx->send_evt.prev) ++#endif ++ { + ngx_delete_posted_event((&ctx->send_evt)); + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409190127.s8J1ROvr088385>