From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 23 Sep 2020 10:22:15 +0100
Subject: gentoo resync : 23.09.2020

---
 media-libs/lensfun/Manifest                        |  3 +-
 .../lensfun/files/lensfun-0.3.2-warnings.patch     | 48 ++++++++++++++++++++++
 media-libs/lensfun/lensfun-0.3.2-r1.ebuild         |  4 ++
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 media-libs/lensfun/files/lensfun-0.3.2-warnings.patch

(limited to 'media-libs/lensfun')

diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index cd6d9fd1411a..247d63ddc182 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,3 +1,4 @@
+AUX lensfun-0.3.2-warnings.patch 1813 BLAKE2B d0ee40324b584eddbee19442f1c221b25043d06b90357feee37b93e9c77dc9475bb45bb23fcd884d90cea031f6b6b46fc9c50e6f22d5bb816d9e289bac8a1e3a SHA512 517d613ba3916dd031eb026748465ec71f2cdc4658b0ce3dede827386f9805916f9bb1c4adc9af350b61b7e68bba1ceee02f89989ff91e52ffcb1ee442599527
 DIST lensfun-0.3.2.tar.gz 784825 BLAKE2B c77cd6b2f1bda0313a980fbd3bbc7ca9ad5ed0b9777cce924f66da5de3974ccfc8939d054c7a7532508b6b0913e2d436a825a83916800b625ff2c552c96a0ae3 SHA512 9c6f546fa70e6dc692e66ef378447345be6d3383812934780d326d772d775c1918cbf3447cd91c067655044cf659025763bf47ba2d938a82a3c2de4d60127446
-EBUILD lensfun-0.3.2-r1.ebuild 1425 BLAKE2B 37045036e950a9466e1ffcd3abf1d0c32f625d881ee13a5937b8f5e2a145fd4b6bf2ff64c827d246e8c5d7cdd2b08e918a3405de4257e21e4b1d7bc02fd8bf5e SHA512 dfea007fc8988f66f159c8aeaadea6292a37ea9d0f56f088cfd977a0bc9e744326265edd73742f0fa48e0753474a7256dd2813303fc90b0ca1460f4dc47ad3f4
+EBUILD lensfun-0.3.2-r1.ebuild 1473 BLAKE2B e6fcc5819ad46d68a42e09e1b805c590c56c0db0bc06e00356a4fef4021b0d2f717287b1ca5e42d92f62270b7f1a84613efd654c219f8619c31b2e6430382492 SHA512 2d81acf0228ec01161668778337706bfb1662f7b8a686184bdecfb1e4554c9210f7d23ef88b053a912065315d4d8e7f1fe73f6f2143ddb22bc2dbdb8ea6f905f
 MISC metadata.xml 713 BLAKE2B e8cc55a88122f0d188e1bce8f72f9ae57f1799c50ccebb1f1253094de326b9858e0ecf38922873397693946848910435103aefe6ed61040080e514d6d0b0bf0d SHA512 0c04301dcb4cb729050574c28c29f7f27494f1368bea0b62667e8ef3ed322a3339bd74090aa2e970129ae6b8e4e3bf749a090dbcca878adec90de568146bd32c
diff --git a/media-libs/lensfun/files/lensfun-0.3.2-warnings.patch b/media-libs/lensfun/files/lensfun-0.3.2-warnings.patch
new file mode 100644
index 000000000000..a1aad34d9d28
--- /dev/null
+++ b/media-libs/lensfun/files/lensfun-0.3.2-warnings.patch
@@ -0,0 +1,48 @@
+Adapted from upstream commit
+
+From 694542f350fc7c9ccafa2d9acb4d4e00e690cbdc Mon Sep 17 00:00:00 2001
+From: Sebastian Kraft <mail@sebastiankraft.net>
+Date: Thu, 22 Dec 2016 18:51:29 +0100
+Subject: [PATCH] Fix some warnings which were introduced when swithcing to
+ C++11 mode
+
+---
+ libs/lensfun/cpuid.cpp  | 4 ++--
+ libs/lensfun/mod-pc.cpp | 8 ++++----
+ tests/test_modifier.cpp | 4 ++--
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/libs/lensfun/cpuid.cpp b/libs/lensfun/cpuid.cpp
+index c435f8ac..d2d63972 100644
+--- a/libs/lensfun/cpuid.cpp
++++ b/libs/lensfun/cpuid.cpp
+@@ -92,9 +92,9 @@ guint _lf_detect_cpu_features ()
+ {
+ #define cpuid(cmd) \
+     __asm volatile ( \
+-        "push %%"R_BX"\n" \
++        "push %%" R_BX "\n" \
+         "cpuid\n" \
+-        "pop %%"R_BX"\n" \
++        "pop %%" R_BX "\n" \
+        : "=a" (ax), "=c" (cx),  "=d" (dx) \
+        : "0" (cmd))
+ 
+diff --git a/tests/test_modifier.cpp b/tests/test_modifier.cpp
+index f087917c..ffa3d4d7 100644
+--- a/tests/test_modifier.cpp
++++ b/tests/test_modifier.cpp
+@@ -78,8 +78,8 @@ void test_mod_projection_center(lfFixture* lfFix, gconstpointer data)
+ // check if output becomes NaN when processing geometry conversion
+ void test_mod_projection_borders(lfFixture* lfFix, gconstpointer data)
+ {
+-    float in[2]  = {lfFix->img_width, lfFix->img_height};
+-    float in2[2] = {(lfFix->img_width-1)/2, (lfFix->img_height-1)/2};
++    float in[2]  = {(float) lfFix->img_width, (float) lfFix->img_height};
++    float in2[2] = {(float) (lfFix->img_width-1)/2, (float) (lfFix->img_height-1)/2};
+     float res[2] = {0, 0};
+ 
+     lfLensType geom_types [] = {LF_RECTILINEAR, LF_PANORAMIC, LF_EQUIRECTANGULAR, LF_FISHEYE_STEREOGRAPHIC, LF_FISHEYE, LF_FISHEYE_EQUISOLID, LF_FISHEYE_ORTHOGRAPHIC, LF_FISHEYE_THOBY, LF_UNKNOWN};
+-- 
+2.26.2
+
diff --git a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
index 528d11db7368..ef48ba8d722a 100644
--- a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
@@ -34,6 +34,10 @@ DEPEND="${RDEPEND}"
 
 DOCS=( README.md docs/mounts.txt ChangeLog )
 
+PATCHES=(
+	"${FILESDIR}/${P}-warnings.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
-- 
cgit v1.2.3