commit: 115f0298d12a1c816fe646bdb33d315eee9196ff
Author: Alexander Weber <web.alexander <AT> web <DOT> de>
AuthorDate: Sun Dec 3 19:10:43 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Dec 3 19:11:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=115f0298
media-video/mediaelch: add support for qt6 and lto
add additional ebuild improvements
Signed-off-by: Alexander Weber <web.alexander <AT> web.de>
media-video/mediaelch/mediaelch-2.10.6.ebuild | 50 +++++++++++++++++++--------
media-video/mediaelch/mediaelch-9999.ebuild | 50 +++++++++++++++++++--------
media-video/mediaelch/metadata.xml | 3 ++
3 files changed, 73 insertions(+), 30 deletions(-)
diff --git a/media-video/mediaelch/mediaelch-2.10.6.ebuild
b/media-video/mediaelch/mediaelch-2.10.6.ebuild
index 2fd803ff06..43f4bc3089 100644
--- a/media-video/mediaelch/mediaelch-2.10.6.ebuild
+++ b/media-video/mediaelch/mediaelch-2.10.6.ebuild
@@ -25,32 +25,52 @@ fi
LICENSE="LGPL-3"
SLOT="0"
-IUSE="debug"
-
-DEPEND="dev-libs/quazip
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5[widgets]
- dev-qt/qtopengl:5
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qtxmlpatterns:5
+IUSE="debug qt5 +qt6 lto"
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+DEPEND=">dev-libs/quazip-1.3[qt5?,qt6]
+ qt5? (
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5[widgets]
+ dev-qt/qtopengl:5
+ dev-qt/qtsql:5
+ dev-qt/qtsvg:5
+ dev-qt/qtxmlpatterns:5
+ )
+ qt6? (
+ dev-qt/qt5compat:6
+ dev-qt/qtbase:6
+ dev-qt/qtdeclarative:6
+ dev-qt/qtmultimedia:6
+ dev-qt/qtsvg:6
+ dev-qt/qttools:6
+ )
dev-util/cmake
- media-libs/libzen
- media-libs/phonon
+ media-video/ffmpeg
media-video/mediainfo"
src_configure() {
- local mycmakeargs=("-DUSE_EXTERN_QUAZIP=ON")
+ local mycmakeargs=(
+ "-DUSE_EXTERN_QUAZIP=ON"
+ "-DDISABLE_UPDATER=ON"
+ )
+
if use debug; then
CMAKE_BUILD_TYPE=Debug
mycmakeargs+=("-DSANITIZE_ADDRESS=on")
CXXFLAGS+=("-fsanitize=address")
fi
+
mycmakeargs+=("-DCMAKE_C_FLAGS=${CFLAGS}")
mycmakeargs+=("-DCMAKE_CXX_FLAGS=${CXXFLAGS}")
+ use qt5 && mycmakeargs+=("-DMEDIAELCH_FORCE_QT5=ON")
+ use qt6 && mycmakeargs+=("-DMEDIAELCH_FORCE_QT6=ON")
+
+ use lto && mycmakeargs+=("-DENABLE_LTO=ON")
+
cmake_src_configure
}
diff --git a/media-video/mediaelch/mediaelch-9999.ebuild
b/media-video/mediaelch/mediaelch-9999.ebuild
index 2fd803ff06..7adf067776 100644
--- a/media-video/mediaelch/mediaelch-9999.ebuild
+++ b/media-video/mediaelch/mediaelch-9999.ebuild
@@ -25,32 +25,52 @@ fi
LICENSE="LGPL-3"
SLOT="0"
-IUSE="debug"
-
-DEPEND="dev-libs/quazip
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5[widgets]
- dev-qt/qtopengl:5
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qtxmlpatterns:5
+IUSE="debug qt5 +qt6 lto"
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+DEPEND=">dev-libs/quazip-1.2[qt5?,qt6]
+ qt5? (
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5[widgets]
+ dev-qt/qtopengl:5
+ dev-qt/qtsql:5
+ dev-qt/qtsvg:5
+ dev-qt/qtxmlpatterns:5
+ )
+ qt6? (
+ dev-qt/qt5compat:6
+ dev-qt/qtbase:6
+ dev-qt/qtdeclarative:6
+ dev-qt/qtmultimedia:6
+ dev-qt/qtsvg:6
+ dev-qt/qttools:6
+ )
dev-util/cmake
- media-libs/libzen
- media-libs/phonon
+ media-video/ffmpeg
media-video/mediainfo"
src_configure() {
- local mycmakeargs=("-DUSE_EXTERN_QUAZIP=ON")
+ local mycmakeargs=(
+ "-DUSE_EXTERN_QUAZIP=ON"
+ "-DDISABLE_UPDATER=ON"
+ )
+
if use debug; then
CMAKE_BUILD_TYPE=Debug
mycmakeargs+=("-DSANITIZE_ADDRESS=on")
CXXFLAGS+=("-fsanitize=address")
fi
+
mycmakeargs+=("-DCMAKE_C_FLAGS=${CFLAGS}")
mycmakeargs+=("-DCMAKE_CXX_FLAGS=${CXXFLAGS}")
+ use qt5 && mycmakeargs+=("-DMEDIAELCH_FORCE_QT5=ON")
+ use qt6 && mycmakeargs+=("-DMEDIAELCH_FORCE_QT6=ON")
+
+ use lto && mycmakeargs+=("-DENABLE_LTO=ON")
+
cmake_src_configure
}
diff --git a/media-video/mediaelch/metadata.xml
b/media-video/mediaelch/metadata.xml
index b84629bfde..7f3ce81029 100644
--- a/media-video/mediaelch/metadata.xml
+++ b/media-video/mediaelch/metadata.xml
@@ -5,6 +5,9 @@
<email>[email protected]</email>
<name>Alexander Weber</name>
</maintainer>
+ <use>
+ <flag name="lto">Enable link-time-optimization. Increases link
time.</flag>
+ </use>
<upstream>
<remote-id type="github">Komet/MediaElch</remote-id>
</upstream>
