public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/openmsx/
@ 2020-12-21 22:24 James Le Cuirot
  0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2020-12-21 22:24 UTC (permalink / raw
  To: gentoo-commits

commit:     edcd0647de90a91b7f100d993229ea6aa0097aa1
Author:     John Helmert III <jchelmert3 <AT> posteo <DOT> net>
AuthorDate: Tue Dec 15 23:17:17 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 22:21:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edcd0647

games-emulation/openmsx: resurrect after python2 purge (with 16.0)

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: John Helmert III <jchelmert3 <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/18673
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-emulation/openmsx/Manifest            |   1 +
 games-emulation/openmsx/metadata.xml        |  19 +++++
 games-emulation/openmsx/openmsx-16.0.ebuild | 111 ++++++++++++++++++++++++++++
 3 files changed, 131 insertions(+)

diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest
new file mode 100644
index 00000000000..fd28218cd55
--- /dev/null
+++ b/games-emulation/openmsx/Manifest
@@ -0,0 +1 @@
+DIST openmsx-16.0.tar.gz 3997584 BLAKE2B 040bb3f6ff0338740b5212aae21db2c97fcee0e8c8ada1bc84a59d94b1b72180c4b2d5eff8cc4ae84dd95bc77f121e15c2f818f1f2e05ba7dc4781b63770db38 SHA512 a06ec56a8a768356b628e59e587ec85898643b04379da5c72bbbd8e48a0533da34a451b7e4d2a2f540f14e6bbcf833534a1bdac9014ce0c35dfd4ca179618f48

diff --git a/games-emulation/openmsx/metadata.xml b/games-emulation/openmsx/metadata.xml
new file mode 100644
index 00000000000..4ae0b02dc38
--- /dev/null
+++ b/games-emulation/openmsx/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer type="person">
+			<email>jchelmert3@posteo.net</email>
+			<name>John Helmert III</name>
+	</maintainer>
+	<maintainer type="project">
+			<email>proxy-maint@gentoo.org</email>
+			<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">openmsx/openmsx</remote-id>
+	</upstream>
+</pkgmetadata>

diff --git a/games-emulation/openmsx/openmsx-16.0.ebuild b/games-emulation/openmsx/openmsx-16.0.ebuild
new file mode 100644
index 00000000000..30edf81cdd2
--- /dev/null
+++ b/games-emulation/openmsx/openmsx-16.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit desktop flag-o-matic python-any-r1 readme.gentoo-r1 toolchain-funcs xdg
+
+DESCRIPTION="MSX emulator that aims for perfection"
+HOMEPAGE="https://openmsx.org/"
+SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_${PV//./_}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/tcl:0=
+	media-libs/alsa-lib
+	media-libs/libogg
+	media-libs/libpng:0=
+	media-libs/libsdl2[sound,video]
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/sdl2-ttf
+	>=media-libs/glew-1.3.2:0=
+	sys-libs/zlib
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+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
+the following directories: /usr/share/${PN}/systemroms
+or ~/.openMSX/share/systemroms
+"
+
+src_prepare() {
+	default
+	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
+
+	# Build system only configured to use bundled version - but not from the
+	# directory it's distributed in
+	cp "${S}/Contrib/catch2/catch.hpp" "${S}/src/unittest" || die
+}
+
+src_configure() {
+	tc-export CXX
+
+	# Doesn't compile without this, and build system doesn't consistently add
+	# it properly for all compilers
+	append-cxxflags '-std=c++17'
+
+	default
+}
+
+src_compile() {
+	emake \
+		CXXFLAGS="${CXXFLAGS}" \
+		INSTALL_SHARE_DIR="${EPREFIX}/usr/share/${PN}" \
+		V=1
+}
+
+src_test() {
+	# To get tests, we need to build with OPENMSX_FLAVOUR=unittest and then the
+	# build is stored in a directory of the pattern
+	# ${WORKDIR}/derived/*-unittest/. This is separate from the actual build,
+	# stored in ${WORKDIR}/derived/*-opt. The unittest binary and the workdir
+	# binary are in each of these directories under their `bin` directories.
+	emake \
+		V=1 \
+		CXXFLAGS="${CXXFLAGS}" \
+		OPENMSX_FLAVOUR=unittest
+
+	# There will only ever be one *-unittest directory
+	"${S}"/derived/*-unittest/bin/openmsx || die
+}
+
+src_install() {
+	# To guarantee installing the proper binary in case tests were built,
+	# specify the default OPENMSX_FLAVOUR
+	emake \
+		V=1 \
+		INSTALL_BINARY_DIR="${ED}/usr/bin" \
+		INSTALL_SHARE_DIR="${ED}/usr/share/${PN}" \
+		INSTALL_DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		OPENMSX_FLAVOUR=opt \
+		install
+
+	einstalldocs
+	readme.gentoo_create_doc
+
+	for i in 16 32 48 64 128 256 ; do
+		newicon -s "${i}" "share/icons/openMSX-logo-${i}.png" "${PN}.png"
+	done
+	make_desktop_entry "${PN}" "openMSX"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	xdg_pkg_postinst
+}


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

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/openmsx/
@ 2021-05-24 23:37 John Helmert III
  0 siblings, 0 replies; 7+ messages in thread
From: John Helmert III @ 2021-05-24 23:37 UTC (permalink / raw
  To: gentoo-commits

commit:     e0faf3c06a3da4155bfad575466921eff97d05d7
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Mon May 24 23:10:53 2021 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Mon May 24 23:37:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0faf3c0

games-emulation/openmsx: add python3_10

Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 games-emulation/openmsx/openmsx-16.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/openmsx/openmsx-16.0-r1.ebuild b/games-emulation/openmsx/openmsx-16.0-r1.ebuild
index eecb98949ac..e321fddfea0 100644
--- a/games-emulation/openmsx/openmsx-16.0-r1.ebuild
+++ b/games-emulation/openmsx/openmsx-16.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit desktop flag-o-matic python-any-r1 readme.gentoo-r1 toolchain-funcs xdg
 


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

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/openmsx/
@ 2021-06-06  3:52 John Helmert III
  0 siblings, 0 replies; 7+ messages in thread
From: John Helmert III @ 2021-06-06  3:52 UTC (permalink / raw
  To: gentoo-commits

commit:     8f716335882b72adc99f5df1b40b57d9723b26e7
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  6 03:47:48 2021 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sun Jun  6 03:52:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f716335

games-emulation/openmsx: add 17.0

Drops patch which has been included in 17.0.

Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 games-emulation/openmsx/Manifest            |   1 +
 games-emulation/openmsx/openmsx-17.0.ebuild | 112 ++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+)

diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest
index fd28218cd55..b6e63060516 100644
--- a/games-emulation/openmsx/Manifest
+++ b/games-emulation/openmsx/Manifest
@@ -1 +1,2 @@
 DIST openmsx-16.0.tar.gz 3997584 BLAKE2B 040bb3f6ff0338740b5212aae21db2c97fcee0e8c8ada1bc84a59d94b1b72180c4b2d5eff8cc4ae84dd95bc77f121e15c2f818f1f2e05ba7dc4781b63770db38 SHA512 a06ec56a8a768356b628e59e587ec85898643b04379da5c72bbbd8e48a0533da34a451b7e4d2a2f540f14e6bbcf833534a1bdac9014ce0c35dfd4ca179618f48
+DIST openmsx-17.0.tar.gz 4045461 BLAKE2B 46c70ce3f853aecebf8bdeddc5786903634d88d013497383490d79b0dbf455f48a70b3658b9913db197cf7e66cbc6f4da37da58b1b24d77c75b731e842c663df SHA512 4fc87efd2bfbcd12bebb4e005b18b1cb2048f5d8f3188ef9b55f1e003c8d021fb47bd67d647137daa6a8640b5656b0db363f3b62158d690ddb5f7bf1af3459e1

diff --git a/games-emulation/openmsx/openmsx-17.0.ebuild b/games-emulation/openmsx/openmsx-17.0.ebuild
new file mode 100644
index 00000000000..e64f1d8a6d6
--- /dev/null
+++ b/games-emulation/openmsx/openmsx-17.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit desktop flag-o-matic python-any-r1 readme.gentoo-r1 toolchain-funcs xdg
+
+DESCRIPTION="MSX emulator that aims for perfection"
+HOMEPAGE="https://openmsx.org/"
+SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_${PV//./_}/${P}.tar.gz"
+
+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[joystick=,sound,video]
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/sdl2-ttf
+	>=media-libs/glew-1.3.2:0=
+	sys-libs/zlib
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+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
+the following directories: /usr/share/${PN}/systemroms
+or ~/.openMSX/share/systemroms
+"
+
+src_prepare() {
+	default
+	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
+
+	# Build system only configured to use bundled version - but not from the
+	# directory it's distributed in
+	cp "${S}/Contrib/catch2/catch.hpp" "${S}/src/unittest" || die
+}
+
+src_configure() {
+	tc-export CXX
+
+	# Doesn't compile without this, and build system doesn't consistently add
+	# it properly for all compilers
+	append-cxxflags '-std=c++17'
+
+	default
+}
+
+src_compile() {
+	emake \
+		CXXFLAGS="${CXXFLAGS}" \
+		INSTALL_SHARE_DIR="${EPREFIX}/usr/share/${PN}" \
+		V=1
+}
+
+src_test() {
+	# To get tests, we need to build with OPENMSX_FLAVOUR=unittest and then the
+	# build is stored in a directory of the pattern
+	# ${WORKDIR}/derived/*-unittest/. This is separate from the actual build,
+	# stored in ${WORKDIR}/derived/*-opt. The unittest binary and the workdir
+	# binary are in each of these directories under their `bin` directories.
+	emake \
+		V=1 \
+		CXXFLAGS="${CXXFLAGS}" \
+		OPENMSX_FLAVOUR=unittest
+
+	# There will only ever be one *-unittest directory
+	"${S}"/derived/*-unittest/bin/openmsx || die
+}
+
+src_install() {
+	# To guarantee installing the proper binary in case tests were built,
+	# specify the default OPENMSX_FLAVOUR
+	emake \
+		V=1 \
+		INSTALL_BINARY_DIR="${ED}/usr/bin" \
+		INSTALL_SHARE_DIR="${ED}/usr/share/${PN}" \
+		INSTALL_DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		OPENMSX_FLAVOUR=opt \
+		install
+
+	einstalldocs
+	readme.gentoo_create_doc
+
+	for i in 16 32 48 64 128 256 ; do
+		newicon -s "${i}" "share/icons/openMSX-logo-${i}.png" "${PN}.png"
+	done
+	make_desktop_entry "${PN}" "openMSX"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	xdg_pkg_postinst
+}


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

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/openmsx/
@ 2022-07-05  4:28 John Helmert III
  0 siblings, 0 replies; 7+ messages in thread
From: John Helmert III @ 2022-07-05  4:28 UTC (permalink / raw
  To: gentoo-commits

commit:     59f5af28fafefaa5aa1decf4d47b0c8f7f0d95c0
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 04:27:31 2022 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 04:28:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59f5af28

games-emulation/openmsx: add 18.0

Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 games-emulation/openmsx/Manifest            |   1 +
 games-emulation/openmsx/openmsx-18.0.ebuild | 112 ++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+)

diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest
index 61bc81a9d708..5c3a8475c626 100644
--- a/games-emulation/openmsx/Manifest
+++ b/games-emulation/openmsx/Manifest
@@ -1 +1,2 @@
 DIST openmsx-17.0.tar.gz 4045461 BLAKE2B 46c70ce3f853aecebf8bdeddc5786903634d88d013497383490d79b0dbf455f48a70b3658b9913db197cf7e66cbc6f4da37da58b1b24d77c75b731e842c663df SHA512 4fc87efd2bfbcd12bebb4e005b18b1cb2048f5d8f3188ef9b55f1e003c8d021fb47bd67d647137daa6a8640b5656b0db363f3b62158d690ddb5f7bf1af3459e1
+DIST openmsx-18.0.tar.gz 4151084 BLAKE2B 0d5b4e4745c12689e4227408481367b4b4faaa4c7c2830ec0c4b9a5eb90c4b415628cd21834384d39fa4a820c725431848e98f7ef722c437f7bb4f96ae7b14c4 SHA512 f395fae8eac3bcb9334251c1c266a8c4d2951d6510a7c4885ddbc95aaed39f4ef8ae12a177d4a9ff44745ca368055f55f9983029b47441f4fd9731696f79809f

diff --git a/games-emulation/openmsx/openmsx-18.0.ebuild b/games-emulation/openmsx/openmsx-18.0.ebuild
new file mode 100644
index 000000000000..1fbd9a8dba20
--- /dev/null
+++ b/games-emulation/openmsx/openmsx-18.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10,11} )
+
+inherit desktop flag-o-matic python-any-r1 readme.gentoo-r1 toolchain-funcs xdg
+
+DESCRIPTION="MSX emulator that aims for perfection"
+HOMEPAGE="https://openmsx.org/"
+SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_${PV//./_}/${P}.tar.gz"
+
+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[joystick=,sound,video]
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/sdl2-ttf
+	>=media-libs/glew-1.3.2:0=
+	sys-libs/zlib
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+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
+the following directories: /usr/share/${PN}/systemroms
+or ~/.openMSX/share/systemroms
+"
+
+src_prepare() {
+	default
+	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
+
+	# Build system only configured to use bundled version - but not from the
+	# directory it's distributed in
+	cp "${S}/Contrib/catch2/catch.hpp" "${S}/src/unittest" || die
+}
+
+src_configure() {
+	tc-export CXX
+
+	# Doesn't compile without this, and build system doesn't consistently add
+	# it properly for all compilers
+	append-cxxflags '-std=c++17'
+
+	default
+}
+
+src_compile() {
+	emake \
+		CXXFLAGS="${CXXFLAGS}" \
+		INSTALL_SHARE_DIR="${EPREFIX}/usr/share/${PN}" \
+		V=1
+}
+
+src_test() {
+	# To get tests, we need to build with OPENMSX_FLAVOUR=unittest and then the
+	# build is stored in a directory of the pattern
+	# ${WORKDIR}/derived/*-unittest/. This is separate from the actual build,
+	# stored in ${WORKDIR}/derived/*-opt. The unittest binary and the workdir
+	# binary are in each of these directories under their `bin` directories.
+	emake \
+		V=1 \
+		CXXFLAGS="${CXXFLAGS}" \
+		OPENMSX_FLAVOUR=unittest
+
+	# There will only ever be one *-unittest directory
+	"${S}"/derived/*-unittest/bin/openmsx || die
+}
+
+src_install() {
+	# To guarantee installing the proper binary in case tests were built,
+	# specify the default OPENMSX_FLAVOUR
+	emake \
+		V=1 \
+		INSTALL_BINARY_DIR="${ED}/usr/bin" \
+		INSTALL_SHARE_DIR="${ED}/usr/share/${PN}" \
+		INSTALL_DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		OPENMSX_FLAVOUR=opt \
+		install
+
+	einstalldocs
+	readme.gentoo_create_doc
+
+	for i in 16 32 48 64 128 256 ; do
+		newicon -s "${i}" "share/icons/openMSX-logo-${i}.png" "${PN}.png"
+	done
+	make_desktop_entry "${PN}" "openMSX"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	xdg_pkg_postinst
+}


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

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/openmsx/
@ 2022-07-05  4:53 John Helmert III
  0 siblings, 0 replies; 7+ messages in thread
From: John Helmert III @ 2022-07-05  4:53 UTC (permalink / raw
  To: gentoo-commits

commit:     14e0c4f8621d34756ee0bad785a32c663bf3376f
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 04:52:41 2022 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 04:53:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14e0c4f8

games-emulation/openmsx: add missing harfbuzz dep

Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 games-emulation/openmsx/{openmsx-18.0.ebuild => openmsx-18.0-r1.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-emulation/openmsx/openmsx-18.0.ebuild b/games-emulation/openmsx/openmsx-18.0-r1.ebuild
similarity index 99%
rename from games-emulation/openmsx/openmsx-18.0.ebuild
rename to games-emulation/openmsx/openmsx-18.0-r1.ebuild
index 1fbd9a8dba20..74a4c7604b70 100644
--- a/games-emulation/openmsx/openmsx-18.0.ebuild
+++ b/games-emulation/openmsx/openmsx-18.0-r1.ebuild
@@ -18,6 +18,7 @@ IUSE="+joystick"
 
 RDEPEND="dev-lang/tcl:0=
 	media-libs/alsa-lib
+	media-libs/harfbuzz:=
 	media-libs/libogg
 	media-libs/libpng:0=
 	media-libs/libsdl2[joystick=,sound,video]


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

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/openmsx/
@ 2022-08-11  7:37 Ionen Wolkens
  0 siblings, 0 replies; 7+ messages in thread
From: Ionen Wolkens @ 2022-08-11  7:37 UTC (permalink / raw
  To: gentoo-commits

commit:     4e583e6cd8c55a42333bba2d0089d032870d69af
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 06:04:37 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 07:37:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e583e6c

games-emulation/openmsx: drop 17.0

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/openmsx/Manifest            |   1 -
 games-emulation/openmsx/openmsx-17.0.ebuild | 112 ----------------------------
 2 files changed, 113 deletions(-)

diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest
index 5c3a8475c626..bceea346b609 100644
--- a/games-emulation/openmsx/Manifest
+++ b/games-emulation/openmsx/Manifest
@@ -1,2 +1 @@
-DIST openmsx-17.0.tar.gz 4045461 BLAKE2B 46c70ce3f853aecebf8bdeddc5786903634d88d013497383490d79b0dbf455f48a70b3658b9913db197cf7e66cbc6f4da37da58b1b24d77c75b731e842c663df SHA512 4fc87efd2bfbcd12bebb4e005b18b1cb2048f5d8f3188ef9b55f1e003c8d021fb47bd67d647137daa6a8640b5656b0db363f3b62158d690ddb5f7bf1af3459e1
 DIST openmsx-18.0.tar.gz 4151084 BLAKE2B 0d5b4e4745c12689e4227408481367b4b4faaa4c7c2830ec0c4b9a5eb90c4b415628cd21834384d39fa4a820c725431848e98f7ef722c437f7bb4f96ae7b14c4 SHA512 f395fae8eac3bcb9334251c1c266a8c4d2951d6510a7c4885ddbc95aaed39f4ef8ae12a177d4a9ff44745ca368055f55f9983029b47441f4fd9731696f79809f

diff --git a/games-emulation/openmsx/openmsx-17.0.ebuild b/games-emulation/openmsx/openmsx-17.0.ebuild
deleted file mode 100644
index e64f1d8a6d6c..000000000000
--- a/games-emulation/openmsx/openmsx-17.0.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit desktop flag-o-matic python-any-r1 readme.gentoo-r1 toolchain-funcs xdg
-
-DESCRIPTION="MSX emulator that aims for perfection"
-HOMEPAGE="https://openmsx.org/"
-SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_${PV//./_}/${P}.tar.gz"
-
-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[joystick=,sound,video]
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/sdl2-ttf
-	>=media-libs/glew-1.3.2:0=
-	sys-libs/zlib
-	virtual/opengl"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-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
-the following directories: /usr/share/${PN}/systemroms
-or ~/.openMSX/share/systemroms
-"
-
-src_prepare() {
-	default
-	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
-
-	# Build system only configured to use bundled version - but not from the
-	# directory it's distributed in
-	cp "${S}/Contrib/catch2/catch.hpp" "${S}/src/unittest" || die
-}
-
-src_configure() {
-	tc-export CXX
-
-	# Doesn't compile without this, and build system doesn't consistently add
-	# it properly for all compilers
-	append-cxxflags '-std=c++17'
-
-	default
-}
-
-src_compile() {
-	emake \
-		CXXFLAGS="${CXXFLAGS}" \
-		INSTALL_SHARE_DIR="${EPREFIX}/usr/share/${PN}" \
-		V=1
-}
-
-src_test() {
-	# To get tests, we need to build with OPENMSX_FLAVOUR=unittest and then the
-	# build is stored in a directory of the pattern
-	# ${WORKDIR}/derived/*-unittest/. This is separate from the actual build,
-	# stored in ${WORKDIR}/derived/*-opt. The unittest binary and the workdir
-	# binary are in each of these directories under their `bin` directories.
-	emake \
-		V=1 \
-		CXXFLAGS="${CXXFLAGS}" \
-		OPENMSX_FLAVOUR=unittest
-
-	# There will only ever be one *-unittest directory
-	"${S}"/derived/*-unittest/bin/openmsx || die
-}
-
-src_install() {
-	# To guarantee installing the proper binary in case tests were built,
-	# specify the default OPENMSX_FLAVOUR
-	emake \
-		V=1 \
-		INSTALL_BINARY_DIR="${ED}/usr/bin" \
-		INSTALL_SHARE_DIR="${ED}/usr/share/${PN}" \
-		INSTALL_DOC_DIR="${ED}/usr/share/doc/${PF}" \
-		OPENMSX_FLAVOUR=opt \
-		install
-
-	einstalldocs
-	readme.gentoo_create_doc
-
-	for i in 16 32 48 64 128 256 ; do
-		newicon -s "${i}" "share/icons/openMSX-logo-${i}.png" "${PN}.png"
-	done
-	make_desktop_entry "${PN}" "openMSX"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	xdg_pkg_postinst
-}


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

* [gentoo-commits] repo/gentoo:master commit in: games-emulation/openmsx/
@ 2023-11-25  5:56 John Helmert III
  0 siblings, 0 replies; 7+ messages in thread
From: John Helmert III @ 2023-11-25  5:56 UTC (permalink / raw
  To: gentoo-commits

commit:     4b2db08d75a54d5cc159ad03aee5df3e9579a41a
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 05:50:48 2023 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 05:56:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b2db08d

games-emulation/openmsx: add 19.1

Reported apparent CXXFLAGS handling regression below. Working around it
with sed, as is already done with LDFLAGS. Add python3_12.

See-Also: https://github.com/openMSX/openMSX/issues/1563
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 games-emulation/openmsx/Manifest            |   1 +
 games-emulation/openmsx/openmsx-19.1.ebuild | 113 ++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+)

diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest
index bceea346b609..66c03abdf711 100644
--- a/games-emulation/openmsx/Manifest
+++ b/games-emulation/openmsx/Manifest
@@ -1 +1,2 @@
 DIST openmsx-18.0.tar.gz 4151084 BLAKE2B 0d5b4e4745c12689e4227408481367b4b4faaa4c7c2830ec0c4b9a5eb90c4b415628cd21834384d39fa4a820c725431848e98f7ef722c437f7bb4f96ae7b14c4 SHA512 f395fae8eac3bcb9334251c1c266a8c4d2951d6510a7c4885ddbc95aaed39f4ef8ae12a177d4a9ff44745ca368055f55f9983029b47441f4fd9731696f79809f
+DIST openmsx-19.1.tar.gz 4216833 BLAKE2B 7d1ed4dfb76d0d9d3eecf1447395b4bec775f6c92edf8164583de3b0fe9fc98bce00c47206340e2cde417ba5580785ec92be04ec7a6c5cf2f1a03cd5769ce746 SHA512 107208f7a9324beb348e8dd7f9ad878ee04ee3948159448065ff2a8c78a9c890e38cb2cbcada754bfc3698a6ba53b0ad1a9ac837d6071eb330b18ea2bdb0fbc7

diff --git a/games-emulation/openmsx/openmsx-19.1.ebuild b/games-emulation/openmsx/openmsx-19.1.ebuild
new file mode 100644
index 000000000000..ef83b43a1552
--- /dev/null
+++ b/games-emulation/openmsx/openmsx-19.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10,11,12} )
+
+inherit desktop flag-o-matic python-any-r1 readme.gentoo-r1 toolchain-funcs xdg
+
+DESCRIPTION="MSX emulator that aims for perfection"
+HOMEPAGE="https://openmsx.org/"
+SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_${PV//./_}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+joystick"
+
+RDEPEND="dev-lang/tcl:0=
+	media-libs/alsa-lib
+	media-libs/harfbuzz:=
+	media-libs/libogg
+	media-libs/libpng:0=
+	media-libs/libsdl2[joystick=,sound,video]
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/sdl2-ttf
+	>=media-libs/glew-1.3.2:0=
+	sys-libs/zlib
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+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
+the following directories: /usr/share/${PN}/systemroms
+or ~/.openMSX/share/systemroms
+"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/^CXXFLAGS:=/d' \
+		-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 's/-fsanitize=address//' build/flavour-unittest.mk || die
+	sed -i -e '/SYMLINK/s:true:false:' build/custom.mk || die
+	sed -i -e 's/GPL.txt//' doc/node.mk || die
+
+	# Build system only configured to use bundled version - but not from the
+	# directory it's distributed in
+	cp "${S}/Contrib/catch2/catch.hpp" "${S}/src/unittest" || die
+}
+
+src_configure() {
+	tc-export CXX
+
+	# Doesn't compile without this, and build system doesn't consistently add
+	# it properly for all compilers
+	append-cxxflags '-std=c++17'
+
+	default
+}
+
+src_compile() {
+	emake \
+		INSTALL_SHARE_DIR="${EPREFIX}/usr/share/${PN}" \
+		V=1
+}
+
+src_test() {
+	# To get tests, we need to build with OPENMSX_FLAVOUR=unittest and then the
+	# build is stored in a directory of the pattern
+	# ${WORKDIR}/derived/*-unittest/. This is separate from the actual build,
+	# stored in ${WORKDIR}/derived/*-opt. The unittest binary and the workdir
+	# binary are in each of these directories under their `bin` directories.
+	emake \
+		V=1 \
+		OPENMSX_FLAVOUR=unittest
+
+	# There will only ever be one *-unittest directory
+	"${S}"/derived/*-unittest/bin/openmsx || die
+}
+
+src_install() {
+	# To guarantee installing the proper binary in case tests were built,
+	# specify the default OPENMSX_FLAVOUR
+	emake \
+		V=1 \
+		INSTALL_BINARY_DIR="${ED}/usr/bin" \
+		INSTALL_SHARE_DIR="${ED}/usr/share/${PN}" \
+		INSTALL_DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		OPENMSX_FLAVOUR=opt \
+		install
+
+	einstalldocs
+	readme.gentoo_create_doc
+
+	for i in 16 32 48 64 128 256 ; do
+		newicon -s "${i}" "share/icons/openMSX-logo-${i}.png" "${PN}.png"
+	done
+	make_desktop_entry "${PN}" "openMSX"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	xdg_pkg_postinst
+}


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

end of thread, other threads:[~2023-11-25  5:56 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-21 22:24 [gentoo-commits] repo/gentoo:master commit in: games-emulation/openmsx/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2021-05-24 23:37 John Helmert III
2021-06-06  3:52 John Helmert III
2022-07-05  4:28 John Helmert III
2022-07-05  4:53 John Helmert III
2022-08-11  7:37 Ionen Wolkens
2023-11-25  5:56 John Helmert III

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