1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00

games/openra: update to 20150614

Changes:	https://github.com/OpenRA/OpenRA/wiki/Changelog#release-20150614
This commit is contained in:
Jan Beich 2015-06-20 22:28:07 +00:00
parent cfbe959af4
commit f28110058a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=390179
3 changed files with 18 additions and 68 deletions

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= openra
PORTVERSION= 20150424
PORTVERSION= 20150614
DISTVERSIONPREFIX= release-
CATEGORIES= games
# XXX Convert to USES=nuget or package dependencies instead
@ -15,10 +15,10 @@ MASTER_SITES= https://nuget.org/api/v2/package/StyleCopPlus.MSBuild/4.7.49.5?dum
https://nuget.org/api/v2/package/SharpFont/3.0.1?dummy=/:SharpFont \
https://nuget.org/api/v2/package/NUnit/2.6.4?dummy=/:NUnit \
https://nuget.org/api/v2/package/Mono.Nat/1.2.21?dummy=/:Mono_Nat \
https://nuget.org/api/v2/package/Moq/4.2.1502.0911?dummy=/:Moq \
https://nuget.org/api/v2/package/FuzzyLogicLibrary/1.2.0?dummy=/:FuzzyLogicLibrary \
https://github.com/${GH_ACCOUNT}/SDL2-CS/releases/download/20140407/:SDL2_CS \
https://github.com/${GH_ACCOUNT}/Eluant/releases/download/20140425/:Eluant
https://github.com/${GH_ACCOUNT}/Eluant/releases/download/20140425/:Eluant \
https://geolite.maxmind.com/download/geoip/database/:GeoLite2
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
StyleCopPlus.MSBuild-4.7.49.5.zip:StyleCopPlus \
StyleCop.MSBuild-4.7.49.0.zip:StyleCop \
@ -30,11 +30,11 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
SharpFont-3.0.1.zip:SharpFont \
NUnit-2.6.4.zip:NUnit \
Mono.Nat-1.2.21.zip:Mono_Nat \
Moq-4.2.1502.0911.zip:Moq \
FuzzyLogicLibrary-1.2.0.zip:FuzzyLogicLibrary \
SDL2-CS.dll:SDL2_CS \
Eluant.dll:Eluant
EXTRACT_ONLY= ${DISTFILES:C/:.*//:N*.dll}
Eluant.dll:Eluant \
GeoLite2-Country.mmdb.gz:GeoLite2
EXTRACT_ONLY= ${DISTFILES:C/:.*//:N*.dll:N*.mmdb*}
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Multiplayer re-envisioning of early RTS games by Westwood Studios
@ -73,18 +73,19 @@ ZENITY_DESC= Use native crash dialog
.include <bsd.port.options.mk>
post-patch:
# XXX Move under post-extract once patch-SharpFont-3.0 is no longer needed
@${CP} -v ${DISTFILES:C/:.*//:M*.dll:S,^,${_DISTDIR}/,} \
${WRKSRC}/thirdparty
post-extract:
@${MKDIR} ${WRKSRC}/thirdparty/download
@${CP} -v ${DISTFILES:C/:.*//:N*.tar*:N*.zip:S,^,${_DISTDIR}/,} \
${WRKSRC}/thirdparty/download
@for f in $$(${SED} -n 's/\.$$//; s,cp \./,,p' \
${WRKSRC}/thirdparty/fetch-thirdparty-deps.sh); do \
${MV} -v ${WRKDIR}/$${f#*/} ${WRKSRC}/thirdparty; \
${MV} -v ${WRKDIR}/$${f#*/} ${WRKSRC}/thirdparty/download; \
done
post-patch:
${REINPLACE_CMD} -e 's/Linux/${OPSYS}/' \
-e '/CP_R/s,hicolor/,hicolor,' \
-e '/fetch-thirdparty-deps/d' \
-e '\,thirdparty/.*\.sh,d' \
-e 's/crashdialog/gamemonitor/' \
-e '/echo/!s/ @/ /' \
-e '/^mods:/s/$$/ version/' \
@ -92,6 +93,7 @@ post-patch:
-e '/^test:/s/$$/ all/' \
${WRKSRC}/Makefile
${REINPLACE_CMD} -e '/linux/{ p; s//${OPSYS:tl}/; }' \
${WRKSRC}/thirdparty/download/*.config \
${WRKSRC}/thirdparty/*.config*
${SED} 's/@LIBLUA51@/liblua-${LUA_VER}.so/' \
${WRKSRC}/thirdparty/Eluant.dll.config.in \

View File

@ -1,5 +1,5 @@
SHA256 (openra-OpenRA-release-20150424_GH0.tar.gz) = b5837cc6b33ff804aa45f25c77662d448828815b1b554eab38ed6bd2ae48dd07
SIZE (openra-OpenRA-release-20150424_GH0.tar.gz) = 17110851
SHA256 (openra-OpenRA-release-20150614_GH0.tar.gz) = 8e5bbb292438697e1cd761b7fdfe7d0325c66a4f5edd8289943fd2beadcd8a2c
SIZE (openra-OpenRA-release-20150614_GH0.tar.gz) = 15178734
SHA256 (StyleCopPlus.MSBuild-4.7.49.5.zip) = b98a8ed20c5e82ff5fe6c2a52ecd45bffd4d4ab284611f35a25889c3bba364c3
SIZE (StyleCopPlus.MSBuild-4.7.49.5.zip) = 124724
SHA256 (StyleCop.MSBuild-4.7.49.0.zip) = 6680dedaa5d27fb1ead475015de98e476e58fa9a27e4b7ad0f08d5f7d8f6ee66
@ -20,11 +20,11 @@ SHA256 (NUnit-2.6.4.zip) = be8cde6e9754474d5d4f553addb6331cf442c2182a0eb4dc87618
SIZE (NUnit-2.6.4.zip) = 99004
SHA256 (Mono.Nat-1.2.21.zip) = fa380d8b531069e0dd7a5d8dffe70b128f591205e432074280859b9e65853d04
SIZE (Mono.Nat-1.2.21.zip) = 23598
SHA256 (Moq-4.2.1502.0911.zip) = 1187ebedd98ba9b8abee93de9779a20ef75068b63c401967235351542f213b03
SIZE (Moq-4.2.1502.0911.zip) = 645358
SHA256 (FuzzyLogicLibrary-1.2.0.zip) = b464509236260f53d963771ed99410a7e1cdbd268a2bde43b189e7d15044a174
SIZE (FuzzyLogicLibrary-1.2.0.zip) = 70571
SHA256 (SDL2-CS.dll) = 61ea325dad3c585449d606c031d6fb2d37ac517ddae78851790846a35dc4d47f
SIZE (SDL2-CS.dll) = 2882560
SHA256 (Eluant.dll) = abb67679c241ae35a430f79696792cbd9093ceda5998f6f578d0fd763ee440b0
SIZE (Eluant.dll) = 64000
SHA256 (GeoLite2-Country.mmdb.gz) = 0dbbf822d49ae5204613900a7ef6b111264bb76762196370753f7d62856cf43a
SIZE (GeoLite2-Country.mmdb.gz) = 2145305

View File

@ -1,52 +0,0 @@
commit 4987a6b
Author: Robert Rouhani <robert.rouhani@gmail.com>
Date: Fri Mar 20 23:51:24 2015 -0400
Updated SharpFont to 3.0.0, adjusted font rendering code for new fixed-point types.
---
OpenRA.Game/Graphics/SpriteFont.cs | 4 ++--
thirdparty/fetch-thirdparty-deps-windows.sh | 14 +++-----------
thirdparty/fetch-thirdparty-deps.ps1 | 20 ++++++--------------
thirdparty/fetch-thirdparty-deps.sh | 5 +++--
4 files changed, 14 insertions(+), 29 deletions(-)
diff --git OpenRA.Game/Graphics/SpriteFont.cs OpenRA.Game/Graphics/SpriteFont.cs
index 65a885e..5f79683 100644
--- OpenRA.Game/Graphics/SpriteFont.cs
+++ OpenRA.Game/Graphics/SpriteFont.cs
@@ -102,13 +102,13 @@ GlyphInfo CreateGlyph(Pair<char, Color> c)
face.LoadChar(c.First, LoadFlags.Default, LoadTarget.Normal);
face.Glyph.RenderGlyph(RenderMode.Normal);
- var size = new Size((int)face.Glyph.Metrics.Width >> 6, (int)face.Glyph.Metrics.Height >> 6);
+ var size = new Size((int)face.Glyph.Metrics.Width, (int)face.Glyph.Metrics.Height);
var s = builder.Allocate(size);
var g = new GlyphInfo
{
Sprite = s,
- Advance = (int)face.Glyph.Metrics.HorizontalAdvance / 64f,
+ Advance = (float)face.Glyph.Metrics.HorizontalAdvance,
Offset = new int2(face.Glyph.BitmapLeft, -face.Glyph.BitmapTop)
};
diff --git thirdparty/fetch-thirdparty-deps.sh thirdparty/fetch-thirdparty-deps.sh
index dcd4b9b..8452657 100755
--- thirdparty/fetch-thirdparty-deps.sh
+++ thirdparty/fetch-thirdparty-deps.sh
@@ -39,10 +39,11 @@ fi
if [ ! -f SharpFont.dll ]; then
echo "Fetching SharpFont from nuget"
- nuget install SharpFont -Version 2.5.0.1
- cp ./SharpFont.2.5.0.1/lib/net20/SharpFont* .
- sed '/osx/s@\(dll="\)[^"]*\(" />\)@\1/Library/Frameworks/Mono.framework/Libraries/libfreetype.6.dylib\2@' ./SharpFont.2.5.0.1/Content/SharpFont.dll.config > SharpFont.dll.config
- rm -rf SharpFont.2.5.0.1
+ nuget install SharpFont -Version 3.0.1
+ cp ./SharpFont.3.0.1/lib/net20/SharpFont* .
+ cp ./SharpFont.3.0.1/config/SharpFont.dll.config .
+ rm -rf SharpFont.3.0.1
+ rm -rf SharpFont.Dependencies.2.5.5.1
fi
if [ ! -f nunit.framework.dll ]; then