summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'games-rpg')
-rw-r--r--games-rpg/eternal-lands/Manifest2
-rw-r--r--games-rpg/eternal-lands/eternal-lands-1.9.5.8.ebuild (renamed from games-rpg/eternal-lands/eternal-lands-1.9.5.3.ebuild)12
-rw-r--r--games-rpg/eternal-lands/files/el-wrapper-1.9.5.8 (renamed from games-rpg/eternal-lands/files/el-wrapper)4
-rw-r--r--games-rpg/eternal-lands/files/eternal-lands-1.9.5.8-build.patch (renamed from games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-build.patch)26
-rw-r--r--games-rpg/kqlives/files/kqlives-0.99_autoconf.patch93
-rw-r--r--games-rpg/kqlives/files/kqlives-0.99_dumb2.patch13
-rw-r--r--games-rpg/kqlives/files/kqlives-0.99_gcc10.patch13
-rw-r--r--games-rpg/kqlives/kqlives-0.99-r2.ebuild (renamed from games-rpg/kqlives/kqlives-0.99-r1.ebuild)28
8 files changed, 158 insertions, 33 deletions
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 7594d8dd2e0..848ae6b0d7f 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -1 +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.8.ebuild
index 9728e4e9815..aae74143d65 100644
--- a/games-rpg/eternal-lands/eternal-lands-1.9.5.3.ebuild
+++ b/games-rpg/eternal-lands/eternal-lands-1.9.5.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,11 +18,11 @@ RDEPEND="app-arch/unzip
media-libs/cal3d[-16bit-indices]
media-libs/freealut
media-libs/libpng:0=
- media-libs/libsdl[X,opengl,video]
+ media-libs/libsdl2[X,opengl,video]
media-libs/libvorbis
media-libs/openal
- media-libs/sdl-image
- media-libs/sdl-net
+ media-libs/sdl2-image
+ media-libs/sdl2-net
sys-libs/zlib[minizip]
virtual/glu
virtual/opengl
@@ -42,7 +42,7 @@ BDEPEND="${DEPEND}
S="${WORKDIR}/Eternal-Lands-${PV}"
PATCHES=(
- "${FILESDIR}/${PN}-1.9.5.3-build.patch"
+ "${FILESDIR}/${PN}-1.9.5.8-build.patch"
"${FILESDIR}/${PN}-1.9.5.3-minizip.patch"
)
@@ -66,7 +66,7 @@ src_compile() {
src_install() {
dobin el.linux.bin
- newbin "${FILESDIR}"/el-wrapper el
+ newbin "${FILESDIR}"/el-wrapper-1.9.5.8 el
newicon -s 48 elc.png ${PN}.png
make_desktop_entry el "Eternal Lands"
diff --git a/games-rpg/eternal-lands/files/el-wrapper b/games-rpg/eternal-lands/files/el-wrapper-1.9.5.8
index ab392d33420..3439c2a1162 100644
--- a/games-rpg/eternal-lands/files/el-wrapper
+++ b/games-rpg/eternal-lands/files/el-wrapper-1.9.5.8
@@ -18,8 +18,8 @@ if [[ ! -e $elc ]] || [[ ! -e $datadir ]] || [[ ! -e $elc/servers.lst ]] ||
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
+ 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 \
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.8-build.patch
index 28f4ab0da54..d4aaa2bd415 100644
--- 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.8-build.patch
@@ -1,7 +1,7 @@
-From ef13ae006609e51eaddbcdf0495f44cfde797e26 Mon Sep 17 00:00:00 2001
+From 0f93097a58d78e0ba9d51d48f56b470047b27210 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
+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>
@@ -10,7 +10,7 @@ Signed-off-by: Stefan Strogin <steils@gentoo.org>
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile.linux b/Makefile.linux
-index c57aeeeb..a0839c5c 100644
+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
@@ -18,17 +18,17 @@ index c57aeeeb..a0839c5c 100644
$(shell pkg-config zlib --cflags)
-CFLAGS=$(PLATFORM) $(CWARN) -O0 -ggdb -pipe $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
-+CFLAGS += $(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 sdl --libs) \
-+LDFLAGS += $(shell pkg-config sdl --libs) \
+-LDFLAGS=$(shell pkg-config sdl2 --libs) \
++LDFLAGS += $(shell pkg-config sdl2 --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
+ $(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/))
@@ -37,7 +37,7 @@ index c57aeeeb..a0839c5c 100644
ifndef CC
CC=gcc
-@@ -127,8 +127,8 @@ all: $(EXE)
+@@ -128,8 +128,8 @@ all: $(EXE)
# the compile targets
$(EXE): $(OBJS)
@@ -48,7 +48,7 @@ index c57aeeeb..a0839c5c 100644
#recompile on Makefile or conf change
#.depend $(OBJS): Makefile.linux make.conf
-@@ -136,14 +136,14 @@ $(EXE): $(OBJS)
+@@ -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
@@ -66,5 +66,5 @@ index c57aeeeb..a0839c5c 100644
mv ".deps/$@.pp" ".deps/$@.P"; \
else rm -f ".deps/$@.pp"; exit 1; \
--
-2.21.0
+2.27.0
diff --git a/games-rpg/kqlives/files/kqlives-0.99_autoconf.patch b/games-rpg/kqlives/files/kqlives-0.99_autoconf.patch
new file mode 100644
index 00000000000..dc4a5f9d453
--- /dev/null
+++ b/games-rpg/kqlives/files/kqlives-0.99_autoconf.patch
@@ -0,0 +1,93 @@
+diff --git a/Makefile.am b/Makefile.am
+index 799b2c0..ff49ce2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,8 +1,8 @@
+ SUBDIRS = intl po scripts
+-bin_PROGRAMS = kq mapdraw mapdiff mapdump $(MAPDRAW2)
+-EXTRA_PROGRAMS = mapdraw2
++bin_PROGRAMS = kqlives kqlives-mapdraw kqlives-mapdiff kqlives-mapdump $(MAPDRAW2)
++EXTRA_PROGRAMS = kqlives-mapdraw2
+
+-kq_SOURCES = src/enemyc.c src/intrface.c src/sgame.c src/bounds.c \
++kqlives_SOURCES = src/enemyc.c src/intrface.c src/sgame.c src/bounds.c \
+ src/combat.c src/entity.c src/movement.c src/shopmenu.c \
+ src/credits.c src/eqpmenu.c src/itemmenu.c src/music.c src/timing.c \
+ src/disk.c src/eskill.c src/kq.c src/res.c \
+@@ -20,29 +20,29 @@ kq_SOURCES = src/enemyc.c src/intrface.c src/sgame.c src/bounds.c \
+ include/eskill.h include/magic.h include/selector.h \
+ include/bounds.h include/gettext.h include/console.h
+
+-EXTRA_kq_SOURCES = src/unix.c src/osx.m src/beos.c src/win.c src/dos.c src/winres.rc
+-kq_LDADD = $(kq_extra_files) $(ALLEGRO_LIBS) $(LIBINTL)
+-kq_DEPENDENCIES = $(kq_extra_files)
++EXTRA_kqlives_SOURCES = src/unix.c src/osx.m src/beos.c src/win.c src/dos.c src/winres.rc
++kqlives_LDADD = $(kq_extra_files) $(ALLEGRO_LIBS) $(LIBINTL)
++kqlives_DEPENDENCIES = $(kq_extra_files)
+
+-mapdraw_SOURCES = maps/mapdata.c maps/mapdraw.h maps/mapedit.c \
++kqlives_mapdraw_SOURCES = maps/mapdata.c maps/mapdraw.h maps/mapedit.c \
+ maps/mapfile.c maps/mapent.c maps/mapshared.c src/disk.c \
+ maps/mapstructs.c src/bounds.c include/disk.h include/structs.h
+-mapdraw_LDADD = $(ALLEGRO_LIBS) $(LIBINTL)
++kqlives_mapdraw_LDADD = $(ALLEGRO_LIBS) $(LIBINTL)
+
+-mapdraw2_SOURCES = maps/mapdraw2.c maps/mapdraw2.h \
++kqlives_mapdraw2_SOURCES = maps/mapdraw2.c maps/mapdraw2.h \
+ maps/mainwindow.c maps/mapedit2.c maps/mapedit2.h \
+ maps/mapshared.c maps/mapdraw.h src/disk.c \
+ src/bounds.c include/disk.h include/structs.h
+-mapdraw2_LDADD = $(GTK_LIBS) $(ALLEGRO_LIBS) $(LIBINTL)
+-mapdraw2_CPPFLAGS = $(AM_CPPFLAGS) $(GTK_CFLAGS)
++kqlives_mapdraw2_LDADD = $(GTK_LIBS) $(ALLEGRO_LIBS) $(LIBINTL)
++kqlives_mapdraw2_CPPFLAGS = $(AM_CPPFLAGS) $(GTK_CFLAGS)
+
+-mapdiff_SOURCES = maps/mapdraw.h maps/mapdiff.c src/disk.c \
++kqlives_mapdiff_SOURCES = maps/mapdraw.h maps/mapdiff.c src/disk.c \
+ include/disk.h include/structs.h
+-mapdiff_LDADD = $(ALLEGRO_LIBS) $(LIBINTL)
++kqlives_mapdiff_LDADD = $(ALLEGRO_LIBS) $(LIBINTL)
+
+-mapdump_SOURCES = maps/mapdump.c maps/mapshared.c maps/mapdata.c \
++kqlives_mapdump_SOURCES = maps/mapdump.c maps/mapshared.c maps/mapdata.c \
+ src/disk.c src/bounds.c include/disk.h include/structs.h
+-mapdump_LDADD = $(ALLEGRO_LIBS) $(LIBINTL)
++kqlives_mapdump_LDADD = $(ALLEGRO_LIBS) $(LIBINTL)
+
+ APPR=KQ.app/Contents/Resources
+ KQ.app: kq
+@@ -88,10 +88,10 @@ dist_music_DATA = music/aa_arofl.xm music/exp.s3m music/oxford.s3m \
+
+ musicdir = $(pkgdatadir)/music
+
+-dist_man_MANS = debian/kq.6
++dist_man_MANS = debian/kqlives.6
+
+ AM_CPPFLAGS = $(WARNING_CFLAGS) -I$(top_srcdir)/include \
+- -DKQ_BIN=\"$(bindir)/kq$(EXEEXT)\" \
++ -DKQ_BIN=\"$(bindir)/kqlives$(EXEEXT)\" \
+ -DKQ_DATA=\"$(pkgdatadir)\" \
+ -DKQ_LIB=\"$(pkglibdir)\" \
+ -DKQ_LOCALE=\"$(localedir)\" \
+diff --git a/configure.ac b/configure.ac
+index 679d74f..48db735 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,7 +2,7 @@
+ # Process this file with autoconf to produce a configure script.
+
+ AC_PREREQ(2.61)
+-AC_INIT([KQ],[0.99],[peterhull90@users.sourceforge.net])
++AC_INIT([KQLIVES],[0.99],[peterhull90@users.sourceforge.net])
+ AC_CONFIG_SRCDIR([src/kq.c])
+ AC_CONFIG_HEADER([config.h])
+ AC_CANONICAL_BUILD
+@@ -88,7 +88,7 @@ AC_SEARCH_LIBS(lua_gettop, lua50 lua5.1 lua, [], [AC_MSG_ERROR([Lua not found])]
+ PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.8.0 libglade-2.0 >= 2.4.0],
+ [AC_SUBST(GTK_LIBS)
+ AC_SUBST(GTK_CFLAGS)
+- MAPDRAW2="mapdraw2${EXEEXT}"],
++ MAPDRAW2="kqlives-mapdraw2${EXEEXT}"],
+ [MAPDRAW2=""])
+ AC_SUBST(MAPDRAW2)
+
diff --git a/games-rpg/kqlives/files/kqlives-0.99_dumb2.patch b/games-rpg/kqlives/files/kqlives-0.99_dumb2.patch
new file mode 100644
index 00000000000..943145b4476
--- /dev/null
+++ b/games-rpg/kqlives/files/kqlives-0.99_dumb2.patch
@@ -0,0 +1,13 @@
+diff --git a/src/music.c b/src/music.c
+index 94c2786..1912d4d 100644
+--- a/src/music.c
++++ b/src/music.c
+@@ -125,7 +125,7 @@ void play_music (const char *music_name, long position)
+ stop_music ();
+ strcpy (filename, kqres (MUSIC_DIR, music_name));
+ if (strstr (filename, ".mod"))
+- mod_song[current_music_player] = dumb_load_mod (filename);
++ mod_song[current_music_player] = dumb_load_mod (filename, 0);
+
+ else if (strstr (filename, ".xm"))
+ mod_song[current_music_player] = dumb_load_xm (filename);
diff --git a/games-rpg/kqlives/files/kqlives-0.99_gcc10.patch b/games-rpg/kqlives/files/kqlives-0.99_gcc10.patch
new file mode 100644
index 00000000000..693b993cdbd
--- /dev/null
+++ b/games-rpg/kqlives/files/kqlives-0.99_gcc10.patch
@@ -0,0 +1,13 @@
+diff --git a/maps/mapshared.c b/maps/mapshared.c
+index 47fa7af..0c05d81 100644
+--- a/maps/mapshared.c
++++ b/maps/mapshared.c
+@@ -129,7 +129,7 @@ unsigned short *map, *b_map, *f_map, *c_map, *cf_map, *cb_map;
+ unsigned char *z_map, *sh_map, *o_map, *cz_map, *csh_map, *co_map;
+ unsigned char *search_map;
+
+-s_bound bound_box[MAX_BOUNDS]; // WK - not redundant. Used on line 266
++extern s_bound bound_box[MAX_BOUNDS]; // WK - not redundant. Used on line 266
+
+ /*! \brief Blit to screen
+ *
diff --git a/games-rpg/kqlives/kqlives-0.99-r1.ebuild b/games-rpg/kqlives/kqlives-0.99-r2.ebuild
index c667ef716e6..0c16049e100 100644
--- a/games-rpg/kqlives/kqlives-0.99-r1.ebuild
+++ b/games-rpg/kqlives/kqlives-0.99-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit desktop
+inherit autotools desktop
MY_P=${P/lives}
@@ -19,8 +19,8 @@ IUSE="cheats nls"
RDEPEND="
dev-lang/lua:0
>=gnome-base/libglade-2.4
- media-libs/aldumb
media-libs/allegro:0
+ >=media-libs/dumb-2.0.3[allegro]
>=x11-libs/gtk+-2.8:2
nls? ( virtual/libintl )"
DEPEND="${RDEPEND}
@@ -29,6 +29,18 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_P}
+PATCHES=(
+ "${FILESDIR}/${P}_autoconf.patch" # Fix #597790
+ "${FILESDIR}/${P}_dumb2.patch" # >=media-libs/dumb-2.0.3 support
+ "${FILESDIR}/${P}_gcc10.patch" # Fix #661422
+)
+
+src_prepare() {
+ default
+ mv debian/{kq,${PN}}.6 || die
+ eautoreconf
+}
+
src_configure() {
econf \
$(use_enable cheats) \
@@ -37,12 +49,6 @@ src_configure() {
src_install() {
default
-
- local x
- for x in diff draw draw2 dump; do
- mv -vf "${D}/etc"/map${x} "${D}/etc"/kq-map${x} || die
- done
-
doicon "${FILESDIR}"/${PN}.xpm
- make_desktop_entry kq KqLives ${PN}
+ make_desktop_entry ${PN} KqLives ${PN}
}