[PR PATCH] New package: nginx-mod-rtmp

[PR PATCH] New package: nginx-mod-rtmp

[agausmann]

[-- Attachment #1: Type: text/plain, Size: 1266 bytes --]

There is a new pull request by agausmann against master on the void-packages repository

https://github.com/agausmann/void-packages nginx-rtmp-module
https://github.com/void-linux/void-packages/pull/44206

New package: nginx-mod-rtmp
<!-- Uncomment relevant sections and delete options which are not applicable -->
CC nginx maintainer @Duncaen 

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/44206.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nginx-rtmp-module-44206.patch --]
[-- Type: text/x-diff, Size: 2643 bytes --]

From 5ddeb8793059e79e6dd3a57e82068cbaf3ce97a4 Mon Sep 17 00:00:00 2001
From: Adam Gausmann <adam@gaussian.dev>
Date: Wed, 31 May 2023 20:59:08 -0500
Subject: [PATCH] New package: nginx-mod-rtmp

---
 srcpkgs/nginx-mod-rtmp |  1 +
 srcpkgs/nginx/template | 20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/nginx-mod-rtmp

diff --git a/srcpkgs/nginx-mod-rtmp b/srcpkgs/nginx-mod-rtmp
new file mode 120000
index 000000000000..da70e2081bc0
--- /dev/null
+++ b/srcpkgs/nginx-mod-rtmp
@@ -0,0 +1 @@
+nginx
\ No newline at end of file
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 174b57623603..0759d7d579ae 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -4,9 +4,10 @@
 # See comments in mime-types template
 pkgname=nginx
 version=1.24.0
-revision=1
+revision=2
 _tests_commit=36a4563f7f00
 _njs_version=0.7.12
+_rtmp_version=1.2.2
 create_wrksrc=yes
 build_wrksrc="nginx-${version}"
 build_style=gnu-makefile
@@ -51,7 +52,8 @@ configure_args="--prefix=${_cfgdir}
  --with-mail_ssl_module
  --with-pcre-jit
  --with-threads
- --add-dynamic-module=../njs-${_njs_version}/nginx"
+ --add-dynamic-module=../njs-${_njs_version}/nginx
+ --add-dynamic-module=../nginx-rtmp-module-${_rtmp_version}"
 hostmakedepends="geoip geoip-devel openssl-devel pcre2-devel perl libxslt-devel
  which"
 makedepends="${hostmakedepends}"
@@ -63,10 +65,12 @@ homepage="https://nginx.org"
 changelog="https://nginx.org/en/CHANGES-${version%.*}"
 distfiles="https://nginx.org/download/nginx-${version}.tar.gz
  https://hg.nginx.org/nginx-tests/archive/${_tests_commit}.tar.gz
- https://hg.nginx.org/njs/archive/${_njs_version}.tar.gz"
+ https://hg.nginx.org/njs/archive/${_njs_version}.tar.gz
+ https://github.com/arut/nginx-rtmp-module/archive/refs/tags/v${_rtmp_version}.tar.gz"
 checksum="77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d
  a90641a75314427b6c02e3a5e811c66d6fe7c0cad93752a6a2725d0129e08fbf
- af648336c236f625311edcd90b83f37702fadad160c2a5ed57b34656609e918a"
+ af648336c236f625311edcd90b83f37702fadad160c2a5ed57b34656609e918a
+ 07f19b7bffec5e357bb8820c63e5281debd45f5a2e6d46b1636d9202c3e09d78"
 # Tests fail when nginx run as root and there is no nginx user
 make_check=ci-skip
 
@@ -195,6 +199,14 @@ nginx-mod-http-xslt-filter_package() {
 	}
 }
 
+nginx-mod-rtmp_package() {
+	short_desc+=" - RTMP module"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/lib/nginx/modules/ngx_rtmp_module.so
+	}
+}
+
 nginx-mod-stream_package() {
 	short_desc+=" - Stream module"
 	depends="${sourcepkg}>=${version}_${revision}"

Re: New package: nginx-mod-rtmp

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 346 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/44206#issuecomment-1571670315

Comment:
External third-party modules don't belong into the nginx template, they don't share the version with nginx and having to revbump nginx whenever there is an update for an external module is not acceptable.

Re: New package: nginx-mod-rtmp

[agausmann]

[-- Attachment #1: Type: text/plain, Size: 499 bytes --]

New comment by agausmann on void-packages repository

https://github.com/void-linux/void-packages/pull/44206#issuecomment-1572608476

Comment:
Okay, after some research it can be built separately using `make modules` ([AUR PKGBUILD](https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=nginx-mod-rtmp)). However it still requires the nginx source distribution, and I'm not sure if/how that can be done (other than hardcoding the current nginx version and distfiles in the template for the module)

Re: New package: nginx-mod-rtmp

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 1237 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/44206#issuecomment-1572644590

Comment:
I tested a setup like arch has in its main repo that creates an `nginx-src` sub-package that the modules would `hostmakedepends` on and copy the source and configure scripts form `/usr/src/nginx` into their build dir.

At that time I tried to patch the configure scripts to not require the fake configure run on host and static files for the cross targets, but never really finished it. [openembedded is using a similar patch](https://github.com/openembedded/meta-openembedded/blob/master/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch) but requiring to specify the values as configure arguments which is a bit annoying because you'll have to copy all of this to each module.
Maybe we could use the openembedded patch but extend it a bit by setting the defaults based on i.e. --target for all the added flags for the architectures we support.

With the patched configure script with defaults for all our targets the module templates would become a bit simpler, but probably still require some extra patching because they follow nginx and are not really cross build compatible.

Re: New package: nginx-mod-rtmp

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 1251 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/44206#issuecomment-1572644590

Comment:
Some time ago I tested a setup like arch has in its main repo that creates an `nginx-src` sub-package that the modules would `hostmakedepends` on and copy the source and configure scripts form `/usr/src/nginx` into their build dir.

At that time I tried to patch the configure scripts to not require the fake configure run on host and static files for the cross targets, but never really finished it. [openembedded is using a similar patch](https://github.com/openembedded/meta-openembedded/blob/master/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch) but requiring to specify the values as configure arguments which is a bit annoying because you'll have to copy all of this to each module.
Maybe we could use the openembedded patch but extend it a bit by setting the defaults based on i.e. --target for all the added flags for the architectures we support.

With the patched configure script with defaults for all our targets the module templates would become a bit simpler, but probably still require some extra patching because they follow nginx and are not really cross build compatible.

Re: New package: nginx-mod-rtmp

[github-actions]

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/44206#issuecomment-1716809113

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [PR PATCH] [Closed]: New package: nginx-mod-rtmp

[github-actions]

[-- Attachment #1: Type: text/plain, Size: 1101 bytes --]

There's a closed pull request on the void-packages repository

New package: nginx-mod-rtmp
https://github.com/void-linux/void-packages/pull/44206

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
CC nginx maintainer @Duncaen 

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->