diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-09-23 17:38:34 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-09-23 17:38:34 +0000 |
| commit | 6632c5f5c144ed85da6ddff59a329309826dee32 (patch) | |
| tree | e8266b385fec6bbf8718de9864178aa71ac70d97 /media-video/cinelerra | |
| parent | Drop mask for removed version of Portage (bug #338441) (diff) | |
| download | historical-6632c5f5c144ed85da6ddff59a329309826dee32.tar.gz historical-6632c5f5c144ed85da6ddff59a329309826dee32.tar.bz2 historical-6632c5f5c144ed85da6ddff59a329309826dee32.zip | |
Remove Debian -line from admin/nasm to fix building wrt #318155 by Jochen Schlick and Andrew Savchenko.
Package-Manager: portage-2.2_rc86/cvs/Linux x86_64
Diffstat (limited to 'media-video/cinelerra')
| -rw-r--r-- | media-video/cinelerra/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/cinelerra/Manifest | 4 | ||||
| -rw-r--r-- | media-video/cinelerra/cinelerra-20100320.ebuild | 3 |
3 files changed, 10 insertions, 4 deletions
diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog index 3c10309bef91..4b7b47032ad7 100644 --- a/media-video/cinelerra/ChangeLog +++ b/media-video/cinelerra/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/cinelerra # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.44 2010/08/16 17:10:10 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.45 2010/09/23 17:38:34 ssuominen Exp $ + + 23 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> + cinelerra-20100320.ebuild: + Remove Debian -line from admin/nasm to fix building wrt #318155 by Jochen + Schlick and Andrew Savchenko. 16 Aug 2010; Sebastian Pipping <sping@gentoo.org> cinelerra-20100320.ebuild: diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest index 7610df3ee893..a90b9f25c0e1 100644 --- a/media-video/cinelerra/Manifest +++ b/media-video/cinelerra/Manifest @@ -6,6 +6,6 @@ AUX cinelerra-jpeg-7.patch 1131 RMD160 128d7cf423843eeaae8a1a334a3166e9ce5295cd AUX cinelerra-libavutil50.patch 2140 RMD160 95720943d2bee3a7f5c5a864aef5631655a65120 SHA1 6fa5d1024adde249fe026837061ceace11b06532 SHA256 f29284a0e8b629c1ff22090c03c9fe3947adbd024dd2c05d925775c8f96f8eda AUX cinelerra-x264.patch 679 RMD160 27c0bb325268a3523887d3d10da94090119247f1 SHA1 f59faeeca021a70ad41887b7ccc0278c8c29472d SHA256 a4a561def29c25d087cab8fceabba1dfed4c712c493dc2c8411cbf6d6226cd2b DIST cinelerra-20100320.tar.bz2 32670992 RMD160 96c47cf5d9f57b88ad7e3ddee42e61cfe9ccb421 SHA1 ecf4c728e149556e4725a84d460f8a0b8dad6277 SHA256 8b1b057f77283c95d728e9b848d71e938756f6deea0102ca69b618753231c9f3 -EBUILD cinelerra-20100320.ebuild 2444 RMD160 f46d35a38548149388e4b85e8f115e6e1c558e47 SHA1 b985da589f61fce8760c0f804e9c3c1b86bec46a SHA256 2df6a31f92864669413b3151ba8c4d64a79f46def80a520f5d7c80ff5ea07bbc -MISC ChangeLog 10837 RMD160 f6eac96d8a14b1939d18868affebd8303c4b421c SHA1 9ee18d26085abe08914e7d3167ebaa9e70926905 SHA256 3b661fe27b31f39bbc357280c7b36a65bc58d7675844411b1090d9b2fb62b670 +EBUILD cinelerra-20100320.ebuild 2497 RMD160 462c2a50212b812b9c1ac620e61966051c8a88fb SHA1 4f4265da2ecf732eb8da421c61a0484c415bc466 SHA256 8551ba83f98e4795add7a8a7c1dae6df711882cc34421f2babaac24b5ef2bd48 +MISC ChangeLog 11033 RMD160 8c9957f0e67cb351d5f421c586a51d5c0d57994c SHA1 1cd48d1cf1076ba99108b390b02a54d96119f891 SHA256 30baa6ceeec4278a2a59676fb03bc84419f373fa81f1703f410d459047c8a313 MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb diff --git a/media-video/cinelerra/cinelerra-20100320.ebuild b/media-video/cinelerra/cinelerra-20100320.ebuild index 330c20fc4cc5..1a5f0b176dbe 100644 --- a/media-video/cinelerra/cinelerra-20100320.ebuild +++ b/media-video/cinelerra/cinelerra-20100320.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20100320.ebuild,v 1.7 2010/08/16 17:10:10 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20100320.ebuild,v 1.8 2010/09/23 17:38:34 ssuominen Exp $ EAPI=2 inherit autotools eutils multilib flag-o-matic @@ -47,6 +47,7 @@ DEPEND="${RDEPEND} mmx? ( dev-lang/nasm )" src_prepare() { + sed -i -e '/Debian/d' admin/nasm || die #318155 epatch \ "${FILESDIR}"/${PN}-libavutil50.patch \ "${FILESDIR}"/${P}-pkgconfig-x264.patch \ |