1 |
commit: 38dd98bf006e8d4aaf6b4b8945c9e8274cbe77e2 |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 28 06:21:22 2012 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 28 06:21:22 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=38dd98bf |
7 |
|
8 |
[app-cdr/k3b] Remove patch, applied upstream fixes bug #433020. |
9 |
|
10 |
(Portage version: 2.2.0_alpha123/git/Linux x86_64, unsigned Manifest commit) |
11 |
|
12 |
--- |
13 |
app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch | 22 ---------------------- |
14 |
app-cdr/k3b/k3b-9999.ebuild | 4 ---- |
15 |
2 files changed, 0 insertions(+), 26 deletions(-) |
16 |
|
17 |
diff --git a/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch b/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch |
18 |
deleted file mode 100644 |
19 |
index 174a776..0000000 |
20 |
--- a/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch |
21 |
+++ /dev/null |
22 |
@@ -1,22 +0,0 @@ |
23 |
-Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp |
24 |
-=================================================================== |
25 |
---- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp |
26 |
-+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp |
27 |
-@@ -88,7 +88,7 @@ bool K3bFFMpegFile::open() |
28 |
- close(); |
29 |
- |
30 |
- // open the file |
31 |
-- int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 ); |
32 |
-+ int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL); |
33 |
- if( err < 0 ) { |
34 |
- kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err; |
35 |
- return false; |
36 |
-@@ -143,7 +143,7 @@ bool K3bFFMpegFile::open() |
37 |
- } |
38 |
- |
39 |
- // dump some debugging info |
40 |
-- ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 ); |
41 |
-+ ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 ); |
42 |
- |
43 |
- return true; |
44 |
- } |
45 |
|
46 |
diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild |
47 |
index 14dc655..9039128 100644 |
48 |
--- a/app-cdr/k3b/k3b-9999.ebuild |
49 |
+++ b/app-cdr/k3b/k3b-9999.ebuild |
50 |
@@ -60,10 +60,6 @@ RDEPEND="${DEPEND} |
51 |
|
52 |
DOCS+=( ChangeLog ) |
53 |
|
54 |
-PATCHES=( |
55 |
- "${FILESDIR}/${PN}-2.0.2-libavformat54.patch" |
56 |
-) |
57 |
- |
58 |
REQUIRED_USE=" |
59 |
mp3? ( encode ) |
60 |
sox? ( encode ) |