commit: 9dd4d3ff586d86bfa9aac3e92bd56718ff33e25e Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Aug 11 15:22:03 2022 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Aug 11 18:44:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dd4d3ff
games-arcade/conveysdl: EAPI6->8, misc changes * use No_homepage/mirror wrt bug #680556 (no replacement known) * add missing icon * tidy patches and add bugref * convert seds to patch * use flag-o-matic and pkg-config to handle flags and add EPREFIX * install the readme (ebuild went through the trouble to modify it but didn't install it) Closes: https://bugs.gentoo.org/680556 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> games-arcade/conveysdl/Manifest | 1 + games-arcade/conveysdl/conveysdl-1.3-r1.ebuild | 55 ---------------------- games-arcade/conveysdl/conveysdl-1.3-r2.ebuild | 52 ++++++++++++++++++++ .../conveysdl/files/conveysdl-1.3-arrays.patch | 23 +++------ .../conveysdl/files/conveysdl-1.3-audio.patch | 15 ++++++ .../conveysdl/files/conveysdl-1.3-speed.patch | 39 ++++----------- 6 files changed, 83 insertions(+), 102 deletions(-) diff --git a/games-arcade/conveysdl/Manifest b/games-arcade/conveysdl/Manifest index f32988e47ccf..055890135264 100644 --- a/games-arcade/conveysdl/Manifest +++ b/games-arcade/conveysdl/Manifest @@ -1 +1,2 @@ DIST conveysdl.1.3.tar 429568 BLAKE2B 950952ad311bb51855bbd1cf3bf25b750d067db1cef8333f44ac3a96f30033f700efb9771d3050be6a3acc63c79b49fa8d64a1a11a088a777a13f21fb82a4c81 SHA512 fe6f91cdd63ae1019cb99613618e44ceeddb4080ad5e50bd8ce0abf27e057617d3658a29b2faf668cbc3b0887f1a4a05cadadb060f69d850c3d85c9e7190dd8a +DIST conveysdl.png 328 BLAKE2B a62da06757da9e103e7156a5fbda7b9a7e0381aa6d203fe4ed7e46568073eef6287a955303a227975f9e073dbab3bad990a8033200da204059887bb8078203c8 SHA512 dcf99bc5112189a5d33a183a8a6ecad3b70456a75112a3caece1d87f967fcb14279f6a2f9a47dc67967806c09b5725cb2f239c29be9370336c0f76bed4db1867 diff --git a/games-arcade/conveysdl/conveysdl-1.3-r1.ebuild b/games-arcade/conveysdl/conveysdl-1.3-r1.ebuild deleted file mode 100644 index 904ee87c07b4..000000000000 --- a/games-arcade/conveysdl/conveysdl-1.3-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# 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" -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/conveysdl-1.3-r2.ebuild b/games-arcade/conveysdl/conveysdl-1.3-r2.ebuild new file mode 100644 index 000000000000..a45ec62f1a9e --- /dev/null +++ b/games-arcade/conveysdl/conveysdl-1.3-r2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop flag-o-matic toolchain-funcs + +DESCRIPTION="Guide the blob along the conveyer belt collecting the red blobs" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"; +SRC_URI=" + mirror://gentoo/${P/-/.}.tar + https://dev.gentoo.org/~ionen/distfiles/${PN}.png"; +S="${WORKDIR}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + media-libs/libsdl[sound,video] + media-libs/sdl-mixer" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-arrays.patch + "${FILESDIR}"/${P}-audio.patch + "${FILESDIR}"/${P}-speed.patch +) + +src_compile() { + tc-export CC + + append-cppflags $($(tc-getPKG_CONFIG) --cflags sdl SDL_mixer || die) \ + -DDATA_PREFIX="'\"${EPREFIX}/usr/share/${PN}/\"'" \ + -DENABLE_SOUND + append-libs $($(tc-getPKG_CONFIG) --libs sdl SDL_mixer || die) + + emake main LDLIBS="${LIBS}" +} + +src_install() { + newbin main ${PN} + + insinto /usr/share/${PN} + doins -r gfx levels sounds + + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry ${PN} Convey + + dodoc readme +} diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch b/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch index a6286d96f145..b733159425e6 100644 --- a/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch +++ b/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch @@ -1,29 +1,18 @@ ---- 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; +https://bugs.gentoo.org/330161 +--- a/main.c ++++ b/main.c +@@ -24,3 +24,3 @@ SDL_Surface *letters[100]; -SDL_Surface *tiles[9]; +SDL_Surface *tiles[10]; SDL_Surface *btiles; - SDL_Surface *blob; - SDL_Surface *jblob; -@@ -51,7 +51,7 @@ - FILE *file_ptr; - +@@ -53,3 +53,3 @@ -int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[7],bloby[7],blobp[7],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore; +int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[8],bloby[8],blobp[8],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore; /* Keys */ - int quit = 0; - int spacebar = 0; -@@ -452,7 +452,7 @@ - static void info(void) - { +@@ -454,3 +454,3 @@ int monkey=70,munk; - char scoremonkey[10]; + char scoremonkey[16]; if (lives>1) { - for (munk=1 ; munk<lives ; munk++ ) - { diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-audio.patch b/games-arcade/conveysdl/files/conveysdl-1.3-audio.patch new file mode 100644 index 000000000000..9f76cb2dc0a9 --- /dev/null +++ b/games-arcade/conveysdl/files/conveysdl-1.3-audio.patch @@ -0,0 +1,15 @@ +Fix header and add lacking instructions to readme. +--- a/main.c ++++ b/main.c +@@ -8,3 +8,3 @@ + #ifdef ENABLE_SOUND +-#include <SDL_Mixer.h> ++#include <SDL_mixer.h> + static int soundv = 2; +--- a/readme ++++ b/readme +@@ -6,2 +6,4 @@ + ++use -nosound to disable sound ++ + I knocked this game up over a couple of days, and can't be diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch b/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch index 6d6d13eb11be..06d518597d94 100644 --- a/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch +++ b/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch @@ -1,31 +1,20 @@ ---- 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 @@ - - +https://bugs.gentoo.org/330161 +--- a/main.c ++++ b/main.c +@@ -54,2 +54,3 @@ int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[8],bloby[8],blobp[8],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore; +int realspeed; /* Keys */ - int quit = 0; - int spacebar = 0; -@@ -140,6 +141,7 @@ - char path[256],jib[50]; - int lvspx,lvspy; +@@ -142,2 +143,3 @@ bpointx=200;bpointy=400;pointx=200;pointy=400;jug=1;death=0;jump=0;jumpf=0;jug=0;blibs=0;blibo=0;die=0;speed=4; + realspeed=speed; strcpy(path, DATA_PREFIX); - sprintf(jib,"levels/level%d",level); - strcat(path, jib); -@@ -212,15 +214,16 @@ - if (jumpf==jumpoo) { jump=0; } - if (jumpf==jumpoo*2) { jumpf=0; } +@@ -214,3 +216,3 @@ } - score+=speed; + score+=realspeed; /*crap*/ - } - - static void plotfloor(void) +@@ -220,5 +222,6 @@ { + if (bpointy==400) realspeed=speed; int nob,nx,nobx=48,ek,ej,el; @@ -34,23 +23,13 @@ + bpointx-=realspeed*2; + bpointy+=realspeed; pointx=bpointx; - pointy=bpointy; - imageplot(bb, blobx[6], bloby[6] ); -@@ -542,7 +545,7 @@ - } - while ( jump_down==0 ); +@@ -544,3 +547,3 @@ leveldone=3; - speed=4; + speed=4; realspeed=speed; blankscreen(); - } - -@@ -563,7 +566,7 @@ - if (quit>0) break; - } +@@ -565,3 +568,3 @@ while ( jump_down==0 ); - speed=4; + speed=4; realspeed=speed; lives+=1; - level+=1; - getlevel();
![https://dev.gentoo.org/~ionen/distfiles/${PN}.png"](https://dev.gentoo.org/~ionen/distfiles/${PN}.png"){kind=link}