From cbc367238bf59a002d8f6ae2ba726ba283f57649 Mon Sep 17 00:00:00 2001 From: Markus Meier Date: Sun, 17 Mar 2024 10:43:00 +0100 Subject: media-gfx/hugin: sync with main tree Signed-off-by: Markus Meier --- media-gfx/hugin/Manifest | 5 +- media-gfx/hugin/hugin-2022.0.0-r2.ebuild | 102 +++++++++++++++++++++++++++++++ media-gfx/hugin/hugin-2023.0.0-r1.ebuild | 96 +++++++++++++++++++++++++++++ media-gfx/hugin/hugin-2023.0.0.ebuild | 97 ----------------------------- media-gfx/hugin/hugin-9999.ebuild | 7 ++- 5 files changed, 206 insertions(+), 101 deletions(-) create mode 100644 media-gfx/hugin/hugin-2022.0.0-r2.ebuild create mode 100644 media-gfx/hugin/hugin-2023.0.0-r1.ebuild delete mode 100644 media-gfx/hugin/hugin-2023.0.0.ebuild diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest index c392ede..daaf54f 100644 --- a/media-gfx/hugin/Manifest +++ b/media-gfx/hugin/Manifest @@ -1,7 +1,8 @@ AUX hugin-2022.0.0-exiv2-0.28.patch 3460 BLAKE2B fab4f433b7a5d0959fc68ee0affae81ba989526713a9b711da8553cdbb9522dac80f1ac52007ba90cbf3066eddd3745ec567d4db9b508cf4e944b1e2c627358d SHA512 b5170d9f3b62fcc2e4e5a51d8766e8db8f1df1dcf6e198dbd739f3f960103a9f5e97a8960fc7d5c9b5e226c74c60762b639b5fb677e38754ee597626c554a10d DIST hugin-2022.0.0.tar.bz2 10374360 BLAKE2B ea77614a650f832f39583328767a55ebe888a003fed117e73b22fd29c641fc8494b190b864b7ccb05f996ceca5d95c5391597333efdc19bce0eba93af14543be SHA512 752bdaaea666a24bddc72b4aa4ccfbf366af30022102a2e74fad9c86045b3aeae50929a8a3eb27e296b27bdb487ecd60b6e363b23413e08af6ed944686569c97 DIST hugin-2023.0.0.tar.bz2 10336322 BLAKE2B 5c35f67160d76f961e812a309a0c50bb012beac74dc888ce716e8d0e3da35dbb053ab4e5d5d043b3d3fee9885f2fc1afa962a73e794cd4df920527456d477e89 SHA512 f950afec9020972baa20931d5001cd479a9169a4eec0d459d830612f40177eea6a25e059047054b8e9679017687e4c2db9fb27f755a3d0b749e5055e2ff0adc8 +EBUILD hugin-2022.0.0-r2.ebuild 2335 BLAKE2B 94a779e56b76dcddd24b25265f999e2d8c8258382d70b4cbdf9f67c59a9096913ea2d6a3b3022003c76353a0cf78d50d6155f533f2173c8b20e893fac30e0334 SHA512 202481e1480b57dab5d0467bfe56c67efa02e121b78a3baad71979b69036bea6d2fc7603d8adac7b41c42908d99336a73c39abae55a6b6e80967b1d54069af63 EBUILD hugin-2022.0.0.ebuild 2181 BLAKE2B 3377bffe29b67fcef72a8b0293ab106ade79d40620a4906531863b5639e2c19ca1b168f874181569d10f0958a2a87f51d4e8081857cc62a36400508c5ccbd690 SHA512 c62f921b2d77c8ed0c04887013a29689d0927847b29b23145a514e04e63f6dc0cbe8e113fdf5e40695dcd8913ddecd4e1566fb44097b7a69117e0adbdb30b923 -EBUILD hugin-2023.0.0.ebuild 2121 BLAKE2B c120fb1f6a6fac448502175561f66dfb8e3196c376da805489972b261e35086765cadfccc173e4d201760535099cb48fd849515954c482a508285830e3975654 SHA512 b431432998797026faf403dd6193adb65f274faffc298f1c683eb3409ceb17d5b1772098aa9e5d6322ee6d1e6d9c4891c2f981f0f08a6295983033573b08e958 -EBUILD hugin-9999.ebuild 2058 BLAKE2B df6505aa5b97c6741fab33474f4d779f04f34b0f853490c17947c388e3e9e7024ead68796075b16f04f9720fb3bd5633bc01a0e680489fd520f90b44875ce846 SHA512 d1212c9961fd7bf10cf4a719d4aa77797cdd1f39045f22ceea4a4eb2861dda03ddee2a5cbf91ba8f971235feb986494658f751426b82ca46bc182f7de1da5da9 +EBUILD hugin-2023.0.0-r1.ebuild 2101 BLAKE2B a7d0d8c1b3805c81a33355ac0ec198154abe4a70602d002095e456e8cd842b2d48a432a149f2aa3ab006647fbc9cc099c10257f7f610f23f0e6395ad4c38406a SHA512 1977be3d275567696742aea13228f79c54957688448637140283161c424a4aac80f95fe978f4b3a3a26bab9fcbb174348c8b7e9e6f2040743858418ce48667d9 +EBUILD hugin-9999.ebuild 2210 BLAKE2B 9961fb69cdbb3e4fd63e567ad6cc96dc8a81e608b3742733ad3cc0c19be059e591ae41f2f64751dfbb4482863b97546696ac7088f5b3d74c88ec434ee50bdc7e SHA512 900b2d13e4e756b57830af1c0c6f39b7cf9dd26afeaf5d8f3ceb06be567843f8ba30ae15af032a3a7486eb6be03b6838d96d2a90f0c70e2dfe4e52044dbfbb4f MISC metadata.xml 547 BLAKE2B ea55ca44dac1ccf74d4af96d42af1d4efac2f9823304b529b96aea364ec4a6f8430fd130f54c064766f0c34f9060ca076aa43de664e37177b41cc2deed0207bc SHA512 5012cb4a58bdc374f89d1a2e81e8321ff25f2de2f5682a2f8859137aa3339ce059e7823e26642f58b939e6c1d7f428356a4df5311fca1105320ebcb417129cba diff --git a/media-gfx/hugin/hugin-2022.0.0-r2.ebuild b/media-gfx/hugin/hugin-2022.0.0-r2.ebuild new file mode 100644 index 0000000..1902077 --- /dev/null +++ b/media-gfx/hugin/hugin-2022.0.0-r2.ebuild @@ -0,0 +1,102 @@ +# 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-2023.0.0-r1.ebuild b/media-gfx/hugin/hugin-2023.0.0-r1.ebuild new file mode 100644 index 0000000..0932706 --- /dev/null +++ b/media-gfx/hugin/hugin-2023.0.0-r1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +WX_GTK_VER="3.2-gtk3" +PYTHON_COMPAT=( python3_{9..12} ) + +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 + +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 +} diff --git a/media-gfx/hugin/hugin-2023.0.0.ebuild b/media-gfx/hugin/hugin-2023.0.0.ebuild deleted file mode 100644 index 934bab6..0000000 --- a/media-gfx/hugin/hugin-2023.0.0.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER="3.2-gtk3" -PYTHON_COMPAT=( python3_{9..12} ) - -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 - -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 -} diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild index 5a3b1af..aec868a 100644 --- a/media-gfx/hugin/hugin-9999.ebuild +++ b/media-gfx/hugin/hugin-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,7 +24,6 @@ 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 @@ -72,6 +71,10 @@ 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 } -- cgit v1.2.3-65-gdbad