kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update to 0.0.12 [1]

Browse source 
- Fix build with clang 3.2

PR:		ports/174780 [1]
Submitted by:	Oliver Heesakkers <dev2@heesakkers.info>
This commit is contained in:
Guido Falsi 2012-12-28 21:18:10 +00:00
parent f0c6ef71bb
commit 005c6f91b2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=309587
6 changed files with 49 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
games/0ad/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= 0ad
PORTVERSION= 0.0.11
PORTVERSION= 0.0.12
CATEGORIES= games
MASTER_SITES= SF/zero-ad/releases
DISTFILES= ${PORTNAME}-${PORTVERSION}-alpha-unix-build.tar.xz \

8
games/0ad/distinfo
View file

@ -1,4 +1,4 @@
SHA256 (0ad-0.0.11-alpha-unix-build.tar.xz) = a218c42bce111d0bcb02b3a18eb14d7c06a839b8863df362083ebd0835d3c6a3
SIZE (0ad-0.0.11-alpha-unix-build.tar.xz) = 8682272
SHA256 (0ad-0.0.11-alpha-unix-data.tar.xz) = a28dd9160637bc1345223ec6f9c36bb693350e9dcc35a3194f43ed463b3ba20e
SIZE (0ad-0.0.11-alpha-unix-data.tar.xz) = 350967036
SHA256 (0ad-0.0.12-alpha-unix-build.tar.xz) = 69d01f9ba12bb78f58fc2c567187cfffe20055591f378724b906e6a48ac73877
SIZE (0ad-0.0.12-alpha-unix-build.tar.xz) = 8693880
SHA256 (0ad-0.0.12-alpha-unix-data.tar.xz) = 0efd800a149f2fed70d7e133b93a385e82810844b50154771514d17d9a68ee07
SIZE (0ad-0.0.12-alpha-unix-data.tar.xz) = 388143556

23
games/0ad/files/patch-build-premake-premake4.lua
View file

@ -1,6 +1,15 @@
--- build/premake/premake4.lua.orig 2012-08-15 02:10:44.000000000 +0200
+++ build/premake/premake4.lua 2012-09-13 04:13:10.184743291 +0200
@@ -220,7 +220,6 @@
--- build/premake/premake4.lua.orig 2012-10-30 01:56:24.000000000 +0100
+++ build/premake/premake4.lua 2012-12-26 18:37:28.882327928 +0100
@@ -134,7 +134,7 @@
function project_set_build_flags()
- flags { "Symbols", "NoEditAndContinue" }
+ flags { "NoEditAndContinue" }
if not _OPTIONS["icc"] and (os.is("windows") or not _OPTIONS["minimal-flags"]) then
-- adds the -Wall compiler flag
flags { "ExtraWarnings" } -- this causes far too many warnings/remarks on ICC
@@ -215,7 +215,6 @@
-- enable security features (stack checking etc) that shouldn't have
-- a significant effect on performance and can catch bugs
@ -8,18 +17,18 @@
"-D_FORTIFY_SOURCE=2",
-- always enable strict aliasing (useful in debug builds because of the warnings)
@@ -292,11 +291,11 @@
@@ -287,11 +286,11 @@
-- X11 includes may be installed in one of a gadzillion of three places
-- Famous last words: "You can't include too much! ;-)"
includedirs {
- "/usr/X11R6/include/X11",
- "/usr/X11R6/include",
+ "%%LOCALBASE%%/X11",
+ "%%LOCALBASE%%/include",
+ "/usr/local/X11",
+ "/usr/local/include",
"/usr/include/X11"
}
- libdirs { "/usr/X11R6/lib" }
+ libdirs { "%%LOCALBASE%%/lib" }
+ libdirs { "/usr/local/lib" }
if _OPTIONS["bindir"] then
defines { "INSTALLED_BINDIR=" .. _OPTIONS["bindir"] }

9
games/0ad/files/patch-libraries-spidermonkey-build.sh
View file

@ -1,6 +1,6 @@
--- libraries/spidermonkey/build.sh.orig 2012-01-31 01:06:56.000000000 +0100
+++ libraries/spidermonkey/build.sh 2012-05-03 15:49:34.640969629 +0200
@@ -49,6 +49,11 @@
--- libraries/spidermonkey/build.sh.orig 2012-06-11 00:39:26.000000000 +0200
+++ libraries/spidermonkey/build.sh 2012-12-18 10:58:11.343785532 +0100
@@ -53,6 +53,14 @@
cd js-1.8.5/js/src
@ -8,6 +8,9 @@
+sed 's/# include <pthread_np.h>/#pragma GCC visibility push(default)\
+#include <pthread_np.h>\
+#pragma GCC visibility pop/' jsnativestack.cpp.orig >jsnativestack.cpp
+
+cp configure configure.orig
+sed 's/"$ac_cv_have_visibility_class_bug" = "no"; then/"$ac_cv_have_visibility_class_bug" = "no" -a "$OS_ARCH" != "FreeBSD" ; then/' configure.orig >configure
+
# We want separate debug/release versions of the library, so we have to change
# the LIBRARY_NAME for each build.

11
games/0ad/files/patch-source-lib-debug.cpp Normal file
View file

@ -0,0 +1,11 @@
--- source/lib/debug.cpp.orig 2012-12-27 22:33:04.665325819 +0100
+++ source/lib/debug.cpp 2012-12-27 22:34:32.369332795 +0100
@@ -353,6 +353,8 @@
// exit really doesn't want to see any more messages.
static atomic_bool isExiting;
+const atomic_bool DEBUG_SUPPRESS = 0xAB;
+
// this logic is applicable to any type of error. special cases such as
// suppressing certain expected WARN_ERRs are done there.
static bool ShouldSuppressError(atomic_bool* suppress)

11
games/0ad/files/patch-source-lib-debug.h Normal file
View file

@ -0,0 +1,11 @@
--- source/lib/debug.h.orig 2012-12-27 22:32:56.384331917 +0100
+++ source/lib/debug.h 2012-12-27 22:33:41.699327215 +0100
@@ -122,7 +122,7 @@
* debugging the symbol engine.
* use 0 as the initial value to avoid allocating .rdata space.
**/
-const atomic_bool DEBUG_SUPPRESS = 0xAB;
+extern const atomic_bool DEBUG_SUPPRESS;
/**
* choices offered by the error dialog that are returned