diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2011-12-03 16:06:23 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2011-12-03 16:06:23 +0000 |
| commit | d50c2ffeb53767d648b22b354e87b06fa0fb6788 (patch) | |
| tree | f4bf4994796677735077ae83cc04e732223f3398 /media-video | |
| parent | Move bubblemon from x11-misc to x11-plugins. Remove deprecated slotmove too. (diff) | |
| download | gentoo-2-d50c2ffeb53767d648b22b354e87b06fa0fb6788.tar.gz gentoo-2-d50c2ffeb53767d648b22b354e87b06fa0fb6788.tar.bz2 gentoo-2-d50c2ffeb53767d648b22b354e87b06fa0fb6788.zip | |
fix build with ffmpeg 0.8, bug #378001
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/qx11grab/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/qx11grab/files/qx11grab-0.2.2-ffmpeg.patch | 22 | ||||
| -rw-r--r-- | media-video/qx11grab/qx11grab-0.2.2.ebuild | 3 |
3 files changed, 29 insertions, 2 deletions
diff --git a/media-video/qx11grab/ChangeLog b/media-video/qx11grab/ChangeLog index 4daaa0dab2a7..c7fdd24609d0 100644 --- a/media-video/qx11grab/ChangeLog +++ b/media-video/qx11grab/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/qx11grab # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/ChangeLog,v 1.8 2011/11/24 12:52:37 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/ChangeLog,v 1.9 2011/12/03 16:06:23 aballier Exp $ + + 03 Dec 2011; Alexis Ballier <aballier@gentoo.org> qx11grab-0.2.2.ebuild, + +files/qx11grab-0.2.2-ffmpeg.patch: + fix build with ffmpeg 0.8, bug #378001 24 Nov 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml: Drop maintainer due retirement, bug #290906 diff --git a/media-video/qx11grab/files/qx11grab-0.2.2-ffmpeg.patch b/media-video/qx11grab/files/qx11grab-0.2.2-ffmpeg.patch new file mode 100644 index 000000000000..9ed38c0ba6c7 --- /dev/null +++ b/media-video/qx11grab/files/qx11grab-0.2.2-ffmpeg.patch @@ -0,0 +1,22 @@ +Index: qx11grab-0.2.2/src/tableeditor/tableeditor.cpp +=================================================================== +--- qx11grab-0.2.2.orig/src/tableeditor/tableeditor.cpp ++++ qx11grab-0.2.2/src/tableeditor/tableeditor.cpp +@@ -67,7 +67,7 @@ void TableEditor::findVideoCodecs() + AVCodec *codec; + for ( codec = av_codec_next ( 0 ); codec != NULL; codec = av_codec_next ( codec ) ) + { +- if ( ( codec->type == CODEC_TYPE_VIDEO ) && ( codec->encode ) ) ++ if ( ( codec->type == AVMEDIA_TYPE_VIDEO ) && ( codec->encode ) ) + { + QString itemName = QString ( "%1 (%2)" ).arg ( codec->long_name, codec->name ); + codecSelection->addItem ( itemName, QVariant ( codec->name ) ); +@@ -86,7 +86,7 @@ void TableEditor::findAudioCodecs() + AVCodec *codec; + for ( codec = av_codec_next ( 0 ); codec != NULL; codec = av_codec_next ( codec ) ) + { +- if ( ( codec->type == CODEC_TYPE_AUDIO ) && ( codec->encode ) ) ++ if ( ( codec->type == AVMEDIA_TYPE_AUDIO ) && ( codec->encode ) ) + { + QString itemName = QString ( "%1 (%2)" ).arg ( codec->long_name, codec->name ); + codecSelection->addItem ( itemName, QVariant ( codec->name ) ); diff --git a/media-video/qx11grab/qx11grab-0.2.2.ebuild b/media-video/qx11grab/qx11grab-0.2.2.ebuild index 23298abcc709..7ec757ef082f 100644 --- a/media-video/qx11grab/qx11grab-0.2.2.ebuild +++ b/media-video/qx11grab/qx11grab-0.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/qx11grab-0.2.2.ebuild,v 1.3 2011/04/03 19:04:43 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/qx11grab-0.2.2.ebuild,v 1.4 2011/12/03 16:06:23 aballier Exp $ EAPI=2 @@ -33,4 +33,5 @@ src_prepare() { -e "s:share/qx11grab:share/doc/${PF}:" \ -e '/COPYING/d' \ CMakeLists.txt || die "sed failed" + epatch "${FILESDIR}/${P}-ffmpeg.patch" } |