* [gentoo-commits] repo/gentoo:master commit in: games-fps/alephone/files/, games-fps/alephone/
@ 2016-01-12 7:47 Michael Sterrett
0 siblings, 0 replies; 3+ messages in thread
From: Michael Sterrett @ 2016-01-12 7:47 UTC (permalink / raw
To: gentoo-commits
commit: f7f490a237173efc6d936dce2d791a220ca452b2
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 12 07:23:19 2016 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Tue Jan 12 07:47:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7f490a2
games-fps/alephone: old
Package-Manager: portage-2.2.26
games-fps/alephone/Manifest | 1 -
games-fps/alephone/alephone-20120514.ebuild | 97 ----------------------
.../alephone/files/alephone-20120514-gcc47.patch | 11 ---
.../alephone/files/alephone-20120514-png15.patch | 11 ---
4 files changed, 120 deletions(-)
diff --git a/games-fps/alephone/Manifest b/games-fps/alephone/Manifest
index ce0458f..41da1b0 100644
--- a/games-fps/alephone/Manifest
+++ b/games-fps/alephone/Manifest
@@ -1,3 +1,2 @@
DIST AlephOne-20100424.tar.bz2 3180896 SHA256 d97089890ce99952027eaf6185baa6cb01b26c2882dfca9e68816dfe7076a5e6 SHA512 b246b662f4bf820238c09fbb6bc55289d0db0a9b5ba15ab2b91a53f93666e81583834fd8a64497074a2e270a2055de24b3be93bb56d58715f9d213b1f4c92494 WHIRLPOOL 3074f6c4ba4925b8a0f7718bdfb0d1084155421397a7604febfeae473635b970b3842152b9a3e200f2bc642790a0dc51e689aa3b18de2235d5697105060c7f93
-DIST AlephOne-20120514.tar.bz2 4716348 SHA256 6a7797af74cf3fae7f5505e64ffe57c56f7331521cb569bcc8b7d7041cb3718b SHA512 71e54341221485765b63c7c723f95e04d41c8e2cecf6bc3f885efc178f4c75fd88cdffe703c4bf41a5e7101fd8cef33797d00cd249e211b7de1b22fc639b4278 WHIRLPOOL 03ff5bd735a28a3113706f4de5837351404ddede2fabc09d45233b3bb646a9550f00cc1d30710a6f32952c452668e5f764fb427ef5495553f6c49ddcfcaef350
DIST AlephOne-20150620.tar.bz2 5031898 SHA256 c0f360dfb74a6264f95d375103a74000930cf0439ffb0464f915f5379443e133 SHA512 fb47969137b791f83b111171d7b92b3708597db294ce19fb682ce28c49edcd4cb84a6ce4dcceb6630812a8c676dfe7f39f3fb4642f40ef7086a0d6c6fdeba8df WHIRLPOOL a00150e8c28763d7d01a5d805e449247dc9ff612eb0e9f0aa2d10e7fcf17654342fa31eb5a2eeb3bc756c80cce84dd9664179977900d635e67401036c71a7c10
diff --git a/games-fps/alephone/alephone-20120514.ebuild b/games-fps/alephone/alephone-20120514.ebuild
deleted file mode 100644
index f08adb7..0000000
--- a/games-fps/alephone/alephone-20120514.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils games
-
-MY_P=AlephOne-${PV}
-DESCRIPTION="An enhanced version of the game engine from the classic Mac game, Marathon"
-HOMEPAGE="http://source.bungie.org/"
-SRC_URI="mirror://sourceforge/marathon/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="alsa mad mpeg sndfile speex truetype vorbis"
-
-RDEPEND="media-libs/sdl-net
- media-libs/sdl-image
- media-libs/libsdl[video]
- dev-libs/expat
- dev-libs/zziplib
- media-libs/libpng:0
- alsa? ( media-libs/alsa-lib )
- mad? ( media-libs/libmad )
- mpeg? ( media-libs/smpeg )
- virtual/opengl
- virtual/glu
- sndfile? ( media-libs/libsndfile )
- speex? ( media-libs/speex )
- truetype? ( media-libs/sdl-ttf )
- vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
- dev-libs/boost
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- sed "s:GAMES_DATADIR:${GAMES_DATADIR}:g" \
- "${FILESDIR}"/${PN}.sh > "${T}"/${PN}.sh \
- || die
-
- # try using the system expat - bug #251108
- sed -i \
- -e '/SUBDIRS/ s/Expat//' \
- -e 's/Expat\/libexpat.a/-lexpat/' \
- Source_Files/Makefile.am \
- || die
- sed -i \
- -e '/Expat/d' \
- configure.ac \
- || die
- rm -r Source_Files/Expat || die
-
- # for automake 1.12 compability - bug #422557
- sed -i -e 's:AC_PROG_CC:&\nAC_PROG_OBJCXX:' configure.ac || die
-
- epatch \
- "${FILESDIR}"/${P}-gcc47.patch \
- "${FILESDIR}"/${P}-png15.patch
-
- eautoreconf
-}
-
-src_configure() {
- egamesconf \
- --enable-lua \
- $(use_enable alsa) \
- $(use_enable mad) \
- $(use_enable mpeg smpeg) \
- --enable-opengl \
- $(use_enable sndfile) \
- $(use_enable speex) \
- $(use_enable truetype ttf) \
- $(use_enable vorbis)
-}
-
-src_install() {
- default
- dogamesbin "${T}"/${PN}.sh
- doman docs/${PN}.6
- dohtml docs/*.html
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
- echo
- elog "Read the docs and install the data files accordingly to play."
- echo
- elog "If you only want to install one scenario, read"
- elog "http://traxus.bungie.org/index.php/Aleph_One_install_guide#Single_scenario_3"
- elog "If you want to install multiple scenarios, read"
- elog "http://traxus.bungie.org/index.php/Aleph_One_install_guide#Multiple_scenarios_3"
- echo
-}
diff --git a/games-fps/alephone/files/alephone-20120514-gcc47.patch b/games-fps/alephone/files/alephone-20120514-gcc47.patch
deleted file mode 100644
index 0f6cac2..0000000
--- a/games-fps/alephone/files/alephone-20120514-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- AlephOne-20120514/Source_Files/Lua/lua_templates.h
-+++ AlephOne-20120514/Source_Files/Lua/lua_templates.h
-@@ -496,7 +496,7 @@
- static index_t ToIndex(lua_State *L, int index) {
- index_t to;
- if(lua_isnil(L, index)) return -1;
-- else if(_lookup(L, index, to)) return to;
-+ else if(L_LazyEnum::_lookup(L, index, to)) return to;
- else {
- std::string error;
- if(lua_isnumber(L, index) || lua_isstring(L, index))
diff --git a/games-fps/alephone/files/alephone-20120514-png15.patch b/games-fps/alephone/files/alephone-20120514-png15.patch
deleted file mode 100644
index bb99d7e..0000000
--- a/games-fps/alephone/files/alephone-20120514-png15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- AlephOne-20120514/Source_Files/RenderOther/IMG_savepng.c
-+++ AlephOne-20120514/Source_Files/RenderOther/IMG_savepng.c
-@@ -86,7 +86,7 @@ int IMG_SavePNG_RW(SDL_RWops *src, SDL_S
- goto savedone;
- }
- /* setup custom writer functions */
-- png_set_write_fn(png_ptr,(voidp)src,png_write_data,NULL);
-+ png_set_write_fn(png_ptr,(png_voidp)src,png_write_data,NULL);
-
- if (setjmp(png_jmpbuf(png_ptr))){
- SDL_SetError("Unknown error writing PNG");
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/alephone/files/, games-fps/alephone/
@ 2022-08-29 22:53 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-08-29 22:53 UTC (permalink / raw
To: gentoo-commits
commit: ec68302f8431a887377c95d166c58cb422fc3b64
Author: Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja>
AuthorDate: Sat Aug 27 09:10:38 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 22:53:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec68302f
games-fps/alephone: new package, add 9999, 20220115
Closes: https://bugs.gentoo.org/82908
Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja>
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-fps/alephone/Manifest | 1 +
games-fps/alephone/alephone-20220115.ebuild | 90 +++++++++++++++++++++++++++++
games-fps/alephone/alephone-9999.ebuild | 90 +++++++++++++++++++++++++++++
games-fps/alephone/files/alephone.sh | 28 +++++++++
games-fps/alephone/metadata.xml | 17 ++++++
5 files changed, 226 insertions(+)
diff --git a/games-fps/alephone/Manifest b/games-fps/alephone/Manifest
new file mode 100644
index 000000000000..56cfbda795a6
--- /dev/null
+++ b/games-fps/alephone/Manifest
@@ -0,0 +1 @@
+DIST release-20220115.tar.gz 6487243 BLAKE2B 7c304d28e826e2b3b32427661d3e85ff5ec41e6200d98468edeb5ea11a751fbbd333b72e3efe0937bc496088e36560351f810a6471d92cb684b0bf6adceabf68 SHA512 53d9c602af58f56b5236ca9a539ffac47abe8350b3d228345348e63648a5ef343335be9b0a3366a201807b3e3aa013dc360a38c3e7b47f4a6da2a696ec6ea646
diff --git a/games-fps/alephone/alephone-20220115.ebuild b/games-fps/alephone/alephone-20220115.ebuild
new file mode 100644
index 000000000000..9bddbbc0d931
--- /dev/null
+++ b/games-fps/alephone/alephone-20220115.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools optfeature prefix xdg
+
+DESCRIPTION="An enhanced version of the game engine from the classic Mac game, Marathon"
+HOMEPAGE="http://source.bungie.org/"
+if [[ ${PV} = 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/Aleph-One-Marathon/alephone/"
+ EGIT_SUBMODULES=() # Upstream includes game data as submodules, we only want the engine
+else
+ SRC_URI="https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-${PV}.tar.gz"
+ S="${WORKDIR}/${PN}-release-${PV}"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+ BitstreamVera OFL-1.1"
+SLOT="0"
+
+IUSE="alsa curl speex upnp"
+
+# ffmpeg covers most audio/video use cases and the package doesn't configure with alternatives enabled (media-libs/smpeg)
+# When resolved upstream, !ffmpeg ( media-libs/libmad media-libs/libsndfile media-libs/libvorbis media-libs/smpeg )
+# with an appropriate REQUIRED_USE may be added.
+# See https://github.com/Aleph-One-Marathon/alephone/issues/85
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/zziplib:=
+ media-libs/libpng
+ media-libs/libsdl2
+ media-libs/sdl2-image[png]
+ media-libs/sdl2-net
+ media-libs/sdl2-ttf
+ media-video/ffmpeg:=[mp3,vorbis]
+ sys-libs/zlib
+ virtual/opengl
+ virtual/glu
+ alsa? ( media-libs/alsa-lib )
+ curl? ( net-misc/curl )
+ speex? ( media-libs/speex )
+ upnp? ( net-libs/miniupnpc )
+"
+
+DEPEND="
+ ${RDEPEND}
+"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-lua \
+ --enable-opengl \
+ --with-ffmpeg \
+ --without-mad \
+ --without-smpeg \
+ --without-sndfile \
+ --without-vorbis \
+ $(use_with alsa) \
+ $(use_with curl) \
+ $(use_with speex) \
+ $(use_with upnp miniupnpc)
+}
+
+src_install() {
+ default
+ prefixify_ro "${FILESDIR}"/${PN}.sh
+ dobin "${T}"/${PN}.sh
+ doman docs/${PN}.6
+ docinto html/
+ dodoc docs/*.html
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ optfeature_header "Install game data:"
+ optfeature "Marathon data files" games-fps/alephone-marathon
+ optfeature "Marathon 2 Durandal data files" games-fps/alephone-durandal
+ optfeature "Marathon: Infinity data files" games-fps/alephone-infinity
+}
diff --git a/games-fps/alephone/alephone-9999.ebuild b/games-fps/alephone/alephone-9999.ebuild
new file mode 100644
index 000000000000..9bddbbc0d931
--- /dev/null
+++ b/games-fps/alephone/alephone-9999.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools optfeature prefix xdg
+
+DESCRIPTION="An enhanced version of the game engine from the classic Mac game, Marathon"
+HOMEPAGE="http://source.bungie.org/"
+if [[ ${PV} = 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/Aleph-One-Marathon/alephone/"
+ EGIT_SUBMODULES=() # Upstream includes game data as submodules, we only want the engine
+else
+ SRC_URI="https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-${PV}.tar.gz"
+ S="${WORKDIR}/${PN}-release-${PV}"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+ BitstreamVera OFL-1.1"
+SLOT="0"
+
+IUSE="alsa curl speex upnp"
+
+# ffmpeg covers most audio/video use cases and the package doesn't configure with alternatives enabled (media-libs/smpeg)
+# When resolved upstream, !ffmpeg ( media-libs/libmad media-libs/libsndfile media-libs/libvorbis media-libs/smpeg )
+# with an appropriate REQUIRED_USE may be added.
+# See https://github.com/Aleph-One-Marathon/alephone/issues/85
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/zziplib:=
+ media-libs/libpng
+ media-libs/libsdl2
+ media-libs/sdl2-image[png]
+ media-libs/sdl2-net
+ media-libs/sdl2-ttf
+ media-video/ffmpeg:=[mp3,vorbis]
+ sys-libs/zlib
+ virtual/opengl
+ virtual/glu
+ alsa? ( media-libs/alsa-lib )
+ curl? ( net-misc/curl )
+ speex? ( media-libs/speex )
+ upnp? ( net-libs/miniupnpc )
+"
+
+DEPEND="
+ ${RDEPEND}
+"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-lua \
+ --enable-opengl \
+ --with-ffmpeg \
+ --without-mad \
+ --without-smpeg \
+ --without-sndfile \
+ --without-vorbis \
+ $(use_with alsa) \
+ $(use_with curl) \
+ $(use_with speex) \
+ $(use_with upnp miniupnpc)
+}
+
+src_install() {
+ default
+ prefixify_ro "${FILESDIR}"/${PN}.sh
+ dobin "${T}"/${PN}.sh
+ doman docs/${PN}.6
+ docinto html/
+ dodoc docs/*.html
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ optfeature_header "Install game data:"
+ optfeature "Marathon data files" games-fps/alephone-marathon
+ optfeature "Marathon 2 Durandal data files" games-fps/alephone-durandal
+ optfeature "Marathon: Infinity data files" games-fps/alephone-infinity
+}
diff --git a/games-fps/alephone/files/alephone.sh b/games-fps/alephone/files/alephone.sh
new file mode 100644
index 000000000000..3bb51c26b67c
--- /dev/null
+++ b/games-fps/alephone/files/alephone.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+DIR=$(dirname "${0}")
+CMD=$(basename "${0}")
+ALEPHONE=${CMD%%.sh}
+
+if [[ -z "${1}" ]]
+then
+ echo "Usage: ${0} SCENARIO FLAGS"
+ echo "Where SCENARIO is one of:"
+ for d in @GENTOO_PORTAGE_EPREFIX@/usr/share/alephone-*
+ do
+ echo " ${d##*/alephone-}"
+ done
+ exit 2
+fi
+
+DATA="@GENTOO_PORTAGE_EPREFIX@/usr/share/alephone-${1}"
+
+shift
+
+# kill ARTS, because we're just that nice
+if artsshell terminate 2> /dev/null
+then
+ sleep 2
+fi
+
+"${DIR}"/"${ALEPHONE}" "$@" "${DATA}"
diff --git a/games-fps/alephone/metadata.xml b/games-fps/alephone/metadata.xml
new file mode 100644
index 000000000000..62d4b84ac671
--- /dev/null
+++ b/games-fps/alephone/metadata.xml
@@ -0,0 +1,17 @@
+<?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" proxied="yes">
+ <email>Matt.Jolly@footclan.ninja</email>
+ <name>Matt Jolly</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Aleph-One-Marathon/alephone</remote-id>
+ <remote-id type="sourceforge">marathon</remote-id>
+ <bugs-to>https://github.com/Aleph-One-Marathon/alephone/issues</bugs-to>
+ </upstream>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/alephone/files/, games-fps/alephone/
@ 2024-09-24 6:31 Matt Jolly
0 siblings, 0 replies; 3+ messages in thread
From: Matt Jolly @ 2024-09-24 6:31 UTC (permalink / raw
To: gentoo-commits
commit: 92ad3787af656bf88a15ecf9044393d63491a552
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 24 04:54:26 2024 +0000
Commit: Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Tue Sep 24 06:30:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92ad3787
games-fps/alephone: add 20240822; update live
- major upstream build system changes and simplifications.
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
games-fps/alephone/Manifest | 1 +
...ne-99999999.ebuild => alephone-20240822.ebuild} | 43 ++++------
games-fps/alephone/alephone-99999999.ebuild | 43 ++++------
.../alephone/files/alephone-20230119-c99.patch | 99 ----------------------
4 files changed, 31 insertions(+), 155 deletions(-)
diff --git a/games-fps/alephone/Manifest b/games-fps/alephone/Manifest
index 24554b54aee2..3455461e77e5 100644
--- a/games-fps/alephone/Manifest
+++ b/games-fps/alephone/Manifest
@@ -1 +1,2 @@
+DIST alephone-20240822.tar.gz 9146694 BLAKE2B 236997765085c520b90399cffba04a5edeb54810e1d0b614ded183addf7520727b6750971cdc70215e211547514209b01c7e515c4e1e7296e18c99c1a79ff958 SHA512 e00dbc4cb84c40c666554114c47f3eff59ab6fbc101d45d20ae510d9cc2ef1d75300f2554f61396939d030d1fd5ff237b512c6e34ae779523b93e206368bec3d
DIST release-20230119.tar.gz 6968352 BLAKE2B 06bc87b4c2bc6a311ee90f854f7c35fb4da2862c417b192a4364dbd38cac9c0c02c4439abf07e6bc7c2d68899fae4dd938464896039943f1fa6ae5a4a644260f SHA512 d1ede53c20a24b74f5525e2e8c09fdbbb05fa0262bbd8f6c1abe6c3698cdfd1dea2436487ec8f64c79a7e1f150367e40ea48838f8a42031b45c0b1498a0e77d1
diff --git a/games-fps/alephone/alephone-99999999.ebuild b/games-fps/alephone/alephone-20240822.ebuild
similarity index 66%
copy from games-fps/alephone/alephone-99999999.ebuild
copy to games-fps/alephone/alephone-20240822.ebuild
index 9a32dc2729ec..7219486b5808 100644
--- a/games-fps/alephone/alephone-99999999.ebuild
+++ b/games-fps/alephone/alephone-20240822.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="https://github.com/Aleph-One-Marathon/alephone/"
EGIT_SUBMODULES=() # Upstream includes game data as submodules, we only want the engine
else
- SRC_URI="https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-${PV}.tar.gz"
+ SRC_URI="https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-release-${PV}"
KEYWORDS="~amd64"
fi
@@ -20,19 +20,15 @@ fi
LICENSE="GPL-3+ BitstreamVera OFL-1.1"
SLOT="0"
-IUSE="alsa curl speex upnp"
+IUSE="curl upnp"
-# ffmpeg covers most audio/video use cases and the package doesn't configure
-# with alternatives enabled (media-libs/smpeg)
-# When resolved upstream,
-# !ffmpeg ( media-libs/libmad media-libs/libsndfile media-libs/libvorbis media-libs/smpeg )
-# with an appropriate REQUIRED_USE may be added.
-# See https://github.com/Aleph-One-Marathon/alephone/issues/85
RDEPEND="
dev-libs/boost:=
dev-libs/zziplib:=
+ media-libs/openal
media-libs/libpng
media-libs/libsdl2
+ media-libs/libsndfile
media-libs/sdl2-image[png]
media-libs/sdl2-net
media-libs/sdl2-ttf
@@ -40,12 +36,7 @@ RDEPEND="
sys-libs/zlib
virtual/opengl
virtual/glu
- alsa? ( media-libs/alsa-lib )
curl? ( net-misc/curl )
- speex? (
- media-libs/speex
- media-libs/speexdsp
- )
upnp? ( net-libs/miniupnpc )
"
@@ -63,23 +54,19 @@ src_prepare() {
}
src_configure() {
- # -Werror=odr
- # https://bugs.gentoo.org/873298
- # https://github.com/Aleph-One-Marathon/alephone/issues/475
+ # With LTO enabled enemies are not visible
+ # https://github.com/Aleph-One-Marathon/alephone/issues/518
filter-lto
-
- econf \
- --enable-lua \
- --enable-opengl \
- --with-ffmpeg \
- --without-mad \
- --without-smpeg \
- --without-sndfile \
- --without-vorbis \
- $(use_with alsa) \
- $(use_with curl) \
- $(use_with speex) \
+ my_econf=(
+ --enable-opengl
+ --with-ffmpeg
+ --with-png
+ --with-sdl_image
+ --with-zzip
+ $(use_with curl)
$(use_with upnp miniupnpc)
+ )
+ econf "${my_econf[@]}"
}
src_compile() {
diff --git a/games-fps/alephone/alephone-99999999.ebuild b/games-fps/alephone/alephone-99999999.ebuild
index 9a32dc2729ec..7219486b5808 100644
--- a/games-fps/alephone/alephone-99999999.ebuild
+++ b/games-fps/alephone/alephone-99999999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="https://github.com/Aleph-One-Marathon/alephone/"
EGIT_SUBMODULES=() # Upstream includes game data as submodules, we only want the engine
else
- SRC_URI="https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-${PV}.tar.gz"
+ SRC_URI="https://github.com/Aleph-One-Marathon/alephone/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-release-${PV}"
KEYWORDS="~amd64"
fi
@@ -20,19 +20,15 @@ fi
LICENSE="GPL-3+ BitstreamVera OFL-1.1"
SLOT="0"
-IUSE="alsa curl speex upnp"
+IUSE="curl upnp"
-# ffmpeg covers most audio/video use cases and the package doesn't configure
-# with alternatives enabled (media-libs/smpeg)
-# When resolved upstream,
-# !ffmpeg ( media-libs/libmad media-libs/libsndfile media-libs/libvorbis media-libs/smpeg )
-# with an appropriate REQUIRED_USE may be added.
-# See https://github.com/Aleph-One-Marathon/alephone/issues/85
RDEPEND="
dev-libs/boost:=
dev-libs/zziplib:=
+ media-libs/openal
media-libs/libpng
media-libs/libsdl2
+ media-libs/libsndfile
media-libs/sdl2-image[png]
media-libs/sdl2-net
media-libs/sdl2-ttf
@@ -40,12 +36,7 @@ RDEPEND="
sys-libs/zlib
virtual/opengl
virtual/glu
- alsa? ( media-libs/alsa-lib )
curl? ( net-misc/curl )
- speex? (
- media-libs/speex
- media-libs/speexdsp
- )
upnp? ( net-libs/miniupnpc )
"
@@ -63,23 +54,19 @@ src_prepare() {
}
src_configure() {
- # -Werror=odr
- # https://bugs.gentoo.org/873298
- # https://github.com/Aleph-One-Marathon/alephone/issues/475
+ # With LTO enabled enemies are not visible
+ # https://github.com/Aleph-One-Marathon/alephone/issues/518
filter-lto
-
- econf \
- --enable-lua \
- --enable-opengl \
- --with-ffmpeg \
- --without-mad \
- --without-smpeg \
- --without-sndfile \
- --without-vorbis \
- $(use_with alsa) \
- $(use_with curl) \
- $(use_with speex) \
+ my_econf=(
+ --enable-opengl
+ --with-ffmpeg
+ --with-png
+ --with-sdl_image
+ --with-zzip
+ $(use_with curl)
$(use_with upnp miniupnpc)
+ )
+ econf "${my_econf[@]}"
}
src_compile() {
diff --git a/games-fps/alephone/files/alephone-20230119-c99.patch b/games-fps/alephone/files/alephone-20230119-c99.patch
deleted file mode 100644
index 7340e1fb2be0..000000000000
--- a/games-fps/alephone/files/alephone-20230119-c99.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-https://github.com/Aleph-One-Marathon/alephone/pull/405
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Sat, 28 Jan 2023 18:03:51 +1100
-Subject: [PATCH] use designated initialisers for SDL_ffmpegCodec*
-
-These were failing to compile under clang16 as the old `audioBitrate`
-was being jammed into `crf`, causing an incompatible integer conversion.
---- a/Source_Files/FFmpeg/SDL_ffmpeg.c
-+++ b/Source_Files/FFmpeg/SDL_ffmpeg.c
-@@ -155,41 +155,55 @@ int SDL_ffmpegDecodeVideoFrame( SDL_ffmpegFile*, AVPacket*, SDL_ffmpegVideoFrame
-
- const SDL_ffmpegCodec SDL_ffmpegCodecAUTO =
- {
-- -1,
-- 720, 576,
-- 1, 25,
-- 6000000,
-- -1, -1,
-- -1,
-- 2, 48000,
-- 192000,
-- -1, -1
-+ .videoCodecID=-1,
-+ .width=720,
-+ .height=576,
-+ .framerateNum=1,
-+ .framerateDen=25,
-+ .videoBitrate=6000000,
-+ .videoMinRate=-1,
-+ .videoMaxRate=-1,
-+ .audioCodecID=-1,
-+ .channels=2,
-+ .sampleRate=48000,
-+ .cpuCount=-1,
-+ .audioQuality=-1
- };
-
-+
-+
- const SDL_ffmpegCodec SDL_ffmpegCodecPALDVD =
- {
-- AV_CODEC_ID_MPEG2VIDEO,
-- 720, 576,
-- 1, 25,
-- 6000000,
-- -1, -1,
-- AV_CODEC_ID_MP2,
-- 2, 48000,
-- 192000,
-- -1, -1
-+ .videoCodecID=AV_CODEC_ID_MPEG2VIDEO,
-+ .width=720,
-+ .height=576,
-+ .framerateNum=1,
-+ .framerateDen=25,
-+ .videoBitrate=6000000,
-+ .videoMinRate=-1,
-+ .videoMaxRate=-1,
-+ .audioCodecID=AV_CODEC_ID_MP2,
-+ .channels=2,
-+ .sampleRate=48000,
-+ .cpuCount=-1,
-+ .audioQuality=-1
- };
-
- const SDL_ffmpegCodec SDL_ffmpegCodecPALDV =
- {
-- AV_CODEC_ID_DVVIDEO,
-- 720, 576,
-- 1, 25,
-- 6553600,
-- -1, -1,
-- AV_CODEC_ID_DVAUDIO,
-- 2, 48000,
-- 256000,
-- -1, -1
-+ .videoCodecID=AV_CODEC_ID_DVVIDEO,
-+ .width=720,
-+ .height=576,
-+ .framerateNum=1,
-+ .framerateDen=25,
-+ .videoBitrate=6553600,
-+ .videoMinRate=-1,
-+ .videoMaxRate=-1,
-+ .audioCodecID=AV_CODEC_ID_DVAUDIO,
-+ .channels=2,
-+ .sampleRate=48000,
-+ .cpuCount=-1,
-+ .audioQuality=-1
- };
-
- SDL_ffmpegFile* SDL_ffmpegCreateFile()
-@@ -2269,4 +2283,4 @@ int SDL_ffmpegDecodeVideoFrame( SDL_ffmpegFile* file, AVPacket *pack, SDL_ffmpeg
- /**
- \endcond
- */
--#endif
-\ No newline at end of file
-+#endif
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-09-24 6:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-29 22:53 [gentoo-commits] repo/gentoo:master commit in: games-fps/alephone/files/, games-fps/alephone/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-09-24 6:31 Matt Jolly
2016-01-12 7:47 Michael Sterrett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox