* [gentoo-commits] repo/gentoo:master commit in: games-rpg/eternal-lands/files/, games-rpg/eternal-lands/
@ 2020-06-05 5:44 Stefan Strogin
0 siblings, 0 replies; 5+ messages in thread
From: Stefan Strogin @ 2020-06-05 5:44 UTC (permalink / raw
To: gentoo-commits
commit: ac0a8e3b8b0cedff61c3249dfda566181850fb8f
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 5 05:42:39 2020 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Fri Jun 5 05:42:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac0a8e3b
games-rpg/eternal-lands: drop old 1.9.5.3
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
games-rpg/eternal-lands/Manifest | 1 -
.../eternal-lands/eternal-lands-1.9.5.3.ebuild | 75 ----------------------
games-rpg/eternal-lands/files/el-wrapper | 53 ---------------
.../files/eternal-lands-1.9.5.3-build.patch | 70 --------------------
4 files changed, 199 deletions(-)
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 9431423a1e2..848ae6b0d7f 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -1,2 +1 @@
-DIST eternal-lands-1.9.5.3.tar.gz 2814562 BLAKE2B ccb3dd78d12817912293f8babbd5f5dde6f0e3ea0cb34526edd7a3f0371f5313f94ff2d6b22cf472442869dfcf9893c19ec72d7ccf879b0e6a3dbfa05249c38f SHA512 bf0da70080377a76c66d6201da6032aae2967051e23f8aa433d450ec845bcd91145b965632fa63f66feebc15eaa9a65ff8f33884cc1b7c3605125f1536d91563
DIST eternal-lands-1.9.5.8.tar.gz 2863932 BLAKE2B f8c4e88b96b4ee73773a2675e7cf2746e5efe6bf029f046a2ce63496b22c217a93eeea9464977710b95c4fe2d928edefd6aa11a712a8fb82d911ee7d1fd993d3 SHA512 e5e89ec6e7df2b1ac80722b6daf5bbb350d2f1bc4c70c819992b528f25c2ac11434d053ff844ff5873deea16c5bbe305834ffeae7b5ecb6daea5638625851ce0
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
deleted file mode 100644
index 9728e4e9815..00000000000
--- a/games-rpg/eternal-lands/eternal-lands-1.9.5.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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}
- 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
deleted file mode 100644
index ab392d33420..00000000000
--- a/games-rpg/eternal-lands/files/el-wrapper
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/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
deleted file mode 100644
index 28f4ab0da54..00000000000
--- a/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-build.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From ef13ae006609e51eaddbcdf0495f44cfde797e26 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-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 <steils@gentoo.org>
----
- 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
-
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-rpg/eternal-lands/files/, games-rpg/eternal-lands/
@ 2024-10-10 20:29 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2024-10-10 20:29 UTC (permalink / raw
To: gentoo-commits
commit: 0bc4705b4ef4e51e307aea09ad70cf21b3c18000
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Aug 10 09:57:38 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Oct 10 20:22:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bc4705b
games-rpg/eternal-lands: add 1.9.6.1
Closes: https://bugs.gentoo.org/860759
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
games-rpg/eternal-lands/Manifest | 1 +
.../eternal-lands/eternal-lands-1.9.6.1.ebuild | 75 ++++++++++++++++++++++
games-rpg/eternal-lands/files/el-wrapper-1.9.6.1 | 53 +++++++++++++++
.../files/eternal-lands-1.9.6.1-build.patch | 45 +++++++++++++
4 files changed, 174 insertions(+)
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 848ae6b0d7f6..3aa826620ea3 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -1 +1,2 @@
DIST eternal-lands-1.9.5.8.tar.gz 2863932 BLAKE2B f8c4e88b96b4ee73773a2675e7cf2746e5efe6bf029f046a2ce63496b22c217a93eeea9464977710b95c4fe2d928edefd6aa11a712a8fb82d911ee7d1fd993d3 SHA512 e5e89ec6e7df2b1ac80722b6daf5bbb350d2f1bc4c70c819992b528f25c2ac11434d053ff844ff5873deea16c5bbe305834ffeae7b5ecb6daea5638625851ce0
+DIST eternal-lands-1.9.6.1.tar.gz 3877154 BLAKE2B 50914c96caf3a6bda4a3a853a4ab680bc9da98283e528d0d1626a38d55504321035356f60dea1a5e307e7c87e07a024627171f81cb6a85e3b63d8df3270e0bb6 SHA512 ac0704b22e8f7525f0319a454b5be695e1640fc1be9fa5c5bbb5a0e32fde634fecb5bf33c23dd58115464d3c26b945ffb1bfb323f057f1c454601a7416d95b66
diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.6.1.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.6.1.ebuild
new file mode 100644
index 000000000000..414835307acf
--- /dev/null
+++ b/games-rpg/eternal-lands/eternal-lands-1.9.6.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs xdg
+
+DESCRIPTION="3D fantasy MMORPG written in C and SDL"
+HOMEPAGE="https://www.eternal-lands.com"
+SRC_URI="https://github.com/raduprv/Eternal-Lands/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/Eternal-Lands-${PV}"
+
+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/libsdl2[X,opengl,video]
+ media-libs/libvorbis
+ media-libs/openal
+ media-libs/sdl2-image
+ media-libs/sdl2-net
+ sys-libs/zlib[minizip]
+ virtual/glu
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libXext"
+DEPEND="${RDEPEND}
+ media-libs/glew"
+BDEPEND="${DEPEND}
+ virtual/pkgconfig
+ doc? (
+ app-text/doxygen
+ media-gfx/graphviz
+ )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.9.6.1-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-1.9.6.1 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-1.9.6.1 b/games-rpg/eternal-lands/files/el-wrapper-1.9.6.1
new file mode 100644
index 000000000000..f475e001accb
--- /dev/null
+++ b/games-rpg/eternal-lands/files/el-wrapper-1.9.6.1
@@ -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.6.1/eternallands-data_1.9.6.1.zip -P $tmpdir
+ unzip $tmpdir/eternallands-data_1.9.6.1.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.6.1/eternallands-sound_1.9.6.1.zip -P $tmpdir
+ wget https://github.com/raduprv/Eternal-Lands/releases/download/1.9.6.1/eternallands-music_1.9.5.9.zip -P $tmpdir
+ unzip $tmpdir/eternallands-sound_1.9.6.1.zip -d $datadir
+ mkdir $datadir/music
+ unzip $tmpdir/eternallands-music_1.9.5.9.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.6.1-build.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.6.1-build.patch
new file mode 100644
index 000000000000..b818d9cb300e
--- /dev/null
+++ b/games-rpg/eternal-lands/files/eternal-lands-1.9.6.1-build.patch
@@ -0,0 +1,45 @@
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -29,11 +29,11 @@
+ $(shell pkg-config zlib --cflags) \
+ $(foreach FEATURE, $(FEATURES), $($(FEATURE)_CFLAGS))
+
+-CFLAGS=$(PLATFORM) $(CWARN) -O1 -ggdb -pipe $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
++CFLAGS += -pipe $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
+
+-CXXFLAGS=$(PLATFORM) $(CXXWARN) -O1 -ggdb -pipe $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
++CXXFLAGS += $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
+
+-LDFLAGS=$(shell pkg-config sdl2 --libs) \
++LDFLAGS += $(shell pkg-config sdl2 --libs) \
+ $(shell pkg-config libxml-2.0 --libs) \
+ $(shell pkg-config SDL2_net --libs) \
+ $(shell pkg-config SDL2_image --libs) \
+@@ -140,8 +140,8 @@
+
+ # 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
+@@ -152,14 +152,14 @@
+ DEPS_MAGIC := $(shell mkdir $(DEPS_DIRS) > /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; \
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-rpg/eternal-lands/files/, games-rpg/eternal-lands/
@ 2020-06-05 5:35 Stefan Strogin
0 siblings, 0 replies; 5+ messages in thread
From: Stefan Strogin @ 2020-06-05 5:35 UTC (permalink / raw
To: gentoo-commits
commit: 05fa8e7395ed3aa78b2f79d0464b2686912f2a7a
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 5 05:32:18 2020 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Fri Jun 5 05:35:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05fa8e73
games-rpg/eternal-lands: version bump to 1.9.5.8
- SDL -> SDL2.
- Update the launcher to download game data from release 1.9.5.7.
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
games-rpg/eternal-lands/Manifest | 1 +
.../eternal-lands/eternal-lands-1.9.5.8.ebuild | 75 ++++++++++++++++++++++
games-rpg/eternal-lands/files/el-wrapper-1.9.5.8 | 53 +++++++++++++++
.../files/eternal-lands-1.9.5.8-build.patch | 70 ++++++++++++++++++++
4 files changed, 199 insertions(+)
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 7594d8dd2e0..9431423a1e2 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -1 +1,2 @@
DIST eternal-lands-1.9.5.3.tar.gz 2814562 BLAKE2B ccb3dd78d12817912293f8babbd5f5dde6f0e3ea0cb34526edd7a3f0371f5313f94ff2d6b22cf472442869dfcf9893c19ec72d7ccf879b0e6a3dbfa05249c38f SHA512 bf0da70080377a76c66d6201da6032aae2967051e23f8aa433d450ec845bcd91145b965632fa63f66feebc15eaa9a65ff8f33884cc1b7c3605125f1536d91563
+DIST eternal-lands-1.9.5.8.tar.gz 2863932 BLAKE2B f8c4e88b96b4ee73773a2675e7cf2746e5efe6bf029f046a2ce63496b22c217a93eeea9464977710b95c4fe2d928edefd6aa11a712a8fb82d911ee7d1fd993d3 SHA512 e5e89ec6e7df2b1ac80722b6daf5bbb350d2f1bc4c70c819992b528f25c2ac11434d053ff844ff5873deea16c5bbe305834ffeae7b5ecb6daea5638625851ce0
diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.5.8.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.5.8.ebuild
new file mode 100644
index 00000000000..aae74143d65
--- /dev/null
+++ b/games-rpg/eternal-lands/eternal-lands-1.9.5.8.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 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/libsdl2[X,opengl,video]
+ media-libs/libvorbis
+ media-libs/openal
+ media-libs/sdl2-image
+ media-libs/sdl2-net
+ sys-libs/zlib[minizip]
+ virtual/glu
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libXext"
+DEPEND="${RDEPEND}
+ 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.8-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-1.9.5.8 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-1.9.5.8 b/games-rpg/eternal-lands/files/el-wrapper-1.9.5.8
new file mode 100644
index 00000000000..3439c2a1162
--- /dev/null
+++ b/games-rpg/eternal-lands/files/el-wrapper-1.9.5.8
@@ -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.7/el_195_p7_data_files.zip -P $tmpdir
+ unzip $tmpdir/el_195_p7_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.8-build.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.5.8-build.patch
new file mode 100644
index 00000000000..d4aaa2bd415
--- /dev/null
+++ b/games-rpg/eternal-lands/files/eternal-lands-1.9.5.8-build.patch
@@ -0,0 +1,70 @@
+From 0f93097a58d78e0ba9d51d48f56b470047b27210 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Fri, 5 Jun 2020 07:19:47 +0300
+Subject: [PATCH] Respect {C,CXX,LD}FLAGS
+
+Upstream-Status: Inappropriate [Gentoo-specific]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ Makefile.linux | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.linux b/Makefile.linux
+index eb57e0e..c9bbc73 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 += -pipe $(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 sdl2 --libs) \
++LDFLAGS += $(shell pkg-config sdl2 --libs) \
+ $(shell pkg-config libxml-2.0 --libs) \
+ $(shell pkg-config SDL2_net --libs) \
+ $(shell pkg-config SDL2_image --libs) \
+@@ -112,7 +112,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
+@@ -128,8 +128,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
+@@ -137,14 +137,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.27.0
+
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-rpg/eternal-lands/files/, games-rpg/eternal-lands/
@ 2019-08-29 1:57 Stefan Strogin
0 siblings, 0 replies; 5+ messages in thread
From: Stefan Strogin @ 2019-08-29 1:57 UTC (permalink / raw
To: gentoo-commits
commit: 8e9c420602b470c6dde9694b26febd35d18711ad
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 29 01:55:24 2019 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Thu Aug 29 01:56:49 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e9c4206
games-rpg/eternal-lands: drop old 1.9.3-r2
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
games-rpg/eternal-lands/Manifest | 2 -
.../eternal-lands/eternal-lands-1.9.3-r2.ebuild | 121 --------
.../files/eternal-lands-1.9.3-build.patch | 314 ---------------------
.../files/eternal-lands-1.9.3-glbuild.patch | 25 --
.../files/eternal-lands-1.9.3-minizip.patch | 75 -----
5 files changed, 537 deletions(-)
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index f79208e9c8b..7594d8dd2e0 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -1,3 +1 @@
-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
diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild
deleted file mode 100644
index 02a7b89440b..00000000000
--- a/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic gnome2-utils games
-
-DESCRIPTION="An online MMORPG written in C and SDL"
-HOMEPAGE="http://www.eternal-lands.com"
-SRC_URI="mirror://gentoo/elc_1.9.3-20120213.tar.bz2
- https://dev.gentoo.org/~rich0/distfiles/${PN}.png"
-
-LICENSE="eternal_lands"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="debug doc kernel_linux"
-
-RDEPEND="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:=
- >=games-rpg/eternal-lands-data-1.9.3
- 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-1.0.6-r1
- app-arch/unzip
- virtual/pkgconfig
- doc? ( app-doc/doxygen
- media-gfx/graphviz )
- media-libs/glew"
-
-S="${WORKDIR}/elc"
-
-src_prepare() {
- local BROWSER="firefox"
-
- sed -i \
- -e 's/#browser/browser/g' \
- -e "s/browser = mozilla/#browser = ${BROWSER}/g" \
- -e "s@#data_dir = /usr/local/games/el/@#data_dir = ${GAMES_DATADIR}/${PN}/@g" \
- el.ini || die "sed failed"
-
- # Finally, update the server
- sed -i -e '/#server_address =/ s/.*/#server_address = game.eternal-lands.com/' \
- el.ini || die "sed failed"
-
- epatch "${FILESDIR}/${PN}-1.9.3-glbuild.patch"
- epatch "${FILESDIR}/${PN}-1.9.3-build.patch"
- epatch "${FILESDIR}/${PN}-1.9.3-minizip.patch"
-
- # remove bundled minizip
- rm io/{crypt,ioapi,unzip,zip}.h || die
- rm io/{ioapi,unzip,zip}.c || die
-
- cp Makefile.linux Makefile
-}
-
-src_compile() {
- emake \
- DEBUG="$(usex debug)" \
- BSD_KERNEL="$(usex !kernel_linux)" \
- DATADIR="${GAMES_DATADIR}/${PN}/"
-
- if use doc; then
- emake docs
- mv ./docs/html/ ../client || die "Failed to move documentation directory"
- fi
-}
-
-src_install() {
- dogamesbin el
- make_desktop_entry el "Eternal Lands"
-
- insopts -m 0660
- insinto "${GAMES_DATADIR}/${PN}"
-
- doins -r *.ini *.txt commands.lst
-
- if use doc ; then
- dohtml -r "${WORKDIR}"/client/*
- fi
-
- doicon -s 64 "${DISTDIR}/${PN}.png"
-
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
- elog "Auto Update is now enabled in Eternal Lands"
- elog "If an update occurs then the client will suddenly exit"
- elog "Updates only happen when the game first loads"
- elog "Please don't report this behaviour as a bug"
-
- # Ensure that the files are writable by the game group for auto
- # updating.
- chmod -R g+rw "${ROOT}/${GAMES_DATADIR}/${PN}"
-
- # Make sure new files stay in games group
- find "${ROOT}/${GAMES_DATADIR}/${PN}" -type d -exec chmod g+sx {} \;
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-build.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-build.patch
deleted file mode 100644
index 989bf2700d8..00000000000
--- a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-build.patch
+++ /dev/null
@@ -1,314 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Jun 24 13:32:38 UTC 2012
-Subject: build system
-
-respect all flags
-respect compiler
-add options for DATADIR, BSD_KERNEL and DEBUG
-use proper pkgconfig calls
-remove needless build types
-rename EXE to "el"
-
---- elc/Makefile.linux
-+++ elc/Makefile.linux
-@@ -3,16 +3,54 @@
- -include make.conf
-
- # basic compiling and linking - rarely changed
--OPTIONS = -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE)) -D_7ZIP_ST
--CFLAGS=$(PLATFORM) $(CWARN) -O0 -ggdb -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
--_CFLAGS=$(PLATFORM) -O2 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
--CXXFLAGS=$(PLATFORM) $(CXXWARN) -O0 -ggdb -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
--_CXXFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
--
--PNG_SCREENSHOT_LIBS = -lpng
--LDFLAGS=$(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lcal3d -lm $(EXTRA_LIBS) -lz -lpng -lvorbis -lvorbisfile \
-- $(foreach FEATURE, $(FEATURES), $($(FEATURE)_LIBS))
--_LDFLAGS=$(XDIR) -lGL -lpthread -lstdc++
-+CC ?= gcc
-+CXX ?= g++
-+
-+# some options
-+DATADIR ?= /usr/share/games/eternal-lands
-+
-+CPPFLAGS += -DDATA_DIR=\"$(DATADIR)\" \
-+ -DLINUX \
-+ -DELC \
-+ $(foreach FEATURE, $(EL_FEATURES), -D$(FEATURE)) \
-+ -D_7ZIP_ST
-+
-+ifeq ($(BSD_KERNEL),yes)
-+CPPFLAGS += -DBSD
-+endif
-+
-+ifeq ($(DEBUG),yes)
-+CPPFLAGS += -DMEMORY_DEBUG
-+endif
-+
-+CFLAGS += $(shell sdl-config --cflags) \
-+ $(shell xml2-config --cflags) \
-+ -fno-strict-aliasing \
-+ $(EXTRA_INCLUDES)
-+
-+CXXFLAGS += $(shell sdl-config --cflags) \
-+ $(shell xml2-config --cflags) \
-+ -fno-strict-aliasing \
-+ $(EXTRA_INCLUDES)
-+
-+LIBS += $(shell pkg-config --libs x11) \
-+ $(shell sdl-config --libs) \
-+ $(shell xml2-config --libs) \
-+ $(shell pkg-config --libs SDL_net) \
-+ $(shell pkg-config --libs SDL_image) \
-+ $(shell pkg-config --libs openal) \
-+ $(shell pkg-config --libs freealut) \
-+ $(shell pkg-config --libs gl) \
-+ $(shell pkg-config --libs glu) \
-+ $(shell pkg-config --libs cal3d) \
-+ $(shell pkg-config --libs libpng) \
-+ $(shell pkg-config --libs vorbis) \
-+ $(shell pkg-config --libs vorbisfile) \
-+ $(shell pkg-config --libs zlib) \
-+ -lm \
-+ $(EXTRA_LIBS) \
-+ $(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_LIBS)) \
-+ -lstdc++
-
- # This works on Ubuntu 8.04 (LTS) at least
- # Install these packages in addition to those required for a standard build
-@@ -59,7 +97,7 @@
- xz/CpuArch.o xz/Delta.o xz/LzFind.o xz/Lzma2Dec.o xz/Lzma2Enc.o \
- xz/LzmaDec.o xz/LzmaEnc.o xz/Sha256.o xz/Xz.o xz/XzCrc64.o xz/XzDec.o \
- xz/XzEnc.o \
-- $(foreach FEATURE, $(FEATURES), $($(FEATURE)_COBJ))
-+ $(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_COBJ))
-
- CXXOBJS=actor_init.o cal3d_wrapper.o context_menu.o optimizer.o sendvideoinfo.o \
- exceptions/extendedexception.o xml/xmlhelper.o quest_log.o \
-@@ -80,7 +118,7 @@
- eye_candy/effect_mines.o eye_candy/effect_missile.o \
- eye_candy/orbital_mover.o eye_candy/kepler_orbit.o \
- eye_candy/effect_staff.o \
-- $(foreach FEATURE, $(FEATURES), $($(FEATURE)_CXXOBJ))
-+ $(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_CXXOBJ))
-
- OBJS=$(COBJS) $(CXXOBJS)
- HEADER_DIRS = . books eye_candy io pawn fsaa engine xz
-@@ -89,24 +127,13 @@
- 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
--
--ifndef CC
--CC=gcc
--endif
--ifndef CXX
--CXX=g++
--endif
--ifndef LINK
--LINK=gcc
--endif
-+EXE=el
-
- all: $(EXE)
-
- # the compile targets
- $(EXE): $(OBJS)
-- @echo " LINK $(EXE)"
-- @$(LINK) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(EXE) $(OBJS) $(LIBS)
-
- #recompile on Makefile or conf change
- #.depend $(OBJS): Makefile.linux make.conf
-@@ -114,25 +141,19 @@
- 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 $@"
-- @if $(CC) $(CFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
-+ @echo "$(CC) $(CFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@"
-+ @if $(CC) $(CFLAGS) $(CPPFLAGS) -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 $@"
-- @if $(CXX) $(CXXFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
-+ @echo "$(CXX) $(CXXFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@"
-+ @if $(CXX) $(CXXFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
- mv ".deps/$@.pp" ".deps/$@.P"; \
- else rm -f ".deps/$@.pp"; exit 1; \
- fi
-
--release:
-- @$(MAKE) -f Makefile.linux 'CFLAGS=$(_CFLAGS)' 'CXXFLAGS=$(_CXXFLAGS)'
--
--static:
-- @$(MAKE) -f Makefile.linux 'CFLAGS=$(_CFLAGS)' 'CXXFLAGS=$(_CXXFLAGS)' 'LDFLAGS=$(_LDFLAGS)' 'OBJS=$(OBJS) $(STATICLIBS)'
--
- clean:
- rm -f $(OBJS) $(EXE)
-
-@@ -140,8 +161,8 @@
- cd docs && doxygen Doxyfile
-
- .depend: $(foreach HEADER_DIR, $(HEADER_DIRS), $(wildcard $(HEADER_DIR)/*.h))
-- $(CC) $(CFLAGS) -MM $(patsubst %.o, %.c, $(COBJS)) >.depend
-- $(CXX) $(CXXFLAGS) -MM $(patsubst %.o, %.cpp, $(CXXOBJS)) >>.depend
-+ $(CC) $(CFLAGS) $(CPPFLAGS) -MM $(patsubst %.o, %.c, $(COBJS)) >.depend
-+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -MM $(patsubst %.o, %.cpp, $(CXXOBJS)) >>.depend
-
- make.conf: make.defaults
- @if (test -f $@ -a '$(UPDATE_CONF)' != 'yes'); \
-@@ -161,7 +182,7 @@
- echo "\t#endinput" >> $@; \
- echo "#endif" >> $@; \
- echo "#define _features_included" >> $@; \
-- for feature in $(FEATURES); do \
-+ for feature in $(EL_FEATURES); do \
- echo "#define $$feature" >> $@; \
- done
-
---- elc/make.defaults
-+++ elc/make.defaults
-@@ -1,71 +1,82 @@
- # set this to "no" if you don't want this file to be overwritten
- UPDATE_CONF=yes
-
-+# set to 'yes' for BSD support
-+BSD_KERNEL=no
-+
-+# set to 'yes' to enable debug support
-+DEBUG=no
-+
- # tune these for your setup & compile options
- # IMPORTANT: if you are using a linker that needs libraries in correct order, make sure you list EYE_CANDY before PNG_SCREENSHOT if you use both
-
- ### Current release default options ###
--FEATURES += CLUSTER_INSIDES # Group objects into separate clusters for clipping on inside maps
--FEATURES += CUSTOM_LOOK # allows you to customize your look.
--FEATURES += CUSTOM_UPDATE # allows autoupdating of custom look information
--FEATURES += FUZZY_PATHS # Makes Tab Map walking not always follow exaclty the same path
--FEATURES += NEW_SOUND # Enables extended sound effects system
--FEATURES += PNG_SCREENSHOT # make screenshots in W3C's PNG format in game, requires libpng
--FEATURES += TEXT_ALIASES # Text aliases
--FEATURES += USE_INLINE # enable some optimizations to use inline functions instead of pure function calls
-+EL_FEATURES += CLUSTER_INSIDES # Group objects into separate clusters for clipping on inside maps
-+EL_FEATURES += CUSTOM_LOOK # allows you to customize your look.
-+EL_FEATURES += CUSTOM_UPDATE # allows autoupdating of custom look information
-+EL_FEATURES += FUZZY_PATHS # Makes Tab Map walking not always follow exaclty the same path
-+EL_FEATURES += NEW_SOUND # Enables extended sound effects system
-+EL_FEATURES += PNG_SCREENSHOT # make screenshots in W3C's PNG format in game, requires libpng
-+EL_FEATURES += TEXT_ALIASES # Text aliases
-+EL_FEATURES += USE_INLINE # enable some optimizations to use inline functions instead of pure function calls
- # new for 1.9.0 release
--FEATURES += BANDWIDTH_SAVINGS # enable bandwidth saving changes for message protocol
-+EL_FEATURES += BANDWIDTH_SAVINGS # enable bandwidth saving changes for message protocol
- # new for 1.9.2 release
--FEATURES += ANIMATION_SCALING # Adds support for animation scaling, depending on the number of animation commands in the actor queue.
--FEATURES += ENCYCL_NAVIGATION # Adds context menus to encyclopedia windows with search and bookmark functions
--FEATURES += FSAA # Adds support for full screen anti-aliasing using OpenGL multisampling.
--FEATURES += NEW_NEW_CHAR_WINDOW # Use the new character creation window; controls always on-screen
--FEATURES += NEW_TEXTURES # Enables the new texture loading and caching system (http://www.eternal-lands.com/forum/index.php?showtopic=54756)
-+EL_FEATURES += ANIMATION_SCALING # Adds support for animation scaling, depending on the number of animation commands in the actor queue.
-+EL_FEATURES += ENCYCL_NAVIGATION # Adds context menus to encyclopedia windows with search and bookmark functions
-+EL_FEATURES += FSAA # Adds support for full screen anti-aliasing using OpenGL multisampling.
-+EL_FEATURES += NEW_NEW_CHAR_WINDOW # Use the new character creation window; controls always on-screen
-+EL_FEATURES += NEW_TEXTURES # Enables the new texture loading and caching system (http://www.eternal-lands.com/forum/index.php?showtopic=54756)
- # new for 1.9.3 release
--FEATURES += FASTER_MAP_LOAD # Enables optimizations to speed up the process of switching between maps
--FEATURES += FASTER_STARTUP # An attempt to reduce the startup time of EL somewhat
--FEATURES += MIDDLE_MOUSE_PASTE # Paste using the middle mouse button from the primary buffer on X systems
-+EL_FEATURES += FASTER_MAP_LOAD # Enables optimizations to speed up the process of switching between maps
-+EL_FEATURES += FASTER_STARTUP # An attempt to reduce the startup time of EL somewhat
-+EL_FEATURES += MIDDLE_MOUSE_PASTE # Paste using the middle mouse button from the primary buffer on X systems
-
- ### Testing options (these options are possible for the next release and should be tested) ###
--#FEATURES += ANTI_ALIAS # allows to enable/disable anti-aliasing in el.ini
--#FEATURES += DYNAMIC_ANIMATIONS # (appears broken) Synchronizes animation to FPS instead of a fixed timer
--#FEATURES += EXT_ACTOR_DICT # Removes remaining hard-coded actor def dictionaries - requires updated actor defs files (http://el.grug.redirectme.net/actor_defs.zip)
--#FEATURES += NEW_ALPHA # (undocumented)
--#FEATURES += USE_SIMD # Enables usage of simd instructions
-+#EL_FEATURES += ANTI_ALIAS # allows to enable/disable anti-aliasing in el.ini
-+#EL_FEATURES += DYNAMIC_ANIMATIONS # (appears broken) Synchronizes animation to FPS instead of a fixed timer
-+#EL_FEATURES += EXT_ACTOR_DICT # Removes remaining hard-coded actor def dictionaries - requires updated actor defs files (http://el.grug.redirectme.net/actor_defs.zip)
-+#EL_FEATURES += NEW_ALPHA # (undocumented)
-+#EL_FEATURES += USE_SIMD # Enables usage of simd instructions
-
- ### Machine specific options (fixes or performance enhancements) ###
--#FEATURES += EL_BIG_ENDIAN # Enable big-endian code (automatically detected for OSX)
--#FEATURES += NO_PF_MACRO # Use a function instead of a macro for pf_get_tile()
--#FEATURES += SIMPLE_LOD # enable a simplistic distance culling to improve performance
-+#EL_FEATURES += EL_BIG_ENDIAN # Enable big-endian code (automatically detected for OSX)
-+#EL_FEATURES += NO_PF_MACRO # Use a function instead of a macro for pf_get_tile()
-+#EL_FEATURES += SIMPLE_LOD # enable a simplistic distance culling to improve performance
-
-
- ### Debug options ###
--#FEATURES += CONTEXT_MENUS_TEST # Enable "#cmtest" command to help test/demo the context menu code
--#FEATURES += DEBUG # (undocumented)
--#FEATURES += DEBUG_XML # Enables missing (optional) XML string property messages
--#FEATURES += DEBUG_POINT_PARTICLES # (undocumented)
--#FEATURES += DEBUG_TIME # Fakes the acceleration of time for use in debugging shadows and the like.
--#FEATURES += DEBUG_MAP_SOUND # Adds (some??) map boundary areas to tab maps and additional logging to stdout
--#FEATURES += ECDEBUGWIN # press ctrl-alt-c to open the Eye Candy debug window: trigger most effects without casting spells or server side events
--#FEATURES += EXTRA_DEBUG # (undocumented)
--#FEATURES += MEMORY_DEBUG # gather information about memory allocation and freeing
--#FEATURES += MISSILES_DEBUG # Enables debug for missiles feature. It will create a file missiles_log.txt file in your settings directory.
--#FEATURES += MUTEX_DEBUG # (undocumented)
--#FEATURES += OPENGL_TRACE # make far more frequent checks for OpenGL errors (requires -DDEBUG to be of any use). Will make error_log.txt a lot larger.
--#FEATURES += TIMER_CHECK # (undocumented)
--#FEATURES += _EXTRA_SOUND_DEBUG # Enable debug for sound effects
-+#EL_FEATURES += CONTEXT_MENUS_TEST # Enable "#cmtest" command to help test/demo the context menu code
-+#EL_FEATURES += DEBUG # (undocumented)
-+#EL_FEATURES += DEBUG_XML # Enables missing (optional) XML string property messages
-+#EL_FEATURES += DEBUG_POINT_PARTICLES # (undocumented)
-+#EL_FEATURES += DEBUG_TIME # Fakes the acceleration of time for use in debugging shadows and the like.
-+#EL_FEATURES += DEBUG_MAP_SOUND # Adds (some??) map boundary areas to tab maps and additional logging to stdout
-+#EL_FEATURES += ECDEBUGWIN # press ctrl-alt-c to open the Eye Candy debug window: trigger most effects without casting spells or server side events
-+#EL_FEATURES += EXTRA_DEBUG # (undocumented)
-+
-+# gather information about memory allocation and freeing
-+ifeq ($(DEBUG),yes)
-+EL_FEATURES += MEMORY_DEBUG
-+endif
-+
-+#EL_FEATURES += MISSILES_DEBUG # Enables debug for missiles feature. It will create a file missiles_log.txt file in your settings directory.
-+#EL_FEATURES += MUTEX_DEBUG # (undocumented)
-+#EL_FEATURES += OPENGL_TRACE # make far more frequent checks for OpenGL errors (requires -DDEBUG to be of any use). Will make error_log.txt a lot larger.
-+#EL_FEATURES += TIMER_CHECK # (undocumented)
-+#EL_FEATURES += _EXTRA_SOUND_DEBUG # Enable debug for sound effects
-
-
- ### Other options (Experimental, unfinished, defunct or otherwise unknown) ###
--#FEATURES += NEW_CURSOR # New coloured cursors made by Emajekral (Experimental) Extract http://users.on.net/~gingerman/sky_cursor-textures.zip into datadir/textures/
--#FEATURES += PAWN # Experimental, not for release, will need server support to function properly. This *will* eat your cat. You've been warned. Enables the Pawn abstract machine.
--#FEATURES += UID # use unique ID sent from server for custom looks. (INCOMPLETE)
--#FEATURES += USE_ACTORS_OPTIMIZER # Enables actor optimizations
--#FEATURES += USE_BOOST
--#FEATURES += USE_TR1 # Needs tr1 version of c++ stl, used for NEW_FILE_IO
--#FEATURES += WRITE_XML # dangerous to use, will wipe out some XML files that are part of the main game download
--#FEATURES += ZLIBW # Enables being able to write gzip compressed files, requires -lzlib/-lz needed for map_editor
--#FEATURES += OLD_MISC_OBJ_DIR # if not defined, ./3dobjects/misc_objects/ paths becomes ./3dobjects/
-+#EL_FEATURES += NEW_CURSOR # New coloured cursors made by Emajekral (Experimental) Extract http://users.on.net/~gingerman/sky_cursor-textures.zip into datadir/textures/
-+#EL_FEATURES += PAWN # Experimental, not for release, will need server support to function properly. This *will* eat your cat. You've been warned. Enables the Pawn abstract machine.
-+#EL_FEATURES += UID # use unique ID sent from server for custom looks. (INCOMPLETE)
-+#EL_FEATURES += USE_ACTORS_OPTIMIZER # Enables actor optimizations
-+#EL_FEATURES += USE_BOOST
-+#EL_FEATURES += USE_TR1 # Needs tr1 version of c++ stl, used for NEW_FILE_IO
-+#EL_FEATURES += WRITE_XML # dangerous to use, will wipe out some XML files that are part of the main game download
-+#EL_FEATURES += ZLIBW # Enables being able to write gzip compressed files, requires -lzlib/-lz needed for map_editor
-+#EL_FEATURES += OLD_MISC_OBJ_DIR # if not defined, ./3dobjects/misc_objects/ paths becomes ./3dobjects/
-
-
-
-@@ -86,7 +97,3 @@
- #EXTRA_INCLUDES=-IC:\\Programme\\Dev-Cpp\\Include
- #EXTRA_LIBS=-lz
- #EXTRA_STATICLIBS=libs/zlib.a
--
--CC=gcc
--CXX=g++
--LINK=gcc
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-glbuild.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-glbuild.patch
deleted file mode 100644
index 972abd9b0d2..00000000000
--- a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-glbuild.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- gl_init.c 2012-02-13 22:01:54.000000000 -0500
-+++ gl_init.c 2012-12-02 18:09:41.274014922 -0500
-@@ -27,6 +27,8 @@
- #include "fsaa/fsaa.h"
- #endif /* FSAA */
-
-+#define APIENTRY
-+
- Uint32 flags;
-
- int window_width=640;
---- platform.h 2012-02-13 22:01:54.000000000 -0500
-+++ platform.h 2012-12-02 17:32:46.017627957 -0500
-@@ -87,9 +87,10 @@
- #define APIENTRYP *
- #elif !defined(BSD)
- #define GL_GLEXT_LEGACY
-+ #include <GL/glew.h>
- #include <GL/gl.h>
- #include <GL/glu.h>
-- #include "glext.h"
-+ #include <GL/glext.h>
- #else // BSD
- #include <GL/gl.h>
- #include <GL/glu.h>
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-minizip.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-minizip.patch
deleted file mode 100644
index 9edb2225450..00000000000
--- a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-minizip.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Jun 24 16:33:08 UTC 2012
-Subject: unbundle minizip
-
-https://bugs.gentoo.org/show_bug.cgi?id=423327
-applied on top of eternal-lands-1.9.3-build.patch
-
---- elc/new_update.c
-+++ elc/new_update.c
-@@ -5,8 +5,8 @@
- #include <string.h>
- #include "md5.h"
- #include "elc_private.h"
--#include "io/zip.h"
--#include "io/unzip.h"
-+#include <zip.h>
-+#include <unzip.h>
- #include "io/ziputil.h"
- #include "io/fileutil.h"
- #include "io/elfilewrapper.h"
---- elc/io/ziputil.h
-+++ elc/io/ziputil.h
-@@ -8,8 +8,8 @@
-
- #include <SDL.h>
- #include "../md5.h"
--#include "zip.h"
--#include "unzip.h"
-+#include <zip.h>
-+#include <unzip.h>
-
- #ifdef __cplusplus
- extern "C"
---- elc/io/elfilewrapper.c
-+++ elc/io/elfilewrapper.c
-@@ -1,5 +1,5 @@
- #include "elfilewrapper.h"
--#include "unzip.h"
-+#include <unzip.h>
- #include "elpathwrapper.h"
- #include "fileutil.h"
- #include <sys/stat.h>
---- elc/Makefile.linux
-+++ elc/Makefile.linux
-@@ -25,11 +25,13 @@
-
- CFLAGS += $(shell sdl-config --cflags) \
- $(shell xml2-config --cflags) \
-+ $(shell pkg-config --cflags minizip) \
- -fno-strict-aliasing \
- $(EXTRA_INCLUDES)
-
- CXXFLAGS += $(shell sdl-config --cflags) \
- $(shell xml2-config --cflags) \
-+ $(shell pkg-config --cflags minizip) \
- -fno-strict-aliasing \
- $(EXTRA_INCLUDES)
-
-@@ -47,6 +49,7 @@
- $(shell pkg-config --libs vorbis) \
- $(shell pkg-config --libs vorbisfile) \
- $(shell pkg-config --libs zlib) \
-+ $(shell pkg-config --libs minizip) \
- -lm \
- $(EXTRA_LIBS) \
- $(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_LIBS)) \
-@@ -80,7 +83,7 @@
- gamewin.o gl_init.o hud.o help.o highlight.o \
- ignore.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 memory.o \
- md5.o mines.o minimap.o misc.o missiles.o multiplayer.o \
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-rpg/eternal-lands/files/, games-rpg/eternal-lands/
@ 2019-05-23 2:29 Stefan Strogin
0 siblings, 0 replies; 5+ messages in thread
From: Stefan Strogin @ 2019-05-23 2:29 UTC (permalink / raw
To: gentoo-commits
commit: 4db23dbb1a7127733ef0a4849824f133c58b8506
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Thu May 16 03:41:49 2019 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Thu May 23 02:27:36 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4db23dbb
games-rpg/eternal-lands: bump version to 1.9.5.3
No longer depends on games-rpg/eternal-lands-data.
Provide a launcher that downloads game data into $HOME on the first
start. It will make auto updates easier and not violating Gentoo
policies.
Closes: https://bugs.gentoo.org/548926
Closes: https://bugs.gentoo.org/652690
Closes: https://bugs.gentoo.org/672238
Closes: https://github.com/gentoo/gentoo/pull/12014
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
games-rpg/eternal-lands/Manifest | 1 +
.../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 ++++++++++++++++++++++
5 files changed, 290 insertions(+)
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index e644551c904..f79208e9c8b 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -1,2 +1,3 @@
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
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 00000000000..77263591394
--- /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 00000000000..ab392d33420
--- /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 00000000000..28f4ab0da54
--- /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 <steils@gentoo.org>
+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 <steils@gentoo.org>
+---
+ 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 00000000000..c1eb35fdc84
--- /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 <steils@gentoo.org>
+Date: Thu, 16 May 2019 05:31:16 +0300
+Subject: [PATCH 2/2] Unbundle minizip
+
+Original patch by Julian Ospald <hasufell@gentoo.org>.
+Bug: https://bugs.gentoo.org/423327
+
+Upstream-Status: Pending
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ 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 <unzip.h>
+ #include "elpathwrapper.h"
+ #include "fileutil.h"
+ #include <sys/stat.h>
+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 <SDL.h>
+ #include "../md5.h"
+-#include "zip.h"
+-#include "unzip.h"
++#include <zip.h>
++#include <unzip.h>
+
+ #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 <string.h>
+ #include "md5.h"
+ #include "elc_private.h"
+-#include "io/zip.h"
+-#include "io/unzip.h"
++#include <zip.h>
++#include <unzip.h>
+ #include "io/ziputil.h"
+ #include "io/fileutil.h"
+ #include "io/elfilewrapper.h"
+--
+2.21.0
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-10-10 20:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-05 5:44 [gentoo-commits] repo/gentoo:master commit in: games-rpg/eternal-lands/files/, games-rpg/eternal-lands/ Stefan Strogin
-- strict thread matches above, loose matches on Subject: below --
2024-10-10 20:29 Conrad Kostecki
2020-06-05 5:35 Stefan Strogin
2019-08-29 1:57 Stefan Strogin
2019-05-23 2:29 Stefan Strogin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox