[PR PATCH] rtmpdump: add gnutls build_option

[PR PATCH] rtmpdump: add gnutls build_option

[Johnnynator]

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

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

https://github.com/Johnnynator/void-packages rtmpdump
https://github.com/void-linux/void-packages/pull/27720

rtmpdump: add gnutls build_option


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rtmpdump-27720.patch --]
[-- Type: text/x-diff, Size: 1170 bytes --]

From 99ff07029a3e925c8eb86571032c3dfef6df3a76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 20:10:08 +0100
Subject: [PATCH] rtmpdump: add gnutls build_option

rtmpdump doesn't build with OpenSSL-1.1
---
 srcpkgs/rtmpdump/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index eeeff44012e..f98160d7f18 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -4,7 +4,7 @@ version=2.4.20161210
 revision=8
 _patchlevel=${version##*.}
 create_wrksrc=yes
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
 short_desc="Toolkit for RTMP streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2, LGPL-2.1"
@@ -17,8 +17,10 @@ case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS+=" -D__LINUX_NETFILTER_H"
 esac
 
+build_options="gnutls"
+
 do_build() {
-	make CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" ${makejobs}
+	make CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" "$(vopt_if gnutls 'CRYPTO=GNUTLS' 'CRYPTO=OPENSSL')" ${makejobs}
 }
 do_install() {
 	vmkdir usr/lib

Re: rtmpdump: add gnutls build_option

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27720#issuecomment-769559072

Comment:
Are you waiting to merge this together with OpenSSL?

Re: rtmpdump: add gnutls build_option

[Johnnynator]

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/27720#issuecomment-770265981

Comment:
> Are you waiting to merge this together with OpenSSL?

Nah, just didn't get around to merging it. Not like this doesn't change anything so far. Will just need to update the build option once we have OpenSSL.

Re: [PR PATCH] [Merged]: rtmpdump: add gnutls build_option

[Johnnynator]

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

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

rtmpdump: add gnutls build_option
https://github.com/void-linux/void-packages/pull/27720

Description: