Github messages for voidlinux
 help / color / mirror / Atom feed
From: Johnnynator <Johnnynator@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] rtmpdump: add gnutls build_option
Date: Wed, 06 Jan 2021 20:17:29 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27720@inbox.vuxu.org> (raw)

[-- 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

             reply	other threads:[~2021-01-06 19:17 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-06 19:17 Johnnynator [this message]
2021-01-29  4:00 ` ericonr
2021-01-30 19:11 ` Johnnynator
2021-01-30 19:11 ` [PR PATCH] [Merged]: " Johnnynator

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27720@inbox.vuxu.org \
    --to=johnnynator@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).