nomacs: build fix

3 files changed, 56 insertions, 45 deletions

diff --git a/packages/media-gfx/nomacs/nomacs-3.10.2.exheres-0 b/packages/media-gfx/nomacs/nomacs-3.15.0.exheres-0
index 75cc531..87f833d 100644
--- a/packages/media-gfx/nomacs/nomacs-3.10.2.exheres-0
+++ b/packages/media-gfx/nomacs/nomacs-3.15.0.exheres-0
@@ -4,3 +4,11 @@
 require nomacs
 PLATFORMS="~amd64 ~x86"
 
+DEFAULT_SRC_PREPARE_PATCHES=(
+    "${FILES}"/strict_cpp_std_build_fix.patch
+)
+
+src_prepare() {
+    cd "${WORKBASE}/${PNV}"
+    default
+}
diff --git a/packages/media-gfx/nomacs/nomacs-3.8.1.exheres-0 b/packages/media-gfx/nomacs/nomacs-3.8.1.exheres-0
deleted file mode 100644
index 75cc531..0000000
--- a/packages/media-gfx/nomacs/nomacs-3.8.1.exheres-0
+++ /dev/null
@@ -1,6 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-# Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru>
-
-require nomacs
-PLATFORMS="~amd64 ~x86"
-
diff --git a/packages/media-gfx/nomacs/nomacs.exlib b/packages/media-gfx/nomacs/nomacs.exlib
index 6d6a176..22e826e 100644
--- a/packages/media-gfx/nomacs/nomacs.exlib
+++ b/packages/media-gfx/nomacs/nomacs.exlib
@@ -1,7 +1,48 @@
 # Distributed under the terms of the GNU General Public License v2
 # Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru>
+SCM_EXTERNAL_REFS="
+    3rd-party/exiv2:nomexiv2
+    3rd-party/expat:nomexpat
+    3rd-party/opencv:opencv
+    3rd-party/quazip:nomquazip
+    3rd-party/LibRaw:nomLibRaw
+    3rd-party/imageformats:nomimageformats
+    ImageLounge/plugins:nomacsplugins
+"
 
+SCM_nomimageformats_EXTERNAL_REFS="
+    libqpsd:libqpsd
+    libqpcx:libqpcx
+    qt-heif-image-plugin:qtheifimageplugin
+    libheif:
+    libde265:libde265
+"
 
+SCM_SECONDARY_REPOSITORIES="
+    nomexiv2
+    nomexpat
+    opencv
+    nomquazip
+    nomLibRaw
+    nomimageformats
+    nomacsplugins
+    libqpsd
+    libqpcx
+    qtheifimageplugin
+    libde265
+"
+
+SCM_nomexiv2_REPOSITORY="https://github.com/nomacs/exiv2.git"
+SCM_nomexpat_REPOSITORY="https://github.com/nomacs/expat.git"
+SCM_opencv_REPOSITORY="https://github.com/opencv/opencv.git"
+SCM_nomquazip_REPOSITORY="https://github.com/nomacs/quazip.git"
+SCM_nomLibRaw_REPOSITORY="https://github.com/nomacs/LibRaw.git"
+SCM_nomimageformats_REPOSITORY="https://github.com/nomacs/imageformats.git"
+SCM_nomacsplugins_REPOSITORY="https://github.com/nomacs/nomacs-plugins.git"
+SCM_libqpsd_REPOSITORY="https://github.com/nomacs/libqpsd.git"
+SCM_libqpcx_REPOSITORY="https://github.com/nomacs/libqpcx.git"
+SCM_qtheifimageplugin_REPOSITORY="https://github.com/nomacs/qt-heif-image-plugin.git"
+SCM_libde265_REPOSITORY="https://github.com/nomacs/libde265.git"
 
 require github [ user=nomacs ]
 require cmake [ api=2 ]
@@ -13,31 +54,20 @@ LICENCES="GPL-3"
 SLOT="0"
 
 MYOPTIONS="
+    heif [[ description = [ Add support for heic/heif image format ] ]]
+    raw [[ description = [ Add support for raw image formats ] ]]
+    tiff
     zip [[ description = [ Build support for zip archives ] ]]
-"
-if ! ever at_least 3.10; then
-    MYOPTIONS+="
-        opencv [[ description = [ Build support for media-libs/opencv ] ]]
-        (
-            raw [[ description = [ Add support for raw image formats ] ]]
-            tiff
-        )
-       [[ *requires = opencv ]]
-   "
-else
-    MYOPTIONS+="
-        raw [[ description = [ Add support for raw image formats ] ]]
-        tiff
-   "
-fi
-
+ "
 
 
 DEPENDENCIES="
     build+run:
         graphics/exiv2
+        media-libs/opencv[qt5]
         x11-libs/qtbase:5[gui]
         x11-libs/qtsvg:5
+        heif? ( media-libs/libheif )
         raw? ( media-libs/libraw )
         tiff? (
             x11-libs/qtimageformats[tiff]
@@ -46,16 +76,6 @@ DEPENDENCIES="
         zip? ( app-arch/quazip )
 "
 
-if ! ever at_least 3.10; then
-    DEPENDENCIES+="
-        opencv? ( media-libs/opencv[qt5] )
-    "
-else
-    DEPENDENCIES+="
-        media-libs/opencv[qt5]
-    "
-fi
-
 
 if ever is_scm; then
     CMAKE_SOURCE="${WORK}"/ImageLounge
@@ -68,22 +88,11 @@ CMAKE_SRC_CONFIGURE_PARAMS+=(
     -DENABLE_TRANSLATIONS=ON
 )
 
-if ever at_least 3.10; then
-    CMAKE_SRC_CONFIGURE_PARAMS+=(
-        -DENABLE_OPENCV=TRUE
-    )
-fi
-
 
 CMAKE_SRC_CONFIGURE_OPTION_ENABLES=(
     "raw RAW"
     "tiff TIFF"
     "zip QUAZIP"
+    "heif HEIF"
 )
 
-if ! ever at_least 3.10; then
-    CMAKE_SRC_CONFIGURE_OPTION_ENABLES+=(
-        "opencv OPENCV"
-    )
-fi
-