From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-601800-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 9A46F1381F3
for <garchives@archives.gentoo.org>; Sun, 23 Jun 2013 18:49:41 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 299BBE0933;
Sun, 23 Jun 2013 18:49:37 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B4727E0933
for <gentoo-commits@lists.gentoo.org>; Sun, 23 Jun 2013 18:49:36 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 8C2F133E3CC
for <gentoo-commits@lists.gentoo.org>; Sun, 23 Jun 2013 18:49:35 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id 233AFE468F
for <gentoo-commits@lists.gentoo.org>; Sun, 23 Jun 2013 18:49:34 +0000 (UTC)
From: "David Heidelberger" <d.okias@gmail.com>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "David Heidelberger" <d.okias@gmail.com>
Message-ID: <1372013045.957f6a26fb4bf1ad086b16ed7c71bef3f6c68c10.okias@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/nepomuk-core/files/, kde-base/nepomuk-core/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-base/nepomuk-core/files/libav_fix.patch kde-base/nepomuk-core/nepomuk-core-4.10.80.ebuild
X-VCS-Directories: kde-base/nepomuk-core/files/ kde-base/nepomuk-core/
X-VCS-Committer: okias
X-VCS-Committer-Name: David Heidelberger
X-VCS-Revision: 957f6a26fb4bf1ad086b16ed7c71bef3f6c68c10
X-VCS-Branch: master
Date: Sun, 23 Jun 2013 18:49:34 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 3f8c3c1e-209f-42e2-a6cb-c73f9af9777a
X-Archives-Hash: df8016f5f71401e29756477f70686381
commit: 957f6a26fb4bf1ad086b16ed7c71bef3f6c68c10
Author: David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Sun Jun 23 18:44:05 2013 +0000
Commit: David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Sun Jun 23 18:44:05 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=957f6a26
[kde-base/nepomuk-core] 4.10.80, fix code to compile with new libav
Package-Manager: portage-2.1.12.9
---
kde-base/nepomuk-core/files/libav_fix.patch | 19 +++++++++++++++++++
kde-base/nepomuk-core/nepomuk-core-4.10.80.ebuild | 2 ++
2 files changed, 21 insertions(+)
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 0000000..209be53
--- /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 533ef56..dd794d4 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)