diff options
| author | David Heidelberger <david.heidelberger@ixit.cz> | 2013-06-23 20:44:05 +0200 |
|---|---|---|
| committer | David Heidelberger <david.heidelberger@ixit.cz> | 2013-06-23 20:44:05 +0200 |
| commit | 957f6a26fb4bf1ad086b16ed7c71bef3f6c68c10 (patch) | |
| tree | 2188d6b107dcbf3d46584b2d5682232c1a672c9d | |
| parent | a560e99eb56a40be72865a62ed82e43b48565619 (diff) | |
| download | kde-957f6a26fb4bf1ad086b16ed7c71bef3f6c68c10.tar.gz kde-957f6a26fb4bf1ad086b16ed7c71bef3f6c68c10.tar.bz2 kde-957f6a26fb4bf1ad086b16ed7c71bef3f6c68c10.zip | |
[kde-base/nepomuk-core] 4.10.80, fix code to compile with new libav
Package-Manager: portage-2.1.12.9
| -rw-r--r-- | kde-base/nepomuk-core/files/libav_fix.patch | 19 | ||||
| -rw-r--r-- | kde-base/nepomuk-core/nepomuk-core-4.10.80.ebuild | 2 |
2 files changed, 21 insertions, 0 deletions
diff --git a/kde-base/nepomuk-core/files/libav_fix.patch b/kde-base/nepomuk-core/files/libav_fix.patch new file mode 100644 index 00000000000..209be5321d5 --- /dev/null +++ b/kde-base/nepomuk-core/files/libav_fix.patch @@ -0,0 +1,19 @@ +diff -Naur a/services/fileindexer/indexer/ffmpegextractor.cpp b/services/fileindexer/indexer/ffmpegextractor.cpp +--- a/services/fileindexer/indexer/ffmpegextractor.cpp 2013-06-10 20:50:24.000000000 +0200 ++++ b/services/fileindexer/indexer/ffmpegextractor.cpp 2013-06-23 20:36:27.336844353 +0200 +@@ -158,12 +158,12 @@ + subRes.addProperty( NFO::height(), codec->height ); + + int aspectRatio = codec->sample_aspect_ratio.num; +- int frameRate = stream->r_frame_rate.num; ++ int frameRate = stream->avg_frame_rate.num; + + if( codec->sample_aspect_ratio.den ) + aspectRatio /= codec->sample_aspect_ratio.den; +- if( stream->r_frame_rate.den ) +- frameRate /= stream->r_frame_rate.den; ++ if( stream->avg_frame_rate.den ) ++ frameRate /= stream->avg_frame_rate.den; + + subRes.addProperty( NFO::aspectRatio(), aspectRatio ); + subRes.addProperty( NFO::frameRate(), frameRate ); diff --git a/kde-base/nepomuk-core/nepomuk-core-4.10.80.ebuild b/kde-base/nepomuk-core/nepomuk-core-4.10.80.ebuild index 533ef56acaf..dd794d42e9d 100644 --- a/kde-base/nepomuk-core/nepomuk-core-4.10.80.ebuild +++ b/kde-base/nepomuk-core/nepomuk-core-4.10.80.ebuild @@ -25,6 +25,8 @@ add_blocker nepomuk '<4.8.80' RESTRICT="test" # bug 392989 +PATCHES=( "${FILESDIR}/libav_fix.patch" ) + src_configure() { local mycmakeargs=( $(cmake-utils_use_with exif Exiv2) |