summaryrefslogtreecommitdiffstats
path: root/redhat/applications/k3b
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-09-08 12:17:12 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-09-08 12:17:12 +0200
commit9165f598d04efce920663e40b398c4388d585d43 (patch)
treee7baa4e798326604a9082c856e4d5f4d1ea9f85b /redhat/applications/k3b
parentc51008ebee10edfbccb321d9e473c6b6c24a8e80 (diff)
downloadtde-packaging-9165f598d04efce920663e40b398c4388d585d43.tar.gz
tde-packaging-9165f598d04efce920663e40b398c4388d585d43.zip
RPM Packaging: updates for 3.5.13.2
Diffstat (limited to 'redhat/applications/k3b')
-rw-r--r--redhat/applications/k3b/k3b-3.5.13.2-fix_ffmpeg_support.patch11
-rw-r--r--redhat/applications/k3b/k3b-3.5.13.2.spec6
2 files changed, 16 insertions, 1 deletions
diff --git a/redhat/applications/k3b/k3b-3.5.13.2-fix_ffmpeg_support.patch b/redhat/applications/k3b/k3b-3.5.13.2-fix_ffmpeg_support.patch
new file mode 100644
index 000000000..bd3bfdebf
--- /dev/null
+++ b/redhat/applications/k3b/k3b-3.5.13.2-fix_ffmpeg_support.patch
@@ -0,0 +1,11 @@
+--- trinity-k3b-3.5.13.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.ORI 2013-09-07 12:10:15.846286823 +0200
++++ trinity-k3b-3.5.13.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-09-07 12:11:08.020207223 +0200
+@@ -49,7 +49,7 @@
+ K3b::Msf length;
+
+ // for decoding
+- char outputBuffer[AVCODEC_MAX_AUDIO_FRAME_SIZE];
++ char outputBuffer[192000];
+ char* outputBufferPos;
+ int outputBufferSize;
+ AVPacket packet;
diff --git a/redhat/applications/k3b/k3b-3.5.13.2.spec b/redhat/applications/k3b/k3b-3.5.13.2.spec
index 3e3b1578c..312876331 100644
--- a/redhat/applications/k3b/k3b-3.5.13.2.spec
+++ b/redhat/applications/k3b/k3b-3.5.13.2.spec
@@ -43,12 +43,16 @@ License: GPLv2+
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Source2: k3brc
+# Fix FTBFS because AVCODEC_MAX_AUDIO_FRAME_SIZE is obsolete
+Patch1: k3b-3.5.13.2-fix_ffmpeg_support.patch
+
# Legacy RedHat / Fedora patches
# manual bufsize (upstream?)
Patch4: k3b-1.0.4-manualbufsize.patch
# RHEL6: Fix K3B icon
Patch106: trinity-k3b-icons.patch
+
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@@ -388,7 +392,7 @@ and a generic audio and video file converter.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-# set in k3brc too
+%patch1 -p1 -b .ffmpeg
%patch4 -p1 -b .manualbufsize
%patch106 -p1 -b .desktopfile