* [gentoo-commits] repo/gentoo:master commit in: games-arcade/opensonic/, games-arcade/opensonic/files/
@ 2017-11-19 12:37 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2017-11-19 12:37 UTC (permalink / raw
To: gentoo-commits
commit: 1851f1dc035a0797acabc37c3684c3e5fa3756ed
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 12:04:00 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 12:36:51 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1851f1dc
games-arcade/opensonic: Update to EAPI 6
* Remove games.eclass
Closes: https://bugs.gentoo.org/638094
Package-Manager: Portage-2.3.14, Repoman-2.3.6
.../opensonic/files/opensonic-0.1.4-r1-cmake.patch | 4 +-
games-arcade/opensonic/opensonic-0.1.4-r2.ebuild | 50 ++++++++++++++++++++++
2 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch b/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch
index b4db7644bc9..53d76faafae 100644
--- a/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch
+++ b/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch
@@ -8,8 +8,8 @@ make paths modifiable
add rules for icon, desktop-file and game-wrapper
fix compilation for as-needed
---- CMakeLists.txt
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -35,16 +35,14 @@
MESSAGE("Using CFLAGS='${CFLAGS}'")
diff --git a/games-arcade/opensonic/opensonic-0.1.4-r2.ebuild b/games-arcade/opensonic/opensonic-0.1.4-r2.ebuild
new file mode 100644
index 00000000000..3e0e1b0c35a
--- /dev/null
+++ b/games-arcade/opensonic/opensonic-0.1.4-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+MY_PN=opensnc
+MY_P=${MY_PN}-src-${PV}
+
+DESCRIPTION="A free open-source game based on the Sonic the Hedgehog universe"
+HOMEPAGE="http://opensnc.sourceforge.net/"
+SRC_URI="https://sourceforge.net/projects/opensnc/files/Open%20Sonic/${PV}/opensnc-src-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror" # unsure about legality of graphics
+
+DEPEND="
+ media-libs/allegro:0=[X,jpeg,png,vorbis]
+ media-libs/libogg:=
+ media-libs/libpng:0=
+ media-libs/libvorbis:=
+ sys-libs/zlib:=
+ virtual/jpeg:0"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}"/${PN}-0.1.4-r1-cmake.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ -DGAME_INSTALL_DIR="${EPREFIX}"/usr/share/${PN}
+ -DGAME_FINAL_DIR="${EPREFIX}"/usr/bin
+ -DGAME_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/${PN}
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ local f
+ while IFS="" read -d $'\0' -r f; do
+ dosym ../../share/${PN}/${f##*/} \
+ /usr/$(get_libdir)/${PN}/${f##*/}
+ done < <(find "${ED%/}"/usr/share/${PN}/ -mindepth 1 -maxdepth 1 -type d -print0)
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-arcade/opensonic/, games-arcade/opensonic/files/
@ 2022-12-05 8:19 Ionen Wolkens
0 siblings, 0 replies; 2+ messages in thread
From: Ionen Wolkens @ 2022-12-05 8:19 UTC (permalink / raw
To: gentoo-commits
commit: 49a51e9b4d615263c31eb346eaeba488fbd0c7f3
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 5 07:37:15 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Dec 5 08:18:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49a51e9b
games-arcade/opensonic: EAPI7->8, fix src_uri and build w/ clang16
Closes: https://bugs.gentoo.org/873181
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../opensonic/files/opensonic-0.1.4-clang16.patch | 26 +++++++++++++
...c-0.1.4-r3.ebuild => opensonic-0.1.4-r4.ebuild} | 44 +++++++++++-----------
2 files changed, 47 insertions(+), 23 deletions(-)
diff --git a/games-arcade/opensonic/files/opensonic-0.1.4-clang16.patch b/games-arcade/opensonic/files/opensonic-0.1.4-clang16.patch
new file mode 100644
index 000000000000..f375d757eb4f
--- /dev/null
+++ b/games-arcade/opensonic/files/opensonic-0.1.4-clang16.patch
@@ -0,0 +1,26 @@
+--- a/src/core/audio.c
++++ b/src/core/audio.c
+@@ -385,3 +385,3 @@
+ */
+-void audio_init(int nomusic)
++void audio_init()
+ {
+--- a/src/entities/object_decorators/dialog_box.c
++++ b/src/entities/object_decorators/dialog_box.c
+@@ -39,3 +39,3 @@
+
+-static objectmachine_t* make_decorator(objectmachine_t *decorated_machine, const char *title, const char *message, void (*strategy)());
++static objectmachine_t* make_decorator(objectmachine_t *decorated_machine, const char *title, const char *message, void (*strategy)(objectdecorator_dialogbox_t*));
+
+@@ -60,3 +60,3 @@
+ /* private methods */
+-objectmachine_t* make_decorator(objectmachine_t *decorated_machine, const char *title, const char *message, void (*strategy)())
++objectmachine_t* make_decorator(objectmachine_t *decorated_machine, const char *title, const char *message, void (*strategy)(objectdecorator_dialogbox_t*))
+ {
+--- a/src/scenes/level.c
++++ b/src/scenes/level.c
+@@ -214,3 +214,3 @@
+ static void update_dlgbox(); /* dialog boxes */
+-static void render_dlgbox(); /* dialog boxes */
++static void render_dlgbox(v2d_t camera_position); /* dialog boxes */
+
diff --git a/games-arcade/opensonic/opensonic-0.1.4-r3.ebuild b/games-arcade/opensonic/opensonic-0.1.4-r4.ebuild
similarity index 53%
rename from games-arcade/opensonic/opensonic-0.1.4-r3.ebuild
rename to games-arcade/opensonic/opensonic-0.1.4-r4.ebuild
index 3aee65163017..ec4956a3e930 100644
--- a/games-arcade/opensonic/opensonic-0.1.4-r3.ebuild
+++ b/games-arcade/opensonic/opensonic-0.1.4-r4.ebuild
@@ -1,57 +1,55 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
DESCRIPTION="Free open-source game based on the Sonic the Hedgehog universe"
-HOMEPAGE="http://opensnc.sourceforge.net/home/index.php"
-SRC_URI="https://sourceforge.net/projects/opensnc/files/Open%20Sonic/${PV}/opensnc-src-${PV}.tar.gz
- https://github.com/t6/loggcompat/archive/4.4.2.tar.gz -> loggcompat-4.4.2.tar.gz"
+HOMEPAGE="https://opensnc.sourceforge.net/"
+SRC_URI="
+ mirror://sourceforge/project/opensnc/Open%20Sonic/${PV}/opensnc-src-${PV}.tar.gz
+ mirror+https://dev.gentoo.org/~ionen/distfiles/loggcompat-4.4.2.tar.gz"
+S="${WORKDIR}/opensnc-src-${PV}"
-LICENSE="GPL-2"
+LICENSE="GPL-2+ MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
RESTRICT="mirror" # unsure about legality of graphics
-DEPEND="
- media-libs/allegro:0=[X,jpeg,png,vorbis]
- media-libs/libogg:=
- media-libs/libpng:0=
- media-libs/libvorbis:=
- sys-libs/zlib:=
- virtual/jpeg:0"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/opensnc-src-${PV}"
+RDEPEND="
+ media-libs/allegro:0[X,jpeg,png,vorbis]
+ media-libs/libvorbis"
+DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-cmake.patch
"${FILESDIR}"/${P}-allegro-4.4.2-loggcompat.patch # bug 711542
+ "${FILESDIR}"/${P}-clang16.patch
)
src_prepare() {
mv "${WORKDIR}"/loggcompat-4.4.2 . || die
+
cmake_src_prepare
}
src_configure() {
local mycmakeargs=(
- -DGAME_INSTALL_DIR="${EPREFIX}"/usr/share/${PN}
-DGAME_FINAL_DIR="${EPREFIX}"/usr/bin
- -DGAME_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/${PN}
-DGAME_HTMLDIR="${EPREFIX}"/usr/share/doc/${PF}/html
+ -DGAME_INSTALL_DIR="${EPREFIX}"/usr/share/${PN}
+ -DGAME_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/${PN}
)
+
cmake_src_configure
}
src_install() {
cmake_src_install
- local f
- while IFS="" read -d $'\0' -r f; do
- dosym ../../share/${PN}/${f##*/} /usr/$(get_libdir)/${PN}/${f##*/}
- done < <(find "${ED}"/usr/share/${PN}/ -mindepth 1 -maxdepth 1 -type d -print0)
+ local d
+ for d in "${ED}"/usr/share/${PN}/*; do
+ dosym -r /usr/{share,$(get_libdir)}/${PN}/${d##*/}
+ done
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-05 8:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-19 12:37 [gentoo-commits] repo/gentoo:master commit in: games-arcade/opensonic/, games-arcade/opensonic/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2022-12-05 8:19 Ionen Wolkens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox