[SCM] k9copy packaging branch, master, updated. a0cb4d309d159bb431ad423b37f0f7bdcae4a533
Eshat Cakar
eshat-guest at alioth.debian.org
Tue Jan 3 17:40:39 UTC 2012
The following commit has been merged in the master branch:
commit a0cb4d309d159bb431ad423b37f0f7bdcae4a533
Author: Eshat Cakar <info at eshat.de>
Date: Tue Jan 3 18:32:12 2012 +0100
Fix "FTBFS with libav in experimental" by including libavutil/mathematics.h in link_libav_directly.patch
---
debian/changelog | 4 +++-
debian/patches/link_libav_directly.patch | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1935325..c881d4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,9 @@ k9copy (2.3.8-1) unstable; urgency=low
* New upstream version.
* Remove rename_deprecated_var.patch, applied upstream.
-
+ * Fix "FTBFS with libav in experimental" by including
+ libavutil/mathematics.h in link_libav_directly.patch (Closes: #654232)
+
-- Eshat Cakar <info at eshat.de> Tue, 03 Jan 2012 15:58:42 +0100
k9copy (2.3.7-3) unstable; urgency=low
diff --git a/debian/patches/link_libav_directly.patch b/debian/patches/link_libav_directly.patch
index 4347c62..bcdea57 100644
--- a/debian/patches/link_libav_directly.patch
+++ b/debian/patches/link_libav_directly.patch
@@ -155,7 +155,7 @@ Author: Reinhard Tartler
bool k9AviDecode::open(const QString & _fileName) {
--- a/src/import/k9avidecode.h
+++ b/src/import/k9avidecode.h
-@@ -14,49 +14,25 @@
+@@ -14,49 +14,26 @@
#include "k9common.h"
#include <qobject.h>
@@ -173,6 +173,7 @@ Author: Reinhard Tartler
+
+extern "C" {
+#include <libswscale/swscale.h>
++#include <libavutil/mathematics.h>
+}
+
#endif
--
k9copy packaging
More information about the pkg-kde-commits
mailing list