diff --git a/.abf.yml b/.abf.yml index b66add7..54042c9 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - 0ad-0.0.16-alpha-unix-build.tar.xz: 4931b9f6cd68ef131832eeedf8b502b54f204cce + 0ad-0.0.23-alpha-unix-build.tar.xz: 4baf0025ba6455a3d955168d2363945f75fd0ec1 diff --git a/0ad-0.0.19-debug.patch b/0ad-0.0.19-debug.patch new file mode 100644 index 0000000..58b6550 --- /dev/null +++ b/0ad-0.0.19-debug.patch @@ -0,0 +1,111 @@ +diff -urN 0ad-0.0.19-alpha/build/premake/premake4/src/host/scripts.c 0ad-0.0.19-alpha-patched/build/premake/premake4/src/host/scripts.c +--- 0ad-0.0.19-alpha/build/premake/premake4/src/host/scripts.c 2013-11-09 01:08:16.000000000 +1100 ++++ 0ad-0.0.19-alpha-patched/build/premake/premake4/src/host/scripts.c 2015-11-30 02:46:32.601208642 +1000 +@@ -87,7 +87,7 @@ + "gs(cfg)\nlocal result = table.translate(cfg.flags, flags)\nreturn result\nend\nfunction premake.dotnet.getkind(cfg)\nif (cfg.kind == \"ConsoleApp\") then\nreturn \"Exe\"\nelseif (cfg.kind == \"WindowedApp\") then\nreturn \"WinExe\"\nelseif (cfg.kind == \"SharedLib\") then\nreturn \"Library\"\nend\nend", + + /* tools/gcc.lua */ +- "premake.gcc = { }\npremake.gcc.cc = \"gcc\"\npremake.gcc.cxx = \"g++\"\npremake.gcc.ar = \"ar\"\nlocal cflags =\n{\nEnableSSE = \"-msse\",\nEnableSSE2 = \"-msse2\",\nExtraWarnings = \"-Wall\",\nFatalWarnings = \"-Werror\",\nFloatFast = \"-ffast-math\",\nFloatStrict = \"-ffloat-store\",\nNoFramePointer = \"-fomit-frame-pointer\",\nOptimize = \"-O2\",\nOptimizeSize = \"-Os\",\nOptimizeSpeed = \"-O3\",\nSymbols = \"-g\",\n}\nlocal cxxflags =\n{\nEnableSSE = \"-msse\",\nEnableSSE2 = \"-msse2\",\nExtraWarnings = \"-Wall\",\nFatalWarnings = \"-Werror\",\nFloatFast = \"-ffast-math\",\nFloatStrict = \"-ffloat-store\",\nNoFramePointer = \"-fomit-frame-pointer\",\nOptimize = \"-O2\",\nOptimizeSize = \"-Os\",\nOptimizeSpeed = \"-O3\",\nSymbols = \"-g\",\nNoExceptions = \"-fno-exceptions\",\nNoRTTI = \"-fno-rtti\",\n}\npremake.gcc.platforms = \n{\nNative = { \ncppflags = \"-MMD -MP\",\n},\nx32 = { \ncppflags = \"-MMD -MP\",\nflags " ++ "premake.gcc = { }\npremake.gcc.cc = \"gcc\"\npremake.gcc.cxx = \"g++\"\npremake.gcc.ar = \"ar\"\nlocal cflags =\n{\nEnableSSE = \"-msse\",\nEnableSSE2 = \"-msse2\",\nExtraWarnings = \"-Wall\",\nFatalWarnings = \"-Werror\",\nFloatFast = \"-ffast-math\",\nFloatStrict = \"-ffloat-store\",\nNoFramePointer = \"-fomit-frame-pointer\",\nOptimize = \"-O2\",\nOptimizeSize = \"-Os\",\nOptimizeSpeed = \"\",\nSymbols = \"\",\n}\nlocal cxxflags =\n{\nEnableSSE = \"-msse\",\nEnableSSE2 = \"-msse2\",\nExtraWarnings = \"-Wall\",\nFatalWarnings = \"-Werror\",\nFloatFast = \"-ffast-math\",\nFloatStrict = \"-ffloat-store\",\nNoFramePointer = \"-fomit-frame-pointer\",\nOptimize = \"-O2\",\nOptimizeSize = \"-Os\",\nOptimizeSpeed = \"\",\nSymbols = \"\",\nNoExceptions = \"-fno-exceptions\",\nNoRTTI = \"-fno-rtti\",\n}\npremake.gcc.platforms = \n{\nNative = { \ncppflags = \"-MMD -MP\",\n},\nx32 = { \ncppflags = \"-MMD -MP\",\nflags " + " = \"-m32\",\nldflags = \"-L/usr/lib32\", \n},\nx64 = { \ncppflags = \"-MMD -MP\",\nflags = \"-m64\",\nldflags = \"-L/usr/lib64\",\n},\nUniversal = { \ncppflags = \"\",\nflags = \"-arch i386 -arch x86_64 -arch ppc -arch ppc64\",\n},\nUniversal32 = { \ncppflags = \"\",\nflags = \"-arch i386 -arch ppc\",\n},\nUniversal64 = { \ncppflags = \"\",\nflags = \"-arch x86_64 -arch ppc64\",\n},\nPS3 = {\ncc = \"ppu-lv2-g++\",\ncxx = \"ppu-lv2-g++\",\nar = \"ppu-lv2-ar\",\ncppflags = \"-MMD -MP\",\n}\n}\nlocal platforms = premake.gcc.platforms\nfunction premake.gcc.getcppflags(cfg)\nlocal result = { }\ntable.insert(result, platforms[cfg.platform].cppflags)\nreturn result\nend\nfunction premake.gcc.getcflags(cfg)\nlocal result = table.translate(cfg.flags, cflags)\ntable.insert(result, platforms[cfg.platform].flags)\nif cfg.system ~= \"windows\" and cfg.kind == \"SharedLib\" then\ntable.insert(result, \"-fPIC\")\nend\nreturn result\nend\nfunction premake.gcc.getcxxflags(cfg)\nlocal re" + "sult = table.translate(cfg.flags, cxxflags)\nif cfg.system ~= \"windows\" and cfg.kind == \"SharedLib\" then\ntable.insert(result, \"-fPIC\")\nend\nreturn result\nend\nfunction premake.gcc.getldflags(cfg)\nlocal result = { }\nif not cfg.flags.Symbols then\nif cfg.system == \"macosx\" then\ntable.insert(result, \"-Wl,-x\")\nelse\ntable.insert(result, \"-s\")\nend\nend\nif cfg.kind == \"SharedLib\" then\nif cfg.system == \"macosx\" then\nresult = table.join(result, { \"-dynamiclib\", \"-flat_namespace\" })\nelse\ntable.insert(result, \"-shared\")\nend\nif cfg.system == \"windows\" and not cfg.flags.NoImportLib then\ntable.insert(result, '-Wl,--out-implib=\"' .. cfg.linktarget.fullpath .. '\"')\nend\nend\nif cfg.kind == \"WindowedApp\" and cfg.system == \"windows\" then\ntable.insert(result, \"-mwindows\")\nend\nlocal platform = platforms[cfg.platform]\ntable.insert(result, platform.flags)\ntable.insert(result, platform.ldflags)\nreturn result\nend\nfunction premake.gcc.getlibdirflags(cfg)\nlocal result = { }\nfo" + "r _, value in ipairs(premake.getlinks(cfg, \"all\", \"directory\")) do\ntable.insert(result, '-L' .. _MAKE.esc(value))\nend\nreturn result\nend\nfunction premake.gcc.getlinkflags(cfg)\nlocal result = { }\nfor _, value in ipairs(premake.getlinks(cfg, \"all\", \"basename\")) do\nif path.getextension(value) == \".framework\" then\ntable.insert(result, '-framework ' .. _MAKE.esc(path.getbasename(value)))\nelse\ntable.insert(result, '-l' .. _MAKE.esc(value))\nend\nend\nreturn result\nend\nfunction premake.gcc.getdefines(defines)\nlocal result = { }\nfor _,def in ipairs(defines) do\ntable.insert(result, '-D' .. def)\nend\nreturn result\nend\nfunction premake.gcc.getincludedirs(includedirs)\nlocal result = { }\nfor _,dir in ipairs(includedirs) do\ntable.insert(result, \"-I\" .. _MAKE.esc(dir))\nend\nreturn result\nend\n", +diff -urN 0ad-0.0.19-alpha/build/premake/premake4/src/tools/gcc.lua 0ad-0.0.19-alpha-patched/build/premake/premake4/src/tools/gcc.lua +--- 0ad-0.0.19-alpha/build/premake/premake4/src/tools/gcc.lua 2012-06-27 07:48:06.000000000 +1100 ++++ 0ad-0.0.19-alpha-patched/build/premake/premake4/src/tools/gcc.lua 2015-11-30 02:42:41.612198130 +1000 +@@ -31,9 +31,9 @@ + FloatStrict = "-ffloat-store", + NoFramePointer = "-fomit-frame-pointer", + Optimize = "-O2", +- OptimizeSize = "-Os", +- OptimizeSpeed = "-O3", +- Symbols = "-g", ++ OptimizeSize = "", ++ OptimizeSpeed = "", ++ Symbols = "", + } + + local cxxflags = +@@ -46,9 +46,9 @@ + FloatStrict = "-ffloat-store", + NoFramePointer = "-fomit-frame-pointer", + Optimize = "-O2", +- OptimizeSize = "-Os", +- OptimizeSpeed = "-O3", +- Symbols = "-g", ++ OptimizeSize = "", ++ OptimizeSpeed = "", ++ Symbols = "", + NoExceptions = "-fno-exceptions", + NoRTTI = "-fno-rtti", + } +diff -urN 0ad-0.0.19-alpha/libraries/source/fcollada/src/Makefile 0ad-0.0.19-alpha-patched/libraries/source/fcollada/src/Makefile +--- 0ad-0.0.19-alpha/libraries/source/fcollada/src/Makefile 2014-09-25 01:39:28.000000000 +1100 ++++ 0ad-0.0.19-alpha-patched/libraries/source/fcollada/src/Makefile 2015-11-30 02:26:05.768152812 +1000 +@@ -9,9 +9,7 @@ + + CXX ?= g++ + CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS) +-CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL + CXXFLAGS_RELEASE := -O2 -DNDEBUG -DRETAIL +-CXXFLAGS_TEST := -O0 -g -D_DEBUG + LIBS += `pkg-config libxml-2.0 --libs` + INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags` + INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES) +@@ -219,33 +217,19 @@ + FCollada/FColladaTest/FCTestXRef/FCTestXRefSimple.cpp \ + FCollada/FColladaTest/FCTestXRef/FCTestXRefTree.cpp \ + +-OBJECTS_DEBUG = $(addprefix output/debug/,$(SOURCE:.cpp=.o)) + OBJECTS_RELEASE = $(addprefix output/release/,$(SOURCE:.cpp=.o)) +-OBJECTS_TEST = $(addprefix output/test/,$(SOURCE:.cpp=.o) $(TEST_SOURCE:.cpp=.o)) +-OBJECTS_ALL = $(OBJECTS_DEBUG) $(OBJECTS_RELEASE) $(OBJECTS_TEST) ++OBJECTS_ALL = $(OBJECTS_RELEASE) + +-all: output/libFColladaSD.a output/libFColladaSR.a install ++all: output/libFColladaSR.a install + + output_dirs: +- bash -c 'mkdir -p output/{debug,release,test}/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}' +- +-test: FCollada/FColladaTest/ output/FColladaTest +- ( cd FCollada/FColladaTest/ ; ../../output/FColladaTest ) +- cat FCollada/FColladaTest/FColladaTestLog.txt +- +-output/libFColladaSD.a: $(OBJECTS_DEBUG) | output_dirs +- @echo "$@" +- @ar -cr $@ $(OBJECTS_DEBUG); ranlib $@ ++ bash -c 'mkdir -p output/release/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}' + + output/libFColladaSR.a: $(OBJECTS_RELEASE) | output_dirs + @echo "$@" + @ar -cr $@ $(OBJECTS_RELEASE); ranlib $@ + +-output/FColladaTest: $(OBJECTS_TEST) | output_dirs +- $(CXX) -o $@ $(LDFLAGS) $(OBJECTS_TEST) $(LIBS) +- +-install: output/libFColladaSD.a output/libFColladaSR.a +- cp output/libFColladaSD.a ../lib/libFColladaSD.a ++install: output/libFColladaSR.a + cp output/libFColladaSR.a ../lib/libFColladaSR.a + + dfile = $(@:.o=.d) +@@ -255,18 +239,10 @@ + sed -e 's/\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ + -e '/^$$/ d' -e 's/$$/ :/' < $(dfile) >> $(Pfile) && \ + rm -f $(dfile) +-output/debug/%.o: %.cpp | output_dirs +- @echo "$<" +- $(CXX) $(CXXFLAGS) $(CXXFLAGS_DEBUG) $(INCLUDES) -MD -MF $(dfile) -c $< -o $@ +- $(gendep) + output/release/%.o: %.cpp | output_dirs + @echo "$<" + $(CXX) $(CXXFLAGS) $(CXXFLAGS_RELEASE) $(INCLUDES) -MD -MF $(dfile) -c $< -o $@ + $(gendep) +-output/test/%.o: %.cpp | output_dirs +- @echo "$<" +- $(CXX) $(CXXFLAGS) $(CXXFLAGS_TEST) $(INCLUDES_TEST) -MD -MF $(dfile) -c $< -o $@ +- $(gendep) + + clean: + rm -rf output diff --git a/0ad-debug.patch b/0ad-debug.patch deleted file mode 100644 index 746fda1..0000000 --- a/0ad-debug.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff -up 0ad-0.0.15-alpha/libraries/source/fcollada/src/Makefile.orig 0ad-0.0.15-alpha/libraries/source/fcollada/src/Makefile ---- 0ad-0.0.15-alpha/libraries/source/fcollada/src/Makefile.orig 2013-12-27 17:28:17.825656505 -0200 -+++ 0ad-0.0.15-alpha/libraries/source/fcollada/src/Makefile 2013-12-27 17:30:47.874662251 -0200 -@@ -9,10 +9,7 @@ endif - - CXX ?= g++ - CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS) --CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL - CXXFLAGS_RELEASE := -O1 -DNDEBUG -DRETAIL --# (-O2 with gcc 4.3 causes linker errors when using this library, for unknown reasons, so stick with -O1 until gcc >4.3 is typical.) --CXXFLAGS_TEST := -O0 -g -D_DEBUG - LIBS += `pkg-config libxml-2.0 --libs` - INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags` - INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES) -@@ -181,72 +178,19 @@ SOURCE = \ - FColladaPlugins/FArchiveXML/FAXSceneExport.cpp \ - FColladaPlugins/FArchiveXML/FAXSceneImport.cpp \ - --TEST_SOURCE = \ -- FCollada/FMath/FMArrayTest.cpp \ -- FCollada/FMath/FMQuaternionTest.cpp \ -- FCollada/FMath/FMTreeTest.cpp \ -- FCollada/FUtils/FUBoundingTest.cpp \ -- FCollada/FUtils/FUCrc32Test.cpp \ -- FCollada/FUtils/FUEventTest.cpp \ -- FCollada/FUtils/FUFileManagerTest.cpp \ -- FCollada/FUtils/FUFunctorTest.cpp \ -- FCollada/FUtils/FUObjectTest.cpp \ -- FCollada/FUtils/FUStringBuilderTest.cpp \ -- FCollada/FUtils/FUStringConversionTest.cpp \ -- FCollada/FUtils/FUStringTest.cpp \ -- FCollada/FUtils/FUTestBed.cpp \ -- FCollada/FUtils/FUUniqueStringMapTest.cpp \ -- FCollada/FColladaTest/FCTest.cpp \ -- FCollada/FColladaTest/FCTestAnimation.cpp \ -- FCollada/FColladaTest/FCTestArchiving.cpp \ -- FCollada/FColladaTest/FCTestController.cpp \ -- FCollada/FColladaTest/FCTestGeometryPolygonsTools.cpp \ -- FCollada/FColladaTest/FCTestParameters.cpp \ -- FCollada/FColladaTest/FCTestSceneGraph.cpp \ -- FCollada/FColladaTest/FCTestAssetManagement/FCTAMCrossCloning.cpp \ -- FCollada/FColladaTest/FCTestAssetManagement/FCTAssetManagement.cpp \ -- FCollada/FColladaTest/FCTestExportImport/FCTEIAnimation.cpp \ -- FCollada/FColladaTest/FCTestExportImport/FCTEICamera.cpp \ -- FCollada/FColladaTest/FCTestExportImport/FCTEIEmitter.cpp \ -- FCollada/FColladaTest/FCTestExportImport/FCTEIExtra.cpp \ -- FCollada/FColladaTest/FCTestExportImport/FCTEIGeometry.cpp \ -- FCollada/FColladaTest/FCTestExportImport/FCTEILight.cpp \ -- FCollada/FColladaTest/FCTestExportImport/FCTEIMaterial.cpp \ -- FCollada/FColladaTest/FCTestExportImport/FCTEIPhysics.cpp \ -- FCollada/FColladaTest/FCTestExportImport/FCTEIVisualScene.cpp \ -- FCollada/FColladaTest/FCTestExportImport/FCTestExportImport.cpp \ -- FCollada/FColladaTest/FCTestXRef/FCTestXRef.cpp \ -- FCollada/FColladaTest/FCTestXRef/FCTestXRefAcyclic.cpp \ -- FCollada/FColladaTest/FCTestXRef/FCTestXRefSimple.cpp \ -- FCollada/FColladaTest/FCTestXRef/FCTestXRefTree.cpp \ -- --OBJECTS_DEBUG = $(addprefix output/debug/,$(SOURCE:.cpp=.o)) - OBJECTS_RELEASE = $(addprefix output/release/,$(SOURCE:.cpp=.o)) --OBJECTS_TEST = $(addprefix output/test/,$(SOURCE:.cpp=.o) $(TEST_SOURCE:.cpp=.o)) --OBJECTS_ALL = $(OBJECTS_DEBUG) $(OBJECTS_RELEASE) $(OBJECTS_TEST) -+OBJECTS_ALL = $(OBJECTS_RELEASE) - --all: output_dirs output/libFColladaSD.a output/libFColladaSR.a install -+all: output_dirs output/libFColladaSR.a install - - output_dirs: -- bash -c 'mkdir -p output/{debug,release,test}/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}' -- --test: FCollada/FColladaTest/ output/FColladaTest -- ( cd FCollada/FColladaTest/ ; ../../output/FColladaTest ) -- cat FCollada/FColladaTest/FColladaTestLog.txt -- --output/libFColladaSD.a: $(OBJECTS_DEBUG) -- @echo "$@" -- @ar -cr $@ $(OBJECTS_DEBUG); ranlib $@ -+ bash -c 'mkdir -p output/release/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}' - - output/libFColladaSR.a: $(OBJECTS_RELEASE) - @echo "$@" - @ar -cr $@ $(OBJECTS_RELEASE); ranlib $@ - --output/FColladaTest: $(OBJECTS_TEST) -- $(CXX) -o $@ $(LDFLAGS) $(OBJECTS_TEST) $(LIBS) -- --install: output/libFColladaSD.a output/libFColladaSR.a -- cp output/libFColladaSD.a ../lib/libFColladaSD.a -+install: output/libFColladaSR.a - cp output/libFColladaSR.a ../lib/libFColladaSR.a - - dfile = $(@:.o=.d) -@@ -256,18 +200,10 @@ gendep = \ - sed -e 's/\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(dfile) >> $(Pfile) && \ - rm -f $(dfile) --output/debug/%.o: %.cpp -- @echo "$<" -- $(CXX) $(CXXFLAGS) $(CXXFLAGS_DEBUG) $(INCLUDES) -MD -MF $(dfile) -c $< -o $@ -- $(gendep) - output/release/%.o: %.cpp - @echo "$<" - $(CXX) $(CXXFLAGS) $(CXXFLAGS_RELEASE) $(INCLUDES) -MD -MF $(dfile) -c $< -o $@ - $(gendep) --output/test/%.o: %.cpp -- @echo "$<" -- $(CXX) $(CXXFLAGS) $(CXXFLAGS_TEST) $(INCLUDES_TEST) -MD -MF $(dfile) -c $< -o $@ -- $(gendep) - - clean: - rm -rf output diff --git a/0ad-miniupnpc.patch b/0ad-miniupnpc.patch deleted file mode 100644 index 2da8acf..0000000 --- a/0ad-miniupnpc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up 0ad-0.0.15-alpha/source/network/NetServer.cpp.orig 0ad-0.0.15-alpha/source/network/NetServer.cpp ---- 0ad-0.0.15-alpha/source/network/NetServer.cpp.orig 2014-04-18 12:08:43.415641350 -0300 -+++ 0ad-0.0.15-alpha/source/network/NetServer.cpp 2014-04-18 12:09:27.221643028 -0300 -@@ -274,7 +274,7 @@ void* CNetServerWorker::SetupUPnP(void*) - // Check that the port was actually forwarded. - ret = UPNP_GetSpecificPortMappingEntry(urls.controlURL, - data.first.servicetype, -- psPort, protocall, -+ psPort, protocall, externalIPAddress, - intClient, intPort, NULL/*desc*/, - NULL/*enabled*/, duration); - diff --git a/0ad-mozjs-incompatible.patch b/0ad-mozjs-incompatible.patch new file mode 100644 index 0000000..3d1d91a --- /dev/null +++ b/0ad-mozjs-incompatible.patch @@ -0,0 +1,38 @@ +diff -uNr 0ad-0.0.21-alpha.orig/source/scriptinterface/ScriptTypes.h 0ad-0.0.21-alpha/source/scriptinterface/ScriptTypes.h +--- 0ad-0.0.21-alpha.orig/source/scriptinterface/ScriptTypes.h 2016-09-02 18:19:31.000000000 +0200 ++++ 0ad-0.0.21-alpha/source/scriptinterface/ScriptTypes.h 2016-11-09 07:14:16.227277422 +0100 +@@ -79,19 +79,6 @@ + include paths. + #endif + +-#if MOZJS_MINOR_VERSION != 3 +-#error Your compiler is trying to use an untested minor version of the \ +-SpiderMonkey library. If you are a package maintainer, please make sure \ +-to check very carefully that this version does not change the behaviour \ +-of the code executed by SpiderMonkey. Different parts of the game (e.g. \ +-the multiplayer mode) rely on deterministic behaviour of the JavaScript \ +-engine. A simple way for testing this would be playing a network game \ +-with one player using the old version and one player using the new \ +-version. Another way for testing is running replays and comparing the \ +-final hash (check trac.wildfiregames.com/wiki/Debugging#Replaymode). \ +-For more information check this link: trac.wildfiregames.com/wiki/Debugging#Outofsync +-#endif +- + class ScriptInterface; + + #endif // INCLUDED_SCRIPTTYPES +diff -uNr 0ad-0.0.21-alpha.orig/source/simulation2/serialization/BinarySerializer.cpp 0ad-0.0.21-alpha/source/simulation2/serialization/BinarySerializer.cpp +--- 0ad-0.0.21-alpha.orig/source/simulation2/serialization/BinarySerializer.cpp 2016-09-18 11:34:45.000000000 +0200 ++++ 0ad-0.0.21-alpha/source/simulation2/serialization/BinarySerializer.cpp 2016-11-09 07:29:10.293824242 +0100 +@@ -145,11 +145,7 @@ + const JSClass* jsclass = JS_GetClass(obj); + if (!jsclass) + throw PSERROR_Serialize_ScriptError("JS_GetClass failed"); +-// TODO: Remove this workaround for upstream API breakage when updating SpiderMonkey +-// See https://bugzilla.mozilla.org/show_bug.cgi?id=1236373 +-#define JSCLASS_CACHED_PROTO_WIDTH js::JSCLASS_CACHED_PROTO_WIDTH + JSProtoKey protokey = JSCLASS_CACHED_PROTO_KEY(jsclass); +-#undef JSCLASS_CACHED_PROTO_WIDTH + + if (protokey == JSProto_Object) + { diff --git a/0ad-rpath.patch b/0ad-rpath.patch index aeaf823..ab76d4d 100644 --- a/0ad-rpath.patch +++ b/0ad-rpath.patch @@ -1,6 +1,7 @@ ---- 0ad-0.0.16-alpha/build/premake/premake4.lua.orig 2014-05-17 22:21:52.787713008 +0200 -+++ 0ad-0.0.16-alpha/build/premake/premake4.lua 2014-05-17 22:22:39.659845979 +0200 -@@ -356,26 +356,6 @@ +diff -urN 0ad-0.0.21-alpha/build/premake/premake4.lua 0ad-0.0.21-alpha-patched/build/premake/premake4.lua +--- 0ad-0.0.21-alpha/build/premake/premake4.lua 2016-09-18 18:54:27.000000000 +1000 ++++ 0ad-0.0.21-alpha-patched/build/premake/premake4.lua 2016-12-05 13:42:29.678426569 +1000 +@@ -368,26 +368,6 @@ defines { "INSTALLED_LIBDIR=" .. _OPTIONS["libdir"] } end @@ -17,7 +18,7 @@ - - -- Adding the executable path and taking care of correct escaping - if _ACTION == "gmake" then -- linkoptions { "-Wl,-rpath,'$$ORIGIN'" } +- linkoptions { "-Wl,-rpath,'$$ORIGIN'" } - elseif _ACTION == "codeblocks" then - linkoptions { "-Wl,-R\\\\$$$ORIGIN" } - end diff --git a/0ad.spec b/0ad.spec index d5af02d..cb32ebd 100644 --- a/0ad.spec +++ b/0ad.spec @@ -12,11 +12,10 @@ %global with_system_nvtt 0 %global without_nvtt 1 -%global with_system_enet 1 Summary: Cross-Platform RTS Game of Ancient Warfare Name: 0ad -Version: 0.0.16 +Version: 0.0.23 Release: 1 Epoch: 1 License: GPLv2+ and BSD and MIT and IBM @@ -29,14 +28,13 @@ Source0: http://releases.wildfiregames.com/%{name}-%{version}-alpha-unix-build.t # and disabled options were not added to the manual page. Source1: %{name}.6 # http://trac.wildfiregames.com/ticket/1421 -Patch0: %{name}-rpath.patch +Patch0: 0ad-rpath.patch # Only do fcollada debug build with enabling debug maintainer mode # It also prevents assumption there that it is building in x86 -Patch1: %{name}-debug.patch -# Build with miniupnpc-1.9 -Patch2: %{name}-miniupnpc.patch +Patch1: 0ad-0.0.19-debug.patch +Patch2: 0ad-mozjs-incompatible.patch # After some trial&error this corrects a %%check failure with gcc 4.9 on i686 -Patch3: %{name}-check.patch +Patch3: 0ad-check.patch BuildRequires: cmake BuildRequires: desktop-file-utils @@ -49,18 +47,20 @@ BuildRequires: miniupnpc-devel %if %{with_system_nvtt} BuildRequires: nvidia-texture-tools-devel %endif -BuildRequires: wxgtku-devel +BuildRequires: wxgtku3.0-devel BuildRequires: pkgconfig(gloox) BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(IL) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libenet) BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libsodium) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libzip) -BuildRequires: pkgconfig(mozjs-24) +BuildRequires: pkgconfig(mozjs-38) +BuildRequires: pkgconfig(nspr) BuildRequires: pkgconfig(openal) -BuildRequires: pkgconfig(sdl) +BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(vorbis) Requires: %{name}-data ExclusiveArch: %{ix86} x86_64 @@ -98,9 +98,7 @@ hobbyist game developers, since 2001. # disable debug build, and "int 0x3" to trap to debugger (x86 only) %patch1 -p1 %endif -%if %{mdvver} >= 201400 %patch2 -p1 -%endif %patch3 -p1 %if %{with_system_nvtt} @@ -116,11 +114,7 @@ build/workspaces/update-workspaces.sh \ --bindir %{_gamesbindir} \ --datadir %{_gamesdatadir}/%{name} \ --libdir %{_libdir}/%{name} \ -%if %{with_system_enet} - --with-system-enet \ -%endif - --with-system-mozjs24 \ - --with-system-miniupnpc \ + --with-system-mozjs38 \ %if %{with_system_nvtt} --with-system-nvtt \ %endif @@ -138,16 +132,12 @@ install -m 755 binaries/system/pyrogenesis%{dbg} %{buildroot}%{_gamesbindir}/pyr install -d -m 755 %{buildroot}%{_libdir}/%{name} for name in AtlasUI%{dbg} Collada%{dbg}; do - install -m 755 binaries/system/lib${name}.so %{buildroot}%{_libdir}/%{name}/lib${name}.so + install -m 755 binaries/system/lib${name}.so %{buildroot}%{_libdir}/%{name}/lib${name}.so done -%if !%{with_system_enet} - install -p -m 755 binaries/system/libenet.so.1 %{buildroot}%{_libdir}/%{name}/libenet.so.1 -%endif - %if !%{without_nvtt} && !%{with_system_nvtt} for name in nvcore nvimage nvmath nvtt; do - install -p -m 755 binaries/system/lib${name}.so %{buildroot}%{_libdir}/%{name}/lib${name}.so + install -p -m 755 binaries/system/lib${name}.so %{buildroot}%{_libdir}/%{name}/lib${name}.so done %endif @@ -157,7 +147,7 @@ install -p -m 644 build/resources/0ad.appdata.xml %{buildroot}%{_datadir}/appdat install -d -m 755 %{buildroot}%{_gamesdatadir}/applications install -m 644 build/resources/0ad.desktop %{buildroot}%{_gamesdatadir}/applications/%{name}.desktop perl -pi -e 's|%{_bindir}/0ad|%{_gamesbindir}/0ad|;' \ - %{buildroot}%{_gamesdatadir}/applications/%{name}.desktop + %{buildroot}%{_gamesdatadir}/applications/%{name}.desktop install -d -m 755 %{buildroot}%{_gamesdatadir}/pixmaps install -m 644 build/resources/0ad.png %{buildroot}%{_gamesdatadir}/pixmaps/%{name}.png