From 0c8665df5a80655983b270fe0707258de58c5e1d Mon Sep 17 00:00:00 2001
From: Hakase <hakase@hakase.app>
Date: Tue, 15 Jan 2019 09:29:52 +0900
Subject: [PATCH] Changed submodule. (rtmp -> flv)

---
 .gitmodules               | 7 +++----
 auto.sh                   | 2 +-
 config.inc.example        | 4 ++--
 lib/nginx-http-flv-module | 1 +
 lib/nginx-rtmp-module     | 1 -
 lib/pcre                  | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)
 create mode 160000 lib/nginx-http-flv-module
 delete mode 160000 lib/nginx-rtmp-module

diff --git a/.gitmodules b/.gitmodules
index d4263fd..1f7244c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,6 @@
 [submodule "lib/nginx-dav-ext-module"]
 	path = lib/nginx-dav-ext-module
 	url = https://github.com/arut/nginx-dav-ext-module.git
-[submodule "lib/nginx-rtmp-module"]
-	path = lib/nginx-rtmp-module
-	url = https://github.com/arut/nginx-rtmp-module.git
 [submodule "lib/ngx_brotli"]
 	path = lib/ngx_brotli
 	url = https://github.com/eustas/ngx_brotli.git
@@ -29,10 +26,12 @@
 	path = lib/zlib
 	url = https://github.com/cloudflare/zlib.git
 	branch = gcc.amd64
-
 [submodule "lib/ngx_http_geoip2_module"]
 	path = lib/ngx_http_geoip2_module
 	url = https://github.com/leev/ngx_http_geoip2_module.git
 [submodule "lib/nginx-module-vts"]
 	path = lib/nginx-module-vts
 	url = https://github.com/vozlt/nginx-module-vts
+[submodule "lib/nginx-http-flv-module"]
+	path = lib/nginx-http-flv-module
+	url = https://github.com/winshining/nginx-http-flv-module.git
diff --git a/auto.sh b/auto.sh
index 93b3de3..48ec166 100755
--- a/auto.sh
+++ b/auto.sh
@@ -94,7 +94,7 @@ TEMP_OPT="-lm"
 
 ### Module check
 if [ "$PAGESPEED" = 1 ]; then BUILD_MODULES="--add-module=./lib/pagespeed ${PS_NGX_EXTRA_FLAGS}"; fi
-if [ "$RTMP" = 1 ]; then BUILD_MODULES="${BUILD_MODULES} --add-module=./lib/nginx-rtmp-module"; fi
+if [ "$FLV" = 1 ]; then BUILD_MODULES="${BUILD_MODULES} --add-module=./lib/nginx-http-flv-module"; fi
 if [ "$NAXSI" = 1 ]; then BUILD_MODULES="${BUILD_MODULES} --add-module=./lib/naxsi/naxsi_src"; fi
 if [ "$DAV_EXT" = 1 ]; then BUILD_MODULES="${BUILD_MODULES} --add-module=./lib/nginx-dav-ext-module"; fi
 if [ "$FANCYINDEX" = 1 ]; then BUILD_MODULES="${BUILD_MODULES} --add-module=./lib/ngx-fancyindex"; fi
diff --git a/config.inc.example b/config.inc.example
index 4d7a918..d15d47b 100644
--- a/config.inc.example
+++ b/config.inc.example
@@ -32,8 +32,8 @@ LTO=1
 ### PageSpeed
 PAGESPEED=0
 
-### nginx-rtmp-module
-RTMP=0
+### nginx-http-flv-module
+FLV=0
 
 ### naxsi
 NAXSI=1
diff --git a/lib/nginx-http-flv-module b/lib/nginx-http-flv-module
new file mode 160000
index 0000000..f6d0461
--- /dev/null
+++ b/lib/nginx-http-flv-module
@@ -0,0 +1 @@
+Subproject commit f6d0461b73133ed5f7088f7b732f6ed1f786f24f
diff --git a/lib/nginx-rtmp-module b/lib/nginx-rtmp-module
deleted file mode 160000
index 791b613..0000000
--- a/lib/nginx-rtmp-module
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 791b6136f02bc9613daf178723ac09f4df5a3bbf
diff --git a/lib/pcre b/lib/pcre
index f9f0c6b..10e4adb 160000
--- a/lib/pcre
+++ b/lib/pcre
@@ -1 +1 @@
-Subproject commit f9f0c6b54d62d048001c508e5384174e74155bb1
+Subproject commit 10e4adbfe9aab5869079fba5edc0ce56fa1b078e