[gentoo-commits] repo/gentoo:master commit in: games-arcade/apricots/files/, games-arcade/apricots/
commit: d5dd056a01154266b8ccd52e13caf31e0f350a4d
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Sep 22 21:43:08 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Sep 22 22:25:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5dd056a
games-arcade/apricots: drop 0.2.6-r2
Signed-off-by: Ionen Wolkens gentoo.org>
games-arcade/apricots/Manifest | 1 -
games-arcade/apricots/apricots-0.2.6-r2.ebuild | 63 -
.../apricots/files/apricots-0.2.6-freealut.patch | 65 --
.../apricots/files/apricots-0.2.6-ldflags.patch| 20 ---
4 files changed, 149 deletions(-)
diff --git a/games-arcade/apricots/Manifest b/games-arcade/apricots/Manifest
index b2b36ece927..777ad348f17 100644
--- a/games-arcade/apricots/Manifest
+++ b/games-arcade/apricots/Manifest
@@ -1,3 +1,2 @@
-DIST apricots-0.2.6.tar.gz 768568 BLAKE2B
82fa6d4be5f1a9ed86e968a4645822cbf558ea37df956d54d0f07e3260ca2e7ff561ae6ea357dabb2c35b7bfd4ff0d806dda5cf51cbb3a956ebdba52f6ef526a
SHA512
cf8a988d316382469e4b13a86315c760b702b3d490398cf2fe96f119ba743c1ff707c09228dbbf4eb601189fece708913a621b04c44e9d93162639ccbd502cf5
DIST apricots-0.2.7.tar.gz 388024 BLAKE2B
5d16cb2637580ae728aa4f1b3911801effa6c79faabf7f3a1c026de8d91aaa582c8063ae33152c44fc9878ae0f7126fdb6ab0363b562e90c7359bcfe6ac78391
SHA512
7f97759402703962f660cdf609f50bb9a4465cc727d3fd17751eb5863b0b9131d9014eab50632c1638130f7e4223c89c45c12cecbc9fe2639943def2ce80ae25
DIST apricots.png 1965 BLAKE2B
164e06ec9856273077636b347cac555cc49f5f38faffeea6f43b9032edee9dfebedce24470f70b185707ee2e467d861164a9c90c370ada5ff89d5c4854b99e7c
SHA512
5d637707d7cfa775e5f3d3416a51a39369cf0bfd9be871295ca3079530c25b893076c2cb6a6621586d67860920e079cb4f491d2c67ff13ce80e56a2cf4e5
diff --git a/games-arcade/apricots/apricots-0.2.6-r2.ebuild
b/games-arcade/apricots/apricots-0.2.6-r2.ebuild
deleted file mode 100644
index 32117603fb8..000
--- a/games-arcade/apricots/apricots-0.2.6-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-DESCRIPTION="Fly a plane around bomb/shoot the enemy. Port of Planegame from
Amiga"
-HOMEPAGE="http://www.fishies.org.uk/apricots.html;
-SRC_URI="http://www.fishies.org.uk/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
- media-libs/openal
- media-libs/freealut"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
-
- eapply "${FILESDIR}"/${P}-freealut.patch \
- "${FILESDIR}"/${P}-ldflags.patch
-
- cp admin/acinclude.m4.in acinclude.m4
-
- sed -i \
- -e
's:-DAP_PATH=\\"$prefix.*":-DAP_PATH=\\"/usr/share/${PN}/\\"":' \
- -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
- configure.in || die
- sed -i \
- -e "s:filename(AP_PATH):filename(\"/etc/${PN}/\"):" \
- ${PN}/init.cpp || die
- sed -i \
- -e "s:apricots.cfg:/etc/${PN}/apricots.cfg:" \
- README apricots.html || die
- sed -i \
- -e 's/-Wmissing-prototypes//' \
- acinclude.m4 || die
-
- mv configure.in configure.ac || die
- eautoreconf
-}
-
-src_compile() {
- emake LIBTOOL="/usr/bin/libtool"
-}
-
-src_install() {
- HTML_DOCS="apricots.html"
- einstalldocs
-
- cd ${PN}
- dobin apricots
- insinto /usr/share/${PN}
- doins *.wav *.psf *.shapes
- insinto /etc/${PN}
- doins apricots.cfg
-
- make_desktop_entry ${PN} Apricots
-}
diff --git a/games-arcade/apricots/files/apricots-0.2.6-freealut.patch
b/games-arcade/apricots/files/apricots-0.2.6-freealut.patch
deleted file mode 100644
index d2e1b27f6f3..000
--- a/games-arcade/apricots/files/apricots-0.2.6-freealut.patch
+++ /dev/null
@@ -1,65 +0,0 @@
a/apricots/apricots.cpp
-+++ b/apricots/apricots.cpp
-@@ -16,6 +16,7 @@
- int main(int, char**){
- #endif
-
-+atexit(SDL_Quit);
- // Initialize data
- gamedata g;
- init_data(g);
-
a/apricots/sampleio.cpp
-+++ b/apricots/sampleio.cpp
-@@ -74,12 +74,9 @@
- alListenerfv(AL_ORIENTATION, front );
-
- // Load in samples
-- ALvoid* data = malloc(5 * (512 * 3) * 1024);
- alGenBuffers(numsamples, samples);
-
- for (int i = 0; i < numsamples; i++){
--ALsizei freq;
--ALboolean fileok;
- // Evil OpenAL portability fix done here
- #ifdef _WIN32
- ALenum format;
-@@ -87,15 +84,12 @@
- alutLoadWAVFile(filenames[i],);
- fileok = (alGetError() == AL_NO_ERROR);
- #else
--ALsizei format;
--ALsizei trash;
--fileok = alutLoadWAV(filenames[i],);
-+ samples[i] = alutCreateBufferFromFile(filenames[i]);
- #endif
--if (!fileok){
-+if (samples[i] == AL_NONE){
- cerr << "sampleio:
[gentoo-commits] repo/gentoo:master commit in: games-arcade/apricots/
commit: 279910450ca6e2e130bf513d6ac6c8c20ce95dc4 Author: Ionen Wolkens gentoo org> AuthorDate: Sat Sep 18 03:51:09 2021 + Commit: Ionen Wolkens gentoo org> CommitDate: Sat Sep 18 04:19:03 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27991045 games-arcade/apricots: add github remote-id Signed-off-by: Ionen Wolkens gentoo.org> games-arcade/apricots/metadata.xml | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/games-arcade/apricots/metadata.xml b/games-arcade/apricots/metadata.xml index 1c3ba213c49..c470ad8c597 100644 --- a/games-arcade/apricots/metadata.xml +++ b/games-arcade/apricots/metadata.xml @@ -1,8 +1,11 @@ https://www.gentoo.org/dtd/metadata.dtd;> - - ga...@gentoo.org - Gentoo Games Project - + + ga...@gentoo.org + Gentoo Games Project + + + moggers87/apricots +
[gentoo-commits] repo/gentoo:master commit in: games-arcade/apricots/files/, games-arcade/apricots/
commit: 3c503cc09585fe79216a773176d9fe25e87e6dd7
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Sep 18 03:51:55 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Sep 18 04:20:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c503cc0
games-arcade/apricots: add 0.2.7 (new upstream)
Now using SDL2, and new ebuild.
Closes: https://bugs.gentoo.org/626524
Closes: https://bugs.gentoo.org/679038
Signed-off-by: Ionen Wolkens gentoo.org>
games-arcade/apricots/Manifest | 2 ++
games-arcade/apricots/apricots-0.2.7.ebuild| 40 ++
.../apricots/files/apricots-0.2.7-sign-undef.patch | 10 ++
3 files changed, 52 insertions(+)
diff --git a/games-arcade/apricots/Manifest b/games-arcade/apricots/Manifest
index aca5a715847..b2b36ece927 100644
--- a/games-arcade/apricots/Manifest
+++ b/games-arcade/apricots/Manifest
@@ -1 +1,3 @@
DIST apricots-0.2.6.tar.gz 768568 BLAKE2B
82fa6d4be5f1a9ed86e968a4645822cbf558ea37df956d54d0f07e3260ca2e7ff561ae6ea357dabb2c35b7bfd4ff0d806dda5cf51cbb3a956ebdba52f6ef526a
SHA512
cf8a988d316382469e4b13a86315c760b702b3d490398cf2fe96f119ba743c1ff707c09228dbbf4eb601189fece708913a621b04c44e9d93162639ccbd502cf5
+DIST apricots-0.2.7.tar.gz 388024 BLAKE2B
5d16cb2637580ae728aa4f1b3911801effa6c79faabf7f3a1c026de8d91aaa582c8063ae33152c44fc9878ae0f7126fdb6ab0363b562e90c7359bcfe6ac78391
SHA512
7f97759402703962f660cdf609f50bb9a4465cc727d3fd17751eb5863b0b9131d9014eab50632c1638130f7e4223c89c45c12cecbc9fe2639943def2ce80ae25
+DIST apricots.png 1965 BLAKE2B
164e06ec9856273077636b347cac555cc49f5f38faffeea6f43b9032edee9dfebedce24470f70b185707ee2e467d861164a9c90c370ada5ff89d5c4854b99e7c
SHA512
5d637707d7cfa775e5f3d3416a51a39369cf0bfd9be871295ca3079530c25b893076c2cb6a6621586d67860920e079cb4f491d2c67ff13ce80e56a2cf4e5
diff --git a/games-arcade/apricots/apricots-0.2.7.ebuild
b/games-arcade/apricots/apricots-0.2.7.ebuild
new file mode 100644
index 000..b7c7ed81881
--- /dev/null
+++ b/games-arcade/apricots/apricots-0.2.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Fly a plane around and bomb/shoot the enemy (port of Planegame
from Amiga)"
+HOMEPAGE="https://github.com/moggers87/apricots;
+SRC_URI="
+
https://github.com/moggers87/apricots/releases/download/v${PV}/${P}.tar.gz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}.png;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="test" # this is only static analysis / linter tests
+
+RDEPEND="
+ media-libs/freealut
+ media-libs/libsdl2[sound,video]
+ media-libs/openal"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-sign-undef.patch
+)
+
+src_install() {
+ emake DESTDIR="${D}" datadir="${ED}/usr/share" install
+ einstalldocs
+
+ insinto /etc
+ doins ${PN}/${PN}.cfg
+ rm "${ED}"/usr/share/${PN}/apricots.cfg
+
+ doicon "${DISTDIR}"/${PN}.png
+ make_desktop_entry ${PN} ${PN^}
+}
diff --git a/games-arcade/apricots/files/apricots-0.2.7-sign-undef.patch
b/games-arcade/apricots/files/apricots-0.2.7-sign-undef.patch
new file mode 100644
index 000..c1904ea9f8b
--- /dev/null
+++ b/games-arcade/apricots/files/apricots-0.2.7-sign-undef.patch
@@ -0,0 +1,10 @@
+Undefined reference to sign() when using -O1 or above.
+--- a/apricots/all.cpp
b/apricots/all.cpp
+@@ -19,5 +19,5 @@
+ // Sign function
+
+-inline int sign(int n) { return (0 < n) - (n < 0); }
++int sign(int n) { return (0 < n) - (n < 0); }
+
+ // Error message for switch statements that shouldn't ever get to default
[gentoo-commits] repo/gentoo:master commit in: games-arcade/apricots/
commit: 42fb1cae4b17b6d8e54f71b05ce685fe3be094ab
Author: Pacho Ramos gentoo org>
AuthorDate: Sun Apr 15 08:59:43 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sun Apr 15 09:11:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42fb1cae
games-arcade/apricots: Drop old
Package-Manager: Portage-2.3.28, Repoman-2.3.9
games-arcade/apricots/apricots-0.2.6-r1.ebuild | 64 --
1 file changed, 64 deletions(-)
diff --git a/games-arcade/apricots/apricots-0.2.6-r1.ebuild
b/games-arcade/apricots/apricots-0.2.6-r1.ebuild
deleted file mode 100644
index a67017a31fa..000
--- a/games-arcade/apricots/apricots-0.2.6-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils games
-
-DESCRIPTION="Fly a plane around bomb/shoot the enemy. Port of Planegame from
Amiga"
-HOMEPAGE="http://www.fishies.org.uk/apricots.html;
-SRC_URI="http://www.fishies.org.uk/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
- media-libs/openal
- media-libs/freealut"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-freealut.patch \
- "${FILESDIR}"/${P}-ldflags.patch
-
- cp admin/acinclude.m4.in acinclude.m4
-
- sed -i \
- -e
's:-DAP_PATH=\\"$prefix.*":-DAP_PATH=\\"${GAMES_DATADIR}/${PN}/\\"":'
\
- -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
- configure.in || die
- sed -i \
- -e
"s:filename(AP_PATH):filename(\"${GAMES_SYSCONFDIR}/${PN}/\"):" \
- ${PN}/init.cpp || die
- sed -i \
- -e "s:apricots.cfg:${GAMES_SYSCONFDIR}/${PN}/apricots.cfg:" \
- README apricots.html || die
- sed -i \
- -e 's/-Wmissing-prototypes//' \
- acinclude.m4 || die
- eautoreconf
-}
-
-src_compile() {
- emake LIBTOOL="/usr/bin/libtool"
-}
-
-src_install() {
- dodoc AUTHORS README TODO ChangeLog
- dohtml apricots.html
- cd ${PN}
- dogamesbin apricots
- insinto "${GAMES_DATADIR}"/${PN}
- doins *.wav *.psf *.shapes
- insinto "${GAMES_SYSCONFDIR}"/${PN}
- doins apricots.cfg
- make_desktop_entry ${PN} Apricots
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
- elog "You can change the game options by editing:"
- elog "${GAMES_SYSCONFDIR}/${PN}/apricots.cfg"
-}
[gentoo-commits] repo/gentoo:master commit in: games-arcade/apricots/, games-arcade/apricots/files/
commit: dc9b81e1766fb34331fc7064a75574268d8358ec
Author: Pacho Ramos gentoo org>
AuthorDate: Sun Apr 15 08:59:33 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sun Apr 15 09:11:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc9b81e1
games-arcade/apricots: Stop using games.eclass
Package-Manager: Portage-2.3.28, Repoman-2.3.9
games-arcade/apricots/apricots-0.2.6-r2.ebuild | 63 ++
.../apricots/files/apricots-0.2.6-freealut.patch | 12 ++---
.../apricots/files/apricots-0.2.6-ldflags.patch| 4 +-
3 files changed, 71 insertions(+), 8 deletions(-)
diff --git a/games-arcade/apricots/apricots-0.2.6-r2.ebuild
b/games-arcade/apricots/apricots-0.2.6-r2.ebuild
new file mode 100644
index 000..b0a37bd7912
--- /dev/null
+++ b/games-arcade/apricots/apricots-0.2.6-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools desktop
+
+DESCRIPTION="Fly a plane around bomb/shoot the enemy. Port of Planegame from
Amiga"
+HOMEPAGE="http://www.fishies.org.uk/apricots.html;
+SRC_URI="http://www.fishies.org.uk/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="media-libs/libsdl[sound,video]
+ media-libs/openal
+ media-libs/freealut"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+
+ eapply "${FILESDIR}"/${P}-freealut.patch \
+ "${FILESDIR}"/${P}-ldflags.patch
+
+ cp admin/acinclude.m4.in acinclude.m4
+
+ sed -i \
+ -e
's:-DAP_PATH=\\"$prefix.*":-DAP_PATH=\\"/usr/share/${PN}/\\"":' \
+ -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
+ configure.in || die
+ sed -i \
+ -e "s:filename(AP_PATH):filename(\"/etc/${PN}/\"):" \
+ ${PN}/init.cpp || die
+ sed -i \
+ -e "s:apricots.cfg:/etc/${PN}/apricots.cfg:" \
+ README apricots.html || die
+ sed -i \
+ -e 's/-Wmissing-prototypes//' \
+ acinclude.m4 || die
+
+ mv configure.in configure.ac || die
+ eautoreconf
+}
+
+src_compile() {
+ emake LIBTOOL="/usr/bin/libtool"
+}
+
+src_install() {
+ HTML_DOCS="apricots.html"
+ einstalldocs
+
+ cd ${PN}
+ dobin apricots
+ insinto /usr/share/${PN}
+ doins *.wav *.psf *.shapes
+ insinto /etc/${PN}
+ doins apricots.cfg
+
+ make_desktop_entry ${PN} Apricots
+}
diff --git a/games-arcade/apricots/files/apricots-0.2.6-freealut.patch
b/games-arcade/apricots/files/apricots-0.2.6-freealut.patch
index 4f663071340..d2e1b27f6f3 100644
--- a/games-arcade/apricots/files/apricots-0.2.6-freealut.patch
+++ b/games-arcade/apricots/files/apricots-0.2.6-freealut.patch
@@ -1,5 +1,5 @@
apricots/apricots.cpp
-+++ apricots/apricots.cpp
+--- a/apricots/apricots.cpp
b/apricots/apricots.cpp
@@ -16,6 +16,7 @@
int main(int, char**){
#endif
@@ -9,8 +9,8 @@
gamedata g;
init_data(g);
apricots/sampleio.cpp
-+++ apricots/sampleio.cpp
+--- a/apricots/sampleio.cpp
b/apricots/sampleio.cpp
@@ -74,12 +74,9 @@
alListenerfv(AL_ORIENTATION, front );
@@ -51,8 +51,8 @@
}
configure.in
-+++ configure.in
+--- a/configure.in
b/configure.in
@@ -100,7 +100,8 @@
dnl Check for OpenAL
diff --git a/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch
b/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch
index 5a2a34490b7..8a7b4a9f9a8 100644
--- a/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch
+++ b/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch
@@ -1,5 +1,5 @@
apricots/Makefile.am.old 2010-10-11 15:58:18.0 +0200
-+++ apricots/Makefile.am 2010-10-11 15:59:21.0 +0200
+--- a/apricots/Makefile.am.old 2010-10-11 15:58:18.0 +0200
b/apricots/Makefile.am 2010-10-11 15:59:21.0 +0200
@@ -4,7 +4,8 @@
## INCLUDES were found outside kdevelop specific part
