* [gentoo-commits] repo/gentoo:master commit in: games-emulation/atari800/files/, games-emulation/atari800/
@ 2020-06-15 15:05 Mike Gilbert
0 siblings, 0 replies; 4+ messages in thread
From: Mike Gilbert @ 2020-06-15 15:05 UTC (permalink / raw
To: gentoo-commits
commit: 1ff944183f6920455aa9c807f1cc00c3a5a5c658
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 15 15:04:28 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 15:04:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ff94418
Revert "games-emulation/atari800: Bump to 4.2.0"
The new ebuild was not included in this commit.
Reverts: 376f45cb0c0a960b24c34437d267f7306bedc24b
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
games-emulation/atari800/Manifest | 1 -
games-emulation/atari800/files/atari800-4.2.0.cfg | 31 -----------------------
2 files changed, 32 deletions(-)
diff --git a/games-emulation/atari800/Manifest b/games-emulation/atari800/Manifest
index c03a9b49edc..825004ae740 100644
--- a/games-emulation/atari800/Manifest
+++ b/games-emulation/atari800/Manifest
@@ -1,3 +1,2 @@
DIST atari800-3.1.0.tar.gz 1492289 BLAKE2B cad7a3111bf714321d01aff1f8b30408efc1eca0876d9b795395d62d18eabdf78b71d3b2af887e8ba03e33e3824fcd5b45070e39cddd0e5ad0bda2d853f724b1 SHA512 c8f035c9be000c67dd854a14a236d165e6e2d30b5138f8772c6ea5c5290b0410525570e3ed9dcb2f9bcb129f97a36e6eef5993f0a5ad3cc993c6b59b127bcabe
-DIST atari800-4.2.0-src.tgz 7047710 BLAKE2B eac4b2da03d2ff5ec9e18dda41e0345975ed16c1cee23d15d2633211b7d4835b7a26c79fbf1672bb9ce3b82d52c7273e717371a0065ba29807f76d823eeb9855 SHA512 1236a8e05bf878e4514ae8e9f1556e0961a7f11ff0333eef415af455d217f712d5c6ededdd343dff6ba1aab777e19997bf9ecb859408187d69fc141301ecba31
DIST xf25.zip 188942 BLAKE2B c10b9108eebc571ac334ea6fca76d227e3d2fcde1595e8823a3d178dc31d9efa9b209572ee03875461289093615470192cf5c9a06cf0b4363d097a9eac201db4 SHA512 306612fc2af41ed10d76103af83e141cfd8bd3ba2ea3cbd1d0b81d4d5b0108c06948a5c626648c8a2424536757a42a3f8b9af1fb63fa3c31096447ffed0f9923
diff --git a/games-emulation/atari800/files/atari800-4.2.0.cfg b/games-emulation/atari800/files/atari800-4.2.0.cfg
deleted file mode 100644
index 6e79c110dbd..00000000000
--- a/games-emulation/atari800/files/atari800-4.2.0.cfg
+++ /dev/null
@@ -1,31 +0,0 @@
-Atari 800 Emulator, Version 4.2.0
-ROM_OS_A_NTSC=
-ROM_OS_A_PAL=
-ROM_OS_B_NTSC=
-ROM_OS_AA00R10=
-ROM_OS_AA00R11=
-ROM_OS_BB00R1=
-ROM_OS_BB01R2=/usr/share/atari800/ATARIXL.ROM
-ROM_OS_BB02R3=
-ROM_OS_BB02R3V4=
-ROM_OS_CC01R4=
-ROM_OS_BB01R3=
-ROM_OS_BB01R4=
-ROM_OS_BB01R59=
-ROM_OS_BB01R59A=
-ROM_5200=
-ROM_5200_A=
-ROM_BASIC_A=
-ROM_BASIC_B=
-ROM_BASIC_C=/usr/share/atari800/ATARIBAS.ROM
-ROM_XEGAME=
-ROM_400/800_CUSTOM=/usr/share/atari800/ATARIOSB.ROM
-ROM_XL/XE_CUSTOM=/usr/share/atari800/ATARIXL.ROM
-ROM_5200_CUSTOM=
-ROM_BASIC_CUSTOM=/usr/share/atari800/ATARIBAS.ROM
-ROM_XEGAME_CUSTOM=
-OS_400/800_VERSION=AUTO
-OS_XL/XE_VERSION=AUTO
-OS_5200_VERSION=AUTO
-BASIC_VERSION=AUTO
-XEGS_GAME_VERSION=AUTO
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/atari800/files/, games-emulation/atari800/
@ 2020-06-15 15:06 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2020-06-15 15:06 UTC (permalink / raw
To: gentoo-commits
commit: c54581f067392f4c49be7def53230f6d7b84ab66
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 15 12:49:20 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 15:06:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c54581f0
games-emulation/atari800: Bump to 4.2.0
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
games-emulation/atari800/Manifest | 1 +
games-emulation/atari800/atari800-4.2.0.ebuild | 73 +++++++++++++++++++++++
games-emulation/atari800/files/atari800-4.2.0.cfg | 31 ++++++++++
3 files changed, 105 insertions(+)
diff --git a/games-emulation/atari800/Manifest b/games-emulation/atari800/Manifest
index 825004ae740..c03a9b49edc 100644
--- a/games-emulation/atari800/Manifest
+++ b/games-emulation/atari800/Manifest
@@ -1,2 +1,3 @@
DIST atari800-3.1.0.tar.gz 1492289 BLAKE2B cad7a3111bf714321d01aff1f8b30408efc1eca0876d9b795395d62d18eabdf78b71d3b2af887e8ba03e33e3824fcd5b45070e39cddd0e5ad0bda2d853f724b1 SHA512 c8f035c9be000c67dd854a14a236d165e6e2d30b5138f8772c6ea5c5290b0410525570e3ed9dcb2f9bcb129f97a36e6eef5993f0a5ad3cc993c6b59b127bcabe
+DIST atari800-4.2.0-src.tgz 7047710 BLAKE2B eac4b2da03d2ff5ec9e18dda41e0345975ed16c1cee23d15d2633211b7d4835b7a26c79fbf1672bb9ce3b82d52c7273e717371a0065ba29807f76d823eeb9855 SHA512 1236a8e05bf878e4514ae8e9f1556e0961a7f11ff0333eef415af455d217f712d5c6ededdd343dff6ba1aab777e19997bf9ecb859408187d69fc141301ecba31
DIST xf25.zip 188942 BLAKE2B c10b9108eebc571ac334ea6fca76d227e3d2fcde1595e8823a3d178dc31d9efa9b209572ee03875461289093615470192cf5c9a06cf0b4363d097a9eac201db4 SHA512 306612fc2af41ed10d76103af83e141cfd8bd3ba2ea3cbd1d0b81d4d5b0108c06948a5c626648c8a2424536757a42a3f8b9af1fb63fa3c31096447ffed0f9923
diff --git a/games-emulation/atari800/atari800-4.2.0.ebuild b/games-emulation/atari800/atari800-4.2.0.ebuild
new file mode 100644
index 00000000000..dd100857854
--- /dev/null
+++ b/games-emulation/atari800/atari800-4.2.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop autotools
+
+DESCRIPTION="Atari 800 emulator"
+HOMEPAGE="https://atari800.github.io/"
+SRC_URI="
+ https://github.com/atari800/atari800/releases/download/ATARI800_${PV//./_}/${P}-src.tgz
+ https://sourceforge.net/projects/${PN}/files/ROM/Original%20XL%20ROM/xf25.zip"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="opengl readline +sdl +sound"
+
+RDEPEND="
+ sdl? (
+ >=media-libs/libsdl-1.2.0[opengl?,sound?,video]
+ )
+ !sdl? (
+ sys-libs/ncurses:=
+ )
+ readline? (
+ sys-libs/readline:=
+ sys-libs/ncurses:=
+ )
+ media-libs/libpng:=
+ sys-libs/zlib
+"
+DEPEND=${RDEPEND}
+BDEPEND="
+ app-arch/unzip
+"
+
+src_prepare() {
+ default
+
+ # Bug 544608
+ eapply -p2 "${FILESDIR}/atari800-3.1.0-tgetent-detection.patch"
+ eautoreconf
+}
+
+src_configure() {
+ local video=ncurses
+ local sound=no
+
+ if use sdl; then
+ video=sdl
+ use sound && sound=sdl
+ elif use sound; then
+ sound=oss
+ fi
+
+ local myconf=(
+ $(use_with opengl)
+ $(use_with readline)
+ --with-video=${video}
+ --with-sound=${sound}
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+ insinto "/usr/share/${PN}"
+ doins "${WORKDIR}/"*.ROM
+ insinto /etc
+ newins "${FILESDIR}"/atari800-4.2.0.cfg atari800.cfg
+ newicon data/atari2.svg ${PN}.svg
+ make_desktop_entry ${PN} "Atari 800 emulator"
+}
diff --git a/games-emulation/atari800/files/atari800-4.2.0.cfg b/games-emulation/atari800/files/atari800-4.2.0.cfg
new file mode 100644
index 00000000000..6e79c110dbd
--- /dev/null
+++ b/games-emulation/atari800/files/atari800-4.2.0.cfg
@@ -0,0 +1,31 @@
+Atari 800 Emulator, Version 4.2.0
+ROM_OS_A_NTSC=
+ROM_OS_A_PAL=
+ROM_OS_B_NTSC=
+ROM_OS_AA00R10=
+ROM_OS_AA00R11=
+ROM_OS_BB00R1=
+ROM_OS_BB01R2=/usr/share/atari800/ATARIXL.ROM
+ROM_OS_BB02R3=
+ROM_OS_BB02R3V4=
+ROM_OS_CC01R4=
+ROM_OS_BB01R3=
+ROM_OS_BB01R4=
+ROM_OS_BB01R59=
+ROM_OS_BB01R59A=
+ROM_5200=
+ROM_5200_A=
+ROM_BASIC_A=
+ROM_BASIC_B=
+ROM_BASIC_C=/usr/share/atari800/ATARIBAS.ROM
+ROM_XEGAME=
+ROM_400/800_CUSTOM=/usr/share/atari800/ATARIOSB.ROM
+ROM_XL/XE_CUSTOM=/usr/share/atari800/ATARIXL.ROM
+ROM_5200_CUSTOM=
+ROM_BASIC_CUSTOM=/usr/share/atari800/ATARIBAS.ROM
+ROM_XEGAME_CUSTOM=
+OS_400/800_VERSION=AUTO
+OS_XL/XE_VERSION=AUTO
+OS_5200_VERSION=AUTO
+BASIC_VERSION=AUTO
+XEGS_GAME_VERSION=AUTO
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/atari800/files/, games-emulation/atari800/
@ 2020-09-18 9:38 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2020-09-18 9:38 UTC (permalink / raw
To: gentoo-commits
commit: 4d041609add28fd1be05fbc487c7ccfefc596c29
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 18 09:30:14 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Sep 18 09:38:04 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d041609
games-emulation/atari800: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
games-emulation/atari800/Manifest | 1 -
games-emulation/atari800/atari800-3.1.0-r1.ebuild | 92 -----------------------
games-emulation/atari800/files/atari800.cfg | 24 ------
3 files changed, 117 deletions(-)
diff --git a/games-emulation/atari800/Manifest b/games-emulation/atari800/Manifest
index c03a9b49edc..8955c0ab342 100644
--- a/games-emulation/atari800/Manifest
+++ b/games-emulation/atari800/Manifest
@@ -1,3 +1,2 @@
-DIST atari800-3.1.0.tar.gz 1492289 BLAKE2B cad7a3111bf714321d01aff1f8b30408efc1eca0876d9b795395d62d18eabdf78b71d3b2af887e8ba03e33e3824fcd5b45070e39cddd0e5ad0bda2d853f724b1 SHA512 c8f035c9be000c67dd854a14a236d165e6e2d30b5138f8772c6ea5c5290b0410525570e3ed9dcb2f9bcb129f97a36e6eef5993f0a5ad3cc993c6b59b127bcabe
DIST atari800-4.2.0-src.tgz 7047710 BLAKE2B eac4b2da03d2ff5ec9e18dda41e0345975ed16c1cee23d15d2633211b7d4835b7a26c79fbf1672bb9ce3b82d52c7273e717371a0065ba29807f76d823eeb9855 SHA512 1236a8e05bf878e4514ae8e9f1556e0961a7f11ff0333eef415af455d217f712d5c6ededdd343dff6ba1aab777e19997bf9ecb859408187d69fc141301ecba31
DIST xf25.zip 188942 BLAKE2B c10b9108eebc571ac334ea6fca76d227e3d2fcde1595e8823a3d178dc31d9efa9b209572ee03875461289093615470192cf5c9a06cf0b4363d097a9eac201db4 SHA512 306612fc2af41ed10d76103af83e141cfd8bd3ba2ea3cbd1d0b81d4d5b0108c06948a5c626648c8a2424536757a42a3f8b9af1fb63fa3c31096447ffed0f9923
diff --git a/games-emulation/atari800/atari800-3.1.0-r1.ebuild b/games-emulation/atari800/atari800-3.1.0-r1.ebuild
deleted file mode 100644
index 559671226b0..00000000000
--- a/games-emulation/atari800/atari800-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop autotools
-
-DESCRIPTION="Atari 800 emulator"
-HOMEPAGE="https://atari800.github.io/"
-SRC_URI="https://sourceforge.net/projects/${PN}/files/${PN}/${PV}/${P}.tar.gz
- https://sourceforge.net/projects/${PN}/files/ROM/Original%20XL%20ROM/xf25.zip"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ncurses oss opengl readline +sdl +sound"
-
-NOTSDL_DEPS="
- sys-libs/ncurses:0=
- sound? (
- !oss? ( media-libs/libsdl[sound] )
- )
-"
-RDEPEND="
- sdl? ( >=media-libs/libsdl-1.2.0[opengl?,sound?,video] )
- ncurses? ( ${NOTSDL_DEPS} )
- !sdl? ( !ncurses? ( ${NOTSDL_DEPS} ) )
- readline? (
- sys-libs/readline:0=
- sys-libs/ncurses:0= )
- media-libs/libpng:0=
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- app-arch/unzip
-"
-
-src_prepare() {
- default
-
- # remove some not-so-interesting ones
- rm -f DOC/{INSTALL.*,*.in,CHANGES.OLD} || die
- sed -i \
- -e '1s/ 1 / 6 /' \
- src/atari800.man || die
- sed "s:/usr/share/games:/usr/share:" \
- "${FILESDIR}"/atari800.cfg > "${T}"/atari800.cfg || die
-
- # Bug 544608
- eapply "${FILESDIR}/${P}-tgetent-detection.patch"
- pushd src > /dev/null && eautoreconf
- popd > /dev/null
-}
-
-src_configure() {
- local video="ncurses"
- local sound=no
-
- use sdl && video="sdl"
- if use sound ; then
- if use sdl ; then
- sound=sdl
- elif use oss ; then
- sound=oss
- else
- echo
- elog "Sound requested but neither sdl nor oss specified."
- elog "Disabling sound suport."
- fi
- fi
-
- cd src && \
- econf \
- $(use_with readline) \
- --with-video=${video} \
- --with-sound=${sound}
-}
-
-src_compile() {
- emake -C src
-}
-
-src_install() {
- dobin src/atari800
- newman src/atari800.man atari800.6
- dodoc README.1ST DOC/*
- insinto "/usr/share/${PN}"
- doins "${WORKDIR}/"*.ROM
- insinto /etc
- doins "${T}"/atari800.cfg
- newicon data/atari2.svg ${PN}.svg
- make_desktop_entry ${PN} "Atari 800 emulator"
-}
diff --git a/games-emulation/atari800/files/atari800.cfg b/games-emulation/atari800/files/atari800.cfg
deleted file mode 100644
index b31c67de095..00000000000
--- a/games-emulation/atari800/files/atari800.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
-Atari 800 Emulator, Version 1.2.2
-OS/A_ROM=atariosa.rom
-OS/B_ROM=/usr/share/games/atari800/ATARIOSB.ROM
-XL/XE_ROM=/usr/share/games/atari800/ATARIXL.ROM
-BASIC_ROM=/usr/share/games/atari800/ATARIBAS.ROM
-5200_ROM=
-DISK_DIR=
-ROM_DIR=
-H1_DIR=
-H2_DIR=
-H3_DIR=
-H4_DIR=
-HD_READ_ONLY=1
-EXE_DIR=
-STATE_DIR=
-PRINT_COMMAND=lpr %s
-SCREEN_REFRESH_RATIO=1
-MACHINE_TYPE=Atari OS/B
-RAM_SIZE=48
-DEFAULT_TV_MODE=NTSC
-DISABLE_BASIC=1
-ENABLE_SIO_PATCH=1
-ENABLE_H_PATCH=1
-ENABLE_P_PATCH=1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/atari800/files/, games-emulation/atari800/
@ 2021-08-19 7:34 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2021-08-19 7:34 UTC (permalink / raw
To: gentoo-commits
commit: cedb9aa7c5f9978ffce04f0f2579e39a1c0f6064
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 19 07:30:46 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 19 07:34:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cedb9aa7
games-emulation/atari800: Update the patch to work against -p1
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
games-emulation/atari800/atari800-4.2.0-r1.ebuild | 8 +++++---
.../atari800/files/atari800-3.1.0-tgetent-detection.patch | 4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/games-emulation/atari800/atari800-4.2.0-r1.ebuild b/games-emulation/atari800/atari800-4.2.0-r1.ebuild
index a791f33ba0c..7e119486988 100644
--- a/games-emulation/atari800/atari800-4.2.0-r1.ebuild
+++ b/games-emulation/atari800/atari800-4.2.0-r1.ebuild
@@ -37,10 +37,12 @@ BDEPEND="
"
src_prepare() {
- default
+ local PATCHES=(
+ # Bug 544608
+ "${FILESDIR}"/atari800-3.1.0-tgetent-detection.patch
+ )
- # Bug 544608
- eapply -p2 "${FILESDIR}/atari800-3.1.0-tgetent-detection.patch"
+ default
eautoreconf
}
diff --git a/games-emulation/atari800/files/atari800-3.1.0-tgetent-detection.patch b/games-emulation/atari800/files/atari800-3.1.0-tgetent-detection.patch
index 018e423af6b..487577e5b1a 100644
--- a/games-emulation/atari800/files/atari800-3.1.0-tgetent-detection.patch
+++ b/games-emulation/atari800/files/atari800-3.1.0-tgetent-detection.patch
@@ -1,6 +1,6 @@
diff -ruN atari800-3.1.0/src/configure.ac new/src/configure.ac
---- atari800-3.1.0/src/configure.ac 2014-04-12 15:58:16.000000000 +0200
-+++ new/src/configure.ac 2015-03-26 23:36:24.419178078 +0100
+--- src/configure.ac 2014-04-12 15:58:16.000000000 +0200
++++ src/configure.ac 2015-03-26 23:36:24.419178078 +0100
@@ -982,7 +982,7 @@
dnl existence of the tgetent symbol in readline. If not, we search for tgetent
dnl in a few other libraries. All done with a single AC_SEARCH_LIBS statement.
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-08-19 7:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-19 7:34 [gentoo-commits] repo/gentoo:master commit in: games-emulation/atari800/files/, games-emulation/atari800/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2020-09-18 9:38 Michał Górny
2020-06-15 15:06 Michał Górny
2020-06-15 15:05 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox