[gentoo-commits] proj/kde:master commit in: app-cdr/k3b/, app-cdr/k3b/files/

[Johannes Huber]

commit:     38dd98bf006e8d4aaf6b4b8945c9e8274cbe77e2
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 28 06:21:22 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Aug 28 06:21:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=38dd98bf

[app-cdr/k3b] Remove patch, applied upstream fixes bug #433020.

(Portage version: 2.2.0_alpha123/git/Linux x86_64, unsigned Manifest commit)

---
 app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch |   22 ----------------------
 app-cdr/k3b/k3b-9999.ebuild                     |    4 ----
 2 files changed, 0 insertions(+), 26 deletions(-)

diff --git a/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch b/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch
deleted file mode 100644
index 174a776..0000000
--- a/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-===================================================================
---- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-@@ -88,7 +88,7 @@ bool K3bFFMpegFile::open()
-     close();
- 
-     // open the file
--    int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 );
-+    int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL);
-     if( err < 0 ) {
-         kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err;
-         return false;
-@@ -143,7 +143,7 @@ bool K3bFFMpegFile::open()
-     }
- 
-     // dump some debugging info
--    ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
-+    ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
- 
-     return true;
- }

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index 14dc655..9039128 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -60,10 +60,6 @@ RDEPEND="${DEPEND}
 
 DOCS+=( ChangeLog )
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.2-libavformat54.patch"
-)
-
 REQUIRED_USE="
 	mp3? ( encode )
 	sox? ( encode )