summaryrefslogtreecommitdiff
path: root/media-gfx/nomacs
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/nomacs')
-rw-r--r--media-gfx/nomacs/Manifest10
-rw-r--r--media-gfx/nomacs/files/nomacs-3.12-gcc9.patch39
-rw-r--r--media-gfx/nomacs/metadata.xml2
-rw-r--r--media-gfx/nomacs/nomacs-3.14.2.ebuild4
-rw-r--r--media-gfx/nomacs/nomacs-3.16.224.ebuild (renamed from media-gfx/nomacs/nomacs-3.12.ebuild)29
5 files changed, 30 insertions, 54 deletions
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index e255c62281f5..03f5d4abe8a0 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,7 +1,7 @@
-AUX nomacs-3.12-gcc9.patch 1098 BLAKE2B 70e4900d2670b9e4ca9f6ae12f4720a0bc25eabdf0ba09729801428cd6f12d5655db15c3ee3a9c2e5c6f5ae5cac6cf77fd6d1730a39ceda8a713a32f989bed8e SHA512 d653c666345f50c83f199aaeec61e4e481124787f5dad53d89ed06f920e0f20beebb4a56e550665c61af3b1718d6fb24092f98b7f0d99e6ab6eb98d5995093be
-DIST nomacs-3.12.tar.gz 1736648 BLAKE2B 533e18dec4be5d945213ccd629262a2cbae1eba93599f43be0a98d32d0b54d9caad7d963809f2fc9bb5c1ba682a39f44763b5d04e50c6e86658f6cd84324f3d2 SHA512 4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119
DIST nomacs-3.14.2.tar.gz 2169504 BLAKE2B 6050ddba3ddbdeb7d1fbd29831d5dfbee066b61398ef46be4145a287d565eb2d55d59f47bc9e9e34a10379f8e0e676ca1f5373389a0d35c27fe85cff5da3fded SHA512 58104c85078bdbff7f65625658bb01b152631470eea93a43494eed55ae5e2441b7bcf3ed6c8f1aef07831bc99c80af94467fcc0e15dc1d282ef313bfcb3c81e9
+DIST nomacs-3.16.224.tar.gz 1932366 BLAKE2B 4a2dc6ef70b0ae5dc9c9397bd2c88ede0db2bb8660e1907d08b36c4a9cf5a9bd151180aa4b2d6b5f529c1786004a6621eff88fa4bc851d60835e8ba6d6269602 SHA512 7ca8e713eedd71bc3dd3804a9a09ece15badb74949b155ea4da72a0ea129be173c8d0951604a6139d4490525cd420da8635773c11f0d133f666a48dcd9064257
DIST nomacs-plugins-3.14.tar.gz 514472 BLAKE2B fe8e1608c0a0ed502ea82efe80a9cfab3a9aff3ca7e8cbecfcb199377d137f5c19ad176940ef1f1109938634af3548008da1311339e6da78b8b5b983102bebb6 SHA512 c0bca87e50b7b91d80a9d6afd95eeb1d6730b17b9a28ad4109514b36c42781b3f67b25f68f48c0953110d1e02bb03762e813af9c1ec2851c072b4aea74969cbd
-EBUILD nomacs-3.12.ebuild 1303 BLAKE2B 8d57bf7614e38a998b4e06e58d6fb8579b71308d1b16b19672316db92e8b41d7895fbabb9817a29436e6d692b5e6f6b9d97f0b0d0fe36361e294613c001f3bf8 SHA512 295dd7047ffee76e074411f26dbdd8f8288ff667cedd104cf3192ac8d196fdb12274c377a7c53cf97dca201674865eb9f66300d49054fcf3289d33f00255e8c2
-EBUILD nomacs-3.14.2.ebuild 1930 BLAKE2B ff33cf895e5dbe243344a2b74d1fa744eaa85ec878181a15f048ec664827b2dc8a0af93fe780350cf86fea5474f3e8e567b5dae36908fada0681098b577f824f SHA512 7b42c86df5921bca0d95d5497742b805743a981e4772940de69a6a528353d51ff30c0472f6f4a960ce808c62235e5a8b74c7e4f75e36321e4c4864b39cf69d1b
-MISC metadata.xml 575 BLAKE2B cfd30ae66e512ded8e2a2c9fe4cd1643802d4604c7e6cbbeda71961366ba7231a2424e56ed269dfa7c7216346690a960cda65a4a1d956e6a842f8a5a8eb86ef2 SHA512 067aee95572e8ce05d9cd31fd21cac89469a785772abf1086ba532c00c042aff074aeef62faced8b4de46bf3ec210c35d3b213f06c5ca6f1fcf2090096c3bc57
+DIST nomacs-plugins-3.16.tar.gz 561522 BLAKE2B 2bda4f36d56709653f6696af3404e416fd2d9fe7fa11de9636643c728028018ac769df3e2e519799322c5c42006cdc114d0e6406f9f60294234b07d9fd8d8409 SHA512 cd72f6ddbe3e07d7ed97f08405bac7574f4f3285c81e835f5630e011c8a9b105f23d892fed8084cb35ce521aca5524db071d0edb8bb04850dd2209d9ed019747
+EBUILD nomacs-3.14.2.ebuild 1928 BLAKE2B 65f9e2319a248fbe8a81cd4cca751c26125ba299b9203e369405eb1cca92345ca9c4b2e5c4210ce4424e40d3738fc8bdeab64a90511e8302078ce6b55b00ccb3 SHA512 82000a615de936bd8434a43f4aeb9936aeffa4f833263169dfa6353f0c735814f11c3f62fbe71218c3c7f4bc16afc0d805c453b0c7881ca7a5b096f3a1351100
+EBUILD nomacs-3.16.224.ebuild 1852 BLAKE2B 4a32c5476b1c383df212b0ecd68a53d11b5258c5daa7385802a08520eae6b9a866c35afb9c18aa00e60f821b38663896943b7ec606a8351720fdfe36967117cc SHA512 122cd0267ec28982d5659471ad0d241e5e02f0ac4a2cb94e6fbc3c8512433a61ae22b4b60616c387698d4e561707faa8e08c41aef886f23f688a164b2667d411
+MISC metadata.xml 594 BLAKE2B 3e4f800e489a388987f8942f433fad19e378644cb2aecd66d7eacbca167fa12597967bc4bef21260d266aa5553c1b103cc4df8167fbba8655a346e25100e66a6 SHA512 2f3ee7d525fff3d6ca2793d96555dcfba34df5b15cd2879e640aa51b5ccd34e2f466c2a5cceab90050af8c3d668c2d57fd88c136d830343da7313c8eaea247c9
diff --git a/media-gfx/nomacs/files/nomacs-3.12-gcc9.patch b/media-gfx/nomacs/files/nomacs-3.12-gcc9.patch
deleted file mode 100644
index ccf6ea31d9d5..000000000000
--- a/media-gfx/nomacs/files/nomacs-3.12-gcc9.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 37805e3bc8753970127db101f4aa0c061bc5a70d Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Sun, 9 Jun 2019 19:15:28 +1000
-Subject: [PATCH] Fix build with GCC9
-
----
- ImageLounge/src/DkCore/DkMetaData.cpp | 2 ++
- ImageLounge/src/DkGui/DkNoMacs.cpp | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/ImageLounge/src/DkCore/DkMetaData.cpp b/ImageLounge/src/DkCore/DkMetaData.cpp
-index 7540f7b9..fe2bc7ec 100644
---- a/src/DkCore/DkMetaData.cpp
-+++ b/src/DkCore/DkMetaData.cpp
-@@ -42,6 +42,8 @@
- #include <QApplication>
- #pragma warning(pop) // no warnings from includes - end
-
-+#include <iostream>
-+
- namespace nmc {
-
- // DkMetaDataT --------------------------------------------------------------------
-diff --git a/ImageLounge/src/DkGui/DkNoMacs.cpp b/ImageLounge/src/DkGui/DkNoMacs.cpp
-index edda14cd..8fcdb59c 100644
---- a/src/DkGui/DkNoMacs.cpp
-+++ b/src/DkGui/DkNoMacs.cpp
-@@ -99,6 +99,8 @@
-
- #include <assert.h>
-
-+#include <iostream>
-+
- namespace nmc {
-
- DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) : QObject(parent) {
---
-2.21.0
-
diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index 17d5f3794443..5d40018fc73b 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.xml
@@ -12,6 +12,6 @@
</upstream>
<use>
<flag name="opencv">Build support for <pkg>media-libs/opencv</pkg></flag>
- <flag name="plugins">Build plugins</flag>
+ <flag name="plugins">Build officially support plugins</flag>
</use>
</pkgmetadata>
diff --git a/media-gfx/nomacs/nomacs-3.14.2.ebuild b/media-gfx/nomacs/nomacs-3.14.2.ebuild
index ff12e28b2c9e..399cf622d2d9 100644
--- a/media-gfx/nomacs/nomacs-3.14.2.ebuild
+++ b/media-gfx/nomacs/nomacs-3.14.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
IUSE="+jpeg +opencv plugins raw tiff zip"
REQUIRED_USE="
diff --git a/media-gfx/nomacs/nomacs-3.12.ebuild b/media-gfx/nomacs/nomacs-3.16.224.ebuild
index a527bc46b3e8..3d0a8e506dd9 100644
--- a/media-gfx/nomacs/nomacs-3.12.ebuild
+++ b/media-gfx/nomacs/nomacs-3.16.224.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+PLUGIN_PKG="${PN}-plugins-$(ver_cut 1-2)"
inherit cmake xdg-utils
DESCRIPTION="Qt-based image viewer"
HOMEPAGE="https://nomacs.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+plugins? ( https://github.com/${PN}/${PN}-plugins/archive/$(ver_cut 1-2).tar.gz -> ${PLUGIN_PKG}.tar.gz )"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="+jpeg +opencv raw tiff zip"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+jpeg +opencv plugins raw +tiff zip"
REQUIRED_USE="
raw? ( opencv )
@@ -32,9 +34,9 @@ RDEPEND="
raw? ( media-libs/libraw:= )
tiff? (
dev-qt/qtimageformats:5
- media-libs/tiff:0
+ media-libs/tiff
)
- zip? ( dev-libs/quazip[qt5(+)] )
+ zip? ( dev-libs/quazip )
"
DEPEND="${RDEPEND}"
BDEPEND="
@@ -45,7 +47,19 @@ BDEPEND="
S="${WORKDIR}/${P}/ImageLounge"
DOCS=( src/changelog.txt )
-PATCHES=( "${FILESDIR}/${P}-gcc9.patch" )
+
+src_prepare() {
+ if use plugins ; then
+ rmdir plugins || die
+ mv -v ../../${PLUGIN_PKG} plugins || die
+ # Fix nomacs-plugins installation and search library directory
+ sed -e "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" \
+ -i plugins/cmake/Utils.cmake || die
+ sed -e "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" \
+ -i src/DkCore/DkPluginManager.cpp || die
+ fi
+ cmake_src_prepare
+}
src_configure() {
local mycmakeargs=(
@@ -53,6 +67,7 @@ src_configure() {
-DUSE_SYSTEM_QUAZIP=ON
-DENABLE_TRANSLATIONS=ON
-DENABLE_OPENCV=$(usex opencv)
+ -DENABLE_PLUGINS=$(usex plugins)
-DENABLE_RAW=$(usex raw)
-DENABLE_TIFF=$(usex tiff)
-DENABLE_QUAZIP=$(usex zip)