gentoo auto-resync : 23:09:2023 - 23:21:08

4 files changed, 109 insertions, 1 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index ca3ec24756df..430b6ccad3ee 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 70eee26ae567..15cc9ba102b0 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,5 +1,6 @@
 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
+EBUILD hugin-2022.0.0-r1.ebuild 2353 BLAKE2B e59e9cac33623bf9a8b5b3008f5e5263667210a73408e1433a80daec4e27ef24298eb138aec665752814e60d34001e7dce72419b92ebcb08cc5165997336b507 SHA512 9d1f989a2671c72abb8c1ccfc1a9021c34a612892cee3510b1b1550de3b0ad9e52468355a196447736caa4942e0afca3c19b1fda8663dd47e2c3836c65efab91
 EBUILD hugin-2022.0.0.ebuild 2181 BLAKE2B 3377bffe29b67fcef72a8b0293ab106ade79d40620a4906531863b5639e2c19ca1b168f874181569d10f0958a2a87f51d4e8081857cc62a36400508c5ccbd690 SHA512 c62f921b2d77c8ed0c04887013a29689d0927847b29b23145a514e04e63f6dc0cbe8e113fdf5e40695dcd8913ddecd4e1566fb44097b7a69117e0adbdb30b923
-EBUILD hugin-9999.ebuild 2058 BLAKE2B 13f52f224c492d093c79429cfdc05b81c8a4c5c5297266107c55f20bb4278d4e4664bc183ee0fe8c210d657a0ac5b51bd86ed0fd7d02c3668551753f0c7a5178 SHA512 b6ae419dffb76575973fe91feef2b578a75d5350e935f9a1da73451030878d3ed7eb0945f6745a8467b5f3c9973487d5e08c37d5a0df47b5accb4bcd4a0aa22f
+EBUILD hugin-9999.ebuild 2228 BLAKE2B 4f1d0cf65165bd0b80e38ffb8b576ce294ef01b8e0dd7dfec7232dcf7a2c7cf02e42ec0209400740cfbbc03797478ed9650e7de8f6ec970269397e1696465c7b SHA512 1e115973d9726421720fcfe2cf773058d72dee03fd8212fe827f8f16c1936c7d512ab13075959507372d0322e7cc3eedcae60dc27e8ac1fd064508fb67b7c693
 MISC metadata.xml 547 BLAKE2B ea55ca44dac1ccf74d4af96d42af1d4efac2f9823304b529b96aea364ec4a6f8430fd130f54c064766f0c34f9060ca076aa43de664e37177b41cc2deed0207bc SHA512 5012cb4a58bdc374f89d1a2e81e8321ff25f2de2f5682a2f8859137aa3339ce059e7823e26642f58b939e6c1d7f428356a4df5311fca1105320ebcb417129cba
diff --git a/media-gfx/hugin/hugin-2022.0.0-r1.ebuild b/media-gfx/hugin/hugin-2022.0.0-r1.ebuild
new file mode 100644
index 000000000000..8fe47c8a270b
--- /dev/null
+++ b/media-gfx/hugin/hugin-2022.0.0-r1.ebuild
@@ -0,0 +1,103 @@
+# 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)
+		# 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-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 9411d0ca3b31..f73101d06bae 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -72,6 +72,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
 }