rpm/k3b
SHA256
1
0
Fork 0
forked from pool/k3b
Code Pull Requests Activity

Accepting request 129262 from KDE:Distro:Factory

Browse Source 
- Fix build with ffmpeg 0.11. Took from Packman. (forwarded request 128947 from RedDwarf)

OBS-URL: https://build.opensuse.org/request/show/129262
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/k3b?expand=0&rev=47
This commit is contained in:
Ismail Dönmez 2012-07-30 15:12:55 +00:00 committed by Git OBS Bridge
parent ddfcaaac1c
commit f33e8bd8a2
3 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
k3b-2.0.2-ffmpeg08.patch → k3b-2.0.2-ffmpeg011.patch
View File

@ -1,5 +1,15 @@
--- k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.old 2011-01-15 21:47:29.000000000 +0100
+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2011-06-22 14:14:58.637253378 +0200
diff -ur k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
--- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2011-01-15 21:47:29.000000000 +0100
+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2012-05-27 20:30:32.174569308 +0200
@@ -88,7 +88,7 @@
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, 0 );
if( err < 0 ) {
kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err;
return false;
@@ -109,7 +109,13 @@
#else
::AVCodecContext* codecContext = d->formatContext->streams[0]->codec;
@ -15,6 +25,15 @@
kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename;
return false;
}
@@ -137,7 +143,7 @@
}
// 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;
}
@@ -225,8 +231,11 @@
QString K3bFFMpegFile::title() const
{

5
k3b.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jul 25 21:52:32 UTC 2012 - reddwarf@opensuse.org
- Fix build with ffmpeg 0.11. Took from Packman.
-------------------------------------------------------------------
Sun Apr 15 20:36:11 UTC 2012 - dmueller@suse.com

10
k3b.spec
View File

@ -35,8 +35,8 @@ Patch0: initial-preference.diff
Patch1: add_mimetypes_bnc661777.diff
# PATCH-FIX-UPSTREAM k3b-short-trackinfo.patch bko #268307 idoenmez@suse.de -- Too short track info dataLen returned at least on HL-DT-ST BH10LS30
Patch2: k3b-short-trackinfo.patch
# PATCH-FIX-UPSTREAM %{name}-2.0.2-ffmpeg08.diff kde#274817 reddwarf@opensuse.org -- Make it compile with the latest ffmpeg.
Patch3: %{name}-2.0.2-ffmpeg08.patch
# PATCH-FIX-UPSTREAM k3b-2.0.2-ffmpeg011.patch reddwarf@opensuse.org -- Make it compile with the latest ffmpeg.
Patch3: k3b-2.0.2-ffmpeg011.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# only needed to patch broken images in the upstream tarball
@ -58,7 +58,11 @@ BuildRequires: libmpcdec-devel
BuildRequires: libmusicbrainz-devel
BuildRequires: libsamplerate-devel
BuildRequires: libsndfile-devel
BuildRequires: libtag-devel
%if %suse_version > 1200
BuildRequires: pkgconfig(taglib)
%else
BuildRequires: taglib-devel
%endif
BuildRequires: libvorbis-devel
%if 0%{?suse_version}
BuildRequires: update-desktop-files