[gentoo-commits] repo/proj/guru:master commit in: media-gfx/mayo/files/, media-gfx/mayo/

[gentoo-commits] repo/proj/guru:master commit in: media-gfx/mayo/files/, media-gfx/mayo/

[David Roman]

commit:     6845ac5af39d4ba01bc776354ed829ab91bb1405
Author:     Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Fri Jun 21 07:42:16 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Fri Jun 21 07:42:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6845ac5a

media-gfx/mayo: new package, add 0.8.0

Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>

 media-gfx/mayo/Manifest                     |  2 ++
 media-gfx/mayo/files/mayo-0.8.0-nogit.patch | 17 ++++++++++++
 media-gfx/mayo/mayo-0.8.0.ebuild            | 43 +++++++++++++++++++++++++++++
 media-gfx/mayo/metadata.xml                 | 11 ++++++++
 4 files changed, 73 insertions(+)

diff --git a/media-gfx/mayo/Manifest b/media-gfx/mayo/Manifest
new file mode 100644
index 000000000..a6e25bdd6
--- /dev/null
+++ b/media-gfx/mayo/Manifest
@@ -0,0 +1,2 @@
+AUX mayo-0.8.0-nogit.patch 487 BLAKE2B 40f2df604ec7c542b76e0f83eb848eb32dd741ec9b2308f300de3e919f856c347ded63759b8a12b1014f8a343f1b1d932980cb50e495b66d6686007f8911d808 SHA512 be8926163191cd13768c3b048cd972d92b5cf8078f364c920f5b6b7070f8ce9063de8fc041080a2d6aadaa13058c9d8a7448052f3e36a527ee55e9043a7d7861
+DIST mayo-0.8.0.tar.gz 9792039 BLAKE2B 9f6c6173996f9731445363ad756ffc51d478ef4a9c0710056941e3f3634ee320987eec99e7d56237ba1f11f6adaca7be2a47816af2b8f7f7c78ba74a1fa8d296 SHA512 4363a41c0ed1dd555302c7b5f61eee136d9ae6999f6a66c92c117cf2a9a74eb5ece991a22ffa29f095b7ec8a2c5426375628c8213ed94b6295c64019141539d7

diff --git a/media-gfx/mayo/files/mayo-0.8.0-nogit.patch b/media-gfx/mayo/files/mayo-0.8.0-nogit.patch
new file mode 100644
index 000000000..d14b50672
--- /dev/null
+++ b/media-gfx/mayo/files/mayo-0.8.0-nogit.patch
@@ -0,0 +1,17 @@
+--- a/version.pri
++++ b/version.pri
+@@ -1,12 +1,5 @@
+-system(git --version):HAVE_GIT=1
+-defined(HAVE_GIT, var) {
+-    MAYO_VERSION_COMMIT = $$system(git rev-parse --short HEAD)
+-    MAYO_VERSION_REVNUM = $$system(git rev-list --count HEAD)
+-} else {
+-    MAYO_VERSION_COMMIT = ??
+-    MAYO_VERSION_REVNUM = 0
+-    warning("Git is not in PATH, cannot find commit ID nor revision number")
+-}
++MAYO_VERSION_COMMIT = ??
++MAYO_VERSION_REVNUM = 0
+ 
+ MAYO_VERSION_MAJ = 0
+ MAYO_VERSION_MIN = 8

diff --git a/media-gfx/mayo/mayo-0.8.0.ebuild b/media-gfx/mayo/mayo-0.8.0.ebuild
new file mode 100644
index 000000000..8c22ccc0a
--- /dev/null
+++ b/media-gfx/mayo/mayo-0.8.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils
+
+DESCRIPTION="Opensource 3D CAD viewer and converter"
+HOMEPAGE="https://github.com/fougue/mayo"
+SRC_URI="https://github.com/fougue/mayo/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=sci-libs/opencascade-7.7.0-r2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	>=media-libs/assimp-5.3.1
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-nogit.patch
+)
+
+src_configure() {
+
+	eqmake5 "CASCADE_INC_DIR=/usr/include/opencascade" "CASCADE_LIB_DIR=/usr/lib64/opencascade" "ASSIMP_INC_DIR=/usr/include/assimp" "ASSIMP_LIB_DIR=/usr/lib64" mayo.pro
+
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	install -d "${D}"/usr/bin/
+	install "${S}"/mayo "${D}"/usr/bin/ || die "failed to move locales"
+
+	einstalldocs
+}

diff --git a/media-gfx/mayo/metadata.xml b/media-gfx/mayo/metadata.xml
new file mode 100644
index 000000000..d92641e87
--- /dev/null
+++ b/media-gfx/mayo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <maintainer type="person">
+                <email>ivan.lloro.boada@gmail.com</email>
+                <name>Ivan Lloro</name>
+        </maintainer>
+        <upstream>
+                <remote-id type="github">fougue/mayo</remote-id>
+        </upstream>
+</pkgmetadata>

[gentoo-commits] repo/proj/guru:master commit in: media-gfx/mayo/files/, media-gfx/mayo/

[David Roman]

commit:     8391289fa180bac84fc7217ddbe20ef10cb9a8e2
Author:     David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Thu Jul  4 11:13:00 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Jul  4 11:13:00 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8391289f

media-gfx/mayo: fix gcc14 build

Closes: https://bugs.gentoo.org/935121
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>

 media-gfx/mayo/files/mayo-0.8.0-gcc14.patch | 43 +++++++++++++++++++++++++++++
 media-gfx/mayo/mayo-0.8.0.ebuild            | 14 +---------
 2 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/media-gfx/mayo/files/mayo-0.8.0-gcc14.patch b/media-gfx/mayo/files/mayo-0.8.0-gcc14.patch
new file mode 100644
index 000000000..c8763811f
--- /dev/null
+++ b/media-gfx/mayo/files/mayo-0.8.0-gcc14.patch
@@ -0,0 +1,43 @@
+From c4fdeb206235e9c37f34b18f5463d1e0702b2c14 Mon Sep 17 00:00:00 2001
+From: Hugues Delorme <delorme.hugues@fougue.pro>
+Date: Thu, 25 Apr 2024 12:37:09 +0200
+Subject: [PATCH] Base: fix missing <algorithm> header
+
+---
+ src/base/property.cpp             | 2 ++
+ src/base/property_enumeration.cpp | 4 +++-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/base/property.cpp b/src/base/property.cpp
+index d98acb31..61b9c623 100644
+--- a/src/base/property.cpp
++++ b/src/base/property.cpp
+@@ -7,6 +7,8 @@
+ #include "property.h"
+ 
+ #include "property_enumeration.h"
++
++#include <algorithm>
+ #include <cassert>
+ 
+ namespace Mayo {
+diff --git a/src/base/property_enumeration.cpp b/src/base/property_enumeration.cpp
+index 556c3e8e..1ef57091 100644
+--- a/src/base/property_enumeration.cpp
++++ b/src/base/property_enumeration.cpp
+@@ -6,12 +6,14 @@
+ 
+ #include "property_enumeration.h"
+ 
++#include <algorithm>
+ #include <stdexcept>
+ 
+ namespace Mayo {
+ 
+ PropertyEnumeration::PropertyEnumeration(
+-        PropertyGroup* grp, const TextId& name, const Enumeration* enumeration)
++        PropertyGroup* grp, const TextId& name, const Enumeration* enumeration
++    )
+     : Property(grp, name),
+       m_enumeration(enumeration),
+       m_value(enumeration && enumeration->empty() ? enumeration->itemAt(0).value : -1)

diff --git a/media-gfx/mayo/mayo-0.8.0.ebuild b/media-gfx/mayo/mayo-0.8.0.ebuild
index 8fe1a4d74..87aefeee2 100644
--- a/media-gfx/mayo/mayo-0.8.0.ebuild
+++ b/media-gfx/mayo/mayo-0.8.0.ebuild
@@ -27,21 +27,9 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-nogit.patch
+	"${FILESDIR}"/${P}-gcc14.patch
 )
 
-pkg_pretend() {
-	# https://bugs.gentoo.org/935121
-	if tc-is-gcc && ver_test $(gcc-version) -ne 13 ; then
-		ewarn "GCC 13 is not in use! Versions different to gcc-13 are known to fail to compile."
-		ewarn "That is so even when any gcc >= 9 should work according to upstream."
-		ewarn "See https://bugs.gentoo.org/935121"
-	elif tc-is-clang; then
-		ewarn "LLVM/Clang >= 6 should work according to upstream but it is untested."
-		ewarn "If compilation fails, gcc-13 is known to work."
-		ewarn "See https://bugs.gentoo.org/935121"
-	fi
-}
-
 src_configure() {
 	eqmake5 "CASCADE_INC_DIR=/usr/include/opencascade" "CASCADE_LIB_DIR=/usr/$(get_libdir)/opencascade" "ASSIMP_INC_DIR=/usr/include/assimp" "ASSIMP_LIB_DIR=/usr/$(get_libdir)" mayo.pro
 }