From 2018227e9344edb9da15fc6a4a8298086cc2aa77 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 2 Jun 2019 21:45:28 +0100 Subject: gentoo resync : 02.06.2019 --- games-rpg/eternal-lands/Manifest | 7 +- .../eternal-lands/eternal-lands-1.9.5.3.ebuild | 76 ++++++++++++++++++ games-rpg/eternal-lands/files/el-wrapper | 53 +++++++++++++ .../files/eternal-lands-1.9.5.3-build.patch | 70 +++++++++++++++++ .../files/eternal-lands-1.9.5.3-minizip.patch | 90 ++++++++++++++++++++++ games-rpg/eternal-lands/metadata.xml | 6 +- 6 files changed, 296 insertions(+), 6 deletions(-) create mode 100644 games-rpg/eternal-lands/eternal-lands-1.9.5.3.ebuild create mode 100644 games-rpg/eternal-lands/files/el-wrapper create mode 100644 games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-build.patch create mode 100644 games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-minizip.patch (limited to 'games-rpg/eternal-lands') diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest index 2773c00f1671..6998c43be05a 100644 --- a/games-rpg/eternal-lands/Manifest +++ b/games-rpg/eternal-lands/Manifest @@ -1,7 +1,12 @@ +AUX el-wrapper 1646 BLAKE2B b4ddf1c5873b765af1c58a57cdb99b164f6e2558e1523253d4ed7a321ae9dc167dcb6f25271353d90549e24ff15387e087db88fda18f6832549a7e71168c4d98 SHA512 fc4e19608f40155f4e5014595b5497f6ebc0df0378bc430b9cd64c3a3139bcc8101e5831ef53e07866b456000c17d7e8209ff0d16e067fa434240bfc4851ee9e AUX eternal-lands-1.9.3-build.patch 16222 BLAKE2B c7da08215575f6a39fd586842f6a872706356f8c203abdb8865de325651d5e9e9e2976da5720cbe05144cc49bf9908667ce910b09bbc32e8a32e6ec82bd2b287 SHA512 b268c0f1dab0f86bfcea3d13122983c4efdbf9941d1851618a01986b2fc36139350e830c6838c229f7ffbb69fd51a46d06277eb43167a47e192b86db710dcfc7 AUX eternal-lands-1.9.3-glbuild.patch 581 BLAKE2B 448e86a18de71390225c4bacb5d824da63db9c0213629c618856de0634d7b9fca97c22558031d79c2a7f69c273b7e68d02fde04c82d2d42b339227ebd7e5b35c SHA512 583b306f98975e8d86314519cfd0034870d07a2d908de9ac2fae9eba50ce90acc7f8949fbe40379a13308ebfdf33379f5801ccfe83d67c318b8edc3ddc0a9ed5 AUX eternal-lands-1.9.3-minizip.patch 2142 BLAKE2B 6b3e12d4cfe47f5e808c7218b72f1f3ce571cacc5e916951068f1e589d8f00056add853d0d45ad72d060cd787f25c0d5f839359c39dbffc29ebfe7ef1a92c759 SHA512 2a560c99504a649de7d01d08bb4d92cdd803e6c91b2ef2d1e82449268e8248b468fb8bb855e8e73396e8d4e5e2def44bda9df07f654b730bb25b509550d0f826 +AUX eternal-lands-1.9.5.3-build.patch 2629 BLAKE2B 2151293ed631e75345fb2c264113e28d11ccf42471599ab4784f1ae19091602a0b2d1ef56da4a0396a263b7e8672810e12d96d0341666a8589037c41793b3342 SHA512 dba8288ee3309f97d779e0005f6f6234ce39de02badad78fe2b642ed120a09b2cda4b1558acf5bb3478a844c964454f935b407c02f0067ca837ab26c860494a1 +AUX eternal-lands-1.9.5.3-minizip.patch 2944 BLAKE2B be3ff1adb91681bbe826a409f2ec3c855c7dcb49d7aab076ab65c6c1145fa70e6cf98ae25a6d18b77fed63395c552047dae1407885758186ef7f3f9e737fd25a SHA512 feaf805e16bbbf33aaf15d6eb4e6303f1c80f135809952b59da2decdc8f1f2b65487031b7b9b29f969e631afa5bfc124741b385f4adff66d65cc1b0cf983f149 DIST elc_1.9.3-20120213.tar.bz2 2401172 BLAKE2B 496315a0d09d0b7cb99a77c77965d3d85a675659ae1970dc2c7c7560146b165a48a35f6dfd7eb461d4347ee2023df91ba47c05120957f52f777ea530e868b8d9 SHA512 3580d3ceb94094443ef25f6e4880c9ffe3fff256c8d8e6657b4e0683a05184da9e6a76264557d2065a8187e3d36febd9d30ff5adff83a17607b1e478be90fabc +DIST eternal-lands-1.9.5.3.tar.gz 2814562 BLAKE2B ccb3dd78d12817912293f8babbd5f5dde6f0e3ea0cb34526edd7a3f0371f5313f94ff2d6b22cf472442869dfcf9893c19ec72d7ccf879b0e6a3dbfa05249c38f SHA512 bf0da70080377a76c66d6201da6032aae2967051e23f8aa433d450ec845bcd91145b965632fa63f66feebc15eaa9a65ff8f33884cc1b7c3605125f1536d91563 DIST eternal-lands.png 9955 BLAKE2B 376f6826bab88e798c39d79f00bd8c8758798b70beb980d44bfcdf0c4afb696ea15f58177267ddf189ce53ef6c2c33efdcf507f5135ccc000b56ca28de078f80 SHA512 c77571c949bb43fa7f95ae58f863ed972cfc76e184de5d0fa0a3599e4f7539f6334b843233b61fc807c90ef270d87cd57494510ce559427b592d255c198729bf EBUILD eternal-lands-1.9.3-r2.ebuild 2853 BLAKE2B 4431c51b3390d8b9bbe525d3c5a246ba3ca87a35e1a1d0fd0c54a83e81dd535062d693bd34b526e86502499d14a91a44ec9f302ed4d2e1e278a5ac4c5c30eb49 SHA512 d67cbfb1b521709f783ddb4429de88500efe327c89cf1a9c37043efa8a86fa28877621c158cd867a600b9b7e93818fc5b78aefa3cb967cb631d76321ec37bfcf -MISC metadata.xml 482 BLAKE2B c0d2df678bcef1eb71b0a5f8824c90cd8d0f0b2fe5edf05db77e37d916b9a313dad3cdcbb64b08f793aef403dd6b79023a83584ce79073f7428a553da787e1dd SHA512 cb16ba8f0737fc26263d31d90e70d7468df8cb3fb09f7777f8c59b198f0f47d2139d5fc81597f7c63bff1afa242b60ab009f645c9269092ddc40dad2f2c62e1f +EBUILD eternal-lands-1.9.5.3.ebuild 1613 BLAKE2B 7a15e0303d1aa003cf094dcdc8abc5576adb4146db6ea244c9cde78676136f70a5246dfbfafd0a2df3b2c6ee5f53c14f9c1dd10d0c783724cfed743e76e859e6 SHA512 4cd53ef77085a43503ba54ce78a58ab374eeec854ba3e95ca8d489c3651dbcd681c6d217d6fc6e8ba5a8c33e0e2ea4af963a46eecb7d2b5bcf57094ec6bbdd97 +MISC metadata.xml 385 BLAKE2B 5f7b3fd58c620d6dda10b183473856241e1ade18bdd190865a4c0a8432d1bbead7da0801acc99dd9b42c77757625a4cd145f615435317d0329e0028af8ece506 SHA512 a3b44275d69059374a2dbf2761b2ff68afdb3fb195f714f1d797c7551bae5c488249dd5dba9bd370e982e69d7ba347306c64a82d1894bf66fbf55a5db985df9c diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.5.3.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.5.3.ebuild new file mode 100644 index 000000000000..772635913942 --- /dev/null +++ b/games-rpg/eternal-lands/eternal-lands-1.9.5.3.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit desktop toolchain-funcs xdg + +DESCRIPTION="A 3D fantasy MMORPG written in C and SDL" +HOMEPAGE="http://www.eternal-lands.com" +SRC_URI="https://github.com/raduprv/Eternal-Lands/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="eternal_lands" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc" + +RDEPEND="app-arch/unzip + dev-libs/libxml2 + media-libs/cal3d[-16bit-indices] + media-libs/freealut + media-libs/libpng:0= + media-libs/libsdl[X,opengl,video] + media-libs/libvorbis + media-libs/openal + media-libs/sdl-image + media-libs/sdl-net + sys-libs/zlib[minizip] + virtual/glu + virtual/opengl + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext" +DEPEND="${RDEPEND} + app-eselect/eselect-opengl + media-libs/glew" +BDEPEND="${DEPEND} + virtual/pkgconfig + doc? ( + app-doc/doxygen + media-gfx/graphviz + )" + +S="${WORKDIR}/Eternal-Lands-${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-1.9.5.3-build.patch" + "${FILESDIR}/${PN}-1.9.5.3-minizip.patch" +) + +src_prepare() { + default + + sed -i "s/FEATURES/EL_FEATURES/g" make.defaults || die + sed -i "s/FEATURES/EL_FEATURES/g" Makefile.linux || die + + # Remove bundled minizip + rm io/{crypt,ioapi,unzip,zip}.h || die + rm io/{ioapi,unzip,zip}.c || die + + cp Makefile.linux Makefile || die +} + +src_compile() { + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" + use doc && emake docs +} + +src_install() { + dobin el.linux.bin + newbin "${FILESDIR}"/el-wrapper el + newicon -s 48 elc.png ${PN}.png + make_desktop_entry el "Eternal Lands" + + dodoc CHANGES TODO + use doc && dodoc -r docs/html/ +} diff --git a/games-rpg/eternal-lands/files/el-wrapper b/games-rpg/eternal-lands/files/el-wrapper new file mode 100644 index 000000000000..ab392d334207 --- /dev/null +++ b/games-rpg/eternal-lands/files/el-wrapper @@ -0,0 +1,53 @@ +#!/bin/bash -e + +elc=~/.elc +datadir=$elc/el_data +browser=xdg-open + +if [[ ! -e $elc ]] || [[ ! -e $datadir ]] || [[ ! -e $elc/servers.lst ]] || + [[ ! -e $elc/el.ini ]]; then + + [[ -e $elc ]] || mkdir -p $elc + + if [[ ! -e $datadir ]]; then + echo + echo "The \"Eternal Lands\" launcher is downloading the game data..." + echo "It is only needed before the first start." + echo "The default data location is ~/.elc/el_data" + echo + + tmpdir="`mktemp -d /tmp/eternal-lands.XXXXXXXXXX`" + trap "rm -r $tmpdir" EXIT + wget https://github.com/raduprv/Eternal-Lands/releases/download/1.9.5.2/el_195_1_data_files.zip -P $tmpdir + unzip $tmpdir/el_195_1_data_files.zip -d $elc + + echo + echo "The game sound and music are optional, you can download \ +them now or any time later from the official website and unpack into \ +~/.elc/el_data/sound and ~/.elc/el_data/music" + while true; do + read -r -n 1 -p "Download the game sound and music now? (y/n) " yn + case $yn in + [Yy]) break;; + [Nn]) break;; + *) echo -e "\nPlease answer Yes or No.";; + esac + done + echo + + if [[ $yn == [Yy] ]]; then + wget https://github.com/raduprv/Eternal-Lands/releases/download/1.9.5.2/eternallands-sound_1.9.4.zip -P $tmpdir + wget https://github.com/raduprv/Eternal-Lands/releases/download/1.9.5.2/music_full.zip -P $tmpdir + unzip $tmpdir/eternallands-sound_1.9.4.zip -d $datadir + mkdir $datadir/music + unzip $tmpdir/music_full.zip -d $datadir/music + fi + + rm -r $tmpdir + fi + + [[ -e $elc/servers.lst ]] || cp $datadir/servers.lst $elc/ + [[ -e $elc/el.ini ]] || cp $datadir/el.ini $elc/ +fi + +exec /usr/bin/el.linux.bin -dir="$datadir" -b="$browser" "$@" diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-build.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-build.patch new file mode 100644 index 000000000000..28f4ab0da542 --- /dev/null +++ b/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-build.patch @@ -0,0 +1,70 @@ +From ef13ae006609e51eaddbcdf0495f44cfde797e26 Mon Sep 17 00:00:00 2001 +From: Stefan Strogin +Date: Tue, 14 May 2019 20:34:47 +0300 +Subject: [PATCH 1/2] Respect {C,CXX,LD}FLAGS + +Upstream-Status: Inappropriate [Gentoo-specific] +Signed-off-by: Stefan Strogin +--- + Makefile.linux | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/Makefile.linux b/Makefile.linux +index c57aeeeb..a0839c5c 100644 +--- a/Makefile.linux ++++ b/Makefile.linux +@@ -17,11 +17,11 @@ OPTIONS = -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE)) -D_7ZIP_ST + $(shell pkg-config vorbisfile --cflags) \ + $(shell pkg-config zlib --cflags) + +-CFLAGS=$(PLATFORM) $(CWARN) -O0 -ggdb -pipe $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES) ++CFLAGS += $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES) + +-CXXFLAGS=$(PLATFORM) $(CXXWARN) -O0 -ggdb -pipe $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES) ++CXXFLAGS += $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES) + +-LDFLAGS=$(shell pkg-config sdl --libs) \ ++LDFLAGS += $(shell pkg-config sdl --libs) \ + $(shell pkg-config libxml-2.0 --libs) \ + $(shell pkg-config SDL_net --libs) \ + $(shell pkg-config SDL_image --libs) \ +@@ -111,7 +111,7 @@ HEADER_DIRS = . books eye_candy io pawn fsaa engine xz + DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P) + #(shell echo $OBJ |sed s/\.o/\.P/)) + +-EXE=el.x86.linux.bin ++EXE=el.linux.bin + + ifndef CC + CC=gcc +@@ -127,8 +127,8 @@ all: $(EXE) + + # the compile targets + $(EXE): $(OBJS) +- @echo " LINK $(EXE)" +- @$(LINK) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS) ++ @echo "$(CC) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)" ++ @$(CC) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS) + + #recompile on Makefile or conf change + #.depend $(OBJS): Makefile.linux make.conf +@@ -136,14 +136,14 @@ $(EXE): $(OBJS) + DEPS_MAGIC := $(shell mkdir .deps .deps/io .deps/shader .deps/eye_candy .deps/exceptions .deps/xz .deps/xml .deps/fsaa .deps/engine > /dev/null 2>&1 || :) + + $(COBJS): %.o: %.c Makefile.linux make.conf +- @echo " CC $@" ++ @echo "$(CC) $(CFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@" + @if $(CC) $(CFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \ + mv ".deps/$@.pp" ".deps/$@.P"; \ + else rm -f ".deps/$@.pp"; exit 1; \ + fi + + $(CXXOBJS): %.o: %.cpp Makefile.linux make.conf +- @echo " CXX $@" ++ @echo "$(CXX) $(CXXFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@" + @if $(CXX) $(CXXFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \ + mv ".deps/$@.pp" ".deps/$@.P"; \ + else rm -f ".deps/$@.pp"; exit 1; \ +-- +2.21.0 + diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-minizip.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-minizip.patch new file mode 100644 index 000000000000..c1eb35fdc849 --- /dev/null +++ b/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-minizip.patch @@ -0,0 +1,90 @@ +From 7df2f0a47ff2d25898063dc2fb30ba3d80d63afb Mon Sep 17 00:00:00 2001 +From: Stefan Strogin +Date: Thu, 16 May 2019 05:31:16 +0300 +Subject: [PATCH 2/2] Unbundle minizip + +Original patch by Julian Ospald . +Bug: https://bugs.gentoo.org/423327 + +Upstream-Status: Pending +Signed-off-by: Stefan Strogin +--- + Makefile.linux | 4 +++- + io/elfilewrapper.c | 2 +- + io/ziputil.h | 4 ++-- + new_update.c | 4 ++-- + 4 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/Makefile.linux b/Makefile.linux +index a0839c5c..d29ac912 100644 +--- a/Makefile.linux ++++ b/Makefile.linux +@@ -12,6 +12,7 @@ OPTIONS = -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE)) -D_7ZIP_ST + $(shell pkg-config cal3d --cflags) \ + $(shell pkg-config gl --cflags) \ + $(shell pkg-config glu --cflags) \ ++ $(shell pkg-config minizip --cflags) \ + $(shell pkg-config openal --cflags) \ + $(shell pkg-config vorbis --cflags) \ + $(shell pkg-config vorbisfile --cflags) \ +@@ -28,6 +29,7 @@ LDFLAGS += $(shell pkg-config sdl --libs) \ + $(shell pkg-config cal3d --libs) \ + $(shell pkg-config gl --libs) \ + $(shell pkg-config glu --libs) \ ++ $(shell pkg-config minizip --libs) \ + $(shell pkg-config openal --libs) \ + $(shell pkg-config vorbis --libs) \ + $(shell pkg-config vorbisfile --libs) \ +@@ -64,7 +66,7 @@ COBJS=2d_objects.o 3d_objects.o \ + hud.o hud_misc_window.o hud_quickbar_window.o hud_statsbar_window.o hud_quickspells_window.o \ + help.o highlight.o ignore.o image_loading.o init.o interface.o items.o io/fileutil.o \ + io/e3d_io.o io/elc_io.o io/map_io.o io/elpathwrapper.o io/xmlcallbacks.o \ +- io/half.o io/normal.o io/elfilewrapper.o io/unzip.o io/ioapi.o io/zip.o io/ziputil.o \ ++ io/half.o io/normal.o io/elfilewrapper.o io/ziputil.o \ + keys.o knowledge.o langselwin.o lights.o list.o load_gl_extensions.o loginwin.o loading_win.o \ + main.o manufacture.o map.o mapwin.o \ + md5.o mines.o minimap.o misc.o missiles.o multiplayer.o \ +diff --git a/io/elfilewrapper.c b/io/elfilewrapper.c +index fad99d62..5dee9a37 100644 +--- a/io/elfilewrapper.c ++++ b/io/elfilewrapper.c +@@ -1,5 +1,5 @@ + #include "elfilewrapper.h" +-#include "unzip.h" ++#include + #include "elpathwrapper.h" + #include "fileutil.h" + #include +diff --git a/io/ziputil.h b/io/ziputil.h +index 86128315..51fa232b 100644 +--- a/io/ziputil.h ++++ b/io/ziputil.h +@@ -8,8 +8,8 @@ + + #include + #include "../md5.h" +-#include "zip.h" +-#include "unzip.h" ++#include ++#include + + #ifdef __cplusplus + extern "C" +diff --git a/new_update.c b/new_update.c +index febd10ae..ec039f6c 100644 +--- a/new_update.c ++++ b/new_update.c +@@ -5,8 +5,8 @@ + #include + #include "md5.h" + #include "elc_private.h" +-#include "io/zip.h" +-#include "io/unzip.h" ++#include ++#include + #include "io/ziputil.h" + #include "io/fileutil.h" + #include "io/elfilewrapper.h" +-- +2.21.0 + diff --git a/games-rpg/eternal-lands/metadata.xml b/games-rpg/eternal-lands/metadata.xml index 3a16e77fe8ea..3b426abd6bc5 100644 --- a/games-rpg/eternal-lands/metadata.xml +++ b/games-rpg/eternal-lands/metadata.xml @@ -1,15 +1,11 @@ - - rich0@gentoo.org - Richard Freeman - games@gentoo.org Gentoo Games Project - Eternal Lands is a FREE MMORPG (massively multiplayer online role playing game) + Eternal Lands is a free 3D fantasy MMORPG (massively multiplayer online role playing game) -- cgit v1.2.3