commit: 5d08c4cb6dc345dc7e784027cb6a8dc4717cad76 Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> AuthorDate: Sat Jun 3 11:41:12 2023 +0000 Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> CommitDate: Sat Jun 3 11:43:00 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d08c4cb
sci-geosciences/opencpn: fix build deps Closes: https://bugs.gentoo.org/862591 Closes: https://bugs.gentoo.org/846953 Bug: https://bugs.gentoo.org/907738 Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org> sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild | 7 ++++--- ...cpn-5.6.2-r2.ebuild => opencpn-5.6.2-r3.ebuild} | 10 +++++---- ...cpn-5.6.2-r2.ebuild => opencpn-5.8.2-r2.ebuild} | 24 ++++++++++++++-------- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild b/sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild index 53ecdb5e91ac..884fa909efe4 100644 --- a/sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild +++ b/sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/OpenCPN-Release_${PV}" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc lzma opengl" +IUSE="doc lzma" RDEPEND=" app-arch/bzip2 @@ -28,9 +28,10 @@ RDEPEND=" media-libs/portaudio net-misc/curl sys-libs/zlib - opengl? ( virtual/opengl ) + virtual/opengl + x11-base/xorg-proto x11-libs/gtk+:3 - x11-libs/wxGTK:${WX_GTK_VER}=[opengl?,X] + x11-libs/wxGTK:${WX_GTK_VER}=[opengl,X] " DEPEND="${RDEPEND}" BDEPEND=" diff --git a/sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild b/sci-geosciences/opencpn/opencpn-5.6.2-r3.ebuild similarity index 91% copy from sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild copy to sci-geosciences/opencpn/opencpn-5.6.2-r3.ebuild index 53ecdb5e91ac..cb75281d7cff 100644 --- a/sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild +++ b/sci-geosciences/opencpn/opencpn-5.6.2-r3.ebuild @@ -18,19 +18,21 @@ S="${WORKDIR}/OpenCPN-Release_${PV}" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc lzma opengl" +IUSE="doc lzma" RDEPEND=" app-arch/bzip2 - lzma? ( app-arch/xz-utils ) dev-libs/tinyxml + lzma? ( app-arch/xz-utils ) media-libs/freetype:2 media-libs/portaudio net-misc/curl sys-libs/zlib - opengl? ( virtual/opengl ) + virtual/libusb:1 + virtual/opengl + x11-base/xorg-proto x11-libs/gtk+:3 - x11-libs/wxGTK:${WX_GTK_VER}=[opengl?,X] + x11-libs/wxGTK:${WX_GTK_VER}=[opengl,X] " DEPEND="${RDEPEND}" BDEPEND=" diff --git a/sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild b/sci-geosciences/opencpn/opencpn-5.8.2-r2.ebuild similarity index 80% copy from sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild copy to sci-geosciences/opencpn/opencpn-5.8.2-r2.ebuild index 53ecdb5e91ac..7d5e879a5b06 100644 --- a/sci-geosciences/opencpn/opencpn-5.6.2-r2.ebuild +++ b/sci-geosciences/opencpn/opencpn-5.8.2-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -WX_GTK_VER="3.0-gtk3" +WX_GTK_VER="3.2-gtk3" inherit wxwidgets xdg cmake DOC_VERSION="4.8.2.0" @@ -18,24 +18,30 @@ S="${WORKDIR}/OpenCPN-Release_${PV}" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc lzma opengl" +IUSE="doc lzma" RDEPEND=" app-arch/bzip2 - lzma? ( app-arch/xz-utils ) dev-libs/tinyxml + lzma? ( app-arch/xz-utils ) media-libs/freetype:2 + media-libs/glew:0 + media-libs/jasper media-libs/portaudio net-misc/curl sys-libs/zlib - opengl? ( virtual/opengl ) + virtual/libusb:1 + virtual/opengl + x11-base/xorg-proto x11-libs/gtk+:3 - x11-libs/wxGTK:${WX_GTK_VER}=[opengl?,X] + x11-libs/wxGTK:${WX_GTK_VER}=[opengl,X] " DEPEND="${RDEPEND}" BDEPEND=" - sys-devel/gettext + dev-cpp/gtest + dev-libs/rapidjson sys-apps/lsb-release + sys-devel/gettext " src_configure() { @@ -43,11 +49,11 @@ src_configure() { setup-wxwidgets local mycmakeargs=( - -DUSE_S57=ON -DUSE_GARMINHOST=ON - -DBUNDLE_GSHHS=CRUDE - -DBUNDLE_TCDATA=ON ) +# -DUSE_S57=ON +# -DBUNDLE_TCDATA=ON +# -DBUNDLE_GSHHS=CRUDE cmake_src_configure }
