[gentoo-commits] repo/gentoo:master commit in: games-arcade/conveysdl/, games-arcade/conveysdl/files/

[Ionen Wolkens]

commit: 597a59ff60bb76f6b632ffe556dec722a4ca1ee1
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Oct  7 05:40:37 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Oct  7 05:41:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=597a59ff

games-arcade/conveysdl: fix build with upcoming clang16

Closes: https://bugs.gentoo.org/871048
Signed-off-by: Ionen Wolkens  gentoo.org>

 games-arcade/conveysdl/conveysdl-1.3-r2.ebuild   | 1 +
 games-arcade/conveysdl/files/conveysdl-1.3-clang16.patch | 8 
 2 files changed, 9 insertions(+)

diff --git a/games-arcade/conveysdl/conveysdl-1.3-r2.ebuild 
b/games-arcade/conveysdl/conveysdl-1.3-r2.ebuild
index a45ec62f1a9e..54d79cf9b620 100644
--- a/games-arcade/conveysdl/conveysdl-1.3-r2.ebuild
+++ b/games-arcade/conveysdl/conveysdl-1.3-r2.ebuild
@@ -26,6 +26,7 @@ PATCHES=(
"${FILESDIR}"/${P}-arrays.patch
"${FILESDIR}"/${P}-audio.patch
"${FILESDIR}"/${P}-speed.patch
+   "${FILESDIR}"/${P}-clang16.patch
 )
 
 src_compile() {

diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-clang16.patch 
b/games-arcade/conveysdl/files/conveysdl-1.3-clang16.patch
new file mode 100644
index ..ca050433c474
--- /dev/null
+++ b/games-arcade/conveysdl/files/conveysdl-1.3-clang16.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/871048
+--- a/main.c
 b/main.c
+@@ -70,3 +70,3 @@
+ 
+-int playsound(soundnum)
++int playsound(int soundnum)
+ {

[gentoo-commits] repo/gentoo:master commit in: games-arcade/conveysdl/, games-arcade/conveysdl/files/

[Pacho Ramos]

commit: 3b63a010beb3c72650c8b9f5d694c17c35b0f4ec
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Apr 15 18:37:25 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Apr 15 19:00:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b63a010

games-arcade/conveysdl: Stop using games.eclass

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 games-arcade/conveysdl/conveysdl-1.3-r1.ebuild | 55 ++
 .../conveysdl/files/conveysdl-1.3-arrays.patch |  4 +-
 .../conveysdl/files/conveysdl-1.3-speed.patch  |  4 +-
 3 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/games-arcade/conveysdl/conveysdl-1.3-r1.ebuild 
b/games-arcade/conveysdl/conveysdl-1.3-r1.ebuild
new file mode 100644
index 000..5c39dd327ee
--- /dev/null
+++ b/games-arcade/conveysdl/conveysdl-1.3-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Guide the blob along the conveyer belt collecting the red blobs"
+HOMEPAGE="http://www.cloudsprinter.com/software/conveysdl/";
+SRC_URI="http://www.cloudsprinter.com/software/conveysdl/${P/-/.}.tar";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="media-libs/libsdl[sound,video]
+   media-libs/sdl-mixer"
+RDEPEND=${DEPEND}
+
+S="${WORKDIR}"
+
+src_prepare() {
+   default
+
+   # Incomplete readme
+   sed -i \
+   -e 's:I k:use -nosound to disable sound\n\nI k:' \
+   readme || die
+
+   sed -i \
+   -e 's:SDL_Mi:SDL_mi:' \
+   main.c || die
+
+   eapply \
+   "${FILESDIR}"/${P}-arrays.patch \
+   "${FILESDIR}"/${P}-speed.patch
+}
+
+src_compile() {
+   emake main \
+   CC="$(tc-getCC)" \
+   CFLAGS="${CFLAGS} $(sdl-config --cflags) \
+   -DDATA_PREFIX=\\\"/usr/share/${PN}/\\\" \
+   -DENABLE_SOUND" \
+   LDLIBS="-lSDL_mixer $(sdl-config --libs)"
+}
+
+src_install() {
+   newbin main ${PN}
+   insinto /usr/share/${PN}
+   doins -r gfx sounds levels
+   newicon gfx/jblob.bmp ${PN}.bmp
+   make_desktop_entry ${PN} Convey /usr/share/pixmaps/${PN}.bmp
+   einstalldocs
+}

diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch 
b/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch
index a3894e58d3d..a6286d96f14 100644
--- a/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch
+++ b/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch
@@ -1,5 +1,5 @@
 main.c.org 2010-07-28 13:16:20.552161148 +0300
-+++ main.c 2010-07-29 20:43:14.714543259 +0300
+--- a/main.c.org   2010-07-28 13:16:20.552161148 +0300
 b/main.c   2010-07-29 20:43:14.714543259 +0300
 @@ -22,7 +22,7 @@
  
  SDL_Surface *bletters;

diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch 
b/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch
index 2b5a6205650..6d6d13eb11b 100644
--- a/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch
+++ b/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch
@@ -1,5 +1,5 @@
 org/main.c 2010-07-30 10:41:21.392783010 +0300
-+++ main.c 2010-07-30 10:44:35.791690958 +0300
+--- a/main.c   2010-07-30 10:41:21.392783010 +0300
 b/main.c   2010-07-30 10:44:35.791690958 +0300
 @@ -52,6 +52,7 @@