0ad: Fix build with new nvtt

diff --git a/0ad/distinfo b/0ad/distinfo
index 48f8e4f987fd99268eef3827e175d3f3116034e4..b9a871311cd48165b2dc7988c7f9018b880c44c5 100644 (file)
--- a/0ad/distinfo
+++ b/0ad/distinfo
@@ -18,4 +18,5 @@ SHA1 (patch-libraries_source_nvtt_src_src_nvcore_Debug.cpp) = e1f16fedfa6cc22be4
 SHA1 (patch-libraries_source_nvtt_src_src_nvcore_nvcore.h) = 2cd3f056b75172ae5e15404746374d627e78ba09
 SHA1 (patch-libraries_source_nvtt_src_src_nvcore_poshlib_posh.h) = b0759ead96db78237c5fa400cf320ab02e8b262b
 SHA1 (patch-libraries_source_nvtt_src_src_nvmath_nvmath.h) = 218723373dc9f117eca33960cac045acc0eee97a
+SHA1 (patch-source_graphics_TextureConverter.cpp) = d4e3920cd507468adc37dc92e27e6cbb50b5c5e2
 SHA1 (patch-source_third__party_mikktspace_weldmesh.cpp) = 35df7dd5d5d2aa784ef03599a47cc69982ebe332

diff --git a/0ad/patches/patch-source_graphics_TextureConverter.cpp b/0ad/patches/patch-source_graphics_TextureConverter.cpp
new file mode 100644 (file)
index 0000000..29f4d06
--- /dev/null
+++ b/0ad/patches/patch-source_graphics_TextureConverter.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- source/graphics/TextureConverter.cpp.orig  2015-06-07 21:56:52.000000000 +0000
++++ source/graphics/TextureConverter.cpp
+@@ -45,6 +45,10 @@ struct BufferOutputHandler : public nvtt
+       {
+       }
+ 
++      virtual void endImage()
++      {
++      }
++
+       virtual bool writeData(const void* data, int size)
+       {
+               size_t off = buffer.size();