summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2016-10-22 16:59:18 +0200
committerMichael Palimaka <kensington@gentoo.org>2016-10-24 03:58:52 +1100
commit8a158a4cebd6ae94a54e8191b83c73ac6507956c (patch)
treeee08efb2f233cbdba9082861eb41dea126d20add /media-gfx/nomacs/files
parentkde-misc/krusader: 2.5.0 version bump (diff)
downloadgentoo-8a158a4cebd6ae94a54e8191b83c73ac6507956c.tar.gz
gentoo-8a158a4cebd6ae94a54e8191b83c73ac6507956c.tar.bz2
gentoo-8a158a4cebd6ae94a54e8191b83c73ac6507956c.zip
media-gfx/nomacs: Add USE=jpeg, fix build with !opencv
Gentoo-bug: 592118, 592134 Package-Manager: portage-2.3.0
Diffstat (limited to 'media-gfx/nomacs/files')
-rw-r--r--media-gfx/nomacs/files/nomacs-3.4-no-opencv.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/media-gfx/nomacs/files/nomacs-3.4-no-opencv.patch b/media-gfx/nomacs/files/nomacs-3.4-no-opencv.patch
new file mode 100644
index 000000000000..698b45c6aced
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.4-no-opencv.patch
@@ -0,0 +1,11 @@
+--- a/src/DkLoader/DkBasicLoader.h
++++ b/src/DkLoader/DkBasicLoader.h
+@@ -258,7 +258,7 @@ class DllLoaderExport DkBasicLoader : public QObject {
+ bool readHeader(const unsigned char** dataPtr, int& fileCount, int& vecSize) const;
+ void getPatchSizeFromFileName(const QString& fileName, int& width, int& height) const;
+ #else
+- bool loadOpenCVVecFile(const QString&, QSharedPointer<QByteArray> = QSharedPointer<QByteArray>(), QSize = QSize()) { return false; };
++ bool loadOpenCVVecFile(const QString&, QImage&, QSharedPointer<QByteArray> = QSharedPointer<QByteArray>(), QSize = QSize()) { return false; };
+ int mergeVecFiles(const QStringList&, QString&) const { return 0; };
+ bool readHeader(const unsigned char**, int&, int&) const { return false; };
+ void getPatchSizeFromFileName(const QString&, int&, int&) const {};