diff --git a/.gitignore b/.gitignore index c5706e0..0975af8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /0ad-0.0.14-alpha-unix-build.tar.xz +/0ad-0.0.15-alpha-unix-build.tar.xz diff --git a/0ad-debug.patch b/0ad-debug.patch index e1918bf..746fda1 100644 --- a/0ad-debug.patch +++ b/0ad-debug.patch @@ -1,10 +1,10 @@ -diff -up 0ad-0.0.14-alpha/libraries/source/fcollada/src/Makefile.orig 0ad-0.0.14-alpha/libraries/source/fcollada/src/Makefile ---- 0ad-0.0.14-alpha/libraries/source/fcollada/src/Makefile.orig 2013-09-05 11:06:14.192030546 -0300 -+++ 0ad-0.0.14-alpha/libraries/source/fcollada/src/Makefile 2013-09-05 11:09:01.894036968 -0300 -@@ -14,10 +14,7 @@ CXXFLAGS += -fvisibility=hidden -W -Wall - ifeq ($(OS_CPU),armv7l) - CXXFLAGS += -mtune=cortex-a15 -mfpu=neon-vfpv4 -mfloat-abi=hard - endif +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.) @@ -12,7 +12,7 @@ diff -up 0ad-0.0.14-alpha/libraries/source/fcollada/src/Makefile.orig 0ad-0.0.14 LIBS += `pkg-config libxml-2.0 --libs` INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags` INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES) -@@ -186,62 +183,13 @@ SOURCE = \ +@@ -181,72 +178,19 @@ SOURCE = \ FColladaPlugins/FArchiveXML/FAXSceneExport.cpp \ FColladaPlugins/FArchiveXML/FAXSceneImport.cpp \ @@ -78,17 +78,18 @@ diff -up 0ad-0.0.14-alpha/libraries/source/fcollada/src/Makefile.orig 0ad-0.0.14 output/libFColladaSR.a: $(OBJECTS_RELEASE) @echo "$@" -@@ -250,8 +198,7 @@ output/libFColladaSR.a: $(OBJECTS_RELEAS - output/FColladaTest: $(OBJECTS_TEST) - $(CXX) -o $@ $(LDFLAGS) $(OBJECTS_TEST) $(LIBS) + @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) -@@ -261,18 +208,10 @@ gendep = \ +@@ -256,18 +200,10 @@ gendep = \ sed -e 's/\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ -e '/^$$/ d' -e 's/$$/ :/' < $(dfile) >> $(Pfile) && \ rm -f $(dfile) diff --git a/0ad-licensecheck.txt b/0ad-licensecheck.txt index f6fce77..8695be7 100644 --- a/0ad-licensecheck.txt +++ b/0ad-licensecheck.txt @@ -46,23 +46,23 @@ ./build/premake/premake4/src/host/lua-5.1.4/src/lstate.h: *No copyright* UNKNOWN ./build/premake/premake4/src/host/lua-5.1.4/src/lstring.c: *No copyright* UNKNOWN ./build/premake/premake4/src/host/lua-5.1.4/src/lstring.h: *No copyright* UNKNOWN -./build/premake/premake4/src/host/lua-5.1.4/src/lstrlib.c: UNKNOWN +./build/premake/premake4/src/host/lua-5.1.4/src/lstrlib.c: *No copyright* UNKNOWN ./build/premake/premake4/src/host/lua-5.1.4/src/ltable.c: *No copyright* UNKNOWN ./build/premake/premake4/src/host/lua-5.1.4/src/ltable.h: *No copyright* UNKNOWN ./build/premake/premake4/src/host/lua-5.1.4/src/ltablib.c: *No copyright* UNKNOWN ./build/premake/premake4/src/host/lua-5.1.4/src/ltm.c: *No copyright* UNKNOWN ./build/premake/premake4/src/host/lua-5.1.4/src/ltm.h: *No copyright* UNKNOWN ./build/premake/premake4/src/host/lua-5.1.4/src/lua.c: *No copyright* UNKNOWN -./build/premake/premake4/src/host/lua-5.1.4/src/lua.h: UNKNOWN +./build/premake/premake4/src/host/lua-5.1.4/src/lua.h: *No copyright* UNKNOWN ./build/premake/premake4/src/host/lua-5.1.4/src/luac.c: *No copyright* UNKNOWN ./build/premake/premake4/src/host/lua-5.1.4/src/luaconf.h: *No copyright* UNKNOWN ./build/premake/premake4/src/host/lua-5.1.4/src/lualib.h: *No copyright* UNKNOWN -./build/premake/premake4/src/host/lua-5.1.4/src/lundump.c: UNKNOWN +./build/premake/premake4/src/host/lua-5.1.4/src/lundump.c: *No copyright* UNKNOWN ./build/premake/premake4/src/host/lua-5.1.4/src/lundump.h: *No copyright* UNKNOWN ./build/premake/premake4/src/host/lua-5.1.4/src/lvm.c: *No copyright* UNKNOWN ./build/premake/premake4/src/host/lua-5.1.4/src/lvm.h: *No copyright* UNKNOWN ./build/premake/premake4/src/host/lua-5.1.4/src/lzio.c: *No copyright* UNKNOWN -./build/premake/premake4/src/host/lua-5.1.4/src/lzio.h: UNKNOWN +./build/premake/premake4/src/host/lua-5.1.4/src/lzio.h: *No copyright* UNKNOWN ./build/premake/premake4/src/host/lua-5.1.4/src/print.c: *No copyright* UNKNOWN ./build/premake/premake4/src/host/os_chdir.c: UNKNOWN ./build/premake/premake4/src/host/os_copyfile.c: UNKNOWN @@ -677,6 +677,64 @@ ./libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h: MIT/X11 (BSD like) ./libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/StdAfx.cpp: MIT/X11 (BSD like) ./libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/StdAfx.h: MIT/X11 (BSD like) +./libraries/source/miniupnpc/build.sh: *No copyright* UNKNOWN +./libraries/source/miniupnpc/include/miniupnpc/bsdqueue.h: BSD (3 clause) +./libraries/source/miniupnpc/include/miniupnpc/declspec.h: *No copyright* UNKNOWN +./libraries/source/miniupnpc/include/miniupnpc/igd_desc_parse.h: UNKNOWN +./libraries/source/miniupnpc/include/miniupnpc/miniupnpc.h: UNKNOWN +./libraries/source/miniupnpc/include/miniupnpc/miniupnpctypes.h: UNKNOWN +./libraries/source/miniupnpc/include/miniupnpc/miniwget.h: UNKNOWN +./libraries/source/miniupnpc/include/miniupnpc/portlistingparse.h: UNKNOWN +./libraries/source/miniupnpc/include/miniupnpc/upnpcommands.h: UNKNOWN +./libraries/source/miniupnpc/include/miniupnpc/upnperrors.h: UNKNOWN +./libraries/source/miniupnpc/include/miniupnpc/upnpreplyparse.h: UNKNOWN +./libraries/source/miniupnpc/src/bsdqueue.h: BSD (3 clause) +./libraries/source/miniupnpc/src/codelength.h: UNKNOWN +./libraries/source/miniupnpc/src/connecthostport.c: UNKNOWN +./libraries/source/miniupnpc/src/connecthostport.h: UNKNOWN +./libraries/source/miniupnpc/src/declspec.h: *No copyright* UNKNOWN +./libraries/source/miniupnpc/src/external-ip.sh: UNKNOWN +./libraries/source/miniupnpc/src/igd_desc_parse.c: UNKNOWN +./libraries/source/miniupnpc/src/igd_desc_parse.h: UNKNOWN +./libraries/source/miniupnpc/src/java/JavaBridgeTest.java: *No copyright* UNKNOWN +./libraries/source/miniupnpc/src/java/testjava.sh: *No copyright* UNKNOWN +./libraries/source/miniupnpc/src/minihttptestserver.c: UNKNOWN +./libraries/source/miniupnpc/src/minisoap.c: UNKNOWN +./libraries/source/miniupnpc/src/minisoap.h: UNKNOWN +./libraries/source/miniupnpc/src/minissdpc.c: UNKNOWN +./libraries/source/miniupnpc/src/minissdpc.h: UNKNOWN +./libraries/source/miniupnpc/src/miniupnpc.c: UNKNOWN +./libraries/source/miniupnpc/src/miniupnpc.h: UNKNOWN +./libraries/source/miniupnpc/src/miniupnpcmodule.c: UNKNOWN +./libraries/source/miniupnpc/src/miniupnpctypes.h: UNKNOWN +./libraries/source/miniupnpc/src/miniwget.c: UNKNOWN +./libraries/source/miniupnpc/src/miniwget.h: UNKNOWN +./libraries/source/miniupnpc/src/minixml.c: BSD (3 clause) +./libraries/source/miniupnpc/src/minixml.h: UNKNOWN +./libraries/source/miniupnpc/src/minixmlvalid.c: UNKNOWN +./libraries/source/miniupnpc/src/portlistingparse.c: UNKNOWN +./libraries/source/miniupnpc/src/portlistingparse.h: UNKNOWN +./libraries/source/miniupnpc/src/pymoduletest.py: *No copyright* UNKNOWN +./libraries/source/miniupnpc/src/receivedata.c: UNKNOWN +./libraries/source/miniupnpc/src/receivedata.h: UNKNOWN +./libraries/source/miniupnpc/src/setup.py: UNKNOWN +./libraries/source/miniupnpc/src/setupmingw32.py: UNKNOWN +./libraries/source/miniupnpc/src/testigddescparse.c: UNKNOWN +./libraries/source/miniupnpc/src/testminiwget.c: UNKNOWN +./libraries/source/miniupnpc/src/testminiwget.sh: UNKNOWN +./libraries/source/miniupnpc/src/testminixml.c: UNKNOWN +./libraries/source/miniupnpc/src/testupnpigd.py: *No copyright* UNKNOWN +./libraries/source/miniupnpc/src/testupnpreplyparse.c: UNKNOWN +./libraries/source/miniupnpc/src/testupnpreplyparse.sh: *No copyright* UNKNOWN +./libraries/source/miniupnpc/src/updateminiupnpcstrings.sh: UNKNOWN +./libraries/source/miniupnpc/src/upnpc.c: UNKNOWN +./libraries/source/miniupnpc/src/upnpcommands.c: UNKNOWN +./libraries/source/miniupnpc/src/upnpcommands.h: UNKNOWN +./libraries/source/miniupnpc/src/upnperrors.c: UNKNOWN +./libraries/source/miniupnpc/src/upnperrors.h: UNKNOWN +./libraries/source/miniupnpc/src/upnpreplyparse.c: UNKNOWN +./libraries/source/miniupnpc/src/upnpreplyparse.h: UNKNOWN +./libraries/source/miniupnpc/src/wingenminiupnpcstrings.c: UNKNOWN ./libraries/source/nvtt/build.sh: *No copyright* UNKNOWN ./libraries/source/nvtt/include/nvtt/nvtt.h: MIT/X11 (BSD like) ./libraries/source/nvtt/src/src/nvcore/BitArray.h: *No copyright* Public domain @@ -863,6 +921,12 @@ ./source/graphics/Decal.cpp: GPL (v2 or later) ./source/graphics/Decal.h: GPL (v2 or later) ./source/graphics/Entity.h: GPL (v2 or later) +./source/graphics/Font.cpp: GPL (v2 or later) +./source/graphics/Font.h: GPL (v2 or later) +./source/graphics/FontManager.cpp: GPL (v2 or later) +./source/graphics/FontManager.h: GPL (v2 or later) +./source/graphics/FontMetrics.cpp: GPL (v2 or later) +./source/graphics/FontMetrics.h: GPL (v2 or later) ./source/graphics/Frustum.cpp: GPL (v2 or later) ./source/graphics/Frustum.h: GPL (v2 or later) ./source/graphics/GameView.cpp: GPL (v2 or later) @@ -953,6 +1017,8 @@ ./source/graphics/UnitAnimation.h: GPL (v2 or later) ./source/graphics/UnitManager.cpp: GPL (v2 or later) ./source/graphics/UnitManager.h: GPL (v2 or later) +./source/graphics/scripting/JSInterface_GameView.cpp: GPL (v2 or later) +./source/graphics/scripting/JSInterface_GameView.h: GPL (v2 or later) ./source/graphics/tests/test_Color.h: GPL (v2 or later) ./source/graphics/tests/test_LOSTexture.h: GPL (v2 or later) ./source/graphics/tests/test_MeshManager.h: GPL (v2 or later) @@ -979,6 +1045,8 @@ ./source/gui/CInput.h: GPL (v2 or later) ./source/gui/CList.cpp: GPL (v2 or later) ./source/gui/CList.h: GPL (v2 or later) +./source/gui/COList.cpp: *No copyright* UNKNOWN +./source/gui/COList.h: *No copyright* UNKNOWN ./source/gui/CProgressBar.cpp: GPL (v2 or later) ./source/gui/CProgressBar.h: GPL (v2 or later) ./source/gui/CRadioButton.cpp: GPL (v2 or later) @@ -1020,6 +1088,7 @@ ./source/gui/scripting/JSInterface_IGUIObject.h: GPL (v2 or later) ./source/gui/scripting/ScriptFunctions.cpp: GPL (v2 or later) ./source/gui/scripting/ScriptFunctions.h: GPL (v2 or later) +./source/gui/tests/test_ParseString.h: GPL (v2 or later) ./source/lib/adts/bit_buf.h: MIT/X11 (BSD like) ./source/lib/adts/cache_adt.h: MIT/X11 (BSD like) ./source/lib/adts/dyn_hash_tbl.h: MIT/X11 (BSD like) @@ -1064,7 +1133,6 @@ ./source/lib/debug.h: MIT/X11 (BSD like) ./source/lib/debug_stl.cpp: MIT/X11 (BSD like) ./source/lib/debug_stl.h: MIT/X11 (BSD like) -./source/lib/external_libraries/cryptopp.h: MIT/X11 (BSD like) ./source/lib/external_libraries/curl.h: MIT/X11 (BSD like) ./source/lib/external_libraries/dbghelp.cpp: MIT/X11 (BSD like) ./source/lib/external_libraries/dbghelp.h: MIT/X11 (BSD like) @@ -1085,15 +1153,12 @@ ./source/lib/external_libraries/zlib.h: MIT/X11 (BSD like) ./source/lib/file/archive/archive.cpp: MIT/X11 (BSD like) ./source/lib/file/archive/archive.h: MIT/X11 (BSD like) -./source/lib/file/archive/archive_builder.cpp: MIT/X11 (BSD like) -./source/lib/file/archive/archive_builder.h: MIT/X11 (BSD like) ./source/lib/file/archive/archive_zip.cpp: MIT/X11 (BSD like) ./source/lib/file/archive/archive_zip.h: MIT/X11 (BSD like) ./source/lib/file/archive/codec.cpp: MIT/X11 (BSD like) ./source/lib/file/archive/codec.h: MIT/X11 (BSD like) ./source/lib/file/archive/codec_zlib.cpp: MIT/X11 (BSD like) ./source/lib/file/archive/codec_zlib.h: MIT/X11 (BSD like) -./source/lib/file/archive/disabled_tests/test_archive_builder.h: MIT/X11 (BSD like) ./source/lib/file/archive/disabled_tests/test_codec_zlib.h: MIT/X11 (BSD like) ./source/lib/file/archive/disabled_tests/test_compression.h: MIT/X11 (BSD like) ./source/lib/file/archive/disabled_tests/test_fat_time.h: MIT/X11 (BSD like) @@ -1169,6 +1234,7 @@ ./source/lib/posix/posix_utsname.h: MIT/X11 (BSD like) ./source/lib/posix/tests/test_posix.h: MIT/X11 (BSD like) ./source/lib/precompiled.h: MIT/X11 (BSD like) +./source/lib/ps_stl.h: MIT/X11 (BSD like) ./source/lib/rand.cpp: MIT/X11 (BSD like) ./source/lib/rand.h: MIT/X11 (BSD like) ./source/lib/regex.cpp: MIT/X11 (BSD like) @@ -1178,8 +1244,6 @@ ./source/lib/res/graphics/ogl_tex.cpp: MIT/X11 (BSD like) ./source/lib/res/graphics/ogl_tex.h: MIT/X11 (BSD like) ./source/lib/res/graphics/tests/test_tex.h: MIT/X11 (BSD like) -./source/lib/res/graphics/unifont.cpp: MIT/X11 (BSD like) -./source/lib/res/graphics/unifont.h: MIT/X11 (BSD like) ./source/lib/res/h_mgr.cpp: MIT/X11 (BSD like) ./source/lib/res/h_mgr.h: MIT/X11 (BSD like) ./source/lib/res/handle.h: MIT/X11 (BSD like) @@ -1237,6 +1301,8 @@ ./source/lib/sysdep/os/osx/osx_bundle.h: MIT/X11 (BSD like) ./source/lib/sysdep/os/osx/osx_pasteboard.h: MIT/X11 (BSD like) ./source/lib/sysdep/os/osx/osx_paths.h: MIT/X11 (BSD like) +./source/lib/sysdep/os/osx/osx_stl_fixes.h: MIT/X11 (BSD like) +./source/lib/sysdep/os/osx/osx_sys_version.h: MIT/X11 (BSD like) ./source/lib/sysdep/os/unix/printf.cpp: MIT/X11 (BSD like) ./source/lib/sysdep/os/unix/udbg.cpp: MIT/X11 (BSD like) ./source/lib/sysdep/os/unix/udbg.h: MIT/X11 (BSD like) @@ -1381,6 +1447,20 @@ ./source/lib/utf8.cpp: MIT/X11 (BSD like) ./source/lib/utf8.h: MIT/X11 (BSD like) ./source/lib/wsecure_crt.cpp: MIT/X11 (BSD like) +./source/lobby/Globals.cpp: GPL (v2 or later) +./source/lobby/IXmppClient.h: GPL (v2 or later) +./source/lobby/StanzaExtensions.cpp: GPL (v2 or later) +./source/lobby/StanzaExtensions.h: GPL (v2 or later) +./source/lobby/XmppClient.cpp: GPL (v2 or later) +./source/lobby/XmppClient.h: GPL (v2 or later) +./source/lobby/glooxwrapper/glooxwrapper.cpp: GPL (v2 or later) +./source/lobby/glooxwrapper/glooxwrapper.h: GPL (v2 or later) +./source/lobby/pkcs5_pbkdf2.cpp: ISC +./source/lobby/pkcs5_pbkdf2.h: MIT/X11 (BSD like) +./source/lobby/scripting/JSInterface_Lobby.cpp: GPL (v2 or later) +./source/lobby/scripting/JSInterface_Lobby.h: GPL (v2 or later) +./source/lobby/sha.cpp: GPL (v2 or later) (with incorrect FSF address) +./source/lobby/sha.h: MIT/X11 (BSD like) ./source/main.cpp: GPL (v2 or later) ./source/maths/BoundingBoxAligned.cpp: GPL (v2 or later) ./source/maths/BoundingBoxAligned.h: GPL (v2 or later) @@ -1388,7 +1468,7 @@ ./source/maths/BoundingBoxOriented.h: GPL (v2 or later) ./source/maths/Brush.cpp: GPL (v2 or later) ./source/maths/Brush.h: GPL (v2 or later) -./source/maths/Ease.h: BSD (2 clause) GPL (v2 or later) +./source/maths/Ease.h: BSD (3 clause) GPL (v2 or later) ./source/maths/Fixed.cpp: GPL (v2 or later) ./source/maths/Fixed.h: GPL (v2 or later) ./source/maths/FixedVector2D.h: GPL (v2 or later) @@ -1413,8 +1493,6 @@ ./source/maths/Vector3D.cpp: GPL (v2 or later) ./source/maths/Vector3D.h: GPL (v2 or later) ./source/maths/Vector4D.h: GPL (v2 or later) -./source/maths/scripting/JSInterface_Vector3D.cpp: GPL (v2 or later) -./source/maths/scripting/JSInterface_Vector3D.h: GPL (v2 or later) ./source/maths/tests/test_Bound.h: GPL (v2 or later) ./source/maths/tests/test_Brush.h: GPL (v2 or later) ./source/maths/tests/test_Fixed.h: GPL (v2 or later) @@ -1457,18 +1535,20 @@ ./source/pch/atlas/precompiled.h: GPL (v2 or later) ./source/pch/engine/precompiled.cpp: GPL (v2 or later) ./source/pch/engine/precompiled.h: GPL (v2 or later) +./source/pch/glooxwrapper/precompiled.cpp: GPL (v2 or later) +./source/pch/glooxwrapper/precompiled.h: GPL (v2 or later) ./source/pch/graphics/precompiled.cpp: GPL (v2 or later) ./source/pch/graphics/precompiled.h: GPL (v2 or later) ./source/pch/gui/precompiled.cpp: GPL (v2 or later) ./source/pch/gui/precompiled.h: GPL (v2 or later) +./source/pch/lobby/precompiled.cpp: GPL (v2 or later) +./source/pch/lobby/precompiled.h: GPL (v2 or later) ./source/pch/lowlevel/precompiled.cpp: GPL (v2 or later) ./source/pch/lowlevel/precompiled.h: GPL (v2 or later) ./source/pch/network/precompiled.cpp: GPL (v2 or later) ./source/pch/network/precompiled.h: GPL (v2 or later) ./source/pch/scriptinterface/precompiled.cpp: GPL (v2 or later) ./source/pch/scriptinterface/precompiled.h: GPL (v2 or later) -./source/pch/se/precompiled.cpp: GPL (v2 or later) -./source/pch/se/precompiled.h: GPL (v2 or later) ./source/pch/simulation2/precompiled.cpp: GPL (v2 or later) ./source/pch/simulation2/precompiled.h: GPL (v2 or later) ./source/pch/test/precompiled.cpp: GPL (v2 or later) @@ -1483,6 +1563,7 @@ ./source/ps/CStr.h: GPL (v2 or later) ./source/ps/CStrIntern.cpp: GPL (v2 or later) ./source/ps/CStrIntern.h: GPL (v2 or later) +./source/ps/CStrInternStatic.h: GPL (v2 or later) ./source/ps/CacheLoader.cpp: GPL (v2 or later) ./source/ps/CacheLoader.h: GPL (v2 or later) ./source/ps/Compress.cpp: GPL (v2 or later) @@ -1497,8 +1578,8 @@ ./source/ps/FileIo.h: GPL (v2 or later) ./source/ps/Filesystem.cpp: GPL (v2 or later) GENERATED FILE ./source/ps/Filesystem.h: GPL (v2 or later) -./source/ps/Font.cpp: GPL (v2 or later) -./source/ps/Font.h: GPL (v2 or later) +./source/ps/GUID.cpp: GPL (v2 or later) +./source/ps/GUID.h: GPL (v2 or later) ./source/ps/Game.cpp: GPL (v2 or later) ./source/ps/Game.h: GPL (v2 or later) ./source/ps/GameSetup/Atlas.cpp: GPL (v2 or later) @@ -1573,6 +1654,8 @@ ./source/ps/XML/tests/test_XMLWriter.h: GPL (v2 or later) ./source/ps/XML/tests/test_XeroXMB.h: GPL (v2 or later) ./source/ps/XML/tests/test_Xeromyces.h: GPL (v2 or later) +./source/ps/scripting/JSInterface_ConfigDB.cpp: GPL (v2 or later) +./source/ps/scripting/JSInterface_ConfigDB.h: GPL (v2 or later) ./source/ps/scripting/JSInterface_Console.cpp: GPL (v2 or later) ./source/ps/scripting/JSInterface_Console.h: GPL (v2 or later) ./source/ps/scripting/JSInterface_VFS.cpp: GPL (v2 or later) @@ -1631,14 +1714,12 @@ ./source/renderer/VertexBufferManager.h: GPL (v2 or later) ./source/renderer/WaterManager.cpp: GPL (v2 or later) ./source/renderer/WaterManager.h: GPL (v2 or later) -./source/scripting/JSConversions.cpp: GPL (v2 or later) -./source/scripting/JSConversions.h: GPL (v2 or later) +./source/renderer/scripting/JSInterface_Renderer.cpp: GPL (v2 or later) +./source/renderer/scripting/JSInterface_Renderer.h: GPL (v2 or later) ./source/scripting/JSUtil.cpp: GPL (v2 or later) ./source/scripting/JSUtil.h: GPL (v2 or later) ./source/scripting/ScriptGlue.cpp: GPL (v2 or later) ./source/scripting/ScriptGlue.h: GPL (v2 or later) -./source/scripting/ScriptableObject.cpp: GPL (v2 or later) -./source/scripting/ScriptableObject.h: GPL (v2 or later) ./source/scripting/ScriptingHost.cpp: GPL (v2 or later) ./source/scripting/ScriptingHost.h: GPL (v2 or later) ./source/scripting/SpiderMonkey.h: GPL (v2 or later) @@ -1744,8 +1825,6 @@ ./source/simulation2/components/ICmpSettlement.h: GPL (v2 or later) ./source/simulation2/components/ICmpSoundManager.cpp: GPL (v2 or later) ./source/simulation2/components/ICmpSoundManager.h: GPL (v2 or later) -./source/simulation2/components/ICmpTechnologyManager.cpp: GPL (v2 or later) -./source/simulation2/components/ICmpTechnologyManager.h: GPL (v2 or later) ./source/simulation2/components/ICmpTechnologyTemplateManager.cpp: GPL (v2 or later) ./source/simulation2/components/ICmpTechnologyTemplateManager.h: GPL (v2 or later) ./source/simulation2/components/ICmpTemplateManager.cpp: GPL (v2 or later) @@ -1762,6 +1841,8 @@ ./source/simulation2/components/ICmpUnitMotion.h: GPL (v2 or later) ./source/simulation2/components/ICmpUnknownScript.cpp: GPL (v2 or later) ./source/simulation2/components/ICmpUnknownScript.h: GPL (v2 or later) +./source/simulation2/components/ICmpValueModificationManager.cpp: GPL (v2 or later) +./source/simulation2/components/ICmpValueModificationManager.h: GPL (v2 or later) ./source/simulation2/components/ICmpVision.cpp: GPL (v2 or later) ./source/simulation2/components/ICmpVision.h: GPL (v2 or later) ./source/simulation2/components/ICmpVisual.cpp: GPL (v2 or later) @@ -1820,6 +1901,7 @@ ./source/simulation2/system/ComponentTest.h: GPL (v2 or later) ./source/simulation2/system/Components.h: GPL (v2 or later) ./source/simulation2/system/Entity.h: GPL (v2 or later) +./source/simulation2/system/EntityMap.h: GPL (v2 or later) ./source/simulation2/system/IComponent.cpp: GPL (v2 or later) ./source/simulation2/system/IComponent.h: GPL (v2 or later) ./source/simulation2/system/Interface.h: GPL (v2 or later) @@ -1864,6 +1946,10 @@ ./source/third_party/mongoose/mongoose.cpp: MIT/X11 (BSD like) ./source/third_party/mongoose/mongoose.h: MIT/X11 (BSD like) ./source/third_party/mongoose/mongoose_orig.c: MIT/X11 (BSD like) +./source/tools/XpartaMuPP/ELO.py: *No copyright* UNKNOWN +./source/tools/XpartaMuPP/LobbyRanking.py: *No copyright* UNKNOWN +./source/tools/XpartaMuPP/XpartaMuPP.py: GPL (v2 or later) +./source/tools/XpartaMuPP/config.py: *No copyright* UNKNOWN ./source/tools/atlas/AtlasFrontends/ActorEditor.cpp: GPL (v2 or later) ./source/tools/atlas/AtlasFrontends/_template.cpp: GPL (v2 or later) ./source/tools/atlas/AtlasFrontends/generate.pl: *No copyright* UNKNOWN @@ -1917,6 +2003,8 @@ ./source/tools/atlas/AtlasUI/CustomControls/FileHistory/FileHistory.h: GPL (v2 or later) ./source/tools/atlas/AtlasUI/CustomControls/HighResTimer/HighResTimer.cpp: GPL (v2 or later) ./source/tools/atlas/AtlasUI/CustomControls/HighResTimer/HighResTimer.h: GPL (v2 or later) +./source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp: GPL (v2 or later) +./source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.h: GPL (v2 or later) ./source/tools/atlas/AtlasUI/CustomControls/SnapSplitterWindow/SnapSplitterWindow.cpp: GPL (v2 or later) ./source/tools/atlas/AtlasUI/CustomControls/SnapSplitterWindow/SnapSplitterWindow.h: GPL (v2 or later) ./source/tools/atlas/AtlasUI/CustomControls/VirtualDirTreeCtrl/virtualdirtreectrl.cpp: GPL (v2 or later) @@ -1940,10 +2028,6 @@ ./source/tools/atlas/AtlasUI/General/IAtlasSerialiser.h: GPL (v2 or later) ./source/tools/atlas/AtlasUI/General/Observable.cpp: GPL (v2 or later) ./source/tools/atlas/AtlasUI/General/Observable.h: GPL (v2 or later) -./source/tools/atlas/AtlasUI/General/VideoRecorder/FFmpeg.cpp: GPL (v2 or later) -./source/tools/atlas/AtlasUI/General/VideoRecorder/FFmpeg.h: GPL (v2 or later) -./source/tools/atlas/AtlasUI/General/VideoRecorder/VideoRecorder.cpp: GPL (v2 or later) -./source/tools/atlas/AtlasUI/General/VideoRecorder/VideoRecorder.h: GPL (v2 or later) ./source/tools/atlas/AtlasUI/Misc/DLLInterface.cpp: GPL (v2 or later) ./source/tools/atlas/AtlasUI/Misc/DLLInterface.h: GPL (v2 or later) ./source/tools/atlas/AtlasUI/Misc/KeyMap.cpp: GPL (v2 or later) @@ -1955,8 +2039,6 @@ ./source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.h: GPL (v2 or later) ./source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.cpp: GPL (v2 or later) ./source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.h: GPL (v2 or later) -./source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinematic/Cinematic.cpp: GPL (v2 or later) -./source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinematic/Cinematic.h: GPL (v2 or later) ./source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Common/Sidebar.cpp: GPL (v2 or later) ./source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Common/Sidebar.h: GPL (v2 or later) ./source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp: GPL (v2 or later) @@ -1973,8 +2055,6 @@ ./source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.h: GPL (v2 or later) ./source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp: GPL (v2 or later) ./source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.h: GPL (v2 or later) -./source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Trigger/Trigger.cpp: GPL (v2 or later) -./source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Trigger/Trigger.h: GPL (v2 or later) ./source/tools/atlas/AtlasUI/ScenarioEditor/Tools/ActorViewerTool.cpp: GPL (v2 or later) ./source/tools/atlas/AtlasUI/ScenarioEditor/Tools/AlterElevation.cpp: GPL (v2 or later) ./source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Brushes.cpp: GPL (v2 or later) @@ -2062,7 +2142,7 @@ ./source/tools/cmpgraph/cmpgraph.pl: *No copyright* UNKNOWN ./source/tools/dds/DDS.pm: *No copyright* UNKNOWN ./source/tools/dds/dds_analyse.pl: *No copyright* UNKNOWN -./source/tools/dist/build.sh: *No copyright* GENERATED FILE +./source/tools/dist/build.sh: *No copyright* UNKNOWN ./source/tools/entconvert/entconvert.pl: *No copyright* UNKNOWN ./source/tools/entdocs/build.sh: *No copyright* UNKNOWN ./source/tools/entdocs/convertrng.xsl: *No copyright* UNKNOWN diff --git a/0ad-rpath.patch b/0ad-rpath.patch index 0fb6cf2..84b5569 100644 --- a/0ad-rpath.patch +++ b/0ad-rpath.patch @@ -1,7 +1,7 @@ -diff -up 0ad-0.0.14-alpha/build/premake/premake4.lua.orig 0ad-0.0.14-alpha/build/premake/premake4.lua ---- 0ad-0.0.14-alpha/build/premake/premake4.lua.orig 2013-08-26 23:42:56.000000000 -0300 -+++ 0ad-0.0.14-alpha/build/premake/premake4.lua 2013-09-05 11:04:57.114027595 -0300 -@@ -326,26 +326,6 @@ function project_set_build_flags() +diff -up 0ad-0.0.15-alpha/build/premake/premake4.lua.orig 0ad-0.0.15-alpha/build/premake/premake4.lua +--- 0ad-0.0.15-alpha/build/premake/premake4.lua.orig 2013-12-27 17:26:42.924652871 -0200 ++++ 0ad-0.0.15-alpha/build/premake/premake4.lua 2013-12-27 17:26:54.611653319 -0200 +@@ -355,26 +355,6 @@ function project_set_build_flags() defines { "INSTALLED_LIBDIR=" .. _OPTIONS["libdir"] } end diff --git a/0ad-saveas.patch b/0ad-saveas.patch deleted file mode 100644 index a28273e..0000000 --- a/0ad-saveas.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff -up 0ad-0.0.14-alpha/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp.orig 0ad-0.0.14-alpha/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp ---- 0ad-0.0.14-alpha/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp.orig 2013-09-05 11:13:07.035046355 -0300 -+++ 0ad-0.0.14-alpha/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp 2013-09-05 11:13:09.036046432 -0300 -@@ -692,30 +692,20 @@ bool ScenarioEditor::OpenFile(const wxSt - - void ScenarioEditor::OnOpen(wxCommandEvent& WXUNUSED(event)) - { -- wxFileDialog dlg (NULL, wxFileSelectorPromptStr, -- Datafile::GetDataDirectory() + _T("/mods/public/maps/scenarios"), m_OpenFilename, -- _T("PMP files (*.pmp)|*.pmp|All files (*.*)|*.*"), -- wxFD_OPEN); -- // Set default filter -- dlg.SetFilterIndex(0); -- -- wxString cwd = wxFileName::GetCwd(); -- -- if (dlg.ShowModal() == wxID_OK) -- { -- // TODO: Handle maps in subdirectories of maps/scenarios -- wxFileName filename(dlg.GetFilename()); -- if (!OpenFile(filename.GetName(), filename.GetFullName())) -- { -- wxLogError(_("Map '%ls' does not exist"), filename.GetName().c_str()); -- } -- -- // paranoia - MSDN says OFN_NOCHANGEDIR (used when we don't give wxCHANGE_DIR) -- // "is ineffective for GetOpenFileName", but it seems to work anyway -- wxCHECK_RET(cwd == wxFileName::GetCwd(), _T("cwd changed")); -+ wxFileName filename(m_OpenFilename); -+ wxFileName dirname(_T("/usr/share/0ad/mods/public/maps/scenarios")); -+ wxString string = wxGetTextFromUser(dirname.GetFullPath() + _T("/"), -+ _T("Choose filename"), -+ filename.GetName()); -+ if (!string.IsEmpty()) { -+ filename.Assign(dirname.GetFullPath() + _("/") + string); -+ filename.SetExt(_T("pmp")); -+ -+ if (!OpenFile(filename.GetName(), filename.GetFullName())) { -+ wxLogError(_("Map '%ls' does not exist"), -+ filename.GetName().c_str()); - } -- -- // TODO: Make this a non-undoable command -+ } - } - - void ScenarioEditor::OnImportHeightmap(wxCommandEvent& WXUNUSED(event)) -@@ -779,40 +769,57 @@ void ScenarioEditor::OnSave(wxCommandEve - - void ScenarioEditor::OnSaveAs(wxCommandEvent& WXUNUSED(event)) - { -- wxFileDialog dlg (NULL, wxFileSelectorPromptStr, -- Datafile::GetDataDirectory() + _T("/mods/public/maps/scenarios"), m_OpenFilename, -- _T("PMP files (*.pmp)|*.pmp|All files (*.*)|*.*"), -- wxFD_SAVE | wxFD_OVERWRITE_PROMPT); -- // Set default filter -- dlg.SetFilterIndex(0); -- -- if (dlg.ShowModal() == wxID_OK) -- { -- // On wxMSW the extension is automatically set to pmp if that filter is selected -- // but not on wxGTK or wxOSX. Set it explicitly since it's the only possible format. -- wxFileName filename(dlg.GetFilename()); -- filename.SetExt(_T("pmp")); -- if (!filename.IsOk()) -- { // Shouldn't happen -- wxLogError(_("Invalid filename '%ls'"), filename.GetFullName().c_str()); -- return; -- } -+ wxFileName filename(m_OpenFilename); -+ wxFileName dirname(_T("/usr/share/0ad/mods/public/maps/scenarios")); -+ wxString string = wxGetTextFromUser(dirname.GetFullPath() + _T("/"), -+ _T("Choose filename"), -+ filename.GetName()); -+ if (!string.IsEmpty()) { -+ filename.Assign(dirname.GetFullPath() + _("/") + string); -+ filename.SetExt(_T("pmp")); -+ -+ if (!dirname.DirExists(dirname.GetFullPath())) { -+ wxLogError(_("Directory '%ls' does not exist"), -+ dirname.GetFullPath().c_str()); -+ return; -+ } -+ if (!dirname.IsDirWritable(dirname.GetFullPath())) { -+ wxLogError(_("Directory '%ls' is not writable"), -+ dirname.GetFullPath().c_str()); -+ return; -+ } -+ if (!filename.IsOk()) { -+ wxLogError(_("Invalid filename '%ls'"), -+ filename.GetFullName().c_str()); -+ return; -+ } -+ if (filename.FileExists(filename.GetFullPath())) { -+ if (wxMessageBox(_("File ") + filename.GetFullPath() + -+ _(" exists, overwrite?"), -+ _("Confirm"), wxOK | wxCANCEL) != wxOK) -+ return; -+ if (!filename.IsFileWritable(filename.GetFullPath())) { -+ wxLogError(_("File '%ls' is not writable"), -+ filename.GetFullPath().c_str()); -+ return; -+ } -+ } - -- wxBusyInfo busy(_("Saving ") + filename.GetFullName()); -- wxBusyCursor busyc; -+ wxBusyInfo busy(_("Saving ") + filename.GetFullName()); -+ wxBusyCursor busyc; - -- m_ToolManager.SetCurrentTool(_T("")); -+ m_ToolManager.SetCurrentTool(_T("")); - -- // TODO: Handle maps in subdirectories of maps/scenarios -- std::wstring map(filename.GetFullName().wc_str()); -- POST_MESSAGE(SaveMap, (map)); -+ // TODO: Handle maps in subdirectories of maps/scenarios -+ std::wstring map(filename.GetFullName().wc_str()); -+ POST_MESSAGE(SaveMap, (map)); - -- SetOpenFilename(filename.GetFullName()); -+ SetOpenFilename(filename.GetFullName()); - -- // Wait for it to finish saving -- qPing qry; -- qry.Post(); -- } -+ // Wait for it to finish saving -+ qPing qry; -+ qry.Post(); -+ } - } - - void ScenarioEditor::SetOpenFilename(const wxString& filename) diff --git a/0ad.appdata.xml b/0ad.appdata.xml deleted file mode 100644 index 0433116..0000000 --- a/0ad.appdata.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 0ad.desktop - CC-BY-SA - -

- 0 A.D. is a real-time strategy (RTS) game of ancient warfare. - It's a historically-based war/economy game that allows players to relive - or rewrite the history of twelve ancient civilizations, each depicted at - their peak of economic growth and military prowess. -

-

- The twelve factions are: Three of the Hellenic States (Athens, Sparta and - Macedonia), two of the kingdoms of Alexander the Great's successors - (Seleucids and Ptolemaic Egyptians), two Celtic tribes (Britons and - Gauls), the Romans, the Persians, the Iberians, the Carthaginians, and the - Mauryans. - Each civilization is complete with substantially unique artwork, - technologies and civilization bonuses. -

- - http://play0ad.com/ - - http://play0ad.com/wp-content/gallery/screenshots/screenshot0072.jpg - http://play0ad.com/wp-content/gallery/screenshots/water-specular.jpg - http://play0ad.com/wp-content/gallery/screenshots/screenshot0050.jpg - http://play0ad.com/wp-content/gallery/screenshots/athenian_gymnasion.jpg - - webmaster@wildfiregames.com - diff --git a/0ad.spec b/0ad.spec index ea5a0e3..0f27688 100644 --- a/0ad.spec +++ b/0ad.spec @@ -24,8 +24,8 @@ %endif Name: 0ad -Version: 0.0.14 -Release: 2%{?dist} +Version: 0.0.15 +Release: 1%{?dist} # BSD License: # build/premake/* # libraries/valgrind/* (not built/used) @@ -70,9 +70,6 @@ Source1: %{name}-licensecheck.txt # and disabled options were not added to the manual page. Source2: %{name}.6 -# http://trac.wildfiregames.com/ticket/2202 -Source3: http://trac.wildfiregames.com/browser/ps/trunk/build/resources/0ad.appdata.xml - Requires: %{name}-data = %{version} BuildRequires: boost-devel BuildRequires: cmake @@ -82,6 +79,7 @@ BuildRequires: DevIL-devel BuildRequires: enet-devel %endif BuildRequires: gamin-devel +BuildRequires: gloox-devel BuildRequires: js-devel BuildRequires: libcurl-devel BuildRequires: libdnet-devel @@ -90,6 +88,7 @@ BuildRequires: libpng-devel BuildRequires: libvorbis-devel BuildRequires: libxml2-devel BuildRequires: libzip-devel +BuildRequires: miniupnpc-devel BuildRequires: nasm %if %{with_system_nvtt} BuildRequires: nvidia-texture-tools-devel @@ -107,18 +106,9 @@ ExclusiveArch: %{ix86} x86_64 # http://trac.wildfiregames.com/ticket/1421 Patch0: %{name}-rpath.patch -# Display more clear error messages when creating custom scenarios -# The suggested usage is: -# $ sudo mkdir /usr/share/0ad/public/maps -# $ sudo chmod 7777 /usr/share/0ad/public/maps -# $ 0ad -editor -# Supposing saved the map as mymap, can test it with: -# $ 0ad -autostart=mymap -Patch1: %{name}-saveas.patch - # Only do fcollada debug build with enabling debug maintainer mode # It also prevents assumption there that it is building in x86 -Patch2: %{name}-debug.patch +Patch1: %{name}-debug.patch %description 0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform @@ -136,10 +126,9 @@ hobbyist game developers, since 2001. %prep %setup -q -n %{name}-%{version}-alpha %patch0 -p1 -%patch1 -p1 %if !%{with_debug} # disable debug build, and "int 0x3" to trap to debugger (x86 only) -%patch2 -p1 +%patch1 -p1 %endif %if %{with_system_nvtt} @@ -159,6 +148,7 @@ build/workspaces/update-workspaces.sh \ --with-system-enet \ %endif --with-system-mozjs185 \ + --with-system-miniupnpc \ %if %{with_system_nvtt} --with-system-nvtt \ %endif @@ -197,7 +187,7 @@ done %endif install -d -m 755 %{buildroot}%{_datadir}/appdata -install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/appdata +install -p -m 644 build/resources/0ad.appdata.xml %{buildroot}%{_datadir}/appdata install -d -m 755 %{buildroot}%{_datadir}/applications install -p -m 644 build/resources/0ad.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop @@ -240,6 +230,11 @@ export STRIP=/bin/true %{_mandir}/man6/*.6* %changelog +* Fri Dec 27 2013 pcpa - 0.0.15-1 +- Update to latest upstream release +- Add new gloox and minupnpc build requires +- Use 0ad.appdata.xml from upstream tarball + * Sat Oct 12 2013 pcpa - 0.0.14-2 - Install appdata file (#1018385) diff --git a/sources b/sources index 96053be..6c16cb8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5bbaffa02b6e9082cbd5142d43f9b700 0ad-0.0.14-alpha-unix-build.tar.xz +a651d81eb9b31da01e376ddaa597e954 0ad-0.0.15-alpha-unix-build.tar.xz