Date: Tue, 11 Feb 2020 21:05:23 +0000 (UTC) From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525892 - in head/games/el: . files Message-ID: <202002112105.01BL5N5g075316@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: acm Date: Tue Feb 11 21:05:23 2020 New Revision: 525892 URL: https://svnweb.freebsd.org/changeset/ports/525892 Log: - Update to 1.9.5.6 - Update to SDL2 dependencies ChangeLog at: https://github.com/raduprv/Eternal-Lands/releases/tag/1.9.5.6 Modified: head/games/el/Makefile head/games/el/distinfo head/games/el/files/patch-Makefile.bsd Modified: head/games/el/Makefile ============================================================================== --- head/games/el/Makefile Tue Feb 11 21:03:56 2020 (r525891) +++ head/games/el/Makefile Tue Feb 11 21:05:23 2020 (r525892) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= el -PORTVERSION= 1.9.5.4 +PORTVERSION= 1.9.5.6 PORTEPOCH= 1 CATEGORIES= games @@ -18,7 +18,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/el.ini:gam USES= compiler:c++11-lang gl gmake gnome iconv openal:al,alut sdl xorg USE_GNOME= libxml2 -USE_SDL= sdl net image +USE_SDL= sdl2 net2 image2 USE_GL= gl USE_XORG= x11 USE_GITHUB= yes Modified: head/games/el/distinfo ============================================================================== --- head/games/el/distinfo Tue Feb 11 21:03:56 2020 (r525891) +++ head/games/el/distinfo Tue Feb 11 21:05:23 2020 (r525892) @@ -1,3 +1,3 @@ -TIMESTAMP = 1577816823 -SHA256 (raduprv-Eternal-Lands-1.9.5.4_GH0.tar.gz) = fa602e8d235ba0002e1054bea7ee77434021d3893c9ad5e90d67c93752fb5ad8 -SIZE (raduprv-Eternal-Lands-1.9.5.4_GH0.tar.gz) = 2833391 +TIMESTAMP = 1581446959 +SHA256 (raduprv-Eternal-Lands-1.9.5.6_GH0.tar.gz) = 3d43f74e74b87ffbcbd567970381904908f96c478bbf6f06a18c7a72f1f98525 +SIZE (raduprv-Eternal-Lands-1.9.5.6_GH0.tar.gz) = 2841673 Modified: head/games/el/files/patch-Makefile.bsd ============================================================================== --- head/games/el/files/patch-Makefile.bsd Tue Feb 11 21:03:56 2020 (r525891) +++ head/games/el/files/patch-Makefile.bsd Tue Feb 11 21:05:23 2020 (r525892) @@ -1,6 +1,6 @@ ---- Makefile.bsd.orig 2014-01-06 15:25:15.000000000 +0100 -+++ Makefile.bsd 2014-01-06 15:49:31.000000000 +0100 -@@ -2,17 +2,19 @@ +--- Makefile.bsd 2020-01-05 15:02:58.000000000 -0500 ++++ Makefile.bsd 2020-02-11 14:01:38.149884000 -0500 +@@ -2,23 +2,25 @@ -include make.conf @@ -12,21 +12,28 @@ -_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) -+CFLAGS+=$(PLATFORM) $(CWARN) $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) -+_CFLAGS=-fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) -+CXXFLAGS+=$(CXXWARN) $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) -+_CXXFLAGS=-fomit-frame-pointer -ffast-math $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) ++CFLAGS+=$(PLATFORM) $(CWARN) $(OPTIONS) $(shell sdl2-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) ++_CFLAGS=-fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl2-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) ++CXXFLAGS+=$(CXXWARN) $(OPTIONS) $(shell sdl2-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) ++_CXXFLAGS=-fomit-frame-pointer -ffast-math $(OPTIONS) $(shell sdl2-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 \ -+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 \ ++LDFLAGS+=$(shell sdl2-config --libs) $(shell xml2-config --libs) -lSDL2_net -lSDL2_image -lopenal $(XDIR) -lGL -lGLU -lcal3d -lm $(EXTRA_LIBS) -lz -lpng -lvorbis -lvorbisfile \ $(foreach FEATURE, $(FEATURES), $($(FEATURE)_LIBS)) -_LDFLAGS=$(XDIR) -lGL -lpthread -lstdc++ +_LDFLAGS=$(XDIR) -lGL -pthread # This works on Ubuntu 8.04 (LTS) at least # Install these packages in addition to those required for a standard build -@@ -86,16 +88,16 @@ + # libasound2-dev libaudio-dev libartsc0-dev libesd0-dev libpulse-dev libaa1-dev libgpmg1-dev libdirectfb-dev + LIBD=/usr/lib +-STATICLIBS=$(LIBD)/libSDL_net.a $(LIBD)/libSDL.a $(LIBD)/libSDL_image.a $(LIBD)/libopenal.a $(LIBD)/libvorbisfile.a $(LIBD)/libvorbis.a $(LIBD)/libogg.a $(LIBD)/libxml2.a $(LIBD)/libcal3d.a $(LIBD)/libpng.a $(LIBD)/libasound.a $(LIBD)/libaudio.a $(LIBD)/libartsc.a $(LIBD)/libesd.a $(LIBD)/libpulse-simple.a $(LIBD)/libpulse.a $(LIBD)/libaa.a $(LIBD)/libgpm.a $(LIBD)/libcurses.a $(LIBD)/libslang.a $(LIBD)/libdirectfb.a $(LIBD)/libdirect.a $(LIBD)/libfusion.a $(LIBD)/librt.a $(LIBD)/libtiff.a $(LIBD)/libjpeg.a $(LIBD)/libGLU.a $(LIBD)/libz.a ++STATICLIBS=$(LIBD)/libSDL2_net.a $(LIBD)/libSDL2.a $(LIBD)/libSDL2_image.a $(LIBD)/libopenal.a $(LIBD)/libvorbisfile.a $(LIBD)/libvorbis.a $(LIBD)/libogg.a $(LIBD)/libxml2.a $(LIBD)/libcal3d.a $(LIBD)/libpng.a $(LIBD)/libasound.a $(LIBD)/libaudio.a $(LIBD)/libartsc.a $(LIBD)/libesd.a $(LIBD)/libpulse-simple.a $(LIBD)/libpulse.a $(LIBD)/libaa.a $(LIBD)/libgpm.a $(LIBD)/libcurses.a $(LIBD)/libslang.a $(LIBD)/libdirectfb.a $(LIBD)/libdirect.a $(LIBD)/libfusion.a $(LIBD)/librt.a $(LIBD)/libtiff.a $(LIBD)/libjpeg.a $(LIBD)/libGLU.a $(LIBD)/libz.a + + # the objects we need + ENCYCLOPEDIA_COBJ = books/fontdef.o books/parser.o books/symbol.o books/typesetter.o sort.o symbol_table.o +@@ -84,16 +86,16 @@ DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P) #(shell echo $OBJ |sed s/\.o/\.P/))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002112105.01BL5N5g075316>