summarylogtreecommitdiffstats
path: root/0016-Rename-equivalent-to-fix-compilation-on-gcc6.patch
diff options
context:
space:
mode:
authorDaniel Bermond2017-02-28 00:47:16 -0300
committerDaniel Bermond2017-02-28 00:47:16 -0300
commitbe35346318aee8b1544b83553e669760a9945ac6 (patch)
treec495e0b5fa83de6f29b675295aad458fbdf0867e /0016-Rename-equivalent-to-fix-compilation-on-gcc6.patch
parentcc91c9cf3e258720f1df9a60b3d24bbf890721de (diff)
downloadaur-be35346318aee8b1544b83553e669760a9945ac6.tar.gz
Fixed compilation with gcc6. Major rewrite.
First commit after adoption. This package needed a major rewrite as follows: 1) description: a) removed the reference to $pkgname to avoid namcap complain. b) updated description. 2) url: Changed URL to the GitHub one since openni.org is redirecting to apple.com. 3) license: changed from GPL to APACHE as it is the correct one. 4) depends: a) added missed glu dependency (build fails in chroot). b) since both freeglut and glu triggers mesa installation, mesa can be removed. 5) makedepends: added dos2unix. See item 7 - prepare(). 6) source: source was a clone of the upstream git repository but this is not a git package (no -git in the name), so it was not making making sense to do a git clone. Changed this to a plain zip download. Please note that it will use the stable version. 7) prepare(): added this function to apply a patch from Debian that fixes building with gcc6. It was necessary to use dos2unix since the source has Windows line endings. 8) build(): a) removed the steps that were being made before running make. I could not identify any difference without them. b) removed the -lGL flag as it is already added by the building process. 9) package(): a) code rewrite, now cleaner IMHO and commented. b) changed the config directory from /usr/share/openni to /etc/openni as used by Debian. c) removed the installation of all Sample binaries because they seem to be useless. d) added installation of documentation (pre-built pdf and chm). e) added installation of the APACHE license and the file with copyright. 10) install file: a) added mention of openni-primesense-sensor. b) changed mention of sensorkinect-git (removed from AUR) to sensorkinect. 11) pkg-config file: a) changed name from OpenNI2 to openni. b) updated description. 12) readability and cosmetics: a) changed indentation from 2 to 4 spaces. b) changed $_platform variable to $_architecture.
Diffstat (limited to '0016-Rename-equivalent-to-fix-compilation-on-gcc6.patch')
-rw-r--r--0016-Rename-equivalent-to-fix-compilation-on-gcc6.patch81
1 files changed, 81 insertions, 0 deletions
diff --git a/0016-Rename-equivalent-to-fix-compilation-on-gcc6.patch b/0016-Rename-equivalent-to-fix-compilation-on-gcc6.patch
new file mode 100644
index 00000000000..bdb71f9f951
--- /dev/null
+++ b/0016-Rename-equivalent-to-fix-compilation-on-gcc6.patch
@@ -0,0 +1,81 @@
+From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
+Date: Sat, 23 Jan 2016 15:22:26 +0100
+Subject: Rename equivalent to fix compilation on gcc6
+
+Closes: #811848
+---
+ Samples/NiViewer/glh/glh_linear.h | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/Samples/NiViewer/glh/glh_linear.h b/Samples/NiViewer/glh/glh_linear.h
+index 422c05f..207adc5 100644
+--- a/Samples/NiViewer/glh/glh_linear.h
++++ b/Samples/NiViewer/glh/glh_linear.h
+@@ -77,7 +77,7 @@ glh_linear.h
+ #define GLH_EPSILON GLH_REAL(10e-6)
+ #define GLH_PI GLH_REAL(3.1415926535897932384626433832795)
+
+-#define equivalent(a,b) (((a < b + GLH_EPSILON) && (a > b - GLH_EPSILON)) ? true : false)
++#define glh_equivalent(a,b) (((a < b + GLH_EPSILON) && (a > b - GLH_EPSILON)) ? true : false)
+
+ namespace glh
+ {
+@@ -1093,7 +1093,7 @@ namespace glh
+
+ real norm = q[0] * q[0] + q[1] * q[1] + q[2] * q[2] + q[3] * q[3];
+
+- s = (equivalent(norm,GLH_ZERO)) ? GLH_ZERO : ( GLH_TWO / norm );
++ s = (glh_equivalent(norm,GLH_ZERO)) ? GLH_ZERO : ( GLH_TWO / norm );
+
+ xs = q[0] * s;
+ ys = q[1] * s;
+@@ -1194,7 +1194,7 @@ namespace glh
+ theta *= real(0.5);
+ real sin_theta = real(sin(theta));
+
+- if (!equivalent(sqnorm,GLH_ONE))
++ if (!glh_equivalent(sqnorm,GLH_ONE))
+ sin_theta /= real(sqrt(sqnorm));
+ x = sin_theta * axis.v[0];
+ y = sin_theta * axis.v[1];
+@@ -1216,14 +1216,14 @@ namespace glh
+
+ alpha = p1.dot(p2);
+
+- if(equivalent(alpha,GLH_ONE))
++ if(glh_equivalent(alpha,GLH_ONE))
+ {
+ *this = identity();
+ return *this;
+ }
+
+ // ensures that the anti-parallel case leads to a positive dot
+- if(equivalent(alpha,-GLH_ONE))
++ if(glh_equivalent(alpha,-GLH_ONE))
+ {
+ vec3 v;
+
+@@ -1280,7 +1280,7 @@ namespace glh
+ void normalize()
+ {
+ real rnorm = GLH_ONE / real(sqrt(w * w + x * x + y * y + z * z));
+- if (equivalent(rnorm, GLH_ZERO))
++ if (glh_equivalent(rnorm, GLH_ZERO))
+ return;
+ x *= rnorm;
+ y *= rnorm;
+@@ -1439,10 +1439,10 @@ namespace glh
+ inline
+ bool operator == ( const quaternion & q1, const quaternion & q2 )
+ {
+- return (equivalent(q1.x, q2.x) &&
+- equivalent(q1.y, q2.y) &&
+- equivalent(q1.z, q2.z) &&
+- equivalent(q1.w, q2.w) );
++ return (glh_equivalent(q1.x, q2.x) &&
++ glh_equivalent(q1.y, q2.y) &&
++ glh_equivalent(q1.z, q2.z) &&
++ glh_equivalent(q1.w, q2.w) );
+ }
+
+ inline