[gentoo-commits] repo/gentoo:master commit in: games-emulation/melonds/

[Maciej Barć]

commit:     8983718b0a291aac84540d8beda2433f91314379
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  5 19:31:41 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Nov  6 07:34:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8983718b

games-emulation/melonds: add qtmultimedia dep; static-link teakra

Closes: https://bugs.gentoo.org/879557
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 .../melonds/{melonds-0.9.5.ebuild => melonds-0.9.5-r1.ebuild}      | 7 ++-----
 games-emulation/melonds/melonds-9999.ebuild                        | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/games-emulation/melonds/melonds-0.9.5.ebuild 
b/games-emulation/melonds/melonds-0.9.5-r1.ebuild
similarity index 90%
rename from games-emulation/melonds/melonds-0.9.5.ebuild
rename to games-emulation/melonds/melonds-0.9.5-r1.ebuild
index c5383c9da154..87e563f0f8c2 100644
--- a/games-emulation/melonds/melonds-0.9.5.ebuild
+++ b/games-emulation/melonds/melonds-0.9.5-r1.ebuild
@@ -26,13 +26,11 @@ IUSE="+jit +opengl"
 LICENSE="BSD-2 GPL-2 GPL-3 Unlicense"
 SLOT="0"
 
-# MelonDS bundles libteakra with many changes,
-# for now we have to block dev-libs/teakra
 RDEPEND="
-       !dev-libs/teakra
        app-arch/libarchive
        dev-qt/qtcore:5
        dev-qt/qtgui:5
+       dev-qt/qtmultimedia:5
        dev-qt/qtnetwork:5
        dev-qt/qtwidgets:5
        media-libs/libsdl2[sound,video]
@@ -63,6 +61,7 @@ src_prepare() {
 
 src_configure() {
        local mycmakeargs=(
+               -DBUILD_SHARED_LIBS=OFF
                -DENABLE_JIT=$(usex jit)
                -DENABLE_OGLRENDERER=$(usex opengl)
        )
@@ -77,8 +76,6 @@ src_compile() {
 src_install() {
        readme.gentoo_create_doc
        cmake_src_install
-
-       dolib.so "${BUILD_DIR}"/src/teakra/src/libteakra.so
 }
 
 pkg_postinst() {

diff --git a/games-emulation/melonds/melonds-9999.ebuild 
b/games-emulation/melonds/melonds-9999.ebuild
index c5383c9da154..87e563f0f8c2 100644
--- a/games-emulation/melonds/melonds-9999.ebuild
+++ b/games-emulation/melonds/melonds-9999.ebuild
@@ -26,13 +26,11 @@ IUSE="+jit +opengl"
 LICENSE="BSD-2 GPL-2 GPL-3 Unlicense"
 SLOT="0"
 
-# MelonDS bundles libteakra with many changes,
-# for now we have to block dev-libs/teakra
 RDEPEND="
-       !dev-libs/teakra
        app-arch/libarchive
        dev-qt/qtcore:5
        dev-qt/qtgui:5
+       dev-qt/qtmultimedia:5
        dev-qt/qtnetwork:5
        dev-qt/qtwidgets:5
        media-libs/libsdl2[sound,video]
@@ -63,6 +61,7 @@ src_prepare() {
 
 src_configure() {
        local mycmakeargs=(
+               -DBUILD_SHARED_LIBS=OFF
                -DENABLE_JIT=$(usex jit)
                -DENABLE_OGLRENDERER=$(usex opengl)
        )
@@ -77,8 +76,6 @@ src_compile() {
 src_install() {
        readme.gentoo_create_doc
        cmake_src_install
-
-       dolib.so "${BUILD_DIR}"/src/teakra/src/libteakra.so
 }
 
 pkg_postinst() {