- Update to Alpha 19 (0.0.19)

- Add option to choose SDL version to depend on

Thanks to the 0ad developers for their suggestions and kind support
with the update.

2 files changed, 3 insertions, 21 deletions

diff --git a/games/0ad/files/patch-build__premake__extern_libs4.lua b/games/0ad/files/patch-build__premake__extern_libs4.lua
index 33280e8f0153..2961665d12ff 100644
--- a/games/0ad/files/patch-build__premake__extern_libs4.lua
+++ b/games/0ad/files/patch-build__premake__extern_libs4.lua
@@ -1,4 +1,4 @@
---- build/premake/extern_libs4.lua.orig	2015-02-20 05:52:18 UTC
+--- build/premake/extern_libs4.lua.orig	2015-11-19 23:47:41 UTC
 +++ build/premake/extern_libs4.lua
 @@ -237,7 +237,7 @@ extern_lib_defs = {
  			end
@@ -9,12 +9,13 @@
  			end
  		end,
  		link_settings = function()
-@@ -346,8 +346,6 @@ extern_lib_defs = {
+@@ -347,9 +347,6 @@ extern_lib_defs = {
  			elseif os.is("macosx") then
  				add_default_include_paths("iconv")
  				defines { "LIBICONV_STATIC" }
 -			elseif os.getversion().description == "FreeBSD" then
 -				defines { "HAVE_ICONV_CONST" }
+-				defines { "ICONV_CONST=const" }
  			end
  		end,
  		link_settings = function()
diff --git a/games/0ad/files/patch-source_network_NetServer.cpp b/games/0ad/files/patch-source_network_NetServer.cpp
deleted file mode 100644
index 0bd7687bd6cb..000000000000
--- a/games/0ad/files/patch-source_network_NetServer.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- source/network/NetServer.cpp.orig	2015-01-24 14:46:52 UTC
-+++ source/network/NetServer.cpp
-@@ -228,6 +228,7 @@ void* CNetServerWorker::SetupUPnP(void*)
- 
- 	int ret = 0;
- 	bool allocatedUrls = false;
-+	int	error	=	0; // Set this for upnpDiscover
- 
- 	// Try a cached URL first
- 	if (!rootDescURL.empty() && UPNP_GetIGDFromUrl(rootDescURL.c_str(), &urls, &data, internalIPAddress, sizeof(internalIPAddress)))
-@@ -236,7 +237,7 @@ void* CNetServerWorker::SetupUPnP(void*)
- 		ret = 1;
- 	}
- 	// No cached URL, or it did not respond. Try getting a valid UPnP device for 10 seconds.
--	else if ((devlist = upnpDiscover(10000, 0, 0, 0, 0, 0)) != NULL)
-+	else if ((devlist = upnpDiscover(10000, 0, 0, 0, 0, 0,&error)) != NULL)
- 	{
- 		ret = UPNP_GetValidIGD(devlist, &urls, &data, internalIPAddress, sizeof(internalIPAddress));
- 		allocatedUrls = ret != 0; // urls is allocated on non-zero return values