media-libs/lensfun: sync with main tree

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

4 files changed, 2 insertions, 118 deletions

diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index 65593f8..a895c06 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,6 +1,3 @@
-AUX lensfun-0.3.2-warnings.patch 1813 BLAKE2B d0ee40324b584eddbee19442f1c221b25043d06b90357feee37b93e9c77dc9475bb45bb23fcd884d90cea031f6b6b46fc9c50e6f22d5bb816d9e289bac8a1e3a SHA512 517d613ba3916dd031eb026748465ec71f2cdc4658b0ce3dede827386f9805916f9bb1c4adc9af350b61b7e68bba1ceee02f89989ff91e52ffcb1ee442599527
-DIST lensfun-0.3.3.tar.gz 992432 BLAKE2B 174f9a34195ca8d7f09de43a2f0d1015bc766579607c44541f631142386a3b5c27c823f9f54f08d462946a0809610b6a87e61cd093b69339fa7d57d28cc833ae SHA512 2d913e3d121ac069f4cb7acb3f09c9cf11c5d0069e743500631bd4b6007a1b19ebccf871a4ac8cfc2797a03066f8a678ea9d70feba0f7d6a05c28cef61f7d9cf
 DIST lensfun-0.3.4_rc1.tar.gz 1045616 BLAKE2B fee14b97dcda98be4e8a32443ff71347ba75e46192f8437be580cb6697f6ef2eca92ef57cfcb2de5bd87fe7ba96542a6b5551b12f50fec09a035c69d6f4b427f SHA512 0d034c6996e5650b022d33a7e00ef7e0e00dfa99155aa62c6c3ab48b9ac936e46f812ceea46e2070514e2c77150a1d7c827831686b1cf73e2acf88b6b3dfb6c5
-EBUILD lensfun-0.3.3.ebuild 1487 BLAKE2B aa5bb2f7e99444876507f8899fbeab603930c8973a7ef61a51b589688ed66d9203114f78debac49bee49ef83fc7c9b1b5a2e1a5347ef4ef73f8f2b761c74fdbd SHA512 0361c7d354e6680c886163793a2e32ef1367be3aa8310ef0b83708c364a40e2263526d9b733d39f06fe63fca1277f5fe3cd7455f07a2839d50148ba3a54c3247
-EBUILD lensfun-0.3.4_rc1.ebuild 1485 BLAKE2B 5a1e2cccae8f10c94bc5e52e934a43504b93d3f7b73ad6c43ace6f7eeafced37c408e1991a396ef6be7ef4d96d00eb136d87e3cd5d01fcfc4bb47456b6314daa SHA512 7c1f09f3c2e0e1032b31a45d8ca5517ff3a4663b11ce4427d34a2dbda6f981730a953d56daea7731b018d0aa6fbb92aaca7ae85372c31810ae6764b6aa30679a
+EBUILD lensfun-0.3.4_rc1.ebuild 1478 BLAKE2B 8d174b0fb60812e9855176ee9b2021c1f162ceb2d04d1a8bddc2e6211c8f6cd35159436a2781f741a299e0b8f907063519a3d1abdf720420fa8ae03144e8a760 SHA512 1280a1013cb934823031f9bb7a2400f281d588fbe9ed38316939c4e18106f1d7a3fc13f1d987d3aa808eee97a9a21afd23bd2d59ca4a938a5a47f223157d38c4
 MISC metadata.xml 716 BLAKE2B 866b92afec30235731857799268948cf0d63be654432c72bf6a93084d2e344d486d0156571e08accfce4c9323aee6e7f155620d2e7a72ebfe69ef27b39bb13cb SHA512 fa3c54e5ea453bcefb5e9b9c76c3a45fa74280ba52b713ac93aa5a95341dc0f9111130b1952bc0a4b3b7898d5d0bde46234e1b42453757ead0c42c002141e6c4
diff --git a/media-libs/lensfun/files/lensfun-0.3.2-warnings.patch b/media-libs/lensfun/files/lensfun-0.3.2-warnings.patch
deleted file mode 100644
index a1aad34..0000000
--- a/media-libs/lensfun/files/lensfun-0.3.2-warnings.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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.3.ebuild b/media-libs/lensfun/lensfun-0.3.3.ebuild
deleted file mode 100644
index 8f6feb3..0000000
--- a/media-libs/lensfun/lensfun-0.3.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-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 ~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}"
-
-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 )
-
-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=/usr
-		-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/lensfun-0.3.4_rc1.ebuild b/media-libs/lensfun/lensfun-0.3.4_rc1.ebuild
index cbdf5c8..2ce6102 100644
--- a/media-libs/lensfun/lensfun-0.3.4_rc1.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.4_rc1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/_rc/-RC}"
 
 LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~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}"