diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
commit | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch) | |
tree | 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /games-rpg/eternal-lands/files | |
parent | f516638b7fe9592837389826a6152a7e1b251c54 (diff) |
gentoo resync : 13.06.2020
Diffstat (limited to 'games-rpg/eternal-lands/files')
-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 |
2 files changed, 15 insertions, 15 deletions
diff --git a/games-rpg/eternal-lands/files/el-wrapper b/games-rpg/eternal-lands/files/el-wrapper-1.9.5.8 index ab392d334207..3439c2a11625 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 28f4ab0da542..d4aaa2bd415f 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 |