public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/melonds/files/, games-emulation/melonds/
@ 2022-03-13  1:10 Maciej Barć
  0 siblings, 0 replies; 2+ messages in thread
From: Maciej Barć @ 2022-03-13  1:10 UTC (permalink / raw
  To: gentoo-commits

commit:     a5a2748cc895020a5d5582192c69874b7fde795d
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 01:00:52 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> 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ć <xgqt <AT> 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
 }


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/melonds/files/, games-emulation/melonds/
@ 2023-12-10 17:08 Maciej Barć
  0 siblings, 0 replies; 2+ messages in thread
From: Maciej Barć @ 2023-12-10 17:08 UTC (permalink / raw
  To: gentoo-commits

commit:     831def21f26427feb8a3b137e1d20254276b00a8
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 16:57:28 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 17:08:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=831def21

games-emulation/melonds: include algorithm

Bug: https://github.com/melonDS-emu/melonDS/pull/1874
Closes: https://bugs.gentoo.org/918666
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 .../files/melonds-0.9.5-DSi_Camera-algorithm.patch | 24 ++++++++++++++++++++++
 games-emulation/melonds/melonds-0.9.5-r4.ebuild    | 13 +++++++++---
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/games-emulation/melonds/files/melonds-0.9.5-DSi_Camera-algorithm.patch b/games-emulation/melonds/files/melonds-0.9.5-DSi_Camera-algorithm.patch
new file mode 100644
index 000000000000..17971f1327c0
--- /dev/null
+++ b/games-emulation/melonds/files/melonds-0.9.5-DSi_Camera-algorithm.patch
@@ -0,0 +1,24 @@
+From e63e29ca91ba5fc1630634fbb9f064b9cce6cc1f Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 11 Nov 2023 10:31:10 -0800
+Subject: [PATCH] DSi_Camera: fix gcc-14 build issue
+
+melonDS/src/DSi_Camera.cpp:190:23: error: 'clamp' is not a member of 'std'
+  190 |             r1 = std::clamp(r1, 0, 255); g1 = std::clamp(g1, 0, 255); b1 = std::clamp(b1, 0, 255);
+      |                       ^~~~~
+---
+ src/DSi_Camera.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/DSi_Camera.cpp b/src/DSi_Camera.cpp
+index 749162932..2b259c590 100644
+--- a/src/DSi_Camera.cpp
++++ b/src/DSi_Camera.cpp
+@@ -16,6 +16,7 @@
+     with melonDS. If not, see http://www.gnu.org/licenses/.
+ */
+ 
++#include <algorithm>
+ #include <stdio.h>
+ #include <string.h>
+ #include "DSi.h"

diff --git a/games-emulation/melonds/melonds-0.9.5-r4.ebuild b/games-emulation/melonds/melonds-0.9.5-r4.ebuild
index a2ea52c0b297..5171a6bad8ec 100644
--- a/games-emulation/melonds/melonds-0.9.5-r4.ebuild
+++ b/games-emulation/melonds/melonds-0.9.5-r4.ebuild
@@ -38,10 +38,17 @@ RDEPEND="
 	net-libs/libpcap
 	net-libs/libslirp
 "
-DEPEND="${RDEPEND}"
-BDEPEND="kde-frameworks/extra-cmake-modules:0"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	kde-frameworks/extra-cmake-modules:0
+"
 
-PATCHES=( "${FILESDIR}"/${P}-no-ccache-detection.patch )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.5-DSi_Camera-algorithm.patch"
+	"${FILESDIR}/${PN}-0.9.5-no-ccache-detection.patch"
+)
 
 # used for JIT recompiler
 QA_EXECSTACK="usr/bin/melonDS"


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-12-10 17:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-13  1:10 [gentoo-commits] repo/gentoo:master commit in: games-emulation/melonds/files/, games-emulation/melonds/ Maciej Barć
  -- strict thread matches above, loose matches on Subject: below --
2023-12-10 17:08 Maciej Barć

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox