diff options
| author | Johannes Huber <johu@gentoo.org> | 2013-12-20 12:19:47 +0100 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2013-12-20 12:19:47 +0100 |
| commit | af596d07eca3289d73ab80c782330eb2694a4725 (patch) | |
| tree | a83562bc8dc7479d228947e7840ba66b5c196933 | |
| parent | 80fb8b2d9287c31b051e63ef9b8011028e1a70ab (diff) | |
| download | kde-af596d07eca3289d73ab80c782330eb2694a4725.tar.gz kde-af596d07eca3289d73ab80c782330eb2694a4725.tar.bz2 kde-af596d07eca3289d73ab80c782330eb2694a4725.zip | |
[kde-base/nepomuk-core] Use subslot for media-gfx/exiv2
Package-Manager: portage-2.2.7
4 files changed, 3 insertions, 22 deletions
diff --git a/kde-base/nepomuk-core/files/libav_fix.patch b/kde-base/nepomuk-core/files/libav_fix.patch deleted file mode 100644 index 108310d5bb9..00000000000 --- a/kde-base/nepomuk-core/files/libav_fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -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; -+ double 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.11.49.9999.ebuild b/kde-base/nepomuk-core/nepomuk-core-4.11.49.9999.ebuild index f8a53885bdc..85bbead9dd8 100644 --- a/kde-base/nepomuk-core/nepomuk-core-4.11.49.9999.ebuild +++ b/kde-base/nepomuk-core/nepomuk-core-4.11.49.9999.ebuild @@ -14,7 +14,7 @@ DEPEND=" >=dev-libs/shared-desktop-ontologies-0.11.0 >=dev-libs/soprano-2.9.3[dbus,raptor,redland,virtuoso] epub? ( app-text/ebook-tools ) - exif? ( media-gfx/exiv2 ) + exif? ( media-gfx/exiv2:= ) ffmpeg? ( virtual/ffmpeg ) pdf? ( app-text/poppler[qt4] ) taglib? ( media-libs/taglib ) diff --git a/kde-base/nepomuk-core/nepomuk-core-4.12.49.9999.ebuild b/kde-base/nepomuk-core/nepomuk-core-4.12.49.9999.ebuild index f8a53885bdc..85bbead9dd8 100644 --- a/kde-base/nepomuk-core/nepomuk-core-4.12.49.9999.ebuild +++ b/kde-base/nepomuk-core/nepomuk-core-4.12.49.9999.ebuild @@ -14,7 +14,7 @@ DEPEND=" >=dev-libs/shared-desktop-ontologies-0.11.0 >=dev-libs/soprano-2.9.3[dbus,raptor,redland,virtuoso] epub? ( app-text/ebook-tools ) - exif? ( media-gfx/exiv2 ) + exif? ( media-gfx/exiv2:= ) ffmpeg? ( virtual/ffmpeg ) pdf? ( app-text/poppler[qt4] ) taglib? ( media-libs/taglib ) diff --git a/kde-base/nepomuk-core/nepomuk-core-9999.ebuild b/kde-base/nepomuk-core/nepomuk-core-9999.ebuild index f8a53885bdc..85bbead9dd8 100644 --- a/kde-base/nepomuk-core/nepomuk-core-9999.ebuild +++ b/kde-base/nepomuk-core/nepomuk-core-9999.ebuild @@ -14,7 +14,7 @@ DEPEND=" >=dev-libs/shared-desktop-ontologies-0.11.0 >=dev-libs/soprano-2.9.3[dbus,raptor,redland,virtuoso] epub? ( app-text/ebook-tools ) - exif? ( media-gfx/exiv2 ) + exif? ( media-gfx/exiv2:= ) ffmpeg? ( virtual/ffmpeg ) pdf? ( app-text/poppler[qt4] ) taglib? ( media-libs/taglib ) |