diff options
| author |   Craig Andrews <candrews@gentoo.org> | 2018-10-26 22:42:07 -0400 |
|---|---|---|
| committer | Craig Andrews <candrews@gentoo.org> | 2018-10-26 22:42:24 -0400 |
| commit | ab606cec475a4b1fea8a9793ef6ed81b83b919f5 (patch) | |
| tree | 7ec20ccbb1e9a51a9c57a4bd14513b0c38c8dcb4 /media-video | |
| parent | dev-libs/gost-engine: Implementation of Russian GOST for OpenSSL (diff) | |
| download | gentoo-ab606cec475a4b1fea8a9793ef6ed81b83b919f5.tar.gz gentoo-ab606cec475a4b1fea8a9793ef6ed81b83b919f5.tar.bz2 gentoo-ab606cec475a4b1fea8a9793ef6ed81b83b919f5.zip | |
media-video/rtmpdump: Don't apply openssl 1.1 patch with USE=libressl
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
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild | 2 | ||||
| -rw-r--r-- | media-video/rtmpdump/rtmpdump-9999.ebuild | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild index 8bfb1dd533de..8a45c29d0d07 100644 --- a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild +++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r2.ebuild @@ -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 } diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild index 8bfb1dd533de..8a45c29d0d07 100644 --- a/media-video/rtmpdump/rtmpdump-9999.ebuild +++ b/media-video/rtmpdump/rtmpdump-9999.ebuild @@ -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 } |