Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Luca Barbato (lu_zero)" <lu_zero@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/rtmpdump: rtmpdump-2.4_p20131018.ebuild ChangeLog rtmpdump-9999.ebuild
Date: Wed, 04 Jun 2014 13:26:35
Message-Id: 20140604132630.2D0FB2004E@flycatcher.gentoo.org
1 lu_zero 14/06/04 13:26:30
2
3 Modified: rtmpdump-2.4_p20131018.ebuild ChangeLog
4 rtmpdump-9999.ebuild
5 Log:
6 Multilib support thanks to Christian Schmidt, bug #501098
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit)
9
10 Revision Changes Path
11 1.7 media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild?rev=1.7&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild?rev=1.7&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild?r1=1.6&r2=1.7
16
17 Index: rtmpdump-2.4_p20131018.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild,v
20 retrieving revision 1.6
21 retrieving revision 1.7
22 diff -u -r1.6 -r1.7
23 --- rtmpdump-2.4_p20131018.ebuild 19 Jan 2014 10:29:23 -0000 1.6
24 +++ rtmpdump-2.4_p20131018.ebuild 4 Jun 2014 13:26:29 -0000 1.7
25 @@ -1,10 +1,10 @@
26 # Copyright 1999-2014 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-2.4_p20131018.ebuild,v 1.6 2014/01/19 10:29:23 ago Exp $
29 +# $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 $
30
31 EAPI="4"
32
33 -inherit multilib toolchain-funcs
34 +inherit multilib toolchain-funcs multilib-minimal
35
36 DESCRIPTION="Open source command-line RTMP client intended to stream audio or video flash content"
37 HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
38 @@ -23,15 +23,20 @@
39 )
40 sys-libs/zlib"
41 RDEPEND="${DEPEND}"
42 -S="${WORKDIR}"
43
44 pkg_setup() {
45 - if ! use ssl && ( use gnutls || use polarssl ) ; then
46 + if ! use ssl && ( use gnutls || use polarssl ) ; then
47 ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."
48 ewarn "Please review the local USE flags for this package."
49 fi
50 }
51
52 +src_unpack() {
53 + mkdir -p "${S}" || die "Can't create source directory"
54 + cd "${S}"
55 + unpack "${A}"
56 +}
57 +
58 src_prepare() {
59 # fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
60 sed -i 's/\$(MAKEFLAGS)//g' Makefile \
61 @@ -40,9 +45,10 @@
62 -e 's:OPT:OPTS:' \
63 -e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
64 || die "failed to fix Makefile"
65 + multilib_copy_sources
66 }
67
68 -src_compile() {
69 +multilib_src_compile() {
70 if use ssl ; then
71 if use gnutls ; then
72 crypto="GNUTLS"
73 @@ -54,13 +60,20 @@
74 fi
75 #fix multilib-script support. Bug #327449
76 sed -i "/^libdir/s:lib$:$(get_libdir)$:" librtmp/Makefile
77 + if ! multilib_build_binaries; then
78 + cd librtmp
79 + fi
80 emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
81 OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
82 }
83
84 -src_install() {
85 +multilib_src_install() {
86 mkdir -p "${ED}"/${DESTTREE}/$(get_libdir)
87 + if multilib_is_native_abi; then
88 + dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
89 + else
90 + cd librtmp
91 + fi
92 emake DESTDIR="${ED}" prefix="${DESTTREE}" mandir="${DESTTREE}/share/man" \
93 CRYPTO="${crypto}" install
94 - dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
95 }
96
97
98
99 1.31 media-video/rtmpdump/ChangeLog
100
101 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/ChangeLog?rev=1.31&view=markup
102 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/ChangeLog?rev=1.31&content-type=text/plain
103 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/ChangeLog?r1=1.30&r2=1.31
104
105 Index: ChangeLog
106 ===================================================================
107 RCS file: /var/cvsroot/gentoo-x86/media-video/rtmpdump/ChangeLog,v
108 retrieving revision 1.30
109 retrieving revision 1.31
110 diff -u -r1.30 -r1.31
111 --- ChangeLog 19 Jan 2014 10:29:23 -0000 1.30
112 +++ ChangeLog 4 Jun 2014 13:26:30 -0000 1.31
113 @@ -1,6 +1,10 @@
114 # ChangeLog for media-video/rtmpdump
115 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
116 -# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/ChangeLog,v 1.30 2014/01/19 10:29:23 ago Exp $
117 +# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/ChangeLog,v 1.31 2014/06/04 13:26:30 lu_zero Exp $
118 +
119 + 04 Jun 2014; Luca Barbato <lu_zero@g.o> rtmpdump-2.4_p20131018.ebuild,
120 + rtmpdump-9999.ebuild:
121 + Multilib support thanks to Christian Schmidt, bug #501098
122
123 19 Jan 2014; Agostino Sarubbo <ago@g.o> rtmpdump-2.4_p20131018.ebuild:
124 Stable for ppc64, wrt bug #496436
125
126
127
128 1.5 media-video/rtmpdump/rtmpdump-9999.ebuild
129
130 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/rtmpdump-9999.ebuild?rev=1.5&view=markup
131 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/rtmpdump-9999.ebuild?rev=1.5&content-type=text/plain
132 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/rtmpdump/rtmpdump-9999.ebuild?r1=1.4&r2=1.5
133
134 Index: rtmpdump-9999.ebuild
135 ===================================================================
136 RCS file: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-9999.ebuild,v
137 retrieving revision 1.4
138 retrieving revision 1.5
139 diff -u -r1.4 -r1.5
140 --- rtmpdump-9999.ebuild 25 Nov 2012 10:53:36 -0000 1.4
141 +++ rtmpdump-9999.ebuild 4 Jun 2014 13:26:30 -0000 1.5
142 @@ -1,10 +1,10 @@
143 -# Copyright 1999-2012 Gentoo Foundation
144 +# Copyright 1999-2014 Gentoo Foundation
145 # Distributed under the terms of the GNU General Public License v2
146 -# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-9999.ebuild,v 1.4 2012/11/25 10:53:36 hwoarang Exp $
147 +# $Header: /var/cvsroot/gentoo-x86/media-video/rtmpdump/rtmpdump-9999.ebuild,v 1.5 2014/06/04 13:26:30 lu_zero Exp $
148
149 EAPI="4"
150
151 -inherit git-2 multilib toolchain-funcs
152 +inherit git-2 multilib toolchain-funcs multilib-minimal
153
154 DESCRIPTION="Open source command-line RTMP client intended to stream audio or video flash content"
155 HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
156 @@ -17,15 +17,15 @@
157 IUSE="gnutls polarssl ssl"
158
159 DEPEND="ssl? (
160 - gnutls? ( net-libs/gnutls )
161 - polarssl? ( !gnutls? ( >=net-libs/polarssl-0.14.0 ) )
162 - !gnutls? ( !polarssl? ( dev-libs/openssl ) )
163 + gnutls? ( net-libs/gnutls[${MULTILIB_USEDEP}] )
164 + polarssl? ( !gnutls? ( >=net-libs/polarssl-0.14.0[${MULTILIB_USEDEP}] ) )
165 + !gnutls? ( !polarssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] ) )
166 )
167 - sys-libs/zlib"
168 + sys-libs/zlib[${MULTILIB_USEDEP}]"
169 RDEPEND="${DEPEND}"
170
171 pkg_setup() {
172 - if ! use ssl && ( use gnutls || use polarssl ) ; then
173 + if ! use ssl && ( use gnutls || use polarssl ) ; then
174 ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."
175 ewarn "Please review the local USE flags for this package."
176 fi
177 @@ -39,11 +39,12 @@
178 -e 's:OPT:OPTS:' \
179 -e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
180 || die "failed to fix Makefile"
181 + multilib_copy_sources
182 }
183
184 -src_compile() {
185 +multilib_src_compile() {
186 if use ssl ; then
187 - if use gnutls ; then
188 + if use gnutls ; then
189 crypto="GNUTLS"
190 elif use polarssl ; then
191 crypto="POLARSSL"
192 @@ -53,13 +54,20 @@
193 fi
194 #fix multilib-script support. Bug #327449
195 sed -i "/^libdir/s:lib$:$(get_libdir)$:" librtmp/Makefile
196 + if ! multilib_build_binaries; then
197 + cd librtmp
198 + fi
199 emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
200 OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
201 }
202
203 -src_install() {
204 +multilib_src_install() {
205 mkdir -p "${ED}"/${DESTTREE}/$(get_libdir)
206 + if multilib_is_native_abi; then
207 + dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
208 + else
209 + cd librtmp
210 + fi
211 emake DESTDIR="${ED}" prefix="${DESTTREE}" mandir="${DESTTREE}/share/man" \
212 - CRYPTO="${crypto}" install
213 - dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
214 + CRYPTO="${crypto}" install
215 }
Report Message
Find on MARC Find on Google Groups