media-libs/lensfun-0.3.3-r1 dazu

Der Ebuild behebt das Problem der kaputten Python-Installation.
This commit is contained in:
Florian Tham
2022-07-07 10:09:58 +02:00
parent a9d192c1f0
commit 96bcdcb41b
4 changed files with 141 additions and 0 deletions

View File

@@ -0,0 +1,4 @@
AUX lensfun-0.3.2-warnings.patch 1813 BLAKE2B d0ee40324b584eddbee19442f1c221b25043d06b90357feee37b93e9c77dc9475bb45bb23fcd884d90cea031f6b6b46fc9c50e6f22d5bb816d9e289bac8a1e3a SHA512 517d613ba3916dd031eb026748465ec71f2cdc4658b0ce3dede827386f9805916f9bb1c4adc9af350b61b7e68bba1ceee02f89989ff91e52ffcb1ee442599527
DIST lensfun-0.3.3.tar.gz 992432 BLAKE2B 174f9a34195ca8d7f09de43a2f0d1015bc766579607c44541f631142386a3b5c27c823f9f54f08d462946a0809610b6a87e61cd093b69339fa7d57d28cc833ae SHA512 2d913e3d121ac069f4cb7acb3f09c9cf11c5d0069e743500631bd4b6007a1b19ebccf871a4ac8cfc2797a03066f8a678ea9d70feba0f7d6a05c28cef61f7d9cf
EBUILD lensfun-0.3.3-r1.ebuild 1764 BLAKE2B 93a81c5996c275e0ee4084b1125744e1b72125c047c802a3320f2feab6eef6e05a1ec454bf5dc21f1c7bb0782ae938191f25003decb29d886460817fe1b4af19 SHA512 a6a64bc37d4e355d3a62d958d213922c0c40e033353c7876a26593bc03511848a1bfd615d6688b8cccd5b1065d676772d8a44c405eb3eab072b5df7bff055efe
MISC metadata.xml 714 BLAKE2B 68947d3724407e09902ca87a7d7857ef43007fc04fbf428ae23ca065564755836c9939c29b745d4477d1e75da71a436dc9308b99a98219aa86c059bfb50f8b38 SHA512 a62f71b0b4deba655826f8f78e95a3585d5e012ed3ab9c8576cba1f6535ef3d4626dfe821ec62e60bd00d00dffd00c1da5ca7a5ae5dba1b7587dc3fc57550078

View File

@@ -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

View File

@@ -0,0 +1,71 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_SINGLE_IMPL=1
inherit distutils-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 ~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
# We have no use for an *.egg file without a corresponding *.pth, and those are deprecated.
# Replace it with the unpacked module and its metadata.
cd "${BUILD_DIR}/apps"
python_domodule lensfun lensfun.egg-info
rm "${D}"/usr/lib/${EPYTHON}/site-packages/*.egg || die
}

View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<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>
<upstream>
<remote-id type="github">lensfun/lensfun</remote-id>
</upstream>
</pkgmetadata>