gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

media-video/rtmpdump: Don't apply openssl 1.1 patch with USE=libressl

Browse Source 
That patch causes compilation errors when used with libressl

Closes: https://bugs.gentoo.org/669708
Signed-off-by: Craig Andrews <candrews@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
This commit is contained in:
Craig Andrews
2018-10-26 22:42:07 -04:00
parent 92a5950424
commit ab606cec47
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild
View File

@@ -24,7 +24,6 @@ DEPEND="ssl? (
RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-openssl-1.1.patch"
"${FILESDIR}/${PN}-swf_vertification_type_2.patch"
"${FILESDIR}/${PN}-swf_vertification_type_2_part_2.patch"
)
@@ -66,6 +65,7 @@ src_prepare() {
-e 's:OPT:OPTS:' \
-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
|| die "failed to fix Makefile"
use ssl && use !gnutls && use !libressl && eapply "${FILESDIR}/${PN}-openssl-1.1.patch"
default
multilib_copy_sources
}

2
media-video/rtmpdump/rtmpdump-9999.ebuild
View File

@@ -24,7 +24,6 @@ DEPEND="ssl? (
RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-openssl-1.1.patch"
"${FILESDIR}/${PN}-swf_vertification_type_2.patch"
"${FILESDIR}/${PN}-swf_vertification_type_2_part_2.patch"
)
@@ -66,6 +65,7 @@ src_prepare() {
-e 's:OPT:OPTS:' \
-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
|| die "failed to fix Makefile"
use ssl && use !gnutls && use !libressl && eapply "${FILESDIR}/${PN}-openssl-1.1.patch"
default
multilib_copy_sources
}