commit: 92729a9da9d9a66f3b6984b2df12e9d93eea6c7b Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Sep 23 20:06:48 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Sep 23 20:06:48 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92729a9d
media-gfx/hugin: disable Wayland backend As noted in the bug, this is broken w/ wxgtk-3.0. Just go for the X backend for now until we can move to wxgtk-3.2, but we can't quite do that yet because of issues w/ egl+wayland. Closes: https://bugs.gentoo.org/833443 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{hugin-9999.ebuild => hugin-2022.0.0-r1.ebuild} | 18 +++++++++++++----- media-gfx/hugin/hugin-9999.ebuild | 4 ++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-2022.0.0-r1.ebuild similarity index 80% copy from media-gfx/hugin/hugin-9999.ebuild copy to media-gfx/hugin/hugin-2022.0.0-r1.ebuild index 9411d0ca3b31..8fe47c8a270b 100644 --- a/media-gfx/hugin/hugin-9999.ebuild +++ b/media-gfx/hugin/hugin-2022.0.0-r1.ebuild @@ -6,17 +6,15 @@ EAPI=7 WX_GTK_VER="3.0-gtk3" PYTHON_COMPAT=( python3_{9..11} ) -inherit mercurial python-single-r1 wxwidgets cmake xdg +inherit python-single-r1 wxwidgets cmake xdg DESCRIPTION="GUI for the creation & processing of panoramic images" HOMEPAGE="http://hugin.sf.net"; -SRC_URI="" -EHG_REPO_URI="http://hg.code.sf.net/p/hugin/hugin"; -EHG_PROJECT="${PN}-${PN}" +SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2" LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2" SLOT="0" -KEYWORDS="" +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_})" @@ -59,12 +57,18 @@ 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 } @@ -72,6 +76,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 } 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 }
