gentoo auto-resync : 05:12:2022 - 15:06:42

3 files changed, 49 insertions, 24 deletions

diff --git a/games-arcade/opensonic/Manifest b/games-arcade/opensonic/Manifest
index 6d2fe7ca1616..e03573916bef 100644
--- a/games-arcade/opensonic/Manifest
+++ b/games-arcade/opensonic/Manifest
@@ -1,6 +1,7 @@
 AUX opensonic-0.1.4-allegro-4.4.2-loggcompat.patch 1416 BLAKE2B 1c8ff37145b488914dd94151320bd0848a3a7e367bcd0f2769c4ed13c36c93ee6d22206a6cec342eab557429ef37f42980454ad66254f35c509f97f7317a4b0b SHA512 afc96537bf04a8beab47fb6ec3c3cd25233df6c4f8f0f7ea7bbb50e7cdfbe126fae878747896a543d12297a1a7d16be42ae800989cfcf7152092fc06ad2b0ad2
+AUX opensonic-0.1.4-clang16.patch 1117 BLAKE2B 8f241e29b393cf7886db6fe0e6537b7ee4a8eb3324c1b593248f7635d494a9442dc4f1a46327a3e7e4edfe16728bdbcf98ce8fc70b30d7889fafad4e5c266ff3 SHA512 c02dd21a88d443f58dc44f193002f18d56d1ae1f07f3ed96dddb4ed8c0cc213bd7ab0dbab60a0c809af886d9501beb261b10eca8d74ce9daae6cb0718b38c5ab
 AUX opensonic-0.1.4-cmake.patch 4658 BLAKE2B 029d9d971a86ca7692aecef178de3ef35b29c409cf047e453a4e085d094b274abe07e606449174fbc40dfe7da5bad0dce519f7058020e0f1aece2f6bec34a96f SHA512 4764d967664c2c775696a4ccbfb17cf8d3051b1b96cc1f2c6314b8054059334374fca5d39153ec565f22b5716f34c4d0ff45f4c7b00500e2590437025f10fd06
 DIST loggcompat-4.4.2.tar.gz 3105 BLAKE2B 846430f7a7252ee4de168274b21c9ffd18e9ba40733aaa45def8a8a4a7a938d00ab61267712008bc599ce91d5a283ab586a4dae77c3cd33af10e2dc641b8be12 SHA512 4d704f999fc3ae3caa094a8a32d5285549c40485c7af9015dc67f832255f2d3963ae1d0db9194b101d66a168b85609ec4926b8ebb39fb7ce7986f7df40f293af
 DIST opensnc-src-0.1.4.tar.gz 10525059 BLAKE2B d5cb825512dfeb614d146e6e7ec45cc3eb56dae0f2cf6c2582e022a1e8ac54e6c87f7bee8795b0e520fa6c24433cb7a748889892cd288f122d7b885e6e91c790 SHA512 239c7b4c7f9663e4d46c54d8bdaefed8d12274b71feaf9c637feb04f3567465f265c50bf3419f4c881ae3fa48a62ab339fe8a0b005c2b080b53d54ebf1e2f29d
-EBUILD opensonic-0.1.4-r3.ebuild 1452 BLAKE2B 5a551e5809c08434fdd003fb71a36d26db03f6fbcc7f05e34dec288f61c6f9a84640b98cfa1551965495aa0d8681e013034ebd791ac7219b64226973fb27b40e SHA512 e05efcc86350804c89088c11b25fc2878d0c971d293fb48f782d8eec1838e6d7a67dd0f5ae9ec62173b44d7279b53712e79f4ac5d1baf18b1994eed49b39ab80
+EBUILD opensonic-0.1.4-r4.ebuild 1287 BLAKE2B 6d03d848fdc7c82727293fbb1c1954cdb61ce96ae4dbddabf1668fa869ebdd687aa9db1b6f0a1f0153e232ab04e24636446eedc63c1e00a2ef0519229d19b922 SHA512 a3c6a233fc9e92366ea030e713403f2835e80beddf48e95b1264f3c30e0fad544585505e4d6f08ad8869c2c4f5eb95889102412ce5e31aa538de3d6d5eb959d9
 MISC metadata.xml 331 BLAKE2B 9067032694130fcaa7f77f16cbefc053da9307e2d7c4f046c7cc1a8bea7653959d0c7d0ac7090613c2e998bd459380a55bd02253bcbcadcbc590ebdc82d64da0 SHA512 22291a8eec897ae63ecc8da06713610c5c5b26a2025c972054914fe975350566160e5bff5ae3b1ca5bbe4c95911b49787c5595d9eec57f33366f1397e8469ced
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
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
 }