* [gentoo-commits] repo/gentoo:master commit in: games-emulation/openmsx/files/, games-emulation/openmsx/
@ 2018-04-29 13:06 Pacho Ramos
0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2018-04-29 13:06 UTC (permalink / raw
To: gentoo-commits
commit: 5ca68d3c847f56813b715626fbefc18baa2f4fb4
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 29 12:05:48 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 13:06:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ca68d3c
games-emulation/openmsx: Drop old
Package-Manager: Portage-2.3.31, Repoman-2.3.9
games-emulation/openmsx/Manifest | 1 -
.../openmsx/files/openmsx-0.9.1-verbose.patch | 14 -----
games-emulation/openmsx/openmsx-0.9.1.ebuild | 64 ----------------------
3 files changed, 79 deletions(-)
diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest
index 8e53442a1e4..24b84ce9f2b 100644
--- a/games-emulation/openmsx/Manifest
+++ b/games-emulation/openmsx/Manifest
@@ -1,2 +1 @@
DIST openmsx-0.14.0.tar.gz 3338719 BLAKE2B e9c09d29bb994f4f40e22271c090580688724cb7024910f0f829a59d0e65e6e70e1c037b943582aac644ee51a00b7e439e751bd84e5828168486b74ee09e8b78 SHA512 74a30de89b4a7cb4d8d5a0ad0c16ab6b58244251ebcbe470cc3cccec6a636492fa8779d1667d76646eabcf8d7d67c53094d5e0a313d452a4a679d797e9394a9b
-DIST openmsx-0.9.1.tar.gz 2975351 BLAKE2B 6c571b1cc0039ea8e37af1d503260f21e6431d4403bb74a06fd60bfd1f1d3d0c1831c9e82ae2446dd8ff1bb7bd0cafcf8290306cb1d0bcc23cb7ba7cfebc3d1b SHA512 7c4d23963f33e3033dea1d0ad9351e4f38f7434e2e077b6f8fd00cf80e0160b45291ff19be71646178ecafa01e954267dfe4c815578d4abb14c8595a863f98ff
diff --git a/games-emulation/openmsx/files/openmsx-0.9.1-verbose.patch b/games-emulation/openmsx/files/openmsx-0.9.1-verbose.patch
deleted file mode 100644
index e8007636f80..00000000000
--- a/games-emulation/openmsx/files/openmsx-0.9.1-verbose.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/build/main.mk.old 2015-01-18 12:18:50.608153217 +0100
-+++ b/build/main.mk 2015-01-18 12:20:00.352861984 +0100
-@@ -541,10 +541,9 @@
- DEPEND_SUBST=$(patsubst $(SOURCES_PATH)/%.cc,$(DEPEND_PATH)/%.d,$<)
- $(OBJECTS_FULL): $(INIT_DUMMY_FILE)
- $(OBJECTS_FULL): $(OBJECTS_PATH)/%.o: $(SOURCES_PATH)/%.cc $(DEPEND_PATH)/%.d
-- @echo "Compiling $(patsubst $(SOURCES_PATH)/%,%,$<)..."
- @mkdir -p $(@D)
- @mkdir -p $(patsubst $(OBJECTS_PATH)%,$(DEPEND_PATH)%,$(@D))
-- @$(COMPILE_ENV) $(CXX) \
-+ $(COMPILE_ENV) $(CXX) \
- $(DEPEND_FLAGS) -MMD -MF $(DEPEND_SUBST) \
- -o $@ $(CXXFLAGS) $(COMPILE_FLAGS) -c $<
- @touch $@ # Force .o file to be newer than .d file.
diff --git a/games-emulation/openmsx/openmsx-0.9.1.ebuild b/games-emulation/openmsx/openmsx-0.9.1.ebuild
deleted file mode 100644
index db68c3dbc64..00000000000
--- a/games-emulation/openmsx/openmsx-0.9.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils games
-
-DESCRIPTION="MSX emulator that aims for perfection"
-HOMEPAGE="http://openmsx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
- dev-lang/tcl:0=
- dev-libs/libxml2
- media-libs/libpng:0
- media-libs/libsdl[sound,video]
- media-libs/glew
- media-libs/sdl-image[png]
- media-libs/sdl-ttf
- virtual/opengl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- sed -i \
- -e '/^LDFLAGS:=/d' \
- -e '/LINK_FLAGS_PREFIX/d' \
- -e '/LINK_FLAGS+=/s/-s//' \
- -e '/LINK_FLAGS+=\$(TARGET_FLAGS)/s/$/ $(LDFLAGS)/' \
- build/main.mk \
- || die
- sed -i -e '/SYMLINK/s:true:false:' build/custom.mk || die
- sed -i -e 's/GPL.txt//' doc/node.mk || die
- epatch "${FILESDIR}"/${P}-verbose.patch
-}
-
-src_compile() {
- emake \
- CXXFLAGS="${CXXFLAGS}" \
- INSTALL_SHARE_DIR="${GAMES_DATADIR}"/${PN}
-}
-
-src_install() {
- emake \
- INSTALL_BINARY_DIR="${D}${GAMES_BINDIR}" \
- INSTALL_SHARE_DIR="${D}${GAMES_DATADIR}"/${PN} \
- INSTALL_DOC_DIR="${D}"/usr/share/doc/${PF} \
- install
- dodoc README
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
-
- elog "If you want to if you want to emulate real MSX systems and not"
- elog "only the free C-BIOS machines, put the system ROMs in one of"
- elog "the following directories: ${GAMES_DATADIR}/${PN}/systemroms"
- elog "or ~/.openMSX/share/systemroms"
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/openmsx/files/, games-emulation/openmsx/
@ 2018-08-29 22:18 James Le Cuirot
0 siblings, 0 replies; 4+ messages in thread
From: James Le Cuirot @ 2018-08-29 22:18 UTC (permalink / raw
To: gentoo-commits
commit: 79b3c537aa2945a8cd29334f5a07fd1dfe508833
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 22:16:44 2018 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 22:17:58 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79b3c537
games-emulation/openmsx: Fix SDL_ttf probe, add Python dep, EAPI 7
Closes: https://bugs.gentoo.org/655888
Package-Manager: Portage-2.3.48, Repoman-2.3.10
games-emulation/openmsx/files/sdl-ttf.patch | 12 ++++++++++++
games-emulation/openmsx/openmsx-0.14.0.ebuild | 19 ++++++++++++++-----
2 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/games-emulation/openmsx/files/sdl-ttf.patch b/games-emulation/openmsx/files/sdl-ttf.patch
new file mode 100644
index 00000000000..6ff469e509e
--- /dev/null
+++ b/games-emulation/openmsx/files/sdl-ttf.patch
@@ -0,0 +1,12 @@
+diff -Naur a/build/libraries.py b/build/libraries.py
+--- a/build/libraries.py 2017-08-03 11:26:28.000000000 +0100
++++ b/build/libraries.py 2018-08-29 23:11:04.392981071 +0100
+@@ -304,7 +304,7 @@
+ class SDL_ttf(Library):
+ libName = 'SDL_ttf'
+ makeName = 'SDL_TTF'
+- header = '<SDL_ttf.h>'
++ header = '<SDL/SDL_ttf.h>'
+ function = 'TTF_OpenFont'
+ dependsOn = ('SDL', 'FREETYPE')
+
diff --git a/games-emulation/openmsx/openmsx-0.14.0.ebuild b/games-emulation/openmsx/openmsx-0.14.0.ebuild
index 8b39565b4be..42d560e04cd 100644
--- a/games-emulation/openmsx/openmsx-0.14.0.ebuild
+++ b/games-emulation/openmsx/openmsx-0.14.0.ebuild
@@ -1,17 +1,19 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit desktop readme.gentoo-r1
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit desktop python-any-r1 readme.gentoo-r1
DESCRIPTION="MSX emulator that aims for perfection"
HOMEPAGE="http://openmsx.org/"
-SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_0_14_0/${P}.tar.gz"
+SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_${PV//./_}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
RDEPEND="
dev-lang/tcl:0=
@@ -23,7 +25,14 @@ RDEPEND="
media-libs/sdl-ttf
virtual/opengl
"
-DEPEND="${RDEPEND}"
+DEPEND="
+ ${RDEPEND}
+ ${PYTHON_DEPS}
+"
+
+PATCHES=(
+ "${FILESDIR}"/sdl-ttf.patch
+)
DOC_CONTENTS="
If you want to if you want to emulate real MSX systems and not
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/openmsx/files/, games-emulation/openmsx/
@ 2021-01-24 23:08 James Le Cuirot
0 siblings, 0 replies; 4+ messages in thread
From: James Le Cuirot @ 2021-01-24 23:08 UTC (permalink / raw
To: gentoo-commits
commit: 1d17bdd5ca9abdc95eaf9c132a6706d70c10ae7c
Author: John Helmert III <jchelmert3 <AT> posteo <DOT> net>
AuthorDate: Sat Jan 23 02:54:53 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 23:05:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d17bdd5
games-emulation/openmsx: fix build failure with libsdl2[-joystick]
Closes: https://bugs.gentoo.org/766552
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: John Helmert III <jchelmert3 <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/19187
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../files/openmsx-16.0-libsdl-joystick-fix.patch | 66 ++++++++++++++++++++++
...{openmsx-16.0.ebuild => openmsx-16.0-r1.ebuild} | 7 ++-
2 files changed, 71 insertions(+), 2 deletions(-)
diff --git a/games-emulation/openmsx/files/openmsx-16.0-libsdl-joystick-fix.patch b/games-emulation/openmsx/files/openmsx-16.0-libsdl-joystick-fix.patch
new file mode 100644
index 00000000000..ff4e4c31e0c
--- /dev/null
+++ b/games-emulation/openmsx/files/openmsx-16.0-libsdl-joystick-fix.patch
@@ -0,0 +1,66 @@
+From eb5ddae80bdc6793de42ee67dd72e2da9d632ba8 Mon Sep 17 00:00:00 2001
+From: Maarten ter Huurne <maarten@treewalker.org>
+Date: Sat, 23 Jan 2021 03:25:38 +0100
+Subject: [PATCH] Fix compile errors and warnings when SDL_JOYSTICK_DISABLED is
+ defined
+
+If there is no base class, it's impossible to override the destructor.
+
+There were warning suppressors for 3 out of 5 arguments that are unused
+when SDL_JOYSTICK_DISABLED is defined; I added the othe two.
+---
+ src/input/JoyMega.hh | 6 +++++-
+ src/input/Joystick.cc | 2 ++
+ src/input/Joystick.hh | 8 ++++++--
+ 3 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/src/input/JoyMega.hh b/src/input/JoyMega.hh
+index 8422bcd2a..05371e27d 100644
+--- a/src/input/JoyMega.hh
++++ b/src/input/JoyMega.hh
+@@ -25,7 +25,11 @@ public:
+ JoyMega(MSXEventDistributor& eventDistributor,
+ StateChangeDistributor& stateChangeDistributor,
+ SDL_Joystick* joystick);
+- ~JoyMega() override;
++ ~JoyMega()
++#ifndef SDL_JOYSTICK_DISABLED
++ override
++#endif
++ ;
+
+ #ifndef SDL_JOYSTICK_DISABLED
+ // Pluggable
+diff --git a/src/input/Joystick.cc b/src/input/Joystick.cc
+index 04b4826cd..90b344c42 100644
+--- a/src/input/Joystick.cc
++++ b/src/input/Joystick.cc
+@@ -32,6 +32,8 @@ void Joystick::registerAll(MSXEventDistributor& eventDistributor,
+ #ifdef SDL_JOYSTICK_DISABLED
+ (void)eventDistributor;
+ (void)stateChangeDistributor;
++ (void)commandController;
++ (void)globalSettings;
+ (void)controller;
+ #else
+ for (auto i : xrange(SDL_NumJoysticks())) {
+diff --git a/src/input/Joystick.hh b/src/input/Joystick.hh
+index 18dd3c1c0..6a0f38d9d 100644
+--- a/src/input/Joystick.hh
++++ b/src/input/Joystick.hh
+@@ -38,9 +38,13 @@ public:
+ Joystick(MSXEventDistributor& eventDistributor,
+ StateChangeDistributor& stateChangeDistributor,
+ CommandController& commandController,
+- GlobalSettings& globalSettings,
++ GlobalSettings& globalSettings,
+ SDL_Joystick* joystick);
+- ~Joystick() override;
++ ~Joystick()
++#ifndef SDL_JOYSTICK_DISABLED
++ override
++#endif
++ ;
+
+ #ifndef SDL_JOYSTICK_DISABLED
+ // Pluggable
diff --git a/games-emulation/openmsx/openmsx-16.0.ebuild b/games-emulation/openmsx/openmsx-16.0-r1.ebuild
similarity index 94%
rename from games-emulation/openmsx/openmsx-16.0.ebuild
rename to games-emulation/openmsx/openmsx-16.0-r1.ebuild
index 30edf81cdd2..c3b639a0bf3 100644
--- a/games-emulation/openmsx/openmsx-16.0.ebuild
+++ b/games-emulation/openmsx/openmsx-16.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,12 +14,13 @@ SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_${PV//./_}
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
+IUSE="+joystick"
RDEPEND="dev-lang/tcl:0=
media-libs/alsa-lib
media-libs/libogg
media-libs/libpng:0=
- media-libs/libsdl2[sound,video]
+ media-libs/libsdl2[joystick=,sound,video]
media-libs/libtheora
media-libs/libvorbis
media-libs/sdl2-ttf
@@ -29,6 +30,8 @@ RDEPEND="dev-lang/tcl:0=
DEPEND="${RDEPEND}"
BDEPEND="${PYTHON_DEPS}"
+PATCHES=( "${FILESDIR}/${P}-libsdl-joystick-fix.patch" )
+
DOC_CONTENTS="
If you want to if you want to emulate real MSX systems and not
only the free C-BIOS machines, put the system ROMs in one of
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/openmsx/files/, games-emulation/openmsx/
@ 2023-04-19 3:24 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-04-19 3:24 UTC (permalink / raw
To: gentoo-commits
commit: 3fd99ef96cb5cef6dc9db82bf844076064718503
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 03:16:26 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 03:16:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fd99ef9
games-emulation/openmsx: fix build w/ gcc 13
Closes: https://bugs.gentoo.org/898908
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../openmsx/files/openmsx-18.0-gcc13.patch | 20 ++++++++++++++++++++
games-emulation/openmsx/openmsx-18.0-r2.ebuild | 7 +++++--
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/games-emulation/openmsx/files/openmsx-18.0-gcc13.patch b/games-emulation/openmsx/files/openmsx-18.0-gcc13.patch
new file mode 100644
index 000000000000..3da34aba3aa0
--- /dev/null
+++ b/games-emulation/openmsx/files/openmsx-18.0-gcc13.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/898908
+https://github.com/openMSX/openMSX/commit/b50d02069c09f11c687637c64ca1b459a5def28c
+
+From b50d02069c09f11c687637c64ca1b459a5def28c Mon Sep 17 00:00:00 2001
+From: m9710797 <vermaelen.wouter@gmail.com>
+Date: Sat, 4 Feb 2023 16:37:39 +0100
+Subject: [PATCH] Added missing #include
+
+Thanks to 'musuruan' for reporting.
+https://github.com/openMSX/openMSX/issues/1487
+--- a/src/utils/hash_set.hh
++++ b/src/utils/hash_set.hh
+@@ -11,6 +11,7 @@
+ #include "unreachable.hh"
+ #include "xrange.hh"
+ #include <cassert>
++#include <cstdint>
+ #include <cstdlib>
+ #include <functional>
+ #include <initializer_list>
diff --git a/games-emulation/openmsx/openmsx-18.0-r2.ebuild b/games-emulation/openmsx/openmsx-18.0-r2.ebuild
index ba32a858f88c..d2c45954266a 100644
--- a/games-emulation/openmsx/openmsx-18.0-r2.ebuild
+++ b/games-emulation/openmsx/openmsx-18.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -38,7 +38,10 @@ the following directories: /usr/share/${PN}/systemroms
or ~/.openMSX/share/systemroms
"
-PATCHES=( "${FILESDIR}/${P}-add-ctime.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-add-ctime.patch"
+ "${FILESDIR}/${P}-gcc13.patch"
+)
src_prepare() {
default
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-04-19 3:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-24 23:08 [gentoo-commits] repo/gentoo:master commit in: games-emulation/openmsx/files/, games-emulation/openmsx/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2023-04-19 3:24 Sam James
2018-08-29 22:18 James Le Cuirot
2018-04-29 13:06 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox