From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E813F158041 for ; Sun, 24 Mar 2024 21:03:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5595E2A0C; Sun, 24 Mar 2024 21:03:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 92BD7E2A0C for ; Sun, 24 Mar 2024 21:03:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1DD9234308C for ; Sun, 24 Mar 2024 21:03:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7C06D15B5 for ; Sun, 24 Mar 2024 21:03:17 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1711314162.868cd36143314836dce0e40be7e3f2bb25eb0a3c.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/, media-gfx/hugin/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/hugin/Manifest media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch media-gfx/hugin/hugin-2022.0.0-r2.ebuild media-gfx/hugin/hugin-2022.0.0.ebuild X-VCS-Directories: media-gfx/hugin/ media-gfx/hugin/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 868cd36143314836dce0e40be7e3f2bb25eb0a3c X-VCS-Branch: master Date: Sun, 24 Mar 2024 21:03:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0ac44727-fb41-4d75-9e5a-6d4ebb713f96 X-Archives-Hash: 6310d824e04803c29a55217c6769ba94 commit: 868cd36143314836dce0e40be7e3f2bb25eb0a3c Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 14 09:06:58 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 24 21:02:42 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868cd361 media-gfx/hugin: drop 2022.0.0, 2022.0.0-r2 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/hugin/Manifest | 1 - .../hugin/files/hugin-2022.0.0-exiv2-0.28.patch | 99 -------------------- media-gfx/hugin/hugin-2022.0.0-r2.ebuild | 102 --------------------- media-gfx/hugin/hugin-2022.0.0.ebuild | 99 -------------------- 4 files changed, 301 deletions(-) diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest index 9cbac297857f..cdb38af8edc9 100644 --- a/media-gfx/hugin/Manifest +++ b/media-gfx/hugin/Manifest @@ -1,2 +1 @@ -DIST hugin-2022.0.0.tar.bz2 10374360 BLAKE2B ea77614a650f832f39583328767a55ebe888a003fed117e73b22fd29c641fc8494b190b864b7ccb05f996ceca5d95c5391597333efdc19bce0eba93af14543be SHA512 752bdaaea666a24bddc72b4aa4ccfbf366af30022102a2e74fad9c86045b3aeae50929a8a3eb27e296b27bdb487ecd60b6e363b23413e08af6ed944686569c97 DIST hugin-2023.0.0.tar.bz2 10336322 BLAKE2B 5c35f67160d76f961e812a309a0c50bb012beac74dc888ce716e8d0e3da35dbb053ab4e5d5d043b3d3fee9885f2fc1afa962a73e794cd4df920527456d477e89 SHA512 f950afec9020972baa20931d5001cd479a9169a4eec0d459d830612f40177eea6a25e059047054b8e9679017687e4c2db9fb27f755a3d0b749e5055e2ff0adc8 diff --git a/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch b/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch deleted file mode 100644 index dff74132b48f..000000000000 --- a/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch +++ /dev/null @@ -1,99 +0,0 @@ -Patch originally taken from ArchLinux, modified to be backwards compatible. - -diff -r 79cd11a7a66f src/hugin_base/panodata/Exiv2Helper.cpp ---- a/src/hugin_base/panodata/Exiv2Helper.cpp Wed May 24 19:13:20 2023 +0200 -+++ b/src/hugin_base/panodata/Exiv2Helper.cpp Mon Jun 05 00:31:19 2023 +0200 -@@ -40,7 +40,11 @@ - Exiv2::ExifData::iterator itr = exifData.findKey(Exiv2::ExifKey(keyName)); - if (itr != exifData.end() && itr->count()) - { -+#if EXIV2_TEST_VERSION(0,28,0) -+ value = itr->toUint32(); -+#else - value = itr->toLong(); -+#endif - return true; - } - else -@@ -165,7 +169,11 @@ - { - if(it!=exifData.end() && it->count()) - { -+#if EXIV2_TEST_VERSION(0,28,0) -+ return it->toUint32(); -+#else - return it->toLong(); -+#endif - } - return 0; - }; -@@ -600,4 +608,4 @@ - }; - - }; //namespace Exiv2Helper --}; //namespace HuginBase -\ No newline at end of file -+}; //namespace HuginBase -diff -r 79cd11a7a66f src/hugin_base/panodata/SrcPanoImage.cpp ---- a/src/hugin_base/panodata/SrcPanoImage.cpp Wed May 24 19:13:20 2023 +0200 -+++ b/src/hugin_base/panodata/SrcPanoImage.cpp Mon Jun 05 00:31:19 2023 +0200 -@@ -384,7 +384,11 @@ - pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageWidthPixels")); - if (pos != xmpData.end()) - { -+#if EXIV2_TEST_VERSION(0,28,0) -+ croppedWidth = pos->toUint32(); -+#else - croppedWidth = pos->toLong(); -+#endif - } - else - { -@@ -394,7 +398,11 @@ - pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageHeightPixels")); - if (pos != xmpData.end()) - { -+#if EXIV2_TEST_VERSION(0,28,0) -+ croppedHeight = pos->toUint32(); -+#else - croppedHeight = pos->toLong(); -+#endif - } - else - { -@@ -408,7 +416,11 @@ - double hfov = 0; - if (pos != xmpData.end()) - { -+#if EXIV2_TEST_VERSION(0,28,0) -+ hfov = 360 * croppedWidth / (double)pos->toUint32(); -+#else - hfov = 360 * croppedWidth / (double)pos->toLong(); -+#endif - } - else - { -@@ -419,7 +431,11 @@ - pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.FullPanoHeightPixels")); - if (pos != xmpData.end()) - { -+#if EXIV2_TEST_VERSION(0,28,0) -+ fullHeight = pos->toUint32(); -+#else - fullHeight = pos->toLong(); -+#endif - } - else - { -@@ -430,7 +446,11 @@ - pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaTopPixels")); - if (pos != xmpData.end()) - { -+#if EXIV2_TEST_VERSION(0,28,0) -+ cropTop = pos->toUint32(); -+#else - cropTop = pos->toLong(); -+#endif - } - else - { diff --git a/media-gfx/hugin/hugin-2022.0.0-r2.ebuild b/media-gfx/hugin/hugin-2022.0.0-r2.ebuild deleted file mode 100644 index 1902077f9eda..000000000000 --- a/media-gfx/hugin/hugin-2022.0.0-r2.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER="3.0-gtk3" -PYTHON_COMPAT=( python3_{9..11} ) - -inherit python-single-r1 wxwidgets cmake xdg - -DESCRIPTION="GUI for the creation & processing of panoramic images" -HOMEPAGE="http://hugin.sf.net" -SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2" - -LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" - -LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW" -IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})" - -CDEPEND=" - dev-db/sqlite:3 - dev-libs/boost:= - >=media-gfx/enblend-4.0 - media-gfx/exiv2:= - media-libs/freeglut - media-libs/glew:= - media-libs/libjpeg-turbo:= - >=media-libs/libpano13-2.9.19_beta1:= - media-libs/libpng:= - media-libs/openexr:= - media-libs/tiff:= - >=media-libs/vigra-1.11.1-r5[openexr] - sci-libs/fftw:3.0= - sci-libs/flann - sys-libs/zlib - virtual/glu - virtual/opengl - x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl] - lapack? ( virtual/blas virtual/lapack ) - python? ( ${PYTHON_DEPS} ) - sift? ( media-gfx/autopano-sift-C )" -RDEPEND="${CDEPEND} - media-libs/exiftool - raw? ( media-gfx/dcraw )" -DEPEND="${CDEPEND} - dev-cpp/tclap - sys-devel/gettext - virtual/pkgconfig - python? ( >=dev-lang/swig-2.0.4 )" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS=( authors.txt README TODO ) - -S=${WORKDIR}/${PN}-$(ver_cut 1-2).0 - -PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # bug 906468 - -pkg_setup() { - use python && python-single-r1_pkg_setup - setup-wxwidgets -} - -src_prepare() { - sed -i \ - -e "/COMMAND.*GZIP/d" \ - -e "s/\.gz//g" \ - "${S}"/doc/CMakeLists.txt || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_HSI=$(usex python) - -DENABLE_LAPACK=$(usex lapack) - # Temporary workaround for bug #833443. Can be dropped when - # we switch to wxgtk-3.2, but complications for that remain - # w/ egl+wayland. - -DUSE_GDKBACKEND_X11=on - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - use python && python_optimize - - local lang - for lang in ${LANGS} ; do - case ${lang} in - ca) dir=ca_ES;; - ca-valencia) dir=ca_ES@valencia;; - cs) dir=cs_CZ;; - *) dir=${lang/-/_};; - esac - if ! use l10n_${lang} ; then - rm -r "${ED}"/usr/share/locale/${dir} || die - fi - done -} diff --git a/media-gfx/hugin/hugin-2022.0.0.ebuild b/media-gfx/hugin/hugin-2022.0.0.ebuild deleted file mode 100644 index 5ffa06386d06..000000000000 --- a/media-gfx/hugin/hugin-2022.0.0.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER="3.0-gtk3" -PYTHON_COMPAT=( python3_{9..11} ) - -inherit python-single-r1 wxwidgets cmake xdg - -DESCRIPTION="GUI for the creation & processing of panoramic images" -HOMEPAGE="http://hugin.sf.net" -SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2" - -LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2" -SLOT="0" -KEYWORDS="amd64 arm64 ~x86" - -LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW" -IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})" - -CDEPEND=" - dev-db/sqlite:3 - dev-libs/boost:= - dev-libs/zthread - >=media-gfx/enblend-4.0 - media-gfx/exiv2:= - media-libs/freeglut - media-libs/glew:= - media-libs/libjpeg-turbo:= - >=media-libs/libpano13-2.9.19_beta1:= - media-libs/libpng:= - media-libs/openexr:= - media-libs/tiff:= - >=media-libs/vigra-1.11.1-r5[openexr] - sci-libs/fftw:3.0= - sci-libs/flann - sys-libs/zlib - virtual/glu - virtual/opengl - x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl] - lapack? ( virtual/blas virtual/lapack ) - python? ( ${PYTHON_DEPS} ) - sift? ( media-gfx/autopano-sift-C )" -RDEPEND="${CDEPEND} - media-libs/exiftool - raw? ( media-gfx/dcraw )" -DEPEND="${CDEPEND} - dev-cpp/tclap - sys-devel/gettext - virtual/pkgconfig - python? ( >=dev-lang/swig-2.0.4 )" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS=( authors.txt README TODO ) - -S=${WORKDIR}/${PN}-$(ver_cut 1-2).0 - -PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # bug 906468 - -pkg_setup() { - use python && python-single-r1_pkg_setup - setup-wxwidgets -} - -src_prepare() { - sed -i \ - -e "/COMMAND.*GZIP/d" \ - -e "s/\.gz//g" \ - "${S}"/doc/CMakeLists.txt || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_HSI=$(usex python) - -DENABLE_LAPACK=$(usex lapack) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - use python && python_optimize - - local lang - for lang in ${LANGS} ; do - case ${lang} in - ca) dir=ca_ES;; - ca-valencia) dir=ca_ES@valencia;; - cs) dir=cs_CZ;; - *) dir=${lang/-/_};; - esac - if ! use l10n_${lang} ; then - rm -r "${ED}"/usr/share/locale/${dir} || die - fi - done -}