Overview
Submit package home:Fisiu:branches:Essentials / amarok to package Essentials / amarok
amarok.changes
Changed
x
1
2
-------------------------------------------------------------------
3
+Thu Dec 27 22:29:28 UTC 2012 - fisiu@opensuse.org
4
+
5
+- Add fix-transcoding.patch - fixes #PM-57.
6
+
7
+-------------------------------------------------------------------
8
Sun Dec 16 01:09:22 UTC 2012 - stefan.bruens@rwth-aachen.de
9
10
- fix broken signal/slot signatures caused by SR:130759
11
amarok.spec
Changed
18
1
2
Patch2: flac_mimetype_bnc671581.diff
3
Patch3: revert_solid_workaround.diff
4
Patch4: liblastfm1-support.diff
5
+# PATCH-FIX-UPSTREAM fix-transcoding.patch kde#309454 -- Fix available transcoding encoders with ffmpeg >= 1.0
6
+Patch5: fix-transcoding.patch
7
BuildRoot: %{_tmppath}/%{name}-%{version}-build
8
9
# Required for the fdupes macro
10
11
if [ $(rpm -q --qf '%{VERSION}' liblastfm-devel | cut -c 1) -gt 0 ]; then
12
%patch4 -p1
13
fi
14
+%patch5 -p0
15
16
# Remove build time references so build-compare can do its work
17
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
18
fix-transcoding.patch
Added
68
1
2
+Index: src/core/transcoding/formats/TranscodingAacFormat.cpp
3
+===================================================================
4
+--- src/core/transcoding/formats/TranscodingAacFormat.cpp.orig
5
++++ src/core/transcoding/formats/TranscodingAacFormat.cpp
6
+@@ -90,7 +90,7 @@ QStringList
7
+ AacFormat::ffmpegParameters( const Configuration &configuration ) const
8
+ {
9
+ QStringList parameters;
10
+- parameters << "-acodec" << "libfaac"; /* libfaac seems to be the only decent AAC encoder
11
++ parameters << "-acodec" << "aac"; /* libfaac seems to be the only decent AAC encoder
12
+ for GNU/Linux and it's a proprietary freeware
13
+ with LGPL portions. Hopefully in the future
14
+ FFmpeg's native aac implementation should get
15
+@@ -114,7 +114,7 @@ AacFormat::ffmpegParameters( const Confi
16
+ bool
17
+ AacFormat::verifyAvailability( const QString &ffmpegOutput ) const
18
+ {
19
+- return ffmpegOutput.contains( QRegExp( ".EA... libfaac" ) );
20
++ return ffmpegOutput.contains( QRegExp( ".EA... aac" ) );
21
+ }
22
+
23
+ }
24
+Index: src/core/transcoding/formats/TranscodingMp3Format.cpp
25
+===================================================================
26
+--- src/core/transcoding/formats/TranscodingMp3Format.cpp.orig
27
++++ src/core/transcoding/formats/TranscodingMp3Format.cpp
28
+@@ -85,7 +85,7 @@ QStringList
29
+ Mp3Format::ffmpegParameters( const Configuration &configuration ) const
30
+ {
31
+ QStringList parameters;
32
+- parameters << "-acodec" << "libmp3lame";
33
++ parameters << "-acodec" << "mp3";
34
+ foreach( Property property, m_propertyList )
35
+ {
36
+ if( !configuration.property( property.name() ).isNull()
37
+@@ -105,7 +105,7 @@ Mp3Format::ffmpegParameters( const Confi
38
+ bool
39
+ Mp3Format::verifyAvailability( const QString &ffmpegOutput ) const
40
+ {
41
+- return ffmpegOutput.contains( QRegExp( ".EA... libmp3lame" ) );
42
++ return ffmpegOutput.contains( QRegExp( ".EA... mp3" ) );
43
+ }
44
+
45
+ }
46
+Index: src/core/transcoding/formats/TranscodingVorbisFormat.cpp
47
+===================================================================
48
+--- src/core/transcoding/formats/TranscodingVorbisFormat.cpp.orig
49
++++ src/core/transcoding/formats/TranscodingVorbisFormat.cpp
50
+@@ -90,7 +90,7 @@ QStringList
51
+ VorbisFormat::ffmpegParameters( const Configuration &configuration ) const
52
+ {
53
+ QStringList parameters;
54
+- parameters << "-acodec" << "libvorbis"; //libvorbis is better than FFmpeg's
55
++ parameters << "-acodec" << "vorbis"; //libvorbis is better than FFmpeg's
56
+ //vorbis implementation in many ways
57
+ foreach( Property property, m_propertyList )
58
+ {
59
+@@ -111,7 +111,7 @@ VorbisFormat::ffmpegParameters( const Co
60
+ bool
61
+ VorbisFormat::verifyAvailability( const QString &ffmpegOutput ) const
62
+ {
63
+- return ffmpegOutput.contains( QRegExp( ".EA... libvorbis" ) );
64
++ return ffmpegOutput.contains( QRegExp( ".EA... vorbis" ) );
65
+ }
66
+
67
+ }
68
Refresh
Refresh
Login required, please
login
or
signup
in order to comment
Request History
Fisiu created request over 11 years ago
- Add fix-transcoding.patch - fixes #PM-57.
mrdocs accepted request about 12 years ago
Reviewed OK