| 1 |
commit: 8983718b0a291aac84540d8beda2433f91314379 |
| 2 |
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 5 19:31:41 2022 +0000 |
| 4 |
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 6 07:34:53 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8983718b |
| 7 |
|
| 8 |
games-emulation/melonds: add qtmultimedia dep; static-link teakra |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/879557 |
| 11 |
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> |
| 12 |
|
| 13 |
.../melonds/{melonds-0.9.5.ebuild => melonds-0.9.5-r1.ebuild} | 7 ++----- |
| 14 |
games-emulation/melonds/melonds-9999.ebuild | 7 ++----- |
| 15 |
2 files changed, 4 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/games-emulation/melonds/melonds-0.9.5.ebuild b/games-emulation/melonds/melonds-0.9.5-r1.ebuild |
| 18 |
similarity index 90% |
| 19 |
rename from games-emulation/melonds/melonds-0.9.5.ebuild |
| 20 |
rename to games-emulation/melonds/melonds-0.9.5-r1.ebuild |
| 21 |
index c5383c9da154..87e563f0f8c2 100644 |
| 22 |
--- a/games-emulation/melonds/melonds-0.9.5.ebuild |
| 23 |
+++ b/games-emulation/melonds/melonds-0.9.5-r1.ebuild |
| 24 |
@@ -26,13 +26,11 @@ IUSE="+jit +opengl" |
| 25 |
LICENSE="BSD-2 GPL-2 GPL-3 Unlicense" |
| 26 |
SLOT="0" |
| 27 |
|
| 28 |
-# MelonDS bundles libteakra with many changes, |
| 29 |
-# for now we have to block dev-libs/teakra |
| 30 |
RDEPEND=" |
| 31 |
- !dev-libs/teakra |
| 32 |
app-arch/libarchive |
| 33 |
dev-qt/qtcore:5 |
| 34 |
dev-qt/qtgui:5 |
| 35 |
+ dev-qt/qtmultimedia:5 |
| 36 |
dev-qt/qtnetwork:5 |
| 37 |
dev-qt/qtwidgets:5 |
| 38 |
media-libs/libsdl2[sound,video] |
| 39 |
@@ -63,6 +61,7 @@ src_prepare() { |
| 40 |
|
| 41 |
src_configure() { |
| 42 |
local mycmakeargs=( |
| 43 |
+ -DBUILD_SHARED_LIBS=OFF |
| 44 |
-DENABLE_JIT=$(usex jit) |
| 45 |
-DENABLE_OGLRENDERER=$(usex opengl) |
| 46 |
) |
| 47 |
@@ -77,8 +76,6 @@ src_compile() { |
| 48 |
src_install() { |
| 49 |
readme.gentoo_create_doc |
| 50 |
cmake_src_install |
| 51 |
- |
| 52 |
- dolib.so "${BUILD_DIR}"/src/teakra/src/libteakra.so |
| 53 |
} |
| 54 |
|
| 55 |
pkg_postinst() { |
| 56 |
|
| 57 |
diff --git a/games-emulation/melonds/melonds-9999.ebuild b/games-emulation/melonds/melonds-9999.ebuild |
| 58 |
index c5383c9da154..87e563f0f8c2 100644 |
| 59 |
--- a/games-emulation/melonds/melonds-9999.ebuild |
| 60 |
+++ b/games-emulation/melonds/melonds-9999.ebuild |
| 61 |
@@ -26,13 +26,11 @@ IUSE="+jit +opengl" |
| 62 |
LICENSE="BSD-2 GPL-2 GPL-3 Unlicense" |
| 63 |
SLOT="0" |
| 64 |
|
| 65 |
-# MelonDS bundles libteakra with many changes, |
| 66 |
-# for now we have to block dev-libs/teakra |
| 67 |
RDEPEND=" |
| 68 |
- !dev-libs/teakra |
| 69 |
app-arch/libarchive |
| 70 |
dev-qt/qtcore:5 |
| 71 |
dev-qt/qtgui:5 |
| 72 |
+ dev-qt/qtmultimedia:5 |
| 73 |
dev-qt/qtnetwork:5 |
| 74 |
dev-qt/qtwidgets:5 |
| 75 |
media-libs/libsdl2[sound,video] |
| 76 |
@@ -63,6 +61,7 @@ src_prepare() { |
| 77 |
|
| 78 |
src_configure() { |
| 79 |
local mycmakeargs=( |
| 80 |
+ -DBUILD_SHARED_LIBS=OFF |
| 81 |
-DENABLE_JIT=$(usex jit) |
| 82 |
-DENABLE_OGLRENDERER=$(usex opengl) |
| 83 |
) |
| 84 |
@@ -77,8 +76,6 @@ src_compile() { |
| 85 |
src_install() { |
| 86 |
readme.gentoo_create_doc |
| 87 |
cmake_src_install |
| 88 |
- |
| 89 |
- dolib.so "${BUILD_DIR}"/src/teakra/src/libteakra.so |
| 90 |
} |
| 91 |
|
| 92 |
pkg_postinst() { |
Archives