lu_zero 14/06/04 13:26:30
Modified: rtmpdump-2.4_p20131018.ebuild ChangeLog
rtmpdump-9999.ebuild
Log:
Multilib support thanks to Christian Schmidt, bug #501098
(Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.7 media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild?rev=1.7&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild?rev=1.7&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild?r1=1.6&r2=1.7
Index: rtmpdump-2.4_p20131018.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rtmpdump-2.4_p20131018.ebuild 19 Jan 2014 10:29:23 -0000 1.6
+++ rtmpdump-2.4_p20131018.ebuild 4 Jun 2014 13:26:29 -0000 1.7
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild,v
1.6 2014/01/19 10:29:23 ago Exp $
+# $Header:
/var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild,v
1.7 2014/06/04 13:26:29 lu_zero Exp $
EAPI="4"
-inherit multilib toolchain-funcs
+inherit multilib toolchain-funcs multilib-minimal
DESCRIPTION="Open source command-line RTMP client intended to stream audio or
video flash content"
HOMEPAGE="http://rtmpdump.mplayerhq.hu/";
@@ -23,15 +23,20 @@
)
sys-libs/zlib"
RDEPEND="${DEPEND}"
-S="${WORKDIR}"
pkg_setup() {
- if ! use ssl && ( use gnutls || use polarssl ) ; then
+ if ! use ssl && ( use gnutls || use polarssl ) ; then
ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."
ewarn "Please review the local USE flags for this package."
fi
}
+src_unpack() {
+ mkdir -p "${S}" || die "Can't create source directory"
+ cd "${S}"
+ unpack "${A}"
+}
+
src_prepare() {
# fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
sed -i 's/\$(MAKEFLAGS)//g' Makefile \
@@ -40,9 +45,10 @@
-e 's:OPT:OPTS:' \
-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
|| die "failed to fix Makefile"
+ multilib_copy_sources
}
-src_compile() {
+multilib_src_compile() {
if use ssl ; then
if use gnutls ; then
crypto="GNUTLS"
@@ -54,13 +60,20 @@
fi
#fix multilib-script support. Bug #327449
sed -i "/^libdir/s:lib$:$(get_libdir)$:" librtmp/Makefile
+ if ! multilib_build_binaries; then
+ cd librtmp
+ fi
emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}"
SYS=posix
}
-src_install() {
+multilib_src_install() {
mkdir -p "${ED}"/${DESTTREE}/$(get_libdir)
+ if multilib_is_native_abi; then
+ dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
+ else
+ cd librtmp
+ fi
emake DESTDIR="${ED}" prefix="${DESTTREE}"
mandir="${DESTTREE}/share/man" \
CRYPTO="${crypto}" install
- dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
}
1.31 media-video/rtmpdump/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/ChangeLog?rev=1.31&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/ChangeLog?rev=1.31&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/ChangeLog?r1=1.30&r2=1.31
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/rtmpdump/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ChangeLog 19 Jan 2014 10:29:23 -0000 1.30
+++ ChangeLog 4 Jun 2014 13:26:30 -0000 1.31
@@ -1,6 +1,10 @@
# ChangeLog for media-video/rtmpdump
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/ChangeLog,v 1.30
2014/01/19 10:29:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/ChangeLog,v 1.31
2014/06/04 13:26:30 lu_zero Exp $
+
+ 04 Jun 2014; Luca Barbato <lu_z...@gentoo.org> rtmpdump-2.4_p20131018.ebuild,
+ rtmpdump-9999.ebuild:
+ Multilib support thanks to Christian Schmidt, bug #501098
19 Jan 2014; Agostino Sarubbo <a...@gentoo.org>
rtmpdump-2.4_p20131018.ebuild:
Stable for ppc64, wrt bug #496436
1.5 media-video/rtmpdump/rtmpdump-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/rtmpdump-9999.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/rtmpdump-9999.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/rtmpdump-9999.ebuild?r1=1.4&r2=1.5
Index: rtmpdump-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-9999.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rtmpdump-9999.ebuild 25 Nov 2012 10:53:36 -0000 1.4
+++ rtmpdump-9999.ebuild 4 Jun 2014 13:26:30 -0000 1.5
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-9999.ebuild,v
1.4 2012/11/25 10:53:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-9999.ebuild,v
1.5 2014/06/04 13:26:30 lu_zero Exp $
EAPI="4"
-inherit git-2 multilib toolchain-funcs
+inherit git-2 multilib toolchain-funcs multilib-minimal
DESCRIPTION="Open source command-line RTMP client intended to stream audio or
video flash content"
HOMEPAGE="http://rtmpdump.mplayerhq.hu/";
@@ -17,15 +17,15 @@
IUSE="gnutls polarssl ssl"
DEPEND="ssl? (
- gnutls? ( net-libs/gnutls )
- polarssl? ( !gnutls? ( >=net-libs/polarssl-0.14.0 ) )
- !gnutls? ( !polarssl? ( dev-libs/openssl ) )
+ gnutls? ( net-libs/gnutls[${MULTILIB_USEDEP}] )
+ polarssl? ( !gnutls? (
>=net-libs/polarssl-0.14.0[${MULTILIB_USEDEP}] ) )
+ !gnutls? ( !polarssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] ) )
)
- sys-libs/zlib"
+ sys-libs/zlib[${MULTILIB_USEDEP}]"
RDEPEND="${DEPEND}"
pkg_setup() {
- if ! use ssl && ( use gnutls || use polarssl ) ; then
+ if ! use ssl && ( use gnutls || use polarssl ) ; then
ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."
ewarn "Please review the local USE flags for this package."
fi
@@ -39,11 +39,12 @@
-e 's:OPT:OPTS:' \
-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
|| die "failed to fix Makefile"
+ multilib_copy_sources
}
-src_compile() {
+multilib_src_compile() {
if use ssl ; then
- if use gnutls ; then
+ if use gnutls ; then
crypto="GNUTLS"
elif use polarssl ; then
crypto="POLARSSL"
@@ -53,13 +54,20 @@
fi
#fix multilib-script support. Bug #327449
sed -i "/^libdir/s:lib$:$(get_libdir)$:" librtmp/Makefile
+ if ! multilib_build_binaries; then
+ cd librtmp
+ fi
emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}"
SYS=posix
}
-src_install() {
+multilib_src_install() {
mkdir -p "${ED}"/${DESTTREE}/$(get_libdir)
+ if multilib_is_native_abi; then
+ dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
+ else
+ cd librtmp
+ fi
emake DESTDIR="${ED}" prefix="${DESTTREE}"
mandir="${DESTTREE}/share/man" \
- CRYPTO="${crypto}" install
- dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
+ CRYPTO="${crypto}" install
}
