From 1ccef27203b03f1fa900c9b44dc425df27e49452 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 7 Sep 2022 04:34:29 +0100 Subject: gentoo auto-resync : 07:09:2022 - 04:34:29 --- games-emulation/Manifest.gz | Bin 9532 -> 9538 bytes games-emulation/openmsx/Manifest | 3 +- .../openmsx/files/openmsx-18.0-add-ctime.patch | 15 +++ games-emulation/openmsx/openmsx-18.0-r1.ebuild | 113 -------------------- games-emulation/openmsx/openmsx-18.0-r2.ebuild | 115 +++++++++++++++++++++ 5 files changed, 132 insertions(+), 114 deletions(-) create mode 100644 games-emulation/openmsx/files/openmsx-18.0-add-ctime.patch delete mode 100644 games-emulation/openmsx/openmsx-18.0-r1.ebuild create mode 100644 games-emulation/openmsx/openmsx-18.0-r2.ebuild (limited to 'games-emulation') diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz index 717392c77c85..b64741ad2522 100644 Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest index 2beb264bb7e4..0e6b653d83ed 100644 --- a/games-emulation/openmsx/Manifest +++ b/games-emulation/openmsx/Manifest @@ -1,3 +1,4 @@ +AUX openmsx-18.0-add-ctime.patch 362 BLAKE2B 23c1c79f0356391f40a2cb64e0e1c82ee46057e06365ddc223876b488f0a258d291466c55f012de1c97fc9f0f496ee0359f6bd6ec7d30866b07895959410ea6a SHA512 c550de0cb5d39513ba626323ce8cee5cfcaf545e9759ebf845b4249c9477bbf914c4fe5efd1f9031f590db2fa47c67e81da948983add72cb05c991fa63cfa860 DIST openmsx-18.0.tar.gz 4151084 BLAKE2B 0d5b4e4745c12689e4227408481367b4b4faaa4c7c2830ec0c4b9a5eb90c4b415628cd21834384d39fa4a820c725431848e98f7ef722c437f7bb4f96ae7b14c4 SHA512 f395fae8eac3bcb9334251c1c266a8c4d2951d6510a7c4885ddbc95aaed39f4ef8ae12a177d4a9ff44745ca368055f55f9983029b47441f4fd9731696f79809f -EBUILD openmsx-18.0-r1.ebuild 2904 BLAKE2B 127580092641849cb6c0c06dff3c5e4f440f8b0ce23cf4129ed9eb57dd0d1f9540530df69d7d8f62bb44dfa287514175c9d69894e0243e2d48201b6c422f9e0c SHA512 a93334f586608e408e5867eed271a80708f94d356afa0559c606881ef689326af2d9d81bf7f857f95dac097e22a2cb40f98b19fec9dbe8d43e1f8b8825b1d39a +EBUILD openmsx-18.0-r2.ebuild 2952 BLAKE2B 1a6f815eed0693734e001be4adb14a8c981d6d0819b5e3cfd5b444440ee31751abcbbb55926b8ae56778e73276df5b6e92f0d921e50cd4e1bb72d3a0a435bf35 SHA512 dab7972a6afe8a120737a3a8926c4e888b27e540f0dc10f6edc445b30467208dd0a19179856ba0bec0c7fbf4a3a7ced91dac76c75c60053ee0998c5d3ccf2a25 MISC metadata.xml 442 BLAKE2B 579f3b84332385ce6f79c1f927bb3d4b1b112954695bd30425849946ec3994158a855fc9dbff8407775ad532a105e518ba30b4e72f3e42d3b64e2cadffaa9220 SHA512 a24a4c4cef293439f8ea46ad1261507160ea5024cbc53947915e6306a1356d5682440fa1eb230a98e715214c53024fa7ffe4aa97f1bb3f385c66c1ee69b8323f diff --git a/games-emulation/openmsx/files/openmsx-18.0-add-ctime.patch b/games-emulation/openmsx/files/openmsx-18.0-add-ctime.patch new file mode 100644 index 000000000000..bc104acaeec5 --- /dev/null +++ b/games-emulation/openmsx/files/openmsx-18.0-add-ctime.patch @@ -0,0 +1,15 @@ +https://github.com/openMSX/openMSX/pull/1445 +https://bugs.gentoo.org/868726 + +diff --git a/src/file/FileBase.hh b/src/file/FileBase.hh +index ec17fb641..d7397f908 100644 +--- a/src/file/FileBase.hh ++++ b/src/file/FileBase.hh +@@ -4,6 +4,7 @@ + #include "MemBuffer.hh" + #include "span.hh" + #include ++#include + #include + + namespace openmsx { diff --git a/games-emulation/openmsx/openmsx-18.0-r1.ebuild b/games-emulation/openmsx/openmsx-18.0-r1.ebuild deleted file mode 100644 index 74a4c7604b70..000000000000 --- a/games-emulation/openmsx/openmsx-18.0-r1.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# 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/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 '/^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 -} diff --git a/games-emulation/openmsx/openmsx-18.0-r2.ebuild b/games-emulation/openmsx/openmsx-18.0-r2.ebuild new file mode 100644 index 000000000000..ba32a858f88c --- /dev/null +++ b/games-emulation/openmsx/openmsx-18.0-r2.ebuild @@ -0,0 +1,115 @@ +# 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/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 +" + +PATCHES=( "${FILESDIR}/${P}-add-ctime.patch" ) + +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 +} -- cgit v1.2.3