Control: tags 880943 + pending Control: tags 1024000 + patch Control: tags 1024000 + pending
Dear maintainer, I've prepared an NMU for pink-pony (versioned as 1.4.1-3.1) and uploaded it to DELAYED/4. Please feel free to tell me if I should cancel it. cu Adrian
diff -Nru pink-pony-1.4.1/debian/changelog pink-pony-1.4.1/debian/changelog --- pink-pony-1.4.1/debian/changelog 2022-01-29 04:59:32.000000000 +0200 +++ pink-pony-1.4.1/debian/changelog 2022-11-19 00:18:31.000000000 +0200 @@ -1,3 +1,11 @@ +pink-pony (1.4.1-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix compilation with libimath-dev. (Closes: #1024000) + * Add upstream fix for Fancy Water. (Closes: #880943) + + -- Adrian Bunk <[email protected]> Sat, 19 Nov 2022 00:18:31 +0200 + pink-pony (1.4.1-3) unstable; urgency=medium * Team upload. diff -Nru pink-pony-1.4.1/debian/control pink-pony-1.4.1/debian/control --- pink-pony-1.4.1/debian/control 2022-01-29 04:56:56.000000000 +0200 +++ pink-pony-1.4.1/debian/control 2022-11-19 00:18:31.000000000 +0200 @@ -11,7 +11,7 @@ libftgl-dev, libglfw3-dev, libglu1-mesa-dev, - libilmbase-dev, + libimath-dev, libprotobuf-dev (>= 2), libsdl-mixer1.2-dev, libsdl1.2-dev, diff -Nru pink-pony-1.4.1/debian/patches/0001-Fix-compile-issues-caused-by-Imath-being-moved-out-o.patch pink-pony-1.4.1/debian/patches/0001-Fix-compile-issues-caused-by-Imath-being-moved-out-o.patch --- pink-pony-1.4.1/debian/patches/0001-Fix-compile-issues-caused-by-Imath-being-moved-out-o.patch 1970-01-01 02:00:00.000000000 +0200 +++ pink-pony-1.4.1/debian/patches/0001-Fix-compile-issues-caused-by-Imath-being-moved-out-o.patch 2022-11-19 00:18:15.000000000 +0200 @@ -0,0 +1,42 @@ +From 72a83f01d196e943a5549f0ff81c013d2bbd0a8c Mon Sep 17 00:00:00 2001 +From: Thomas Weber <[email protected]> +Date: Sat, 2 Oct 2021 13:49:12 +0200 +Subject: Fix compile issues caused by Imath being moved out of IlmBase + +diff --git a/src/Line.cc b/src/Line.cc +index 10a8193..c757b57 100644 +--- a/src/Line.cc ++++ b/src/Line.cc +@@ -1,15 +1,15 @@ + #include "Line.hh" +-#include <ImathLimits.h> ++#include <limits> + +-#define EPSILON limits<double>::epsilon() ++#define EPSILON std::limits<double>::epsilon() + + bool Line::intersects(const Line& seg) +-{ ++{ + double ax = a.x, ay = a.y; + double bx = b.x, by = b.y; + double cx = seg.a.x, cy = seg.a.y; + double dx = seg.b.x, dy = seg.b.y; +- ++ + double S = (((cx*(dy - ay)) + (dx*(ay - cy)) + (ax*(cy - dy)))/(((bx - ax)*(dy - cy)) + ((by - ay)*(cx - dx)))); + double T = ((((1.0 - S)*ay) + (S*by) - cy)/(dy - cy)); + +@@ -22,7 +22,7 @@ V2d Line::intersection(const Line& seg) + double bx = b.x, by = b.y; + double cx = seg.a.x, cy = seg.a.y; + double dx = seg.b.x, dy = seg.b.y; +- +- double S = (((cx*(dy - ay)) + (dx*(ay - cy)) + (ax*(cy - dy)))/(((bx - ax)*(dy - cy)) + ((by - ay)*(cx - dx)))); ++ ++ double S = (((cx*(dy - ay)) + (dx*(ay - cy)) + (ax*(cy - dy)))/(((bx - ax)*(dy - cy)) + ((by - ay)*(cx - dx)))); + return (1-S) * a + S * b; + } +-- +2.30.2 + diff -Nru pink-pony-1.4.1/debian/patches/0001-Various-fixes.patch pink-pony-1.4.1/debian/patches/0001-Various-fixes.patch --- pink-pony-1.4.1/debian/patches/0001-Various-fixes.patch 1970-01-01 02:00:00.000000000 +0200 +++ pink-pony-1.4.1/debian/patches/0001-Various-fixes.patch 2022-11-19 00:18:31.000000000 +0200 @@ -0,0 +1,25 @@ +From f2eb8f0dc1d403428b9f287d414e925a006b2d70 Mon Sep 17 00:00:00 2001 +From: Thomas Weber <[email protected]> +Date: Sat, 3 Nov 2018 21:44:31 +0100 +Subject: Various fixes + +--- + resources/GLSL/water.frag | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/resources/GLSL/water.frag b/resources/GLSL/water.frag +index 4264d24..7c25a46 100644 +--- a/resources/GLSL/water.frag ++++ b/resources/GLSL/water.frag +@@ -26,7 +26,7 @@ float dispf(vec2 p) + + vec3 displacement(vec3 wp, float dist) + { +- return wp + normal * (dispf(wp.xz) * min(1.0,2.0/pow(dist,1)) * 0.5 + 0.5) * 4.0; ++ return wp + normal * (dispf(wp.xz) * min(1.0,2.0/dist) * 0.5 + 0.5) * 4.0; + } + + void main (void) +-- +2.30.2 + diff -Nru pink-pony-1.4.1/debian/patches/series pink-pony-1.4.1/debian/patches/series --- pink-pony-1.4.1/debian/patches/series 2022-01-29 04:48:50.000000000 +0200 +++ pink-pony-1.4.1/debian/patches/series 2022-11-19 00:18:31.000000000 +0200 @@ -2,3 +2,5 @@ datadir.patch tinyxml.patch glfw3.patch +0001-Fix-compile-issues-caused-by-Imath-being-moved-out-o.patch +0001-Various-fixes.patch diff -Nru pink-pony-1.4.1/debian/SConstruct pink-pony-1.4.1/debian/SConstruct --- pink-pony-1.4.1/debian/SConstruct 2022-01-29 04:48:50.000000000 +0200 +++ pink-pony-1.4.1/debian/SConstruct 2022-11-19 00:18:31.000000000 +0200 @@ -7,7 +7,7 @@ env['LIBS'] = ['GLU', 'GL', 'protobuf', 'IL'] env['CPPPATH'] = ['#', '#/src', '#/external/flextGL/', '/usr/include/OpenEXR'] -env.ParseConfig("pkg-config IlmBase --cflags --libs") +env.ParseConfig("pkg-config Imath --cflags --libs") env.ParseConfig("pkg-config glfw3 --cflags --libs") env.ParseConfig("pkg-config ftgl --cflags --libs") env.ParseConfig("pkg-config sigc++-2.0 --cflags --libs")
