From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- games-arcade/epiar/Manifest | 18 +- games-arcade/epiar/epiar-0.5-r1.ebuild | 58 ++- games-arcade/epiar/epiar-0.5.1.ebuild | 50 +++ .../epiar/files/epiar-0.5-Makefile.linux.patch | 4 +- games-arcade/epiar/files/epiar-0.5-gcc41.patch | 4 +- games-arcade/epiar/files/epiar-0.5-paths.patch | 20 +- .../epiar/files/epiar-0.5-respect-CC.patch | 37 ++ games-arcade/epiar/files/epiar-0.5-underlink.patch | 4 +- .../epiar/files/epiar-0.5-unsilence-build.patch | 445 +++++++++++++++++++++ .../epiar/files/epiar-0.5.1-fix-bashisms.patch | 41 ++ .../epiar/files/epiar-0.5.1-unbundle-lua5.1.patch | 49 +++ games-arcade/epiar/metadata.xml | 19 +- 12 files changed, 697 insertions(+), 52 deletions(-) create mode 100644 games-arcade/epiar/epiar-0.5.1.ebuild create mode 100644 games-arcade/epiar/files/epiar-0.5-respect-CC.patch create mode 100644 games-arcade/epiar/files/epiar-0.5-unsilence-build.patch create mode 100644 games-arcade/epiar/files/epiar-0.5.1-fix-bashisms.patch create mode 100644 games-arcade/epiar/files/epiar-0.5.1-unbundle-lua5.1.patch (limited to 'games-arcade/epiar') diff --git a/games-arcade/epiar/Manifest b/games-arcade/epiar/Manifest index 21cb07e45540..1a23d18677b3 100644 --- a/games-arcade/epiar/Manifest +++ b/games-arcade/epiar/Manifest @@ -1,7 +1,13 @@ -AUX epiar-0.5-Makefile.linux.patch 682 BLAKE2B 0794a07f1f4beef8b16e8fc720930cabe3db40941be39c0ed3d1ef66b4a24bab68f9aeb6961b4a4429d4de7fc12dc395dbf7e34c7caf887aedee0cf7af94e584 SHA512 5219be09af0443a780d918306086f9c7792a9fd6e7051806c368db6808017ee9c2897b4093664f9c087e3fe987b22edeb50280f25f615cdbfcdf914c1cf4be47 -AUX epiar-0.5-gcc41.patch 332 BLAKE2B c3d34f29b2d9186d0f6ac14b14bb40e63578764f613b74bd670266dda3885c4542e48e3e95b06a668e01fccc9630a9d0e46f1918f1dda37e1e78840ca890dfb7 SHA512 29de0155e37696c1f2f66060aa6b08d01df13bcf36e2fc20a803bf664bd7a326d4ec70141376305771d2c188e67ddd32d19d5a864c3a8c9c7c5ea329a6e19060 -AUX epiar-0.5-paths.patch 2195 BLAKE2B 995f1d0a39b72be7e1e542a6e799b5d644d62cdb2ad1710f44bc73a82310c148b54113254c4502f499fceaada0aadb5944ec5d370b3ca79c72b208d6197e4c20 SHA512 4f6068f69b6f2367bbc665159f2612da86591d050e5296304b26d613c6579465c632a442251033fdb7803e6cb72c8f70e6118e8c1d43d33f0376863b91ebd037 -AUX epiar-0.5-underlink.patch 818 BLAKE2B 9ab04018e1051d905674b53154e4297be50e1954a79c28f7e70fd47381f9dcd4b452385d05dc38ad2cd117bb4b6b06d9d95727d61fdaf483f4d3940a2c8f6028 SHA512 ada142afdd3de71af454bd1a03c8c406d609deeff7a68a84b7066089761bebcb01dae8e69f7fccbd0cf4f0294789696e1181900c30f857c8b5197c24bab51b2a +AUX epiar-0.5-Makefile.linux.patch 630 BLAKE2B ff0d5db4ffaf7bcff729949850417f041656e0ad0c5de67fbcec677aa3c98ced091cff58f889d76dac48f08538dd54404b19d63e4209438ee63a2bddd2220412 SHA512 412c512c41c0858c590b6985c02725d6b0d05880ba4db720188227ac95327f0d3feb4feb77ef6bf2ce2bc595d99a341dcd048f6c0d6d1d48def9ed060548da8e +AUX epiar-0.5-gcc41.patch 260 BLAKE2B e376243f0c9b6c68e214b2dde7944c785cea339968f2e638de5db8b91d314cfe22cc7cffe10586107c8e3850448adf1208889a279bc25fbab53bd3d57ff0f74b SHA512 3c46bf77afe021d7d9c1ee3ef5c6bda3faaf4568d09873c2d39ceb593bc1b07c9cdd3739c9c00ef4cec842a189641a8c729becde5373b54ff04bdc7429fa7075 +AUX epiar-0.5-paths.patch 2215 BLAKE2B 85c4ae921c974a015e5c53e170387d10a12d3f1bd22159dccc6661ea1b7ae42538d9f095a84074e113cc8e5c9d500adffd08b2de01afa8a1100071ef6966e412 SHA512 c5c06280bdba3591e7e12b8fd57726821eaa53244418be4bcc4054ee9fcc1bf28da8ca06a9b3ef1263e8c5ab091e47927c6fe9542d7ce146857e328b5e8517b2 +AUX epiar-0.5-respect-CC.patch 814 BLAKE2B 2a2ccb2f55288796c99ae2ece44b923136ebff2988cf5042510a723e4fa0dd2cc91c7d1847ad5f5ab57d98a07dcd75ad620bb2da6cad8c142d9c202e0f1fe60a SHA512 c7100d1aa495c81a08f644d681f069f527d1d3f80ae8fee8129a3230a8bd359e83d38786db029b7a829fc2a71affa51d0fc958794070de0bd797808c70dfbd5e +AUX epiar-0.5-underlink.patch 746 BLAKE2B 43f42641e01052db79846da7915bd01769dc8532174aeb81bdba214e345140a2afe88a3f72635ea9545042bbc695a0a4210bf94ee661ef257280bf318483fcbc SHA512 bd832844b2061a9b96c4bb50184a54d08cc591f66429083354f3d88a87f0a49ac1f0db0d0f9d2184beee9f90810e1200d318fe82248212d5d86d383b12367916 +AUX epiar-0.5-unsilence-build.patch 14334 BLAKE2B bcb119fb4d69d33772267deda942b53984bf8e2dae265bca62a39cddde863f041b171e42ce193684cf37899074f3808dbd0939556857927de71033259acfb34b SHA512 eefe9b37a4115bb648fe49a134be8c7675b611bf58061db3d68c03b3e455ec38004d25363e4a735880a3f0d14219ed98966e447111b20428c8d7b590a334f9ae +AUX epiar-0.5.1-fix-bashisms.patch 1030 BLAKE2B e0e1515239d7817e2048e6ced27a9fc145105553ad29678cc5eabeafd2d8a036e671e919fd4407838869e581fc4c087cc995cce0b479f328b32670332ac9fa3a SHA512 3ce20334179a31c71474db4ed6eb3659feb101545871706fa6c9fe0a437533e0f50ebc2e23a64ba067d01264e1f6855bf84214f7fdaa08a0859a96e7885b9691 +AUX epiar-0.5.1-unbundle-lua5.1.patch 1315 BLAKE2B 1c188513e9b787fc4c331c954d454db11c408756ddf80a5664e069b833fd14bf4c77684674f14922a6d43e2e7f9f1b758339221a0db6d72a821b3e7c1000cc06 SHA512 1a7747609bdaa8f910223f349d42e60fa4bbce3c52952faf56fc262db52b014a970a68669276790e0580bc4b439f47f16eedceeb72843c2119171c8279507b7d DIST epiar-0.5.0-src.zip 8809392 BLAKE2B c29c541f5841da91d13f7ccddfa2d2175265a434ae03e2ed87a64cd5c177d7139ff2cf44ec679ec023fe783427868f0f234c6f5f49d0d52ab08be852d424ba59 SHA512 22d8655aefd3aa071de064aeeed40d8780fb32ee702e657c8b8a723c381b6825ae9b5820cf5b29991e14bc264c443d0b24f88656b4997a6270383aa080c15f3e -EBUILD epiar-0.5-r1.ebuild 1072 BLAKE2B 35e0c44ca0b32f752bbf28b0829b8007edf755d147b3f3d81c0edcb3dce59f903647b5967fffbc73f9b79cdcd5f9f3265ef227ba5650e9cfd4c212e30368c7ff SHA512 2af283cb0c0fc323257d952e80115e5f4c4a64be465789616ab3ba2b116320d5ffc31510c585f67c320531b07c9b0422b0949ed6b0c171f090061a617ad21e23 -MISC metadata.xml 823 BLAKE2B 4ad0d0b974bd58a1d1edd77eb201fa2e236eb6b7a1efee030c8f106a6a016f3ecbf3de213b162a9d0f52d0e0751c4c3905acdaab4cd2d24292c6425620f7c88b SHA512 ef154f46f533f6b255bac62dcdffb84833fee98135e714b9a6b546a9128c3d3be0e7cfe7721ce1ccf302019b414ef1edb4ba92cc43b7024be6881a3cb0d6dffb +DIST epiar-0.5.1.tar.gz 35576547 BLAKE2B 6648eeccbe86e6935f53d83e5a58aa5839dbec2f5a8c408fd4d8a95e303daa8877c001f5dd4e37a2b72b3c24df646236c850c57c1a1d000fca63177cf075c729 SHA512 ce09aaafc455f3f9721d46a1703bf110ae00041234627b2b5fb4a9489f38672d0d0600b01a65d210728a50b596a51aacddc525d50d1138a6959db421b9384c40 +EBUILD epiar-0.5-r1.ebuild 1197 BLAKE2B 4f2dc48d2b421651d2000adc4b722d3e570fba1c35aba04508f14564b40a47b23bcd2c7c34b654b8fd656aa4a2d50791e08cae2b7814f110c88632796edaa4e4 SHA512 64e732bd2e0c3ca4b5f35a1fc6e4291a0bf391a9ad9125817318572ff74e70e87472c0495de189e1bc5f185754f989c94d4959a351e0bd935286439191271cbc +EBUILD epiar-0.5.1.ebuild 873 BLAKE2B 41d337a56a03023011212bc858be0b90f7107eee990d149006e93b47dc84a6c545b47d66f27c1d0f30be7eaab3913117ad772cc43ab99ccd8c36d8bb809b8685 SHA512 29a1636387c2a6a8814bdf10c681efa147f67f4bb4e294f036d9ef7b59176a1adcce8364ce1d2f41c9a9ed9e8c4dfab08f39ccec89a81fe9e01f8a23a4691257 +MISC metadata.xml 880 BLAKE2B 4f4dda3a961b4324d6f619579c35cf846f68522deb3d3da44af4632ba2d5b425188d9290f7b6616043d55f1b13f8bb95cf2f173f57ebd96333bc2615b56c3b92 SHA512 9ac27c5206acab0ed599e47b66a57d5c2f674075d72ebda527130745774bf95a8f3c0e2acc8d6f5938f82a695bfa3e12889fa90d5b2dda0b15410bf433858bcd diff --git a/games-arcade/epiar/epiar-0.5-r1.ebuild b/games-arcade/epiar/epiar-0.5-r1.ebuild index 203d8500f903..ba57731041dd 100644 --- a/games-arcade/epiar/epiar-0.5-r1.ebuild +++ b/games-arcade/epiar/epiar-0.5-r1.ebuild @@ -1,50 +1,66 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit flag-o-matic eutils games +EAPI=7 + +inherit flag-o-matic toolchain-funcs DESCRIPTION="A space adventure/combat game" HOMEPAGE="https://sourceforge.net/projects/epiar/" SRC_URI="mirror://sourceforge/epiar/${P}.0-src.zip" +S="${WORKDIR}" LICENSE="GPL-2 LGPL-2.1" SLOT="0" KEYWORDS="~x86" -IUSE="" -RDEPEND="media-libs/libsdl[video] - media-libs/sdl-image[png]" -DEPEND="${RDEPEND} +RDEPEND=" + media-libs/libsdl[video] + media-libs/sdl-image[png] +" +DEPEND=" + ${RDEPEND} x11-libs/libX11 virtual/opengl - app-arch/unzip" +" +BDEPEND="app-arch/unzip" -S=${WORKDIR} +PATCHES=( + "${FILESDIR}"/${P}-paths.patch + "${FILESDIR}"/${P}-gcc41.patch + "${FILESDIR}"/${P}-Makefile.linux.patch + "${FILESDIR}"/${P}-underlink.patch + "${FILESDIR}"/${P}-unsilence-build.patch + "${FILESDIR}"/${P}-respect-CC.patch +) src_prepare() { + default + + append-cflags -fcommon + sed -i \ - -e "/^CFLAGS/s:-pg -g:${CFLAGS} ${LDFLAGS}:" \ + -e "/^CFLAGS/s:-pg -g:${CFLAGS} ${CPPFLAGS} ${LDFLAGS}:" \ Makefile.linux || die - epatch \ - "${FILESDIR}"/${P}-paths.patch \ - "${FILESDIR}"/${P}-gcc41.patch \ - "${FILESDIR}"/${P}-Makefile.linux.patch \ - "${FILESDIR}"/${P}-underlink.patch + sed -i \ - -e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}/:" \ + -e "s:GENTOO_DATADIR:/usr/share/${PN}/:" \ src/main.c || die } src_compile() { - emake -f Makefile.linux + emake \ + -j1 \ + -f Makefile.linux \ + CC="$(tc-getCC)" } src_install() { - dogamesbin epiar - insinto "${GAMES_DATADIR}"/${PN} + dobin epiar + + insinto /usr/share/${PN} doins -r missions *.eaf - keepdir "${GAMES_DATADIR}"/${PN}/plugins + + keepdir /usr/share/${PN}/plugins dodoc AUTHORS ChangeLog README - prepgamesdirs } diff --git a/games-arcade/epiar/epiar-0.5.1.ebuild b/games-arcade/epiar/epiar-0.5.1.ebuild new file mode 100644 index 000000000000..83ff1fd13f13 --- /dev/null +++ b/games-arcade/epiar/epiar-0.5.1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-1 ) +inherit autotools lua-single + +DESCRIPTION="A space adventure/combat game" +HOMEPAGE="https://epiar.net/" +SRC_URI="https://github.com/cthielen/Epiar/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + dev-games/physfs + dev-libs/libxml2 + media-libs/ftgl + media-libs/libsdl[video] + media-libs/sdl-image[png] + media-libs/sdl-mixer + ${LUA_DEPS} +" +DEPEND=" + ${RDEPEND} + x11-libs/libX11 + virtual/opengl +" +BDEPEND=" + app-arch/unzip + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.5.1-unbundle-lua5.1.patch + "${FILESDIR}"/${PN}-0.5.1-fix-bashisms.patch +) + +src_prepare() { + default + + # Remove bundled Lua 5.1 + rm -rf source/lua || die + + eautoreconf +} diff --git a/games-arcade/epiar/files/epiar-0.5-Makefile.linux.patch b/games-arcade/epiar/files/epiar-0.5-Makefile.linux.patch index 3086bd13ef9a..baf89abc3f9a 100644 --- a/games-arcade/epiar/files/epiar-0.5-Makefile.linux.patch +++ b/games-arcade/epiar/files/epiar-0.5-Makefile.linux.patch @@ -1,5 +1,5 @@ ---- Makefile.linux.old 2007-04-05 16:42:30 +0000 -+++ Makefile.linux 2007-04-05 16:42:47 +0000 +--- a/Makefile.linux ++++ b/Makefile.linux @@ -24,7 +24,7 @@ @echo Building Epiar 0.5.0 ... @$(CC) $(CFLAGS) -I/usr/X11R6/lib/ $(OBJS) -o epiar $(LIBS) diff --git a/games-arcade/epiar/files/epiar-0.5-gcc41.patch b/games-arcade/epiar/files/epiar-0.5-gcc41.patch index 65f08b2691d1..7bc0e28d99cf 100644 --- a/games-arcade/epiar/files/epiar-0.5-gcc41.patch +++ b/games-arcade/epiar/files/epiar-0.5-gcc41.patch @@ -1,5 +1,5 @@ ---- src/game/game.h.old 2006-04-23 22:13:36.000000000 +0200 -+++ src/game/game.h 2006-04-23 22:13:50.000000000 +0200 +--- a/src/game/game.h ++++ b/src/game/game.h @@ -2,7 +2,6 @@ #include "includes.h" diff --git a/games-arcade/epiar/files/epiar-0.5-paths.patch b/games-arcade/epiar/files/epiar-0.5-paths.patch index 41266c7272b1..0401a029e03a 100644 --- a/games-arcade/epiar/files/epiar-0.5-paths.patch +++ b/games-arcade/epiar/files/epiar-0.5-paths.patch @@ -1,5 +1,5 @@ ---- src/input/input.c -+++ src/input/input.c +--- a/src/input/input.c ++++ b/src/input/input.c @@ -240,7 +240,10 @@ * ******************************************************************************/ @@ -35,8 +35,8 @@ if (fp == NULL) { fprintf(stdout, "Could not create '~/.epiar-input.ecf' to save keybindings\n"); return; ---- src/main.c -+++ src/main.c +--- a/src/main.c ++++ b/src/main.c @@ -16,7 +16,7 @@ unsigned char view_mode = 0; int ship_to_follow = 0; @@ -55,14 +55,14 @@ init(desired_bpp); menu(); ---- src/main.h -+++ src/main.h +--- a/src/main.h ++++ b/src/main.h @@ -1,2 +1,2 @@ extern char epiar_version[6]; -extern char *game_path; +extern const char * const game_path; ---- src/system/init.c -+++ src/system/init.c +--- a/src/system/init.c ++++ b/src/system/init.c @@ -89,9 +89,6 @@ main_eaf = NULL; } @@ -73,8 +73,8 @@ if (average_loop_time == 0) average_loop_time = 18; /* in case they quit on menu */ #ifndef NDEBUG ---- src/system/path.c -+++ src/system/path.c +--- a/src/system/path.c ++++ b/src/system/path.c @@ -45,7 +45,7 @@ } #endif diff --git a/games-arcade/epiar/files/epiar-0.5-respect-CC.patch b/games-arcade/epiar/files/epiar-0.5-respect-CC.patch new file mode 100644 index 000000000000..cf2d1d866f95 --- /dev/null +++ b/games-arcade/epiar/files/epiar-0.5-respect-CC.patch @@ -0,0 +1,37 @@ +From 74b0233e06365262ca6fc9bde1cfb70051acb83c Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Tue, 6 Apr 2021 23:38:53 +0000 +Subject: [PATCH 2/2] respect CC + +--- + Makefile.linux | 2 +- + tools/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.linux b/Makefile.linux +index 903e392..aad4b49 100644 +--- a/Makefile.linux ++++ b/Makefile.linux +@@ -18,7 +18,7 @@ timer.o target.o zoom.o r_ships.o warship.o maneuvers.o gate_defender.o + + PLUGIN_OBJS= + +-CC=cc ++CC?=cc + + default: $(OBJS) + echo Building Epiar 0.5.0 ... +diff --git a/tools/Makefile b/tools/Makefile +index 8491658..a3f940d 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -1,5 +1,5 @@ + default: +- gcc -Wall main.c -o eaf_util ++ $(CC) -Wall main.c -o eaf_util + + clean: + rm -rf eaf_util +-- +2.31.1 + diff --git a/games-arcade/epiar/files/epiar-0.5-underlink.patch b/games-arcade/epiar/files/epiar-0.5-underlink.patch index 13146cb68b27..fb4669be90cb 100644 --- a/games-arcade/epiar/files/epiar-0.5-underlink.patch +++ b/games-arcade/epiar/files/epiar-0.5-underlink.patch @@ -1,5 +1,5 @@ ---- Makefile.linux.old 2011-06-22 15:15:50.000000000 +0200 -+++ Makefile.linux 2011-06-22 15:17:01.000000000 +0200 +--- a/Makefile.linux ++++ b/Makefile.linux @@ -1,6 +1,6 @@ CFLAGS=-W -Wall `sdl-config --cflags` -Isrc/ -DLINUX -DDEVEL -export-dynamic -I/usr/include/SDL -I/usr/local/include/SDL -DBLIT_METHOD_2 -DNAUDIO -O2 -march=pentium4 -pipe -mfpmath=sse -ggdb -Wl,-O1 -Wl,--as-needed diff --git a/games-arcade/epiar/files/epiar-0.5-unsilence-build.patch b/games-arcade/epiar/files/epiar-0.5-unsilence-build.patch new file mode 100644 index 000000000000..20a6d6755c8a --- /dev/null +++ b/games-arcade/epiar/files/epiar-0.5-unsilence-build.patch @@ -0,0 +1,445 @@ +From 5cc36cce65329d946140feb78f17fc3c91cc7496 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Tue, 6 Apr 2021 23:38:27 +0000 +Subject: [PATCH 1/2] unsilence build + +--- + Makefile | 20 ++--- + Makefile.linux | 218 ++++++++++++++++++++++++------------------------- + 2 files changed, 119 insertions(+), 119 deletions(-) + +diff --git a/Makefile b/Makefile +index d0aa7a8..f2c4641 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,13 +1,13 @@ + default: +- @echo "To build Epiar, please type the command that corresponds to your system:" +- @echo "" +- @echo "Linux - make -f Makefile.linux" +- @echo "FreeBSD - make -f Makefile.freebsd" +- @echo "Windows - Documentation not available yet" ++ echo "To build Epiar, please type the command that corresponds to your system:" ++ echo "" ++ echo "Linux - make -f Makefile.linux" ++ echo "FreeBSD - make -f Makefile.freebsd" ++ echo "Windows - Documentation not available yet" + + clean: +- @echo "Please specify your system:" +- @echo "" +- @echo "Linux - make -f Makefile.linux clean" +- @echo "FreeBSD - make -f Makefile.freebsd clean" +- @echo "Windows - Documentation not available yet" ++ echo "Please specify your system:" ++ echo "" ++ echo "Linux - make -f Makefile.linux clean" ++ echo "FreeBSD - make -f Makefile.freebsd clean" ++ echo "Windows - Documentation not available yet" +diff --git a/Makefile.linux b/Makefile.linux +index 40ae1ff..903e392 100644 +--- a/Makefile.linux ++++ b/Makefile.linux +@@ -21,290 +21,290 @@ PLUGIN_OBJS= + CC=cc + + default: $(OBJS) +- @echo Building Epiar 0.5.0 ... +- @$(CC) $(CFLAGS) -I/usr/X11R6/lib/ $(OBJS) -o epiar $(LIBS) +- @echo Building plugins ... +- @$(MAKE) -f Makefile.linux plugin +- @echo Epiar 0.5.0 build complete. +- @echo +- @echo Type './epiar' to play. ++ echo Building Epiar 0.5.0 ... ++ $(CC) $(CFLAGS) -I/usr/X11R6/lib/ $(OBJS) -o epiar $(LIBS) ++ echo Building plugins ... ++ $(MAKE) -f Makefile.linux plugin ++ echo Epiar 0.5.0 build complete. ++ echo ++ echo Type './epiar' to play. + + static: $(OBJS) +- @echo Building Epiar 0.5.0 and linking statically ... +- @$(CC) $(CFLAGS) -L/usr/X11R6/lib -L/opt/gnome-2.1/lib $(OBJS) -o epiar $(STATIC_LIBS) +- @echo Building plugins ... +- @$(MAKE) plugin +- @echo Epiar 0.5.0 build complete. +- @echo +- @echo Type './epiar' to play. ++ echo Building Epiar 0.5.0 and linking statically ... ++ $(CC) $(CFLAGS) -L/usr/X11R6/lib -L/opt/gnome-2.1/lib $(OBJS) -o epiar $(STATIC_LIBS) ++ echo Building plugins ... ++ $(MAKE) plugin ++ echo Epiar 0.5.0 build complete. ++ echo ++ echo Type './epiar' to play. + + clean: +- @rm -f $(OBJS) +- @rm -f plugins/*.so +- @rm -f *~ +- @rm -f src/*~ +- @rm -f src/system/*~ +- @rm -f src/system/video/*~ +- @rm -f src/audio/*~ +- @rm -f epiar ++ rm -f $(OBJS) ++ rm -f plugins/*.so ++ rm -f *~ ++ rm -f src/*~ ++ rm -f src/system/*~ ++ rm -f src/system/video/*~ ++ rm -f src/audio/*~ ++ rm -f epiar + + main.o: src/main.c +- @$(CC) $(CFLAGS) -c src/main.c ++ $(CC) $(CFLAGS) -c src/main.c + + init.o: src/system/init.c +- @$(CC) $(CFLAGS) -c src/system/init.c ++ $(CC) $(CFLAGS) -c src/system/init.c + + video.o: src/system/video/video.c +- @$(CC) $(CFLAGS) -c src/system/video/video.c ++ $(CC) $(CFLAGS) -c src/system/video/video.c + + backbuffer.o: src/system/video/backbuffer.c +- @$(CC) $(CFLAGS) -c src/system/video/backbuffer.c ++ $(CC) $(CFLAGS) -c src/system/video/backbuffer.c + + debug.o: src/system/debug.c +- @$(CC) $(CFLAGS) -c src/system/debug.c ++ $(CC) $(CFLAGS) -c src/system/debug.c + + audio.o: src/audio/audio.c +- @$(CC) $(CFLAGS) -c src/audio/audio.c ++ $(CC) $(CFLAGS) -c src/audio/audio.c + + linux_video.o: src/osdep/linux/linux_video.c +- @$(CC) $(CFLAGS) -c src/osdep/linux/linux_video.c ++ $(CC) $(CFLAGS) -c src/osdep/linux/linux_video.c + + sprite.o: src/sprite/sprite.c +- @$(CC) $(CFLAGS) -c src/sprite/sprite.c ++ $(CC) $(CFLAGS) -c src/sprite/sprite.c + + menu.o: src/menu/menu.c +- @$(CC) $(CFLAGS) -c src/menu/menu.c ++ $(CC) $(CFLAGS) -c src/menu/menu.c + + game.o: src/game/game.c +- @$(CC) $(CFLAGS) -c src/game/game.c ++ $(CC) $(CFLAGS) -c src/game/game.c + + update.o: src/game/update.c +- @$(CC) $(CFLAGS) -c src/game/update.c ++ $(CC) $(CFLAGS) -c src/game/update.c + + input.o: src/input/input.c +- @$(CC) $(CFLAGS) -c src/input/input.c ++ $(CC) $(CFLAGS) -c src/input/input.c + + rander.o: src/system/rander.c +- @$(CC) $(CFLAGS) -c src/system/rander.c ++ $(CC) $(CFLAGS) -c src/system/rander.c + + planet.o: src/sprite/planet.c src/sprite/planet.h +- @$(CC) $(CFLAGS) -c src/sprite/planet.c ++ $(CC) $(CFLAGS) -c src/sprite/planet.c + + fire.o: src/sprite/fire.c src/sprite/fire.h +- @$(CC) $(CFLAGS) -c src/sprite/fire.c ++ $(CC) $(CFLAGS) -c src/sprite/fire.c + + ai.o: src/ai/ai.c src/ai/ai.h +- @$(CC) $(CFLAGS) -c src/ai/ai.c ++ $(CC) $(CFLAGS) -c src/ai/ai.c + + linux_misc.o: src/osdep/linux/linux_misc.c src/osdep/linux/linux_misc.h +- @$(CC) $(CFLAGS) -c src/osdep/linux/linux_misc.c ++ $(CC) $(CFLAGS) -c src/osdep/linux/linux_misc.c + + flare.o: src/sprite/flare.c src/sprite/flare.h +- @$(CC) $(CFLAGS) -c src/sprite/flare.c ++ $(CC) $(CFLAGS) -c src/sprite/flare.c + + particle.o: src/sprite/particle.c src/sprite/particle.h +- @$(CC) $(CFLAGS) -c src/sprite/particle.c ++ $(CC) $(CFLAGS) -c src/sprite/particle.c + + music.o: src/audio/music.c src/audio/music.h +- @$(CC) $(CFLAGS) -c src/audio/music.c ++ $(CC) $(CFLAGS) -c src/audio/music.c + + hud.o: src/hud/hud.c src/hud/hud.h +- @$(CC) $(CFLAGS) -c src/hud/hud.c ++ $(CC) $(CFLAGS) -c src/hud/hud.c + + afont_base.o: src/system/afont_base.c src/system/afont.h +- @$(CC) $(CFLAGS) -c src/system/afont_base.c ++ $(CC) $(CFLAGS) -c src/system/afont_base.c + + afont_sdl.o: src/system/afont_sdl.c src/system/afont_sdl.h +- @$(CC) $(CFLAGS) -c src/system/afont_sdl.c ++ $(CC) $(CFLAGS) -c src/system/afont_sdl.c + + trig.o: src/system/trig.c src/system/trig.h +- @$(CC) $(CFLAGS) -c src/system/trig.c ++ $(CC) $(CFLAGS) -c src/system/trig.c + + playlist.o: src/audio/playlist.c src/audio/playlist.h +- @$(CC) $(CFLAGS) -c src/audio/playlist.c ++ $(CC) $(CFLAGS) -c src/audio/playlist.c + + options.o: src/menu/options.c src/menu/options.h +- @$(CC) $(CFLAGS) -c src/menu/options.c ++ $(CC) $(CFLAGS) -c src/menu/options.c + + save.o: src/system/save.c src/system/save.h +- @$(CC) $(CFLAGS) -c src/system/save.c ++ $(CC) $(CFLAGS) -c src/system/save.c + + land.o: src/land/land.c src/land/land.h +- @$(CC) $(CFLAGS) -c src/land/land.c ++ $(CC) $(CFLAGS) -c src/land/land.c + + land_dlg.o: src/land/land_dlg.c src/land/land_dlg.h +- @$(CC) $(CFLAGS) -c src/land/land_dlg.c ++ $(CC) $(CFLAGS) -c src/land/land_dlg.c + + math.o: src/system/math.c src/system/math.h +- @$(CC) $(CFLAGS) -c src/system/math.c ++ $(CC) $(CFLAGS) -c src/system/math.c + + status.o: src/menu/status.c src/menu/status.h +- @$(CC) $(CFLAGS) -c src/menu/status.c ++ $(CC) $(CFLAGS) -c src/menu/status.c + + shipyard.o: src/land/shipyard.c src/land/shipyard.h +- @$(CC) $(CFLAGS) -c src/land/shipyard.c ++ $(CC) $(CFLAGS) -c src/land/shipyard.c + + gui_commdlg.o: src/gui/gui_commdlg.c src/gui/gui_commdlg.h +- @$(CC) $(CFLAGS) -c src/gui/gui_commdlg.c ++ $(CC) $(CFLAGS) -c src/gui/gui_commdlg.c + + navigation.o: src/navigation/navigation.c src/navigation/navigation.h +- @$(CC) $(CFLAGS) -c src/navigation/navigation.c ++ $(CC) $(CFLAGS) -c src/navigation/navigation.c + + gate.o: src/sprite/gate.c src/sprite/gate.h +- @$(CC) $(CFLAGS) -c src/sprite/gate.c ++ $(CC) $(CFLAGS) -c src/sprite/gate.c + + comm.o: src/comm/comm.c src/comm/comm.h +- @$(CC) $(CFLAGS) -c src/comm/comm.c ++ $(CC) $(CFLAGS) -c src/comm/comm.c + + plugin.o: src/system/plugin.c src/system/plugin.h +- @$(CC) $(CFLAGS) -c src/system/plugin.c ++ $(CC) $(CFLAGS) -c src/system/plugin.c + + path.o: src/system/path.c src/system/path.h +- @$(CC) $(CFLAGS) -c src/system/path.c ++ $(CC) $(CFLAGS) -c src/system/path.c + + tutorial.o: src/tutorial/tutorial.c src/tutorial/tutorial.h +- @$(CC) $(CFLAGS) -c src/tutorial/tutorial.c ++ $(CC) $(CFLAGS) -c src/tutorial/tutorial.c + + defender.o: src/ai/defender.c src/ai/defender.h +- @$(CC) $(CFLAGS) -c src/ai/defender.c ++ $(CC) $(CFLAGS) -c src/ai/defender.c + + missions.o: src/missions/missions.c src/missions/missions.h +- @$(CC) $(CFLAGS) -c src/missions/missions.c ++ $(CC) $(CFLAGS) -c src/missions/missions.c + + trader.o: src/ai/trader.c src/ai/trader.h +- @$(CC) $(CFLAGS) -c src/ai/trader.c ++ $(CC) $(CFLAGS) -c src/ai/trader.c + + explorer.o: src/ai/explorer.c src/ai/explorer.h +- @$(CC) $(CFLAGS) -c src/ai/explorer.c ++ $(CC) $(CFLAGS) -c src/ai/explorer.c + + alliances.o: src/alliances/alliances.c src/alliances/alliances.h +- @$(CC) $(CFLAGS) -c src/alliances/alliances.c ++ $(CC) $(CFLAGS) -c src/alliances/alliances.c + + summary.o: src/land/summary.c src/land/summary.h +- @$(CC) $(CFLAGS) -c src/land/summary.c ++ $(CC) $(CFLAGS) -c src/land/summary.c + + employment.o: src/land/employment.c src/land/employment.h +- @$(CC) $(CFLAGS) -c src/land/employment.c ++ $(CC) $(CFLAGS) -c src/land/employment.c + + bar.o: src/land/bar.c src/land/bar.h +- @$(CC) $(CFLAGS) -c src/land/bar.c ++ $(CC) $(CFLAGS) -c src/land/bar.c + + track.o: src/racing/track.c src/racing/track.h +- @$(CC) $(CFLAGS) -c src/racing/track.c ++ $(CC) $(CFLAGS) -c src/racing/track.c + + model.o: src/sprite/model.c src/sprite/model.h +- @$(CC) $(CFLAGS) -c src/sprite/model.c ++ $(CC) $(CFLAGS) -c src/sprite/model.c + + force.o: src/force/force.c src/force/force.h +- @$(CC) $(CFLAGS) -c src/force/force.c ++ $(CC) $(CFLAGS) -c src/force/force.c + + weapon.o: src/sprite/weapon.c src/sprite/weapon.h +- @$(CC) $(CFLAGS) -c src/sprite/weapon.c ++ $(CC) $(CFLAGS) -c src/sprite/weapon.c + + asteroid.o: src/asteroid/asteroid.c src/asteroid/asteroid.h +- @$(CC) $(CFLAGS) -c src/asteroid/asteroid.c ++ $(CC) $(CFLAGS) -c src/asteroid/asteroid.c + + network.o: src/network/network.c src/network/network.h +- @$(CC) $(CFLAGS) -c src/network/network.c ++ $(CC) $(CFLAGS) -c src/network/network.c + + chunk.o: src/sprite/chunk.c src/sprite/chunk.h +- @$(CC) $(CFLAGS) -c src/sprite/chunk.c ++ $(CC) $(CFLAGS) -c src/sprite/chunk.c + + gui_btab.o: src/gui/gui_btab.c src/gui/gui.h +- @$(CC) $(CFLAGS) -c src/gui/gui_btab.c ++ $(CC) $(CFLAGS) -c src/gui/gui_btab.c + + gui_button.o: src/gui/gui_button.c src/gui/gui.h +- @$(CC) $(CFLAGS) -c src/gui/gui_button.c ++ $(CC) $(CFLAGS) -c src/gui/gui_button.c + + gui.o: src/gui/gui.c src/gui/gui.h +- @$(CC) $(CFLAGS) -c src/gui/gui.c ++ $(CC) $(CFLAGS) -c src/gui/gui.c + + gui_checkbox.o: src/gui/gui_checkbox.c src/gui/gui.h +- @$(CC) $(CFLAGS) -c src/gui/gui_checkbox.c ++ $(CC) $(CFLAGS) -c src/gui/gui_checkbox.c + + gui_commondlg.o: src/gui/gui_commondlg.c src/gui/gui.h +- @$(CC) $(CFLAGS) -c src/gui/gui_commondlg.c ++ $(CC) $(CFLAGS) -c src/gui/gui_commondlg.c + + gui_frame.o: src/gui/gui_frame.c src/gui/gui.h +- @$(CC) $(CFLAGS) -c src/gui/gui_frame.c ++ $(CC) $(CFLAGS) -c src/gui/gui_frame.c + + gui_image.o: src/gui/gui_image.c src/gui/gui.h +- @$(CC) $(CFLAGS) -c src/gui/gui_image.c ++ $(CC) $(CFLAGS) -c src/gui/gui_image.c + + gui_keybox.o: src/gui/gui_keybox.c +- @$(CC) $(CFLAGS) -c src/gui/gui_keybox.c ++ $(CC) $(CFLAGS) -c src/gui/gui_keybox.c + + gui_label.o: src/gui/gui_label.c src/gui/gui.h +- @$(CC) $(CFLAGS) -c src/gui/gui_label.c ++ $(CC) $(CFLAGS) -c src/gui/gui_label.c + + gui_scrollbar.o: src/gui/gui_scrollbar.c src/gui/gui.h +- @$(CC) $(CFLAGS) -c src/gui/gui_scrollbar.c ++ $(CC) $(CFLAGS) -c src/gui/gui_scrollbar.c + + gui_session.o: src/gui/gui_session.c src/gui/gui.h +- @$(CC) $(CFLAGS) -c src/gui/gui_session.c ++ $(CC) $(CFLAGS) -c src/gui/gui_session.c + + gui_tab.o: src/gui/gui_tab.c src/gui/gui.h +- @$(CC) $(CFLAGS) -c src/gui/gui_tab.c ++ $(CC) $(CFLAGS) -c src/gui/gui_tab.c + + gui_textbox.o: src/gui/gui_textbox.c src/gui/gui.h +- @$(CC) $(CFLAGS) -c src/gui/gui_textbox.c ++ $(CC) $(CFLAGS) -c src/gui/gui_textbox.c + + gui_text_entry.o: src/gui/gui_text_entry.c src/gui/gui.h +- @$(CC) $(CFLAGS) -c src/gui/gui_text_entry.c ++ $(CC) $(CFLAGS) -c src/gui/gui_text_entry.c + + gui_window.o: src/gui/gui_window.c src/gui/gui.h +- @$(CC) $(CFLAGS) -c src/gui/gui_window.c ++ $(CC) $(CFLAGS) -c src/gui/gui_window.c + + gui_listbox.o: src/gui/gui_listbox.c src/gui/gui.h +- @$(CC) $(CFLAGS) -c src/gui/gui_listbox.c ++ $(CC) $(CFLAGS) -c src/gui/gui_listbox.c + + net_sprite.o: src/network/net_sprite.c +- @$(CC) $(CFLAGS) -c src/network/net_sprite.c ++ $(CC) $(CFLAGS) -c src/network/net_sprite.c + + upgrade.o: src/sprite/upgrade.c +- @$(CC) $(CFLAGS) -c src/sprite/upgrade.c ++ $(CC) $(CFLAGS) -c src/sprite/upgrade.c + + eaf.o: src/system/eaf.c src/system/eaf.h +- @$(CC) $(CFLAGS) -c src/system/eaf.c ++ $(CC) $(CFLAGS) -c src/system/eaf.c + + scenario.o: src/game/scenario.c src/game/scenario.h +- @$(CC) $(CFLAGS) -c src/game/scenario.c ++ $(CC) $(CFLAGS) -c src/game/scenario.c + + pirate.o: src/ai/pirate.c src/ai/pirate.h +- @$(CC) $(CFLAGS) -c src/ai/pirate.c ++ $(CC) $(CFLAGS) -c src/ai/pirate.c + + outfit.o: src/outfit/outfit.c src/outfit/outfit.h +- @$(CC) $(CFLAGS) -c src/outfit/outfit.c ++ $(CC) $(CFLAGS) -c src/outfit/outfit.c + + esf.o: src/system/esf.c src/system/esf.h +- @$(CC) $(CFLAGS) -c src/system/esf.c ++ $(CC) $(CFLAGS) -c src/system/esf.c + + timer.o: src/system/timer.c src/system/timer.h +- @$(CC) $(CFLAGS) -c src/system/timer.c ++ $(CC) $(CFLAGS) -c src/system/timer.c + + font.o: src/system/font.c src/system/font.h +- @$(CC) $(CFLAGS) -c src/system/font.c ++ $(CC) $(CFLAGS) -c src/system/font.c + + target.o: src/sprite/target.c src/sprite/target.h +- @$(CC) $(CFLAGS) -c src/sprite/target.c ++ $(CC) $(CFLAGS) -c src/sprite/target.c + + zoom.o: src/system/video/zoom.c src/system/video/zoom.h +- @$(CC) $(CFLAGS) -c src/system/video/zoom.c ++ $(CC) $(CFLAGS) -c src/system/video/zoom.c + + r_ships.o: src/sprite/r_ships.c src/sprite/r_ships.h +- @$(CC) $(CFLAGS) -c src/sprite/r_ships.c ++ $(CC) $(CFLAGS) -c src/sprite/r_ships.c + + warship.o: src/ai/warship.c src/ai/warship.h +- @$(CC) $(CFLAGS) -c src/ai/warship.c ++ $(CC) $(CFLAGS) -c src/ai/warship.c + + gate_defender.o: src/ai/gate_defender.c src/ai/gate_defender.h +- @$(CC) $(CFLAGS) -c src/ai/gate_defender.c ++ $(CC) $(CFLAGS) -c src/ai/gate_defender.c + + maneuvers.o: src/ai/maneuvers.c src/ai/maneuvers.h +- @$(CC) $(CFLAGS) -c src/ai/maneuvers.c ++ $(CC) $(CFLAGS) -c src/ai/maneuvers.c + + plugin: $(PLUGIN_OBJS) +- @echo Plugins built. ++ echo Plugins built. + + plugins/radar.so: src/plugins/radar.c +- @$(CC) $(CFLAGS) $(OBJS) -shared src/plugins/radar.c -o plugins/radar.so ++ $(CC) $(CFLAGS) $(OBJS) -shared src/plugins/radar.c -o plugins/radar.so +-- +2.31.1 + diff --git a/games-arcade/epiar/files/epiar-0.5.1-fix-bashisms.patch b/games-arcade/epiar/files/epiar-0.5.1-fix-bashisms.patch new file mode 100644 index 000000000000..cc064799366a --- /dev/null +++ b/games-arcade/epiar/files/epiar-0.5.1-fix-bashisms.patch @@ -0,0 +1,41 @@ +From 99b92a9d29f61beae05227c4f10ed54c41c02b11 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Wed, 7 Apr 2021 00:29:01 +0000 +Subject: [PATCH 2/2] Fix bashisms + +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b5a70d5..4d3d598 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,13 +22,13 @@ AC_PROG_RANLIB + AC_LANG(C++) + + dnl Check for a C++ compiler +-if test "$ac_cv_prog_cxx_g" == no ++if test "$ac_cv_prog_cxx_g" = no + then + AC_MSG_ERROR([Cannot find a working C++ compiler]) + fi + + dnl Set PKG_CONFIG if necessary +-if test "$PKG_CONFIG" == "" ++if test "$PKG_CONFIG" = "" + then + PKG_CONFIG=`which pkg-config` + fi +@@ -71,7 +71,7 @@ AC_CHECK_LIB(physfs, PHYSFS_init, have_physfs_lib=yes) + if test x$have_physfs_hdr = xyes -a x$have_physfs_lib = xyes; then + enable_physfs="yes" + else +-dnl if test "$ac_cv_prog_cxx_g" == no ++dnl if test "$ac_cv_prog_cxx_g" = no + dnl then + AC_MSG_ERROR([Could not find PhysicsFS]) + dnl fi +-- +2.31.1 + diff --git a/games-arcade/epiar/files/epiar-0.5.1-unbundle-lua5.1.patch b/games-arcade/epiar/files/epiar-0.5.1-unbundle-lua5.1.patch new file mode 100644 index 000000000000..e80615e549b6 --- /dev/null +++ b/games-arcade/epiar/files/epiar-0.5.1-unbundle-lua5.1.patch @@ -0,0 +1,49 @@ +From 0ed05474a5ea50cc972fae620fd1580ed0026fca Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Wed, 7 Apr 2021 00:28:07 +0000 +Subject: [PATCH 1/2] Unbundle Lua 5.1 and dynamically link with system copy + +Signed-off-by: Sam James +--- + Makefile.am | 6 ++---- + configure.ac | 3 +++ + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 334b80e..b24ad29 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-AM_CXXFLAGS = -I$(top_srcdir)/source/ -I$(top_srcdir)/source/lua/src ++AM_CXXFLAGS = -I$(top_srcdir)/source/ $(LUA_CFLAGS) + + bin_PROGRAMS = epiar + +@@ -74,9 +74,7 @@ epiar_SOURCES = source/main.cpp \ + source/Utilities/trig.cpp \ + source/Utilities/xml.cpp + +-epiar_LDADD = source/lua/src/liblua.a +- +-SUBDIRS=source/lua ++epiar_LDADD = $(LUA_LIBS) + + include resources/Animations/Makefile.am + include resources/audio/Makefile.am +diff --git a/configure.ac b/configure.ac +index 17202ae..b5a70d5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -99,6 +99,9 @@ case "$target" in *-apple-darwin*) + LIBS="$LIBS `xml2-config --libs`" + esac + ++dnl Check for Lua 5.1 ++PKG_CHECK_MODULES([LUA], [lua5.1], [], [AC_MSG_ERROR([Could not find needed Lua 5.1])]) ++ + dnl Check for SDL + SDL_VERSION=1.2.10 + +-- +2.31.1 + diff --git a/games-arcade/epiar/metadata.xml b/games-arcade/epiar/metadata.xml index 9a42744eb0df..af9cc9c06ba0 100644 --- a/games-arcade/epiar/metadata.xml +++ b/games-arcade/epiar/metadata.xml @@ -6,16 +6,17 @@ Gentoo Games Project -Epiar is a space adventure/combat game written in C with SDL -(Simple DirectMedia Layer). It is absolutely free (released -under the General Public License v2). -In Epiar, you begin as a shuttle pilot in a galaxy generally -ruled by anarchy, with few stable governments and numerous -rebel factions. You start your adventure off doing whatever -you want, but generally trying to save up money for a new -starship, and your adventure takes off from there ... - + Epiar is a space adventure/combat game written in C with SDL + (Simple DirectMedia Layer). It is absolutely free (released + under the General Public License v2). + In Epiar, you begin as a shuttle pilot in a galaxy generally + ruled by anarchy, with few stable governments and numerous + rebel factions. You start your adventure off doing whatever + you want, but generally trying to save up money for a new + starship, and your adventure takes off from there ... + + cthielen/Epiar epiar -- cgit v1.2.3