diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-04-22 01:34:42 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-04-22 01:34:42 +0000 |
commit | 48aa43bcfb20a82b4bce04569f80945516e341ff (patch) | |
tree | 3168abb5bce7f094a6ac008458ef6ffa1a7440a1 /media-video/avifile | |
parent | - disable aout by default patch stems from owl (diff) | |
download | gentoo-2-48aa43bcfb20a82b4bce04569f80945516e341ff.tar.gz gentoo-2-48aa43bcfb20a82b4bce04569f80945516e341ff.tar.bz2 gentoo-2-48aa43bcfb20a82b4bce04569f80945516e341ff.zip |
Added patch to convert labels to local form, fixes #86320.
(Portage version: 2.0.51.19)
Diffstat (limited to 'media-video/avifile')
-rw-r--r-- | media-video/avifile/ChangeLog | 7 | ||||
-rw-r--r-- | media-video/avifile/avifile-0.7.43.20050224-r1.ebuild | 4 | ||||
-rw-r--r-- | media-video/avifile/files/avifile-0.7.43.20050224-fixlabels.patch | 18 |
3 files changed, 27 insertions, 2 deletions
diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog index dd2a64a577ae..c0f6fc5a2962 100644 --- a/media-video/avifile/ChangeLog +++ b/media-video/avifile/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/avifile # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.99 2005/04/18 00:15:15 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.100 2005/04/22 01:34:42 flameeyes Exp $ + + 22 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> + +files/avifile-0.7.43.20050224-fixlabels.patch, + avifile-0.7.43.20050224-r1.ebuild: + Added patch to convert labels to local form, fixes #86320. 18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> +files/avifile-0.7.43.20050224-sdllibs.patch, diff --git a/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild b/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild index fe0a9ef53192..4d4e86abf4e3 100644 --- a/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild +++ b/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild,v 1.2 2005/04/18 00:15:15 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild,v 1.3 2005/04/22 01:34:42 flameeyes Exp $ inherit eutils flag-o-matic @@ -56,6 +56,8 @@ src_unpack() { epatch ${FILESDIR}/avifile-0.7.43.20050224-sysffmpeg.patch # removes sed-out of -L/usr/lib(64?) on sdl libs flags epatch ${FILESDIR}/avifile-0.7.43.20050224-sdllibs.patch + # fixes bug #86320 + epatch ${FILESDIR}/${P}-fixlabels.patch if ! use qt ; then sed -i -e 's/qtvidcap\ qtrecompress//g' \ diff --git a/media-video/avifile/files/avifile-0.7.43.20050224-fixlabels.patch b/media-video/avifile/files/avifile-0.7.43.20050224-fixlabels.patch new file mode 100644 index 000000000000..e841cb0c8b0d --- /dev/null +++ b/media-video/avifile/files/avifile-0.7.43.20050224-fixlabels.patch @@ -0,0 +1,18 @@ +diff -ur a/lib/common/mmx.cpp avifile-0.7-0.7.43/lib/common/mmx.cpp +--- a/lib/common/mmx.cpp 2005-02-15 15:33:39.000000000 +0300 ++++ avifile-0.7-0.7.43/lib/common/mmx.cpp 2005-03-23 22:09:48.730535320 +0300 +@@ -122,12 +122,12 @@ + // x_accum-=x_min; + "subl %6, %%edx \n\t" + // if(x_accum<=0) { +- "jnc x2 \n\t" ++ "jnc 2f \n\t" + // xaccum+=dst_w; + "addl %7, %%edx \n\t" + // src++; + "addl $2, %%eax \n\t" +- "x2: \n\t" ++ "2: \n\t" + "decl %8 \n\t" + "jnz 1b \n\t" + "popl %%ebx \n\t" |