diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-09-03 10:51:11 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-09-03 10:51:11 +0200 |
commit | 37242d98de844e26d5cf84734372218355a42b75 (patch) | |
tree | fe37eac82b1538a072ae416d32049d778750a2df /pkgs/applications/graphics | |
parent | 825c08e368947e775278a74d58d269bb38c60c8f (diff) | |
parent | 0529e4d90885b4e911162e8f8be077ae22322eba (diff) |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/freepv/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/photivo/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/graphics/photivo/gcc6.patch | 13 |
3 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index 6d82db4bac1ac..e6d8a06a51930 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libjpeg, mesa, freeglut, zlib, cmake, libX11, libxml2, libpng, - libXxf86vm, gcc6 }: + libXxf86vm }: stdenv.mkDerivation { name = "freepv-0.3.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; buildInputs = [ libjpeg mesa freeglut zlib cmake libX11 libxml2 libpng - libXxf86vm gcc6 ]; + libXxf86vm ]; postPatch = '' sed -i -e '/GECKO/d' CMakeLists.txt diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix index 69bc36dea61c0..0d1adcff6e834 100644 --- a/pkgs/applications/graphics/photivo/default.nix +++ b/pkgs/applications/graphics/photivo/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { name = "lensfun-0.3.patch"; sha256 = "0ys45x4r4bjjlx0zpd5d56rgjz7k8gxili4r4k8zx3zfka4a3zwv"; }) + ./gcc6.patch ]; postPatch = '' # kinda icky diff --git a/pkgs/applications/graphics/photivo/gcc6.patch b/pkgs/applications/graphics/photivo/gcc6.patch new file mode 100644 index 0000000000000..e2eb795fc8e2c --- /dev/null +++ b/pkgs/applications/graphics/photivo/gcc6.patch @@ -0,0 +1,13 @@ +diff --git c/Sources/ptImage.cpp i/Sources/ptImage.cpp +index 9c95093..623c157 100755 +--- c/Sources/ptImage.cpp ++++ i/Sources/ptImage.cpp +@@ -5291,7 +5291,7 @@ ptImage* ptImage::Box(const uint16_t MaxRadius, float* Mask) { + NewRow = NewRow < 0? -NewRow : NewRow > Height1? Height1_2-NewRow : NewRow ; + NewRow *= m_Width; + for(j = -IntRadius; j <= IntRadius; j++) { +- if (Dist[abs(i)][abs(j)] < Radius) { ++ if (Dist[int16_t(abs(i))][int16_t(abs(j))] < Radius) { + NewCol = Col+j; + NewCol = NewCol < 0? -NewCol : NewCol > Width1? Width1_2-NewCol : NewCol ; + |