From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 04E5B15808B for ; Sun, 13 Mar 2022 01:10:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A23DE07D8; Sun, 13 Mar 2022 01:10:23 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 154B7E081B for ; Sun, 13 Mar 2022 01:10:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BA349343264 for ; Sun, 13 Mar 2022 01:10:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC0202EA for ; Sun, 13 Mar 2022 01:10:19 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1647133496.a5a2748cc895020a5d5582192c69874b7fde795d.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/melonds/files/, games-emulation/melonds/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/melonds/files/melonds-system-teakra.patch games-emulation/melonds/melonds-0.9.3-r1.ebuild games-emulation/melonds/melonds-0.9.3-r2.ebuild games-emulation/melonds/melonds-0.9.4_p1-r1.ebuild games-emulation/melonds/melonds-0.9.4_p1.ebuild games-emulation/melonds/melonds-9999.ebuild X-VCS-Directories: games-emulation/melonds/ games-emulation/melonds/files/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: a5a2748cc895020a5d5582192c69874b7fde795d X-VCS-Branch: master Date: Sun, 13 Mar 2022 01:10:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6094df4e-e682-45fc-aac7-2d89a79125dd X-Archives-Hash: 23f09c4bf7edeb044f2b52c9be3d5312 commit: a5a2748cc895020a5d5582192c69874b7fde795d Author: Maciej Barć gentoo org> AuthorDate: Sun Mar 13 01:00:52 2022 +0000 Commit: Maciej Barć gentoo org> CommitDate: Sun Mar 13 01:04:56 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5a2748c games-emulation/melonds: use system teakra Closes: https://bugs.gentoo.org/834984 Signed-off-by: Maciej Barć gentoo.org> .../melonds/files/melonds-system-teakra.patch | 23 ++++++++++++++++++++++ ...nds-0.9.3-r1.ebuild => melonds-0.9.3-r2.ebuild} | 13 +++++------- ...-0.9.4_p1.ebuild => melonds-0.9.4_p1-r1.ebuild} | 13 +++++------- games-emulation/melonds/melonds-9999.ebuild | 13 +++++------- 4 files changed, 38 insertions(+), 24 deletions(-) diff --git a/games-emulation/melonds/files/melonds-system-teakra.patch b/games-emulation/melonds/files/melonds-system-teakra.patch new file mode 100644 index 000000000000..b59c31e4ba9a --- /dev/null +++ b/games-emulation/melonds/files/melonds-system-teakra.patch @@ -0,0 +1,23 @@ +index 7288b54..6525f11 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -110,7 +110,6 @@ if (ENABLE_JIT) + endif() + endif() + +-add_subdirectory(teakra EXCLUDE_FROM_ALL) + target_link_libraries(core teakra) + + +index c889aff..a6339d9 100644 +--- a/src/DSi_DSP.cpp ++++ b/src/DSi_DSP.cpp +@@ -16,7 +16,7 @@ + with melonDS. If not, see http://www.gnu.org/licenses/. + */ + +-#include "teakra/include/teakra/teakra.h" ++#include "teakra/teakra.h" + + #include "DSi.h" + #include "DSi_DSP.h" diff --git a/games-emulation/melonds/melonds-0.9.3-r1.ebuild b/games-emulation/melonds/melonds-0.9.3-r2.ebuild similarity index 90% rename from games-emulation/melonds/melonds-0.9.3-r1.ebuild rename to games-emulation/melonds/melonds-0.9.3-r2.ebuild index 77ff242ab004..0cde97c7b287 100644 --- a/games-emulation/melonds/melonds-0.9.3-r1.ebuild +++ b/games-emulation/melonds/melonds-0.9.3-r2.ebuild @@ -1,9 +1,6 @@ # Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# NOTICE: -# melonds bundles teakra, its upstream haven't had a release since 2020 - EAPI=8 MY_PN="melonDS" @@ -32,6 +29,7 @@ SLOT="0" DEPEND=" app-arch/libarchive + dev-libs/teakra dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 @@ -55,7 +53,11 @@ DOC_CONTENTS="You need the following files in order to run melonDS: Place them in ~/.config/melonDS Those files can be found somewhere on the Internet ;-)" +PATCHES=( "${FILESDIR}"/melonds-system-teakra.patch ) + src_prepare() { + rm -r ./src/teakra || die + cmake_src_prepare } @@ -73,16 +75,11 @@ src_compile() { } src_install() { - # install teakra - dolib.so "${BUILD_DIR}/src/teakra/src/libteakra.so" - cmake_src_install - readme.gentoo_create_doc } pkg_postinst() { xdg_pkg_postinst - readme.gentoo_print_elog } diff --git a/games-emulation/melonds/melonds-0.9.4_p1.ebuild b/games-emulation/melonds/melonds-0.9.4_p1-r1.ebuild similarity index 90% rename from games-emulation/melonds/melonds-0.9.4_p1.ebuild rename to games-emulation/melonds/melonds-0.9.4_p1-r1.ebuild index d27c6c66a307..706876b372f2 100644 --- a/games-emulation/melonds/melonds-0.9.4_p1.ebuild +++ b/games-emulation/melonds/melonds-0.9.4_p1-r1.ebuild @@ -1,9 +1,6 @@ # Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# NOTICE: -# melonds bundles teakra, its upstream haven't had a release since 2020 - EAPI=8 MY_PN="melonDS" @@ -32,6 +29,7 @@ SLOT="0" DEPEND=" app-arch/libarchive + dev-libs/teakra dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 @@ -55,7 +53,11 @@ DOC_CONTENTS="You need the following files in order to run melonDS: Place them in ~/.config/melonDS Those files can be found somewhere on the Internet ;-)" +PATCHES=( "${FILESDIR}"/melonds-system-teakra.patch ) + src_prepare() { + rm -r ./src/teakra || die + cmake_src_prepare } @@ -73,16 +75,11 @@ src_compile() { } src_install() { - # install teakra - dolib.so "${BUILD_DIR}/src/teakra/src/libteakra.so" - cmake_src_install - readme.gentoo_create_doc } pkg_postinst() { xdg_pkg_postinst - readme.gentoo_print_elog } diff --git a/games-emulation/melonds/melonds-9999.ebuild b/games-emulation/melonds/melonds-9999.ebuild index 77ff242ab004..0cde97c7b287 100644 --- a/games-emulation/melonds/melonds-9999.ebuild +++ b/games-emulation/melonds/melonds-9999.ebuild @@ -1,9 +1,6 @@ # Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# NOTICE: -# melonds bundles teakra, its upstream haven't had a release since 2020 - EAPI=8 MY_PN="melonDS" @@ -32,6 +29,7 @@ SLOT="0" DEPEND=" app-arch/libarchive + dev-libs/teakra dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 @@ -55,7 +53,11 @@ DOC_CONTENTS="You need the following files in order to run melonDS: Place them in ~/.config/melonDS Those files can be found somewhere on the Internet ;-)" +PATCHES=( "${FILESDIR}"/melonds-system-teakra.patch ) + src_prepare() { + rm -r ./src/teakra || die + cmake_src_prepare } @@ -73,16 +75,11 @@ src_compile() { } src_install() { - # install teakra - dolib.so "${BUILD_DIR}/src/teakra/src/libteakra.so" - cmake_src_install - readme.gentoo_create_doc } pkg_postinst() { xdg_pkg_postinst - readme.gentoo_print_elog }