[gentoo-commits] repo/gentoo:master commit in: games-rpg/eternal-lands/files/, games-rpg/eternal-lands/
commit: ac0a8e3b8b0cedff61c3249dfda566181850fb8f
Author: Stefan Strogin gentoo org>
AuthorDate: Fri Jun 5 05:42:39 2020 +
Commit: Stefan Strogin gentoo org>
CommitDate: Fri Jun 5 05:42:39 2020 +
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 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..000
--- 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..000
--- 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.XX`"
- 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
[gentoo-commits] repo/gentoo:master commit in: games-rpg/eternal-lands/files/, games-rpg/eternal-lands/
commit: 05fa8e7395ed3aa78b2f79d0464b2686912f2a7a
Author: Stefan Strogin gentoo org>
AuthorDate: Fri Jun 5 05:32:18 2020 +
Commit: Stefan Strogin gentoo org>
CommitDate: Fri Jun 5 05:35:00 2020 +
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 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 000..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 000..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.XX`"
+ 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
+
[gentoo-commits] repo/gentoo:master commit in: games-rpg/eternal-lands/files/, games-rpg/eternal-lands/
commit: 4db23dbb1a7127733ef0a4849824f133c58b8506
Author: Stefan Strogin gentoo org>
AuthorDate: Thu May 16 03:41:49 2019 +
Commit: Stefan Strogin gentoo org>
CommitDate: Thu May 23 02:27:36 2019 +
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 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 000..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 000..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 ]]
[gentoo-commits] repo/gentoo:master commit in: games-rpg/eternal-lands/files/
commit: 2141769aba5f646f0d8b7d2dfee0fd2f207c77ec
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Fri Dec 22 15:27:30 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sat Dec 23 13:10:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2141769a
games-rpg/eternal-lands: remove unused patches
.../files/eternal-lands-1.9.1-libpng.patch | 23 --
.../files/eternal-lands-1.9.2-glext.patch | 11 ---
2 files changed, 34 deletions(-)
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.1-libpng.patch
b/games-rpg/eternal-lands/files/eternal-lands-1.9.1-libpng.patch
deleted file mode 100644
index 953ab8ffefd..000
--- a/games-rpg/eternal-lands/files/eternal-lands-1.9.1-libpng.patch
+++ /dev/null
@@ -1,23 +0,0 @@
elc.orig/misc.c
-+++ elc/misc.c
-@@ -311,7 +311,7 @@ int IMG_SavePNG_RW (SDL_Surface *face, S
- }
-
- /* Set error handling. */
-- if (setjmp(png_ptr->jmpbuf))
-+ if (setjmp(png_jmpbuf(png_ptr)))
- {
- /* If we get here, we had a problem reading the file */
- IMG_SetError("Error writing the PNG file");
-@@ -360,10 +360,7 @@ done:
- if (row_pointers != NULL)
- free (row_pointers);
-
-- if (info_ptr != NULL && info_ptr->palette != NULL)
-- free (info_ptr->palette);
--
-- png_destroy_write_struct (_ptr, (png_infopp)NULL);
-+ png_destroy_write_struct (_ptr, _ptr);
-
- return result;
- }
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.2-glext.patch
b/games-rpg/eternal-lands/files/eternal-lands-1.9.2-glext.patch
deleted file mode 100644
index f096d2fc425..000
--- a/games-rpg/eternal-lands/files/eternal-lands-1.9.2-glext.patch
+++ /dev/null
@@ -1,11 +0,0 @@
platform.h.orig2011-06-18 13:55:09.704489907 -0400
-+++ platform.h 2011-06-18 13:55:41.675544567 -0400
-@@ -79,7 +79,7 @@
- #define GL_GLEXT_LEGACY
- #include
- #include
-- #include "glext.h"
-+ #include
- #else // BSD
- #include
- #include
[gentoo-commits] repo/gentoo:master commit in: games-rpg/eternal-lands/files/
commit: 9dbaa4de0ef08ab92f998c00bc9dca7108d5 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Sat Nov 26 18:19:08 2016 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Dec 3 11:37:49 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dbaa4de games-rpg/eternal-lands: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/2920 games-rpg/eternal-lands/files/eternal-lands-1.9.0-glext.patch | 11 --- 1 file changed, 11 deletions(-) diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.0-glext.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.0-glext.patch deleted file mode 100644 index a41db54.. --- a/games-rpg/eternal-lands/files/eternal-lands-1.9.0-glext.patch +++ /dev/null @@ -1,11 +0,0 @@ platform.h.orig2010-02-03 13:21:41.300205559 -0500 -+++ platform.h 2010-02-03 13:22:25.704049074 -0500 -@@ -79,7 +79,7 @@ - #define GL_GLEXT_LEGACY - #include - #include -- #include "glext.h" -+ #include - #endif - - // Inlucde the plaform specific location sound libs
