- Update to 0.4.15

- Remove -ffast-math to fix problems when built with clang 3.8+ ([1])

PR:		215532 [1]
Submitted by:	scf [1]
This commit is contained in:
Dmitry Marakasov 2016-12-24 16:37:21 +00:00
parent 4a040e3339
commit 838231d129
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=429371
4 changed files with 29 additions and 26 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= minetest
PORTVERSION= 0.4.14
PORTVERSION= 0.4.15
CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org
@ -24,7 +24,7 @@ CMAKE_ARGS= -DCUSTOM_MANDIR="${PREFIX}/man" \
PORTDATA= *
PORTDOCS= *
OPTIONS_DEFINE= CLIENT SERVER CURL NLS SOUND DOCS EXAMPLES FREETYPE LEVELDB REDIS LUAJIT SPATIAL
OPTIONS_DEFINE= CLIENT SERVER CURL NLS SOUND DOCS EXAMPLES FREETYPE LEVELDB REDIS LUAJIT SPATIAL PGSQL
OPTIONS_DEFAULT=CLIENT SERVER CURL SOUND FREETYPE LUAJIT
OPTIONS_SUB= yes
@ -44,32 +44,25 @@ CLIENT_LIB_DEPENDS= libpng.so:graphics/png \
libIrrlicht.so:x11-toolkits/irrlicht
CLIENT_USES= jpeg
CLIENT_USE= GL=gl XORG=x11,xext
SERVER_CMAKE_ON= -DBUILD_SERVER=1
SERVER_CMAKE_OFF= -DBUILD_SERVER=0
CURL_CMAKE_ON= -DENABLE_CURL=1
CURL_CMAKE_OFF= -DENABLE_CURL=0
SERVER_CMAKE_BOOL= BUILD_SERVER
CURL_CMAKE_BOOL= ENABLE_CURL
CURL_LIB_DEPENDS= libcurl.so:ftp/curl
NLS_CMAKE_ON= -DENABLE_GETTEXT=1
NLS_CMAKE_OFF= -DENABLE_GETTEXT=0
NLS_CMAKE_BOOL= ENABLE_GETTEXT
NLS_USES= gettext
NLS_LDFLAGS= -L${LOCALBASE}/lib
SOUND_CMAKE_ON= -DENABLE_SOUND=1
SOUND_CMAKE_OFF= -DENABLE_SOUND=0
LEVELDB_CMAKE_ON= -DENABLE_LEVELDB=1
LEVELDB_CMAKE_OFF= -DENABLE_LEVELDB=0
SOUND_CMAKE_BOOL= ENABLE_SOUND
LEVELDB_CMAKE_BOOL= ENABLE_LEVELDB
LEVELDB_LIB_DEPENDS= libleveldb.so:databases/leveldb
REDIS_CMAKE_ON= -DENABLE_REDIS=1
REDIS_CMAKE_OFF= -DENABLE_REDIS=0
REDIS_CMAKE_BOOL= ENABLE_REDIS
REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis
FREETYPE_CMAKE_ON= -DENABLE_FREETYPE=1
FREETYPE_CMAKE_OFF= -DENABLE_FREETYPE=0
FREETYPE_CMAKE_BOOL= ENABLE_FREETYPE
FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2
LUAJIT_CMAKE_ON= -DENABLE_LUAJIT=1
LUAJIT_CMAKE_OFF= -DENABLE_LUAJIT=0
LUAJIT_CMAKE_BOOL= ENABLE_LUAJIT
LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit
SPATIAL_LIB_DEPENDS= libspatialindex.so:devel/spatialindex
SPATIAL_CMAKE_ON= -DENABLE_SPATIAL=1
SPATIAL_CMAKE_OFF= -DENABLE_SPATIAL=0
SPATIAL_CMAKE_BOOL= ENABLE_SPATIAL
PGSQL_USES= pgsql
PGSQL_CMAKE_BOOL= ENABLE_POSTGRESQL
.include <bsd.port.options.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1463406391
SHA256 (minetest-minetest-0.4.14_GH0.tar.gz) = 203de4d41a60466126ab92ca85f726d88d0084f2e78393da239e7416cb847054
SIZE (minetest-minetest-0.4.14_GH0.tar.gz) = 8637454
TIMESTAMP = 1482488146
SHA256 (minetest-minetest-0.4.15_GH0.tar.gz) = 5684e6118e3484f8901323f1ca4179202659010b33c72f02bc03df792493e3a9
SIZE (minetest-minetest-0.4.15_GH0.tar.gz) = 8809609

View File

@ -1,7 +1,7 @@
--- src/CMakeLists.txt.orig 2016-05-15 12:49:15 UTC
--- src/CMakeLists.txt.orig 2016-12-22 22:14:17 UTC
+++ src/CMakeLists.txt
@@ -309,11 +309,6 @@ else()
set(PLATFORM_LIBS -lrt ${PLATFORM_LIBS})
@@ -344,11 +344,6 @@ else()
endif(HAVE_LIBRT)
endif(APPLE)
- # This way Xxf86vm is found on OpenBSD too
@ -12,3 +12,12 @@
# Prefer local iconv if installed
find_library(ICONV_LIBRARY iconv)
mark_as_advanced(ICONV_LIBRARY)
@@ -760,7 +755,7 @@ else()
set(OTHER_FLAGS "${OTHER_FLAGS} -mthreads -fexceptions")
endif()
- set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -ffast-math -Wall -pipe -funroll-loops")
+ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -Wall -pipe -funroll-loops")
if(APPLE)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os")
else()

View File

@ -5,4 +5,5 @@ man/man6/minetest.6.gz
man/man6/minetestserver.6.gz
share/applications/minetest.desktop
share/appdata/minetest.appdata.xml
share/icons/hicolor/128x128/apps/minetest.png
share/icons/hicolor/scalable/apps/minetest.svg