diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
| commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
| tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /x11-misc/fracplanet/files | |
reinit the tree, so we can have metadata
Diffstat (limited to 'x11-misc/fracplanet/files')
| -rw-r--r-- | x11-misc/fracplanet/files/fracplanet-0.4.0-gcc6.patch | 44 | ||||
| -rw-r--r-- | x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch | 22 |
2 files changed, 66 insertions, 0 deletions
diff --git a/x11-misc/fracplanet/files/fracplanet-0.4.0-gcc6.patch b/x11-misc/fracplanet/files/fracplanet-0.4.0-gcc6.patch new file mode 100644 index 000000000000..4d760d672f8d --- /dev/null +++ b/x11-misc/fracplanet/files/fracplanet-0.4.0-gcc6.patch @@ -0,0 +1,44 @@ +Description: Fix compilation with gcc-6 +Author: Gert Wollny <gw.fossdev@gmail.com> +Last-Updated: 2016-07-09 +Forwarded: No +Bug-Debian: https://bugs.debian.org/811642 + +--- fracplanet-0.4.0.orig/image.cpp ++++ fracplanet-0.4.0/image.cpp +@@ -85,7 +85,7 @@ template <> bool Raster<uchar>::write_pg + out.write(reinterpret_cast<const char*>(&(*(row->begin()))),row->size()); + } + out.close(); +- return out; ++ return out.good(); + } + + template <> bool Raster<ushort>::write_pgmfile(const std::string& filename,Progress* target) const +@@ -101,7 +101,7 @@ template <> bool Raster<ushort>::write_p + progress.step(); + for (const ushort* it=row->begin();it!=row->end();++it) + { +- const uchar p[2]={((*it)>>8),(*it)}; ++ const uchar p[2]={static_cast<uchar>((*it)>>8),static_cast<uchar>((*it) & 0x00FF)}; + if (m>=256) + { + // PGM spec is most significant byte first +@@ -115,7 +115,7 @@ template <> bool Raster<ushort>::write_p + } + } + out.close(); +- return out; ++ return out.good(); + } + + template <> bool Raster<ByteRGBA>::write_ppmfile(const std::string& filename,Progress* target) const +@@ -132,7 +132,7 @@ template <> bool Raster<ByteRGBA>::write + out.write(reinterpret_cast<const char*>(&((*it).r)),3); + } + out.close(); +- return out; ++ return out.good(); + } + + diff --git a/x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch b/x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch new file mode 100644 index 000000000000..4a52d1c44a62 --- /dev/null +++ b/x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch @@ -0,0 +1,22 @@ +--- a/triangle_mesh_viewer.h ++++ b/triangle_mesh_viewer.h +@@ -24,6 +24,7 @@ + #ifndef _triangle_mesh_viewer_h_ + #define _triangle_mesh_viewer_h_ + ++#include <GL/glu.h> + #include "parameters_render.h" + #include "random.h" + #include "triangle_mesh.h" + +--- a/fracplanet.pro ++++ b/fracplanet.pro +@@ -8,7 +8,7 @@ + + HEADERS += $$system(ls *.h) + SOURCES += $$system(ls *.cpp) +-LIBS += -lboost_program_options ++LIBS += -lboost_program_options -lGLU + + DEFINES += QT_DLL + |