Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nginx: fix rtmp module with openssl 1.1.1

Browse source 
Patch that changes the order of some include files in ngx_rtp_cenc.c
that caused a compilation failure.  Patch submitted upstream (#13).

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
This commit is contained in:
Eneas U de Queiroz 2018-12-06 16:39:14 -02:00
parent c4e8ff98c0
commit 015e30b5ea
2 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/nginx/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=nginx
PKG_VERSION:=1.15.6
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://nginx.org/download/
@ -444,6 +444,7 @@ ifeq ($(CONFIG_NGINX_RTMP_MODULE),y)
define Prepare/nginx-rtmp
$(eval $(Download/nginx-rtmp))
gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
$(call PatchDir,$(PKG_BUILD_DIR)/nginx-rtmp,./patches-nginx-rtmp)
endef
endif

26
net/nginx/patches-nginx-rtmp/100-ngx_rtp_cenc.c-move-ngx_-config-core-.h-to-top.patch Normal file
View file

@ -0,0 +1,26 @@
From df4113fb4d9177c7cfb0639b5e92b1fadfd4c174 Mon Sep 17 00:00:00 2001
From: Eneas U de Queiroz <cote2004-github@yahoo.com>
Date: Thu, 6 Dec 2018 15:54:23 -0200
Subject: [PATCH] ngx_rtp_cenc.c: move ngx_{config,core}.h to top
Fixes compilation error: unknown type name 'cpu_set_t'
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
diff --git a/dash/ngx_rtmp_cenc.c b/dash/ngx_rtmp_cenc.c
index f0b81e7..e4af2b1 100644
--- a/dash/ngx_rtmp_cenc.c
+++ b/dash/ngx_rtmp_cenc.c
@@ -1,10 +1,10 @@
+#include <ngx_config.h>
+#include <ngx_core.h>
#include <openssl/aes.h>
#include <openssl/rand.h>
#include <openssl/evp.h>
-#include <ngx_config.h>
-#include <ngx_core.h>
#include <ngx_rtmp.h>
#include "ngx_rtmp_cenc.h"