From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- games-action/xbomber/Manifest | 7 ++ games-action/xbomber/files/xbomber-101-clang.patch | 123 +++++++++++++++++++++ games-action/xbomber/files/xbomber-101-gcc4.patch | 11 ++ .../xbomber/files/xbomber-101-ldflags.patch | 15 +++ .../xbomber/files/xbomber-101-va_list.patch | 48 ++++++++ games-action/xbomber/metadata.xml | 8 ++ games-action/xbomber/xbomber-101-r1.ebuild | 47 ++++++++ 7 files changed, 259 insertions(+) create mode 100644 games-action/xbomber/Manifest create mode 100644 games-action/xbomber/files/xbomber-101-clang.patch create mode 100644 games-action/xbomber/files/xbomber-101-gcc4.patch create mode 100644 games-action/xbomber/files/xbomber-101-ldflags.patch create mode 100644 games-action/xbomber/files/xbomber-101-va_list.patch create mode 100644 games-action/xbomber/metadata.xml create mode 100644 games-action/xbomber/xbomber-101-r1.ebuild (limited to 'games-action/xbomber') diff --git a/games-action/xbomber/Manifest b/games-action/xbomber/Manifest new file mode 100644 index 000000000000..f35b2f043214 --- /dev/null +++ b/games-action/xbomber/Manifest @@ -0,0 +1,7 @@ +AUX xbomber-101-clang.patch 2141 BLAKE2B bec55e1d8fcd7d64eb152cf92afd5e8224ce084dd926651e965c03b39d8fe95aedfcbadb1737a92930b8aa713adf6a1a849d3f547b7830887fd1f3fe61ccd1aa SHA512 3954bcf1793e2acf0213861920b0831935e3c3224090c1430bd085603ea1acca59ec542df64f09b4165d06ee2f1264a3add308a2d3f472be0a7200b640d44bef +AUX xbomber-101-gcc4.patch 368 BLAKE2B d8173579f686648835424e520b6a7383c5b80be2331a9693e32323031583cd0e75757655710f3d7901a4cb09fdcf44dbc3881df98236747fca98e6584e855390 SHA512 06cfd4e13f42d6669fb96db5c207bbb035510155f9e1b0de5ab741585300e6c9afb8e9ecc0c7a326baf34527fa4af87243dada7fb86bcf0587f6cf67648ec688 +AUX xbomber-101-ldflags.patch 454 BLAKE2B a6b2b5b7f8b8987ae5765df7a1891ce6d0d5da178474ec6bb30079542d0b477c8abfa2eaf5d3fd61a9e64c96291dd00210d4288ca5ba4d8c6512f9ee60f3f90a SHA512 8fe9a9b934ab9bc624a8b18a199947b98c6abfd9e3c748a2de54b46f557710121ea0c0179ea565f57c469186afaf11e0bd0d389f42f0df346809f114ef02a109 +AUX xbomber-101-va_list.patch 904 BLAKE2B bad11c1e3ccc9cf4ac423fee8b67ce2ab2a8d4d5606e358f060661e9a7e6880792fe89fa28d75122fe47c8449111cc049ab17f3c8ca14b916f71c190a879b2ae SHA512 87a7a4c5decb5e406521b2b5401a7c9053700f026df6aee936e6d1accf0c82c2468cb6e03483d0e2f8e551685d5f2edaa35d81df23b2e42ca11a2b305748f5b1 +DIST xbomber-101.tgz 396707 BLAKE2B 15120c28a0e2e00203b2a532f88e682ed56c3a85ed463819aab88942843ed13fc83edf0f26fc06666e017c34a02daec2611e4bb11f29f0b8f3663119cf8c9116 SHA512 3f7259ad7f4bf3ec15997c187e354a5cb91cd19743003f480b4900caa2a888d977aa3d6f1e96411666bb0a971fcf17593b76fde9804bb6e1e1b0dab9d4b6abb2 +EBUILD xbomber-101-r1.ebuild 942 BLAKE2B 6392fabce0cb3b50ccae2d713b8fc99f380e66bd5f7be4cc66b52a41726c0964c612b525b1066e9f10f25a8a080727d435585b02f2e6400e3e5686c75d57c0c7 SHA512 f3f5e4f0c16f7f44fbf3bbfee1a08eb8030e30c66ec93f99d23ecb6899f83c34e1ffef4b67ecb24a8d3dbb78c591ed384cc610e163bbcb7f37e490e9831c1ac4 +MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-action/xbomber/files/xbomber-101-clang.patch b/games-action/xbomber/files/xbomber-101-clang.patch new file mode 100644 index 000000000000..1771f15abc5e --- /dev/null +++ b/games-action/xbomber/files/xbomber-101-clang.patch @@ -0,0 +1,123 @@ +--- a/bomber.c 2016-07-13 16:35:34.596802964 -0500 ++++ b/bomber.c 2016-07-13 16:40:43.110797439 -0500 +@@ -350,7 +350,7 @@ + inform1(i); + } + +-networktraffic() ++void networktraffic() + { + int i,j,k; + int length; +@@ -1252,7 +1252,7 @@ + } + } + +-addsprite(int x,int y,figure *fig) ++void addsprite(int x,int y,figure *fig) + { + sprite *sp; + if(spritesused==MAXSPRITES) return; +@@ -1262,7 +1262,7 @@ + sp->ypos=y; + sp->fig=fig; + } +-adddamage(int xpos,int ypos,int xsize,int ysize) ++void adddamage(int xpos,int ypos,int xsize,int ysize) + { + damage *dm; + if(damageused==MAXDAMAGES) return; +@@ -1375,7 +1375,7 @@ + return (y>>FRACTION)+arraystarty; + } + +-int trymove(player *pl,int dx,int dy) ++void trymove(player *pl,int dx,int dy) + { + int wx,wy; + int sx,sy; +@@ -1520,7 +1520,7 @@ + } + } + +-doplayer(player *pl) ++void doplayer(player *pl) + { + int last; + int color; +@@ -1640,7 +1640,7 @@ + 8,14,4, + }; + +-initplayers() ++void initplayers() + { + int i; + unsigned char *p; +@@ -1794,7 +1794,7 @@ + copyup(); + } + +-pulseon() ++void pulseon() + { + if(havepulse) return; + havepulse=1; +@@ -1803,7 +1803,7 @@ + thandler(0); + setitimer(ITIMER_REAL,&itval,NULL); + } +-pulseoff() ++void pulseoff() + { + if(!havepulse) return; + havepulse=0; +@@ -2235,7 +2235,7 @@ + failure(char *str,...) + { + gamemode=0; +- return; ++ return 1; + } + drawmode3() + { +@@ -2261,7 +2261,7 @@ + } + + +-domode3() ++void domode3() + { + int size; + int i,j; +@@ -2351,7 +2351,7 @@ + + gamemode=0; + } +-domode4() ++void domode4() + { + unsigned char querystr[16]; + long now; +--- a/bomber.h 2016-07-13 16:35:34.596802964 -0500 ++++ b/bomber.h 2016-07-13 16:40:26.797797731 -0500 +@@ -210,6 +210,8 @@ + extern void scrprintf(char *str, ...); + extern int textx,texty,fontxsize,fontysize; + extern void texthome(void); ++extern void adddamage(int xpos,int ypos,int xsize,int ysize); ++extern void addsprite(int x,int y,figure *fig); + + extern unsigned char field[32][32]; + extern void *info[32][32]; +--- a/sound.c 2016-07-13 16:35:34.596802964 -0500 ++++ b/sound.c 2016-07-13 16:40:57.702797177 -0500 +@@ -44,7 +44,7 @@ + + + +-soundinit(char *name) ++void soundinit(char *name) + { + int fd[2]; + char devname[256]; diff --git a/games-action/xbomber/files/xbomber-101-gcc4.patch b/games-action/xbomber/files/xbomber-101-gcc4.patch new file mode 100644 index 000000000000..0ee82d81801b --- /dev/null +++ b/games-action/xbomber/files/xbomber-101-gcc4.patch @@ -0,0 +1,11 @@ +--- a/bomber.c 2006-01-28 12:06:34.000000000 -0700 ++++ b/bomber.c 2006-01-28 12:06:46.000000000 -0700 +@@ -1699,7 +1699,7 @@ + } + void addtail(void *header,void *entry) + { +- while(((list *)header)->next) ((list *)header)=((list *)header)->next; ++ while(((list *)header)->next) header=((list *)header)->next; + ((list *)header)->next=entry; + ((list *)entry)->next=0; + } diff --git a/games-action/xbomber/files/xbomber-101-ldflags.patch b/games-action/xbomber/files/xbomber-101-ldflags.patch new file mode 100644 index 000000000000..a0bf2f89d735 --- /dev/null +++ b/games-action/xbomber/files/xbomber-101-ldflags.patch @@ -0,0 +1,15 @@ +--- a/Makefile 2010-10-19 09:17:43.000000000 +0200 ++++ b/Makefile 2010-10-19 09:18:12.000000000 +0200 +@@ -1,10 +1,8 @@ +-CFLAGS = -O3 +- + bomber: bomber.o x.o sound.o matcher +- $(CC) -o bomber bomber.o x.o sound.o -lX11 -L/usr/X11R6/lib/ ++ $(CC) $(CFLAGS) $(LDFLAGS) -o bomber bomber.o x.o sound.o -lX11 -L/usr/X11R6/lib/ + + matcher: matcher.c +- $(CC) matcher.c -o matcher ++ $(CC) $(CFLAGS) $(LDFLAGS) matcher.c -o matcher + + bomber.o: bomber.c bomber.h + diff --git a/games-action/xbomber/files/xbomber-101-va_list.patch b/games-action/xbomber/files/xbomber-101-va_list.patch new file mode 100644 index 000000000000..5a1691a65ad8 --- /dev/null +++ b/games-action/xbomber/files/xbomber-101-va_list.patch @@ -0,0 +1,48 @@ +--- a/bomber.c 2005-11-06 16:50:04.000000000 +0100 ++++ b/bomber.c 2005-11-06 16:47:35.000000000 +0100 +@@ -1,5 +1,6 @@ + #include + #include ++#include + #include + #include + #include +@@ -626,8 +627,11 @@ + void scrprintf(char *str,...) + { + char output[256],*p,*p2; ++va_list ap; + +- vsprintf(output,str,&str+1); ++ va_start(ap, str); ++ vsprintf(output,str,ap); ++ va_end(ap); + p=output; + for(;;) + { +@@ -653,8 +657,11 @@ + void bigscrprintf(char *str,...) + { + char output[256],*p,*p2; ++va_list ap; + +- vsprintf(output,str,&str+1); ++ va_start(ap, str); ++ vsprintf(output,str,ap); ++ va_end(ap); + p=output; + for(;;) + { +@@ -1873,8 +1880,11 @@ + additem(char *item,...) + { + char output[256]; ++va_list ap; + +- vsprintf(output,item,&item+1); ++ va_start(ap, item); ++ vsprintf(output,item,ap); ++ va_end(ap); + if(menunum<0) + menutitle=menuput; + else diff --git a/games-action/xbomber/metadata.xml b/games-action/xbomber/metadata.xml new file mode 100644 index 000000000000..78274e0fa550 --- /dev/null +++ b/games-action/xbomber/metadata.xml @@ -0,0 +1,8 @@ + + + + + games@gentoo.org + Gentoo Games Project + + diff --git a/games-action/xbomber/xbomber-101-r1.ebuild b/games-action/xbomber/xbomber-101-r1.ebuild new file mode 100644 index 000000000000..2757b322f5db --- /dev/null +++ b/games-action/xbomber/xbomber-101-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Bomberman clone w/multiplayer support" +HOMEPAGE="http://www.xdr.com/dash/bomber.html" +SRC_URI="http://www.xdr.com/dash/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="x11-libs/libX11" +RDEPEND="!sci-biology/emboss + ${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-va_list.patch + "${FILESDIR}"/${P}-gcc4.patch + "${FILESDIR}"/${P}-ldflags.patch + "${FILESDIR}"/${P}-clang.patch +) + +src_prepare() { + sed -i \ + -e "/^CC/d" \ + -e 's/gcc/$(CC)/g' \ + -e "s:X386:X11R6:" \ + Makefile || die + + # ${P}-ldflags.patch depends on the munged Makefile + default + + sed -i \ + -e "s:data/%s:/usr/share/${PN}/%s:" bomber.c || die + sed -i \ + -e "s:=\"data\":=\"/usr/share/${PN}\":" sound.c || die +} + +src_install() { + dobin matcher bomber + insinto /usr/share/${PN} + doins -r data/* + dodoc README Changelog +} -- cgit v1.2.3