media-libs/lensfun: sync with main tree

Signed-off-by: Markus Meier <maekke@gentoo.org>

5 files changed, 68 insertions, 93 deletions

diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index c475aa5..d52c0e3 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,22 +1 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST lensfun-0.3.2.tar.gz 784825 BLAKE2B c77cd6b2f1bda0313a980fbd3bbc7ca9ad5ed0b9777cce924f66da5de3974ccfc8939d054c7a7532508b6b0913e2d436a825a83916800b625ff2c552c96a0ae3 SHA512 9c6f546fa70e6dc692e66ef378447345be6d3383812934780d326d772d775c1918cbf3447cd91c067655044cf659025763bf47ba2d938a82a3c2de4d60127446
-DIST lensfun-0.3.95.tar.gz 2731561 BLAKE2B b5ea2b8b98c6178a93c969fafdd39f2495856dda9c7d61b7df43de89e0918bbe336d3552255b94c8d5edc03210f1f8907a73881ec7db71e46d77a3c2b746171b SHA512 27740d90a26be0d20a20f5ecab2991d85afd87ae96822025374f69bd0df0ddb825aee284f7861a34f0da6e57a8c021354244665852a6b77368918b6820d6b51e
-EBUILD lensfun-0.3.2-r1.ebuild 1425 BLAKE2B 37045036e950a9466e1ffcd3abf1d0c32f625d881ee13a5937b8f5e2a145fd4b6bf2ff64c827d246e8c5d7cdd2b08e918a3405de4257e21e4b1d7bc02fd8bf5e SHA512 dfea007fc8988f66f159c8aeaadea6292a37ea9d0f56f088cfd977a0bc9e744326265edd73742f0fa48e0753474a7256dd2813303fc90b0ca1460f4dc47ad3f4
-EBUILD lensfun-0.3.95.ebuild 1385 BLAKE2B 36b22c92f1d61a9230ff975b33606c54ff1ae13c6bfd7d01159301901f63106e1fd3ab154c89232933a32a5f6ce66f200f6703e30bec9fdb4ed5cf7fcf89eb3f SHA512 242a7c5a32c0e5e4b1c5a2aea37d4a2eb0906154da53b678682091f375a3595351f608ff73a3977ff78e66a9b2376cf467ccdacd5a91ac4a2c0edd8fdb45b567
-MISC metadata.xml 612 BLAKE2B e0e745eb0d418ebbd7461736d92c432b48d88823142bc2bebf9765c3b9270124fd4a9718e384fd46acd8667bbb602d10c74435acaedfa0449e3890a186671ea0 SHA512 f61a2e3333e7f8fa5f3a64f93eabccac5bfd6587a195c019a3f2ed786f2d996412921a8308fc48e70b4347f230704b8fc18f0f7274a5e00ab68e0e5667640faa
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQGTBAEBCAB9FiEEO7vfxj/1NCgzMht7hGSR/kUngVoFAl7bhFRfFIAAAAAALgAo
-aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNC
-QkJERkM2M0ZGNTM0MjgzMzMyMUI3Qjg0NjQ5MUZFNDUyNzgxNUEACgkQhGSR/kUn
-gVpQRAf+K6xNXoiFRd+s/T16ePgTY/rxaxbyJnh4tBj4VS9oK7ExOidPjlvXPm7q
-9S1YAFOPFdICpcjMPDrONWKMmDbU5tCZZP0ek/x1B6TBzQI9o+TrbjwSJQXnmBUz
-LppiUBqwAWsGhyWS21y9XravJqwwPXr21vrdCIuEboUDeUXNs0uvjYjHtZubdyU7
-BC0VhZoIhsGQEKe6Gtt2MjUgXHIcKi+HS5zXzbx3F+nTmN8oujxbQM5R1iYjSa1H
-jltJrqAtrQ6i50g7iaF1Iz3qkeWyUJPlBFUa5ce19LQfHlvZTr2yV5oqfDYKfyiA
-KPjjl23Uu49QvRYR47v3J0gucfn+vg==
-=OAcO
------END PGP SIGNATURE-----
+DIST lensfun-0.3.3.tar.gz 992432 BLAKE2B 174f9a34195ca8d7f09de43a2f0d1015bc766579607c44541f631142386a3b5c27c823f9f54f08d462946a0809610b6a87e61cd093b69339fa7d57d28cc833ae SHA512 2d913e3d121ac069f4cb7acb3f09c9cf11c5d0069e743500631bd4b6007a1b19ebccf871a4ac8cfc2797a03066f8a678ea9d70feba0f7d6a05c28cef61f7d9cf
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 0000000..a1aad34
--- /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.3.ebuild
index 528d11d..8f6feb3 100644
--- a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{9..10} )
 inherit python-single-r1 cmake
 
 DESCRIPTION="Library for rectifying and simulating photographic lens distortions"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -34,10 +34,14 @@ DEPEND="${RDEPEND}"
 
 DOCS=( README.md docs/mounts.txt ChangeLog )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.2-warnings.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
-		-DSETUP_PY_INSTALL_PREFIX="${ED}"/usr
+		-DSETUP_PY_INSTALL_PREFIX=/usr
 		-DBUILD_LENSTOOL=ON
 		-DBUILD_STATIC=OFF
 		-DBUILD_DOC=$(usex doc)
diff --git a/media-libs/lensfun/lensfun-0.3.95.ebuild b/media-libs/lensfun/lensfun-0.3.95.ebuild
deleted file mode 100644
index aa7ff1a..0000000
--- a/media-libs/lensfun/lensfun-0.3.95.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-single-r1 cmake
-
-DESCRIPTION="Library for rectifying and simulating photographic lens distortions"
-HOMEPAGE="https://lensfun.github.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-python/docutils
-	)
-"
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.40
-	media-libs/libpng:0=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md docs/mounts.txt ChangeLog )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
-		-DBUILD_LENSTOOL=ON
-		-DBUILD_STATIC=OFF
-		-DBUILD_DOC=$(usex doc)
-		-DBUILD_FOR_SSE=$(usex cpu_flags_x86_sse)
-		-DBUILD_FOR_SSE2=$(usex cpu_flags_x86_sse2)
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	mkdir -p "${T}/db/lensfun" || die
-	cp data/db/* "${T}/db/lensfun/" || die
-
-	XDG_DATA_HOME="${T}/db" cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	python_optimize
-}
diff --git a/media-libs/lensfun/metadata.xml b/media-libs/lensfun/metadata.xml
index 89c819c..1a9bdd6 100644
--- a/media-libs/lensfun/metadata.xml
+++ b/media-libs/lensfun/metadata.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
+	<maintainer type="person">
+		<email>dilfridge@gentoo.org</email>
+		<name>Andreas K. Huettel</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>maekke@gentoo.org</email>
+		<name>Markus Meier</name>
 	</maintainer>
 	<longdescription lang="en">
-The project provides a database of photographic lenses and a library that allows advanced access to the database including functions to correct images based on intimate knowledge of lens characteristics and calibration data.
-</longdescription>
+	The project provides a database of photographic lenses and a library that allows advanced access to the database including functions to correct images based on intimate knowledge of lens characteristics and calibration data.
+	</longdescription>
 	<upstream>
 		<remote-id type="github">lensfun/lensfun</remote-id>
 	</upstream>